Merge branch 'dev' of http://222.212.85.86:8222/bdzl2/bxztApp into dev

packages/mobile/src/views/IceEvent/IceEventAdd.vue

@@ -560,10 +560,10 @@ const handleAdd = async () => {
         params: { data: encodeURIComponent(JSON.stringify(yhzDetail.value)) },
       });
     } else {
+      toast.close();
       throw new Error(res.message);
     }
   } catch (error) {
-    toast.close();
     showToast({
       type: "fail",
       message: error.message,

packages/mobile/src/views/IceEvent/IceEventDetails.vue

@@ -13,13 +13,24 @@
           style="font-size: 18px; font-weight: bold; line-height: inherit"
         >
         </van-cell>
-        <van-cell :title="'发生时间： ' + eventDetailData?.event?.occurTime"> </van-cell>
+        <van-cell :title="'发生时间： ' + eventDetailData?.event?.occurTime">
-        <van-cell :title="'发生地点： ' + eventDetailData?.event?.occurLocation"> </van-cell>
+        </van-cell>
-        <van-cell :title="'起点桩号： ' + eventDetailData?.event?.startStakeNo"> </van-cell>
+        <van-cell
-        <van-cell :title="'止点桩号： ' + eventDetailData?.event?.endStakeNo"> </van-cell>
+          :title="'发生地点： ' + eventDetailData?.event?.occurLocation"
-        <van-cell :title="'受灾里程： ' + eventDetailData?.event?.disasterMileage"> </van-cell>
+        >
-        <van-cell :title="'填报人： ' + eventDetailData?.event?.reporterName"> </van-cell>
+        </van-cell>
-        <van-cell :title="'填报时间： ' + eventDetailData?.event?.reportTime"> </van-cell>
+        <van-cell :title="'起点桩号： ' + eventDetailData?.event?.startStakeNo">
+        </van-cell>
+        <van-cell :title="'止点桩号： ' + eventDetailData?.event?.endStakeNo">
+        </van-cell>
+        <van-cell
+          :title="'受灾里程： ' + eventDetailData?.event?.disasterMileage"
+        >
+        </van-cell>
+        <van-cell :title="'填报人： ' + eventDetailData?.event?.reporterName">
+        </van-cell>
+        <van-cell :title="'填报时间： ' + eventDetailData?.event?.reportTime">
+        </van-cell>
       </van-cell-group>
       <van-cell-group>
         <van-cell
@@ -27,8 +38,14 @@
           style="font-size: 18px; font-weight: bold; line-height: inherit"
         >
         </van-cell>
-        <van-cell :title="'处置措施： ' + eventDetailData?.event?.disposalMeasures"> </van-cell>
+        <van-cell
-        <van-cell :title="'预计恢复时间： ' + eventDetailData?.event?.expectRecoverTime"> </van-cell>
+          :title="'处置措施： ' + eventDetailData?.event?.disposalMeasures"
+        >
+        </van-cell>
+        <van-cell
+          :title="'预计恢复时间： ' + eventDetailData?.event?.expectRecoverTime"
+        >
+        </van-cell>
       </van-cell-group>
       <van-cell-group>
         <van-cell
@@ -36,9 +53,75 @@
           style="font-size: 18px; font-weight: bold; line-height: inherit"
         >
         </van-cell>
-        <van-cell :title="'投入人力： ' + eventDetailData?.material?.inputManpower"> </van-cell>
+        <van-cell
-        <van-cell :title="'投入资金： ' + eventDetailData?.material?.inputFunds"> </van-cell>
+          :title="
-        <van-cell :title="'投入设备： ' + eventDetailData?.material?.inputEquipment"> </van-cell>
+            '投入人力： ' + eventDetailData?.material?.inputManpower + ' 人次'
+          "
+        >
+        </van-cell>
+        <van-cell
+          :title="
+            '投入资金： ' + eventDetailData?.material?.inputFunds + ' 万元'
+          "
+        >
+        </van-cell>
+        <van-cell
+          :title="
+            '投入设备： ' + eventDetailData?.material?.inputEquipment + ' 台班'
+          "
+        >
+        </van-cell>
+        <van-cell
+          v-for="(item, index) in eventDetailData?.materialUsageList"
+          :key="index"
+          :title="`${item.materialName}：${item.usageAmount} ${item.materialUnit}`"
+        >
+        </van-cell>
+        <van-cell
+          :title="`当前通行状况：${
+            { 1: '正常通行', 2: '限速通行', 3: '封闭交通' }[
+              eventDetailData?.traffic?.currentStatus
+            ] || '未知状态'
+          }`"
+        >
+        </van-cell>
+        <van-cell
+          :title="`有无车辆滞留：${
+            { 0: '无', 1: '有' }[
+              eventDetailData?.traffic?.hasStrandedVehicles
+            ] || '未知状态'
+          }`"
+        >
+        </van-cell>
+        <van-cell
+          v-if = 'eventDetailData?.traffic?.hasStrandedVehicles === 1'
+          :title="
+            '滞留车辆数：' + eventDetailData?.traffic?.strandedVehicleCount + ' 辆'
+          "
+        >
+        </van-cell>
+        <van-cell
+          :title="
+            '实际恢复时间： ' + eventDetailData?.traffic?.actualRecoverTime
+          "
+        >
+        </van-cell>
+        <van-cell
+          :title="
+            '附件： '
+          "
+        >
+          <template #label>
+            <van-image
+              v-for="(item, index) in eventDetailData?.photos"
+              :key="index"
+              :src="item.photoUrl"
+              fit="cover"
+              width="100px"
+              @click="showImage(item.photoUrl)"
+            ></van-image>
+          </template>
+        </van-cell>
       </van-cell-group>
     </div>
   </div>
@@ -49,7 +132,7 @@ import "vant/es/toast/style";
 import "vant/es/popup/style";
 import { ref, onMounted, toRaw, reactive } from "vue";
 import { useRouter, useRoute } from "vue-router";
-import { showToast, showLoadingToast } from "vant";
+import { showToast, showLoadingToast, showImagePreview } from "vant";
 import { request } from "../../../../shared/utils/request";
 
 const router = useRouter();
@@ -92,6 +175,10 @@ const onClickLeft = () => {
     params: { data: encodeURIComponent(JSON.stringify(yhzDetail.value)) },
   });
 };
+
+const showImage = (url) => {
+  showImagePreview([url]);
+};
 </script>
     
     <style scoped>

packages/shared/utils/request.js

@@ -5,6 +5,17 @@ const service = axios.create({
     timeout: 10000
 })
 
+// 请求拦截器
+service.interceptors.request.use(config => {
+    const token = localStorage.getItem('token');
+    if (token) {
+        config.headers.Authorization = `${token}`;
+    }
+    return config;
+}, error => {
+    return Promise.reject(error);
+});
+
 export async function request(config) {
     try {
         const res = await service(config)