From 0591529148a514291efb379117e82782eb2d4540 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 12 Dec 2023 15:28:35 +0800
Subject: [PATCH] =?UTF-8?q?2023-12-12=20=E5=8D=8F=E5=90=8C=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E7=82=B9=E5=87=BB=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/eam/eamAdmin.vue                   |  2 +-
 src/views/modules/eam/eamWorkOrderForDefect.vue      |  2 +-
 src/views/modules/eam/eamWorkOrderForMaintenance.vue | 12 ++++++------
 src/views/modules/sys/sceneDynamicControlModel.vue   |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/eam/eamAdmin.vue b/src/views/modules/eam/eamAdmin.vue
index 6eaeff0..72d4856 100644
--- a/src/views/modules/eam/eamAdmin.vue
+++ b/src/views/modules/eam/eamAdmin.vue
@@ -934,7 +934,7 @@
         // 先清空缓存选中
         this.$nextTick(() => this.$refs.departmentTable.clearSelection())
         // 拿到选中的部门编号
-        let tempDataList = this.modalData.department.split(';')
+        let tempDataList = (this.modalData.department == null ? '' : this.modalData.department).split(';')
         // 查询所有部门
         getEmpyDeptList(this.departmentData).then(({data}) => {
           if (data && data.code === 0) {
diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue
index ff731bc..0521aa2 100644
--- a/src/views/modules/eam/eamWorkOrderForDefect.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect.vue
@@ -1329,7 +1329,7 @@
         // 先清空缓存选中
         this.$nextTick(() => this.$refs.departmentTable.clearSelection())
         // 拿到选中的部门编号
-        let tempDataList = this.searchData.departmentName.split(';')
+        let tempDataList = (this.searchData.departmentName == null ? '' : this.searchData.departmentName).split(';')
         // 查询部门
         getEmpyDeptList(this.departmentData).then(({data}) => {
           if (data && data.code === 0) {
diff --git a/src/views/modules/eam/eamWorkOrderForMaintenance.vue b/src/views/modules/eam/eamWorkOrderForMaintenance.vue
index aca55da..ace4991 100644
--- a/src/views/modules/eam/eamWorkOrderForMaintenance.vue
+++ b/src/views/modules/eam/eamWorkOrderForMaintenance.vue
@@ -151,7 +151,7 @@
         </el-form-item>
         <el-form-item>
           <span v-if="saveData.status === '已完工'" slot="label"><a>协同人员</a></span>
-          <span v-if="saveData.status === '待审核'" slot="label" @click="getOperatorList()"><a>协同人员</a></span>
+          <span v-if="saveData.status === '待审核'" slot="label" @click="getOperatorList"><a>协同人员</a></span>
           <el-input v-model="saveData.operator" readonly style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
@@ -325,7 +325,7 @@
             <el-input v-model="operatorData.adminName" style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item :label="' '">
-            <el-button type="primary" @click="getOperatorList()">查询</el-button>
+            <el-button type="primary" @click="getOperatorList">查询</el-button>
           </el-form-item>
         </el-form>
         <el-table
@@ -1380,11 +1380,11 @@
       },
 
       // 获取人员列表
-      getOperatorList(){
+      getOperatorList () {
         // 先清空缓存选中
         this.$nextTick(() => this.$refs.operatorTable.clearSelection())
         // 拿到选中的人员编号
-        let tempDataList = this.saveData.adminID.split(';')
+        let tempDataList = (this.saveData.adminID == null ? '' : this.saveData.adminID).split(';')
         // 查询所有部门
         getOperatorList(this.operatorData).then(({data}) => {
           if (data && data.code === 0) {
@@ -1395,8 +1395,8 @@
                 this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
               }
             })
-            this.operatorModelFlag = true;
-          }else {
+            this.operatorModelFlag = true
+          } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
             })
diff --git a/src/views/modules/sys/sceneDynamicControlModel.vue b/src/views/modules/sys/sceneDynamicControlModel.vue
index 3aafa09..966a8aa 100644
--- a/src/views/modules/sys/sceneDynamicControlModel.vue
+++ b/src/views/modules/sys/sceneDynamicControlModel.vue
@@ -406,7 +406,7 @@ export default {
       // 先清空缓存选中
       this.$nextTick(() => this.$refs.objectTable.clearSelection())
       // 拿到选中的设备编号
-      let tempDataList = this.modalData.thirdType.split(';')
+      let tempDataList = (this.modalData.thirdType == null ? '' : this.modalData.thirdType).split(';')
       // 查询所有设备
       getObjectList(this.objectData).then(({data}) => {
         if (data && data.code === 0) {