From e98a588c6a1f0d81e35c4305689d1c414375aca6 Mon Sep 17 00:00:00 2001
From: x_ying <2438792676@qq.com>
Date: Wed, 3 Aug 2022 16:06:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E5=85=A8=E9=80=89bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../archivesCheck/module/addCheck.vue         | 107 ++++++++++-------
 src/views/system/notifyManage/index.vue       | 113 +++++++++---------
 2 files changed, 119 insertions(+), 101 deletions(-)

diff --git a/src/views/archivesManage/archivesCheck/module/addCheck.vue b/src/views/archivesManage/archivesCheck/module/addCheck.vue
index 8521dd0..7ac3acd 100644
--- a/src/views/archivesManage/archivesCheck/module/addCheck.vue
+++ b/src/views/archivesManage/archivesCheck/module/addCheck.vue
@@ -27,6 +27,8 @@
               filterable
               clearable
               placeholder="请选择"
+              :collapse-tags="showTags"
+              @change="selectChange"
             >
               <el-option
                 v-for="item in category"
@@ -68,52 +70,52 @@ var menus = [
     id: 1,
     label: '父区域',
     children: [
+      // {
+      //   id: 100,
+      //   label: '子区域1',
+      //   children: [
       {
-        id: 100,
-        label: '子区域1',
-        children: [
-          {
-            id: 1000,
-            label: '设备1.1'
-          },
-          {
-            id: 1001,
-            label: '设备1.2'
-          },
-          {
-            id: 1002,
-            label: '设备1.3'
-          },
-          {
-            id: 1003,
-            label: '设备1.4'
-          }
-        ]
+        id: 1000,
+        label: '设备1.1'
       },
       {
-        id: 101,
-        label: '子区域2',
-        children: [
-          {
-            id: 1006,
-            label: '设备2.1'
-          },
-          {
-            id: 1007,
-            label: '设备2.2'
-          },
-          {
-            id: 1008,
-            label: '设备2.3'
-          },
-          {
-            id: 1011,
-            label: '设备2.4'
-          }
-        ]
+        id: 1001,
+        label: '设备1.2'
+      },
+      {
+        id: 1002,
+        label: '设备1.3'
+      },
+      {
+        id: 1003,
+        label: '设备1.4'
+      }
+    ]
+  },
+  {
+    id: 101,
+    label: '子区域2',
+    children: [
+      {
+        id: 1006,
+        label: '设备2.1'
+      },
+      {
+        id: 1007,
+        label: '设备2.2'
+      },
+      {
+        id: 1008,
+        label: '设备2.3'
+      },
+      {
+        id: 1011,
+        label: '设备2.4'
       }
     ]
   }
+  //   ]
+  // }
 ]
 export default {
   components: { Treeselect },
@@ -128,13 +130,15 @@ export default {
       defaultProps: { children: 'children', label: 'label' },
       nodeKey: 'id',
       defaultCheckedKeys: [],
-      categoryValue: ['选项1'],
+      categoryValue: [0, 1, 2, 3],
       category: [
-        { value: '选项1', label: '全部' },
-        { value: '选项2', label: '档号' },
-        { value: '选项3', label: '题名' },
-        { value: '选项4', label: '位置' }
-      ]
+        { value: 0, label: '全部' },
+        { value: 1, label: '档号' },
+        { value: 2, label: '题名' },
+        { value: 3, label: '位置' }
+      ],
+      showTags: true
+
     }
   },
 
@@ -144,6 +148,17 @@ export default {
     },
     handleSave() {
       this.addFormVisible = false
+    },
+    // 选择门类
+    selectChange(val) {
+      console.log(val)
+      if (val[val.length - 1] === 0) {
+        this.categoryValue = [0, 1, 2, 3]
+        this.showTags = true
+      } else {
+        this.categoryValue = this.categoryValue.filter(item => item !== 0)
+        this.showTags = false
+      }
     }
 
   }
diff --git a/src/views/system/notifyManage/index.vue b/src/views/system/notifyManage/index.vue
index cdff735..52af82d 100644
--- a/src/views/system/notifyManage/index.vue
+++ b/src/views/system/notifyManage/index.vue
@@ -61,7 +61,7 @@
             </el-form-item>
             <el-form-item label="选择对象" prop="paramName">
               <el-select ref="selectBox" v-model="selectOptions" multiple :collapse-tags="showTags" clearable placeholder="请选择" style="width:315px" @change="changeSelect">
