Merge remote-tracking branch 'origin/master'

danger-manage-web/src/views/system/info/index.vue

@@ -394,6 +394,9 @@ export default {
     },
     MapdialogFun() {
       this.dialogTableVisible = true;
+      if(this.form.longitude!=null && this.form.longitude!=''){
+        this.devicePos = [this.form.longitude, this.form.latitude];
+      }
     },
     dialogcancelFun() {
       this.dialogTableVisible = false;
@@ -407,6 +410,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.devicePos = [];
       this.reset();
       this.open = true;
       this.title = "添加应急物资管理";

danger-manage-web/src/views/system/workinfo/index.vue

@@ -161,7 +161,7 @@
         <el-form-item label="任务描述" prop="workDescribe">
           <el-input type="textarea" v-model="form.workDescribe" placeholder="请输入任务描述" />
         </el-form-item>
-        <el-form-item label="巡检点多个" prop="pantrolId">
+        <el-form-item label="巡检点多个" prop="pantrolId" >
           <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
           <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
           <!--<el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')" >父子联动</el-checkbox>-->
@@ -867,5 +867,9 @@ export default {
   ::v-deep .el-dialog{
     background: #f7f7f7;
   }
+  ::v-deep .el-tree{
+    height: 250px;
+    overflow:auto;
+  }
   /*el-pagination*/
 </style>