Merge remote-tracking branch 'origin/master'

src/api/danger.js

@@ -31,6 +31,14 @@ export function getUnclaimedList (params) {
     params
   })
 }
+// 查询分析对象列表
+export function getHazardList (params) {
+  return Axios({
+    url: '/app/doubledefense/hazard/list',
+    method: 'get',
+    params
+  })
+}
 // 获取部门数据
 export function getDeptTree (params) {
   return Axios({

src/components/module/select.vue

@@ -27,11 +27,13 @@
 
 <script>
 export default {
-  props: ['title', 'value', 'options', 'verify', 'id'],
+  props: ['title', 'value', 'options', 'verify', 'id', 'disable'],
   name: 'Select',
   watch: {
     value (cur, old) {
+      console.log(cur, '这是传授那个的')
       if (!cur) {
+        this.internalValue = ''
         this.reminder = true
         this.className = 'el_input_focusTrue'
       } else {
@@ -42,6 +44,7 @@ export default {
     },
     options (cur, old) {
       this.option = cur
+      this.internalValue = ''
     }
   },
   data () {
@@ -91,6 +94,7 @@ export default {
       this.internalValue = selectedOptions.map(option => option.text)[selectedOptions.length - 1]
     },
     focus () {
+      if (this.disable) return
       this.show = true
       if (!this.internalValue) {
         this.className = 'el_input_blur'

src/views/home/danger/addDanger.vue

@@ -7,12 +7,20 @@
       <Input title="隐患名称" :verify="true" v-model="addForm.dangerName" />
       <Input title="隐患描述" :verify="false" v-model="dangerDesc" />
       <Select
+      :disable="dangerType"
         :verify="true"
         title="所在区域"
         :options="getAreaTree"
         v-model="addForm.areaId"
       />
       <Select
+      :disable="dangerType"
+        :verify="true"
+        title="分析对象名称"
+        :options="getAreaTree1"
+        v-model="addForm.hazardId"
+      />
+      <Select
         :verify="true"
         title="隐患来源"
         :options="dangerSrcList"
@@ -75,7 +83,8 @@ import {
   upload,
   getDangerItem,
   editDanger,
-  convertImageToBase64Str
+  convertImageToBase64Str,
+  getHazardList
 } from '@/api/danger'
 export default {
   name: 'Vueh5CbsAddDanger',
@@ -100,8 +109,24 @@ export default {
       return new Date(2010, 0, 1)
     }
   },
+  watch: {
+    addForm: {
+      handler (val) {
+        if (val.areaId && (val.areaId !== this.areaIdOld)) {
+          console.log('进来了', val.areaId, this.areaIdOld)
+          this.getHazardList(val.areaId)
+          this.areaIdOld = val.areaId
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
   data () {
     return {
+      areaIdOld: '.',
+      dangerType: false,
+      getAreaTree1: [], // 分析对象名称列表
       dangerImage: '',
       dangerDesc: '', // 隐患描述
       controlMeasures: '', // 任务名称
@@ -111,6 +136,7 @@ export default {
         registTime: '', // 发现时间
         dangerName: '', // 隐患名称
         areaId: '', // 所属区域
+        hazardId: '', // 分析对象名称
         dangerLevel: 0, // 隐患等级
         dangerSrc: '', // 隐患来源
         hazardDangerType: '', // 隐患类型
@@ -143,10 +169,17 @@ export default {
     }
   },
 
-  created () {
+  async created () {
     console.log(new Date('2023-09-25 15:55:12').getDate())
     if (this.$route.params.id) {
-      this.addForm.areaId = this.$route.params.id
+      this.dangerType = true
+      this.getAreaTree1 = this.$route.params.list
+      this.addForm.areaId = this.$route.params.areaId
+      this.areaIdOld = this.$route.params.areaId
+      this.addForm.hazardId = this.$route.params.hazardId
+      // await this.getHazardList(this.$route.params.areaId)
+      console.log(this.addForm.hazardId, '第一个')
+      console.log(this.addForm.areaId, '第二个')
     }
     if (this.$route.query.id) {
       getDangerItem(this.$route.query.id).then(({ data }) => {
@@ -158,6 +191,7 @@ export default {
           this.addForm.registTime = data.data.registTime
           this.addForm.dangerName = data.data.dangerName
           this.addForm.areaId = data.data.areaId
+          this.addForm.hazardId = data.data.hazardId
           this.addForm.dangerLevel = data.data.dangerLevel
           this.addForm.dangerSrc = data.data.dangerSrc
           this.addForm.hazardDangerType = data.data.hazardDangerType
@@ -180,6 +214,19 @@ export default {
   },
 
   methods: {
+    getHazardList (id) {
+      getHazardList({ areaId: id }).then(({ data }) => {
+        if (data.code === 200) {
+          this.getAreaTree1 = this.getUsers(data.data)
+          this.addForm.hazardId = ''
+        }
+      })
+    },
+    getUsers (data) {
+      return data.map(item => {
+        return { text: item.hazardName, value: item.id }
+      })
+    },
     async toBase (list) {
       for await (const item of list) {
         const { data } = await convertImageToBase64Str({ url: item })
@@ -246,6 +293,7 @@ export default {
           this.itemForm.registTime = this.addForm.registTime
           this.itemForm.dangerName = this.addForm.dangerName
           this.itemForm.areaId = this.addForm.areaId
+          this.itemForm.hazardId = this.addForm.hazardId
           this.itemForm.dangerLevel = this.addForm.dangerLevel
           this.itemForm.dangerSrc = this.addForm.dangerSrc
           this.itemForm.hazardDangerType = this.addForm.hazardDangerType
@@ -266,7 +314,10 @@ export default {
           })
         } else {
           addDanger({
+            riskMeasureId: this.$route.params.riskMeasureId || '',
+            checkTaskInventoryRecordId: this.$route.params.id || '',
             areaId: this.addForm.areaId,
+            hazardId: this.addForm.hazardId,
             controlMeasures: this.controlMeasures,
             dangerDesc: this.dangerDesc,
             dangerImage: this.dangerImage,

src/views/home/danger/dangerDetails.vue

@@ -47,24 +47,30 @@
               <p>{{ itemForm.areaName }}</p>
             </div>
             <div class="right">
-              <span>隐患类型</span>
+              <span>分析对象名称</span>
               <p>
-                {{ $findItemById(dangerTypeList, itemForm.hazardDangerType) }}
+                {{ itemForm.hazardName }}
               </p>
             </div>
           </div>
           <div class="textMain">
             <div class="left">
+              <span>隐患类型</span>
+              <p>
+                {{ $findItemById(dangerTypeList, itemForm.hazardDangerType) }}
+              </p>
+            </div>
+            <div class="right">
               <span>隐患来源</span>
               <p>{{ $findItemById(dangerSrcList, itemForm.dangerSrc) }}</p>
             </div>
-            <div class="right">
+          </div>
+          <div class="textMain">
+            <div class="left">
               <span>隐患等级</span>
               <p>{{ itemForm.dangerLevel ? "重大隐患" : "一般隐患" }}</p>
             </div>
-          </div>
-          <div class="textMain">
-            <div class="center">
+            <div class="right">
               <span>隐患描述</span>
               <p>{{ itemForm.dangerDesc || "无" }}</p>
             </div>

src/views/home/polling/inspect.vue

@@ -32,7 +32,7 @@
                     </p>
                 </div>
                 <template #right>
-                  <button class="appearBtn" @click="addDanger(pro.areaId)">隐患上报</button>
+                  <button class="appearBtn" @click="addDanger(pro)">隐患上报</button>
                 </template>
               </van-swipe-cell>
               <p style="text-align: center;" v-if="!childrenList1.length">
@@ -52,7 +52,7 @@
                     </p>
                   </div>
                   <template #right>
-                    <button class="appearBtn" @click="addDanger(pro.areaId)">隐患上报</button>
+                    <button class="appearBtn" @click="addDanger(pro)">隐患上报</button>
                   </template>
                 </van-swipe-cell>
                 <p style="text-align: center;" @click="setList" v-if="!typeBtn && childrenList.length">
@@ -74,7 +74,7 @@
                     </p>
                   </div>
                   <template #right>
-                    <button class="appearBtn" @click="addDanger(pro.areaId)">隐患上报</button>
+                    <button class="appearBtn" @click="addDanger(pro)">隐患上报</button>
                   </template>
                 </van-swipe-cell>
                 <p style="text-align: center;" @click="setList" v-if="!typeBtn && childrenList.length">
@@ -95,6 +95,9 @@ import {
   getAreaCheckTaskList,
   getCheckTaskInventoryListByRistUnitId
 } from '@/api/polling'
+import {
+  getHazardList
+} from '@/api/danger'
 export default {
   name: 'VueSkInspect',
 
@@ -124,8 +127,19 @@ export default {
   },
 
   methods: {
-    addDanger (id) {
-      this.$router.push({ name: 'addDanger', params: { id } })
+    addDanger (item) {
+      console.log(item)
+      getHazardList({ areaId: item.areaId }).then(({ data }) => {
+        if (data.code === 200) {
+          this.getAreaTree1 = this.getUsers(data.data)
+          this.$router.push({ name: 'addDanger', params: { id: item.id, hazardId: item.hazardId, areaId: item.areaId, riskMeasureId: item.riskMeasureId, list: this.getUsers(data.data) } })
+        }
+      })
+    },
+    getUsers (data) {
+      return data.map(item => {
+        return { text: item.hazardName, value: item.id }
+      })
     },
     setTab (name) {
       this.typeBtn = false

src/views/home/polling/task.vue

@@ -32,27 +32,27 @@ export default {
   },
 
   mounted () {
-    const nfcCode = Android.getNfcCode()
-    console.log(nfcCode, '这是nfc卡号')
-    if (nfcCode) {
-      register(nfcCode).then((res) => {
-        console.log('页面刷新的，重新调用列表数据了')
-        if (res.code === 200) {
-          console.log('打卡成功！！！！！')
-          this.$notify({
-            type: 'success',
-            message: res.msg,
-            duration: 1500
-          })
-        }
-      }).catch(err => {
-        console.log(err, '走到错误了')
-      })
-      this.areaList()
-    }
-    this.nfcTime = setInterval(() => {
-      this.getNfc()
-    }, 1000)
+    // const nfcCode = Android.getNfcCode()
+    // console.log(nfcCode, '这是nfc卡号')
+    // if (nfcCode) {
+    //   register(nfcCode).then((res) => {
+    //     console.log('页面刷新的，重新调用列表数据了')
+    //     if (res.code === 200) {
+    //       console.log('打卡成功！！！！！')
+    //       this.$notify({
+    //         type: 'success',
+    //         message: res.msg,
+    //         duration: 1500
+    //       })
+    //     }
+    //   }).catch(err => {
+    //     console.log(err, '走到错误了')
+    //   })
+    //   this.areaList()
+    // }
+    // this.nfcTime = setInterval(() => {
+    //   this.getNfc()
+    // }, 1000)
     this.areaList()
   },
   beforeDestroy () {