-                <el-option key="全选" label="全选" value="全选" />
+                <!-- <el-option key="全选" label="全选" value="全选" /> -->
                 <el-option v-for="item in sendObjOptions" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -97,7 +97,7 @@ export default {
       sendVisible: false,
       delVisible: false,
       sendForm: {
-        msgType: '1',
+        msgType: 1,
         notification: '',
         pushObj: '用户',
         sendObj: ['全选']
@@ -105,26 +105,25 @@ export default {
       pushObj: '用户',
       checked: '',
       msgTypeOptions: [
-        { value: '1', label: '系统通知' },
-        { value: '2', label: '报警消息', disabled: true },
-        { value: '3', label: '借还消息', disabled: true },
-        { value: '4', label: '下载消息', disabled: true }
+        { value: 1, label: '系统通知' },
+        { value: 2, label: '报警消息', disabled: true },
+        { value: 3, label: '借还消息', disabled: true },
+        { value: 4, label: '下载消息', disabled: true }
       ],
       personOptions: [
-        { value: '1', label: '张三' },
-        { value: '2', label: '李四' },
-        { value: '3', label: '王五' },
-        { value: '4', label: '张三' },
-        { value: '5', label: '李四' },
-        { value: '6', label: '王五' },
-        { value: '7', label: '张三' },
-        { value: '8', label: '李四' },
-        { value: '9', label: '王五' }
+        { value: 0, label: '全部用户' },
+        { value: 1, label: '张三' },
+        { value: 2, label: '李四' },
+        { value: 3, label: '王五' },
+        { value: 4, label: '张三' },
+        { value: 5, label: '李四' },
+        { value: 6, label: '王五' }
       ],
       devOptions: [
-        { value: '1', label: '设备1' },
-        { value: '2', label: '设备2' },
-        { value: '3', label: '设备3' }
+        { value: 0, label: '全部设备' },
+        { value: 1, label: '设备1' },
+        { value: 2, label: '设备2' },
+        { value: 3, label: '设备3' }
       ],
       selectOptions: [],
       showTags: true,
@@ -157,14 +156,6 @@ export default {
     getData() {
       this.tableData = data1.rows
     },
-    // 默认全选
-    defaultSelAll() {
-      let arr = null
-      arr = this.sendObjOptions.map(item => { return item.value })
-      this.selectOptions = ['全选', ...arr]
-      console.log(this.selectOptions)
-      this.showTags = true
-    },
     clickRowHandler(row) {
       // this.$refs.table.clearSelection()
       this.$refs.table.toggleRowSelection(row) // 单选选中
@@ -223,38 +214,50 @@ export default {
     //   // console.log(this.sendForm.sendObj)
     // },
     // el-select 选中值发生变化时触发，val为目前选中的值
+
+    // 默认全选
+    defaultSelAll() {
+      this.selectOptions = this.sendObjOptions.map(item => { return item.value })
+      this.showTags = true
+    },
     changeSelect(val) {
-      // 最后选中得值
-      var endSelectVal = val[val.length - 1]
-      // showTags配合 collapse-tags 属性来
-      if (!val.includes('全选') && val.length === this.sendObjOptions.length) {
-        // 当前选中得值不包含“全选”，且其他项全选中
-        this.showTags = true
-        val.unshift('全选')
-        this.$refs.selectBox.$el.querySelector('.el-input__inner').style.height = '34px'
-      } else if (val.includes('全选') && val.length === 1) {
-        // 当前选中得值是“全选”时
-        this.showTags = true
-        this.sendObjOptions.map(item => {
-          val.push(item.value)
-        })
-      } else if (val.includes('全选') && val.length - 1 < this.sendObjOptions.length && endSelectVal === '全选') {
-        // 当前选中得值是其他项，未全部选完，而最后选中得是“全选”时
-        val = []
-        this.sendObjOptions.map(item => {
-          val.push(item.value)
-        })
-        val.unshift('全选')
-        this.showTags = true
-        this.$refs.selectBox.$el.querySelector('.el-input__inner').style.height = '34px'
-      } else if (val.includes('全选') && val.length - 1 < this.sendObjOptions.length) {
-        // 当前选中得值是其他项，未全部选完时
+      if (val[val.length - 1] === 0) {
+        this.defaultSelAll()
+      } else {
+        this.selectOptions = this.selectOptions.filter(item => item !== 0)
         this.showTags = false
-        val = val.filter(item => {
-          return item !== '全选'
-        })
       }
-      this.selectOptions = val // 赋值给select绑定得
+      // 最后选中得值
+      // var endSelectVal = val[val.length - 1]
+      // // showTags配合 collapse-tags 属性来
+      // if (!val.includes('全选') && val.length === this.sendObjOptions.length) {
+      //   // 当前选中得值不包含“全选”，且其他项全选中
+      //   this.showTags = true
+      //   val.unshift('全选')
+      //   this.$refs.selectBox.$el.querySelector('.el-input__inner').style.height = '34px'
+      // } else if (val.includes('全选') && val.length === 1) {
+      //   // 当前选中得值是“全选”时
+      //   this.showTags = true
+      //   this.sendObjOptions.map(item => {
+      //     val.push(item.value)
+      //   })
+      // } else if (val.includes('全选') && val.length - 1 < this.sendObjOptions.length && endSelectVal === '全选') {
+      //   // 当前选中得值是其他项，未全部选完，而最后选中得是“全选”时
+      //   val = []
+      //   this.sendObjOptions.map(item => {
+      //     val.push(item.value)
+      //   })
+      //   val.unshift('全选')
+      //   this.showTags = true
+      //   this.$refs.selectBox.$el.querySelector('.el-input__inner').style.height = '34px'
+      // } else if (val.includes('全选') && val.length - 1 < this.sendObjOptions.length) {
+      //   // 当前选中得值是其他项，未全部选完时
+      //   this.showTags = false
+      //   val = val.filter(item => {
+      //     return item !== '全选'
+      //   })
+      // }
+      // this.selectOptions = val // 赋值给select绑定得
     },
     pushObjChange(val) {
       if (val) {