Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/components/orgTree/index.vue

@@ -110,7 +110,7 @@ export default {
     this.getDeptTree();
   },
   computed:{
-    ...mapGetters(["businessTree"]),
+    ...mapGetters(["orgTree"]),
   },
   mounted() {
     this.getHeight();

src/components/orgTree/orgDropDown.vue

@@ -7,6 +7,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { deptTreeSelect } from "@/api/system/public";
 import sync from "@/components/computed.sync.js";
+import { mapGetters, mapMutations } from "vuex";
 export default {
   name: "orgDropTree",
   data() {
@@ -37,9 +38,13 @@ export default {
         console.info(this.currentNode)
         this.$emit("select", this.currentNode);
       }
-    }
+    },orgTree(val)
+    {
+      this.getDeptTree();
+    },
   },
   computed: {
+    ...mapGetters(["orgTree"]),
     val: sync("value"),
   },
   components: { Treeselect },

src/views/resumption/protection/dialog.edit.vue

@@ -13,7 +13,7 @@
           size="small"
           ref="form"
           label-position="right"
-          label-width="130px"
+          label-width="150px"
           label-prefix=":"
         >
           <el-form-item label="所属机构" prop="orgId">
@@ -29,7 +29,7 @@
               v-model="formData.alarmHostId"
               placeholder="请选择报警主机"
               clearable
-              style="width: 330px"
+              style="width: 310px"
             >
               <el-option
                 v-for="host in alarmHostOptions"

src/views/resumption/taskManager/index.vue

@@ -115,7 +115,7 @@
           </div>
           <el-table
             border
-            height="600"
+            height="580"
             size="small"
             v-loading="loading"
             :data="pageData"