Merge branch 'dev-磐石1101' into dev

src/assets/scss/modules/management/epidemic.scss

@@ -19,6 +19,9 @@
   .item_width_4 {
     width: 350px;
   }
+  .item_width_5 {
+    width: 450px;
+  }
 
   .btn-selperson {
     margin-left: 20px;

src/views/modules/base/epidemic/epidRisk/risk.vue

@@ -337,7 +337,7 @@ export default {
       this.tableLoading = false
     },
     handleAreaChange (val) {
-
+      console.log(val)
       if (val.length > 0) {
         const labels = this.$refs.sourceArea.getCheckedNodes()[0].pathLabels
 

src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue

@@ -105,7 +105,7 @@
 
           <el-cascader ref="sourceArea"
                        v-model="sourceAllCode"
-                       class="item_width_4"
+                       class="item_width_5"
                        :props="areaProps"
                        @change="handleSourceArea"
                        clearable></el-cascader>
@@ -159,7 +159,7 @@
           <template>
 
             <el-cascader ref="nowArea"
-                         class="item_width_4"
+                         class="item_width_5"
                          :props="areaProps"
                          v-model="nowAllCode"
                          clearable
@@ -421,7 +421,24 @@ export default {
 
       trafficTypeList: [],
       dangerLevelList: [],
-      isolateTypeList: [],
+      isolateTypeList: [
+        {
+          value: '0',
+          label: '集中隔离'
+        },
+        {
+          value: '1',
+          label: '居家隔离'
+        },
+        {
+          value: '2',
+          label: '居家健康监测'
+        },
+        {
+          value: '4',
+          label: '不需要隔离'
+        },
+      ],
       tripDataTypeList: [],
 
       dataRule: {
@@ -486,7 +503,7 @@ export default {
 
     this.getDangerLevel()
     this.getTrafficType()
-    this.getIsolateType()
+    // this.getIsolateType()
     this.getTripDataType()
   },
   destroyed () {
@@ -518,7 +535,8 @@ export default {
 
       } else {
         const { user } = this.$store.state
-        // this.nowAllCode = user.areaCodePath
+        //默认：山东省37-菏泽市3717-曹县371721
+        this.nowAllCode = ['37', '3717', '371721']
       }
       // this.$refs['ref_form'].resetFields();
 
@@ -788,6 +806,7 @@ export default {
       const url = "/sys/dict/data/dictlist";
 
       let params = {
+        // dictType: "isolatedState",
         dictType: "isolate_type",
       };
 
@@ -796,7 +815,6 @@ export default {
       if (code === 0) {
         this.isolateTypeList = data
 
-
       } else {
         this.$message.error(msg)
       }

src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue

@@ -456,8 +456,10 @@ export default {
     },
 
     async toIssueInfo (index) {
+
       const { tableList } = this;
       this.detailId = tableList[index].id
+      console.log('this.detailId', this.detailId)
       this.showDetail = true
 
     },