单位树调整

src/main.js

@@ -11,13 +11,11 @@ import 'quill/dist/quill.core.css';
 import 'quill/dist/quill.snow.css';
 import 'quill/dist/quill.bubble.css';
 import ConfirmPlugin from '@/plugins/ConfirmPlugin'
-import CompanyTree from '@/plugins/CompanyTree'
 
 Vue.config.productionTip = false
 Vue.use(AxiosPlugin);
 Vue.use(VueQuillEditor);
 //Vue.use(ConfirmPlugin);
-//Vue.use(CompanyTree);
 
 Vue.prototype.$echarts = echarts
 

src/plugins/CompanyTree.js

@@ -1,25 +0,0 @@
-import companyInfoApi from "@/api/base/companyInfo";
-
-export default {
-  install(Vue) {
-    Vue.prototype.$cloneData = (title, content, callback) => {
-      var companyResult = "";
-
-      companyInfoApi.list().then(function (response) {
-        var jsonData = response.data;
-        if (jsonData.result) {
-          companyResult = jsonData.data;
-        }
-      });
-
-      let cloneData = JSON.parse(JSON.stringify(companyResult)); // 对源数据深度克隆
-      cloneData.filter(father => {
-        // 循环所有项，并添加children属性
-        let branchArr = cloneData.filter(child => father.id == child.parentId); // 返回每一项的子级数组
-        branchArr.length > 0 ? (father.children = branchArr) : ""; //给父级添加一个children属性，并赋值
-        return father.parentId == null; //返回第一层
-      });
-      return cloneData;
-    };
-  }
-}

src/views/base/alarmConfig-detail.vue

@@ -27,7 +27,7 @@
           </el-select>-->
           <el-select-tree
             :props="props"
-            :options="optionData"
+            :options="companyResult"
             :value="formModel.companyId"
             @getValue="getSelectedValue($event)"
             height="200"
@@ -158,18 +158,6 @@ export default {
       }
     };
   },
-  computed: {
-    /* 转树形数据 */
-    optionData() {
-      let cloneData = JSON.parse(JSON.stringify(this.companyResult)); // 对源数据深度克隆
-      return cloneData.filter(father => {
-        // 循环所有项，并添加children属性
-        let branchArr = cloneData.filter(child => father.id == child.parentId); // 返回每一项的子级数组
-        branchArr.length > 0 ? (father.children = branchArr) : ""; //给父级添加一个children属性，并赋值
-        return father.parentId == null; //返回第一层
-      });
-    }
-  },
   created() {
     this.loadTree();
   },

src/views/base/alarmConfig-list.vue

@@ -31,7 +31,8 @@
         </el-select>-->
         <el-select-tree
           :props="props"
-          :options="optionData"
+          aria-setsize="mini"
+          :options="companyResult"
           :value="queryModel.companyId"
           @getValue="getSelectedValue($event)"
           height="200"
@@ -154,18 +155,6 @@ export default {
       }
     };
   },
-  computed: {
-    /* 转树形数据 */
-    optionData() {
-      let cloneData = JSON.parse(JSON.stringify(this.companyResult)); // 对源数据深度克隆
-      return cloneData.filter(father => {
-        // 循环所有项，并添加children属性
-        let branchArr = cloneData.filter(child => father.id == child.parentId); // 返回每一项的子级数组
-        branchArr.length > 0 ? (father.children = branchArr) : ""; //给父级添加一个children属性，并赋值
-        return father.parentId == null; //返回第一层
-      });
-    }
-  },
   created() {
     this.tableHeight = window.innerHeight - 280;
     this.loadTree();

src/views/base/deviceInfo-detail.vue

@@ -33,7 +33,7 @@
               </el-select>-->
               <el-select-tree
                 :props="props"
-                :options="optionData"
+                :options="companyResult"
                 :value="formModel.companyId"
                 @getValue="getSelectedValue($event)"
                 height="200"
@@ -156,18 +156,6 @@ export default {
       }
     };
   },
-  computed: {
-    /* 转树形数据 */
-    optionData() {
-      let cloneData = JSON.parse(JSON.stringify(this.companyResult)); // 对源数据深度克隆
-      return cloneData.filter(father => {
-        // 循环所有项，并添加children属性
-        let branchArr = cloneData.filter(child => father.id == child.parentId); // 返回每一项的子级数组
-        branchArr.length > 0 ? (father.children = branchArr) : ""; //给父级添加一个children属性，并赋值
-        return father.parentId == null; //返回第一层
-      });
-    }
-  },
   created() {
     this.loadTree();
   },

