Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop

src/views/report-manage/all-report/components/ReportDrawer.vue

@@ -20,9 +20,9 @@
           <div>
             <n-grid :cols="2">
               <n-gi><span>气象信息</span></n-gi>
-              <n-gi><span v-for="(item,index) in weatherList" :key="index">&nbsp;{{ item.label }}:&nbsp;{{ item.value }}&nbsp;</span></n-gi>
+              <n-gi><span>{{ reportDetail.airWeather || '-' }}</span></n-gi>
               <n-gi><span>巡检方式</span></n-gi>
-              <n-gi><span>{{ reportDetail.lcName }}</span></n-gi>
+              <n-gi><span>{{ taskType[reportDetail.mission?.inspectionType] }}</span></n-gi>
               <n-gi><span>巡检设备</span></n-gi>
               <n-gi><span>{{ reportDetail?.mission?.droneName }}</span></n-gi>
               <n-gi><span>巡检开始时间</span></n-gi>
@@ -41,13 +41,13 @@
               <n-gi><span>巡检内容</span></n-gi>
               <n-gi><span>巡检检查结果</span></n-gi>
               <n-gi><span>林场问题图斑</span></n-gi>
-              <n-gi><span>{{ problemsNum['type_1'] }}</span></n-gi>
+              <n-gi><span>{{ problemsNum['LC001'] }}</span></n-gi>
               <n-gi><span>病死树</span></n-gi>
-              <n-gi><span>{{ problemsNum['type_2'] }}</span></n-gi>
+              <n-gi><span>{{ problemsNum['LC002'] }}</span></n-gi>
               <n-gi><span>人员活动</span></n-gi>
-              <n-gi><span>{{ problemsNum['type_3'] }}</span></n-gi>
+              <n-gi><span>{{ problemsNum['LC003'] }}</span></n-gi>
               <n-gi><span>火灾隐患</span></n-gi>
-              <n-gi><span>{{ problemsNum['type_4'] }}</span></n-gi>
+              <n-gi><span>{{ problemsNum['LC004'] }}</span></n-gi>
             </n-grid>
           </div>
         </div>
@@ -99,12 +99,15 @@ export default defineComponent({
   setup(props, { emit }) {
     const data = reactive({
       reportDetail: {},
-      weatherList: [],
       problemsNum: {
-        'type_1': 0,
-        'type_2': 0,
-        'type_3': 0,
-        'type_4': 0
+        'LC001': 0,
+        'LC002': 0,
+        'LC003': 0,
+        'LC004': 0
+      },
+      taskType: {
+        1: '日常巡检',
+        2: '应急巡检'
       }
     })
 
@@ -127,22 +130,14 @@ export default defineComponent({
             .then(res => {
               if (res.code === 0) {
                 data.reportDetail = res.data
-                const parm = res.data.airWeather.wth?.parm || []
-                data.weatherList = parm.length !== 0 ? [
-                  // { label: '天气', value: '' },
-                  { label: '气温', value: parm.tmp / 10 + '℃' },
-                  { label: '湿度', value: parm.hum / 10 + 'RH' },
-                  { label: '风度', value: parm.wspd + 'm/s' },
-                  { label: '风向', value: parm.wdir }
-                ] : []
                 data.problemsNum = {
-                  'type_1': 0,
-                  'type_2': 0,
-                  'type_3': 0,
-                  'type_4': 0
+                  'LC001': 0,
+                  'LC002': 0,
+                  'LC003': 0,
+                  'LC004': 0
                 }
                 res.data.questionTypeInfo.forEach((item) => {
-                  const key = `type_${item.type}`
+                  const key = `${item.type}`
                   data.problemsNum[key] = item.quantity
                 })
                 // data.reportDetail.questionReportList.forEach((item, index) => {