src/views/base/deviceInfo-list.vue

@@ -31,7 +31,7 @@
         </el-select>-->
         <el-select-tree
           :props="props"
-          :options="optionData"
+          :options="companyResult"
           :value="queryModel.companyId"
           @getValue="getSelectedValue($event)"
           height="200"
@@ -330,18 +330,6 @@ export default {
       }
     };
   },
-  computed: {
-    /* 转树形数据 */
-    optionData() {
-      let cloneData = JSON.parse(JSON.stringify(this.companyResult)); // 对源数据深度克隆
-      return cloneData.filter(father => {
-        // 循环所有项，并添加children属性
-        let branchArr = cloneData.filter(child => father.id == child.parentId); // 返回每一项的子级数组
-        branchArr.length > 0 ? (father.children = branchArr) : ""; //给父级添加一个children属性，并赋值
-        return father.parentId == null; //返回第一层
-      });
-    }
-  },
   created() {
     this.tableHeight = window.innerHeight - 280;
 
@@ -351,6 +339,15 @@ export default {
       var jsonData = response.data;
       this.typeData = jsonData.data;
     });
+
+    var self = this;
+    companyInfoApi.list().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+
     this.loadTree();
   },
   methods: {
@@ -599,12 +596,6 @@ export default {
   mounted: function() {
     var self = this;
     this.changePage(1);
-    companyInfoApi.list().then(function(response) {
-      var jsonData = response.data;
-      if (jsonData.result) {
-        self.companyResult = jsonData.data;
-      }
-    });
   },
   components: {
     "deviceInfo-detail": DeviceInfoDetail,

src/views/base/personDeviceLog-list.vue

@@ -60,7 +60,7 @@
           </el-select>&nbsp;-->
           <el-select-tree
             :props="props"
-            :options="optionData"
+            :options="companyResult"
             :value="queryModel.companyId"
             @getValue="getSelectedValue($event)"
             height="200"
@@ -216,18 +216,6 @@ export default {
       }
     };
   },
-  computed: {
-    /* 转树形数据 */
-    optionData() {
-      let cloneData = JSON.parse(JSON.stringify(this.companyResult)); // 对源数据深度克隆
-      return cloneData.filter(father => {
-        // 循环所有项，并添加children属性
-        let branchArr = cloneData.filter(child => father.id == child.parentId); // 返回每一项的子级数组
-        branchArr.length > 0 ? (father.children = branchArr) : ""; //给父级添加一个children属性，并赋值
-        return father.parentId == null; //返回第一层
-      });
-    }
-  },
   created() {
     var self = this;
     this.getCurrentMonthFirst();
@@ -288,6 +276,9 @@ export default {
       formData.append("pageSize", self.pageSize);
 
       formData.append("faceImage", self.queryModel.faceImage);
+      if (self.queryModel.timeRanges == null) {
+        self.queryModel.timeRanges = "";
+      }
       formData.append("timeRanges", self.queryModel.timeRanges);
       formData.append("matchStatus", self.queryModel.matchStatus);
       formData.append("personName", self.queryModel.personName);
@@ -296,7 +287,7 @@ export default {
       formData.append("position", self.queryModel.position);
       formData.append("matchMsg", self.queryModel.matchMsg);
 
-      if(self.queryModel.companyId == null){
+      if (self.queryModel.companyId == null) {
         self.queryModel.companyId = "";
       }
       formData.append("companyId", self.queryModel.companyId);
@@ -372,7 +363,7 @@ export default {
       formData.append("personName", self.queryModel.personName);
       formData.append("deviceNo", self.queryModel.deviceNo);
       formData.append("aliasName", self.queryModel.aliasName);
-      if(self.queryModel.companyId == null){
+      if (self.queryModel.companyId == null) {
         self.queryModel.companyId = "";
       }
       formData.append("companyId", self.queryModel.companyId);

src/views/base/personInfo-detail.vue

@@ -33,7 +33,7 @@
               </el-select>-->
               <el-select-tree
                 :props="props"
-                :options="optionData"
+                :options="companyResult"
                 :value="formModel.companyId"
                 @getValue="getSelectedValue($event)"
                 height="200"
@@ -95,13 +95,6 @@
                   :value="company.id"
                 ></el-option>
               </el-select>
-              <!-- <el-select-tree
-                :props="props"
-                :options="optionData"
-                :value="formModel.personCompany"
-                @getValue="getSelectedValue($event)"
-                height="200"
-              ></el-select-tree>-->
             </el-form-item>
           </el-col>
         </el-row>
@@ -276,18 +269,6 @@ export default {
       }
     };
   },
-  computed: {
-    /* 转树形数据 */
-    optionData() {
-      let cloneData = JSON.parse(JSON.stringify(this.companyResult)); // 对源数据深度克隆
-      return cloneData.filter(father => {
-        // 循环所有项，并添加children属性
-        let branchArr = cloneData.filter(child => father.id == child.parentId); // 返回每一项的子级数组
-        branchArr.length > 0 ? (father.children = branchArr) : ""; //给父级添加一个children属性，并赋值
-        return father.parentId == null; //返回第一层
-      });
-    }
-  },
   created() {
     var formData = new FormData();
     formData.append("catalogName", "用户身份");

src/views/base/warningPusher-detail.vue

@@ -33,7 +33,7 @@
               </el-select>-->
               <el-select-tree
                 :props="props"
-                :options="optionData"
+                :options="companyResult"
                 :value="formModel.companyId"
                 @getValue="getSelectedValue($event)"
                 height="200"
@@ -185,18 +185,6 @@ export default {
       }
     };
   },
-  computed: {
-    /* 转树形数据 */
-    optionData() {
-      let cloneData = JSON.parse(JSON.stringify(this.companyResult)); // 对源数据深度克隆
-      return cloneData.filter(father => {
-        // 循环所有项，并添加children属性
-        let branchArr = cloneData.filter(child => father.id == child.parentId); // 返回每一项的子级数组
-        branchArr.length > 0 ? (father.children = branchArr) : ""; //给父级添加一个children属性，并赋值
-        return father.parentId == null; //返回第一层
-      });
-    }
-  },
   created() {
     this.loadTree();
   },

src/views/base/warningPusher-list.vue

@@ -31,7 +31,7 @@
         </el-select>-->
         <el-select-tree
           :props="props"
-          :options="optionData"
+          :options="companyResult"
           :value="queryModel.companyId"
           @getValue="getSelectedValue($event)"
           height="200"
@@ -188,18 +188,6 @@ export default {
       }
     };
   },
-  computed: {
-    /* 转树形数据 */
-    optionData() {
-      let cloneData = JSON.parse(JSON.stringify(this.companyResult)); // 对源数据深度克隆
-      return cloneData.filter(father => {
-        // 循环所有项，并添加children属性
-        let branchArr = cloneData.filter(child => father.id == child.parentId); // 返回每一项的子级数组
-        branchArr.length > 0 ? (father.children = branchArr) : ""; //给父级添加一个children属性，并赋值
-        return father.parentId == null; //返回第一层
-      });
-    }
-  },
   created() {
     this.tableHeight = window.innerHeight - 280;
     this.loadTree();

src/views/business/workAttendance-list.vue

@@ -43,7 +43,7 @@
             </el-select>-->
             <el-select-tree
               :props="props"
-              :options="optionData"
+              :options="companyResult"
               :value="queryModel.companyId"
               @getValue="getSelectedValue($event)"
               height="200"
@@ -226,18 +226,6 @@ export default {
       }
     };
   },
-  computed: {
-    /* 转树形数据 */
-    optionData() {
-      let cloneData = JSON.parse(JSON.stringify(this.companyResult)); // 对源数据深度克隆
-      return cloneData.filter(father => {
-        // 循环所有项，并添加children属性
-        let branchArr = cloneData.filter(child => father.id == child.parentId); // 返回每一项的子级数组
-        branchArr.length > 0 ? (father.children = branchArr) : ""; //给父级添加一个children属性，并赋值
-        return father.parentId == null; //返回第一层
-      });
-    }
-  },
   created() {
     var self = this;
     companyInfoApi.list().then(function(response) {

src/views/sys/user-list.vue

@@ -183,7 +183,7 @@ export default {
       modalTitle: "",      
       businessKey: "",
       showModal: false,
-      companyResult:"",
+      companyResult:[],
       dialogFormVisible:false,
       newPassword:""
     };