Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

back/src/mixins/view-module.js

@@ -356,6 +356,11 @@ export default {
 
     deleteHandle2(id) {
       console.log('删除========================》', id, this.dataListSelections)
+      this.$confirm('确认是否删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         const ids = []
         if (id) {
           ids.push(id)
@@ -368,8 +373,18 @@ export default {
         }
         this.$http.post('/resource/delete', { ids: ids }).then(res => {
           console.log('删除成功', res)
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          });
           this.getDataList()
         })
+      }).catch(() => {
+        // this.$message({
+        //   type: 'info',
+        //   message: '已取消删除'
+        // });          
+      });
     },
     // 导出
     exportHandle() {

back/src/views/modules/ability/IntegratedServices.vue

@@ -70,7 +70,7 @@ export default {
       mixinViewModuleOptions: {
         getDataListURL: "/fuse/page",
         exportURL: "/ability/bsabilityai/export",
-        deleteURL: "/fuse",
+        deleteURL: "/fuse/delete",
         getDataListIsPage: true,
         deleteIsBatch: false,
       },
@@ -93,6 +93,11 @@ export default {
   },
   methods: {
     deleteRow(id) {
+      this.$confirm('确认是否删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         this.$http.delete('/fuse/delete', {
           data: [id]
         }).then(res => {
@@ -111,6 +116,8 @@ export default {
         }).catch(err => {
           this.$message.error(err);
         })
+      }).catch(() => {
+      });
     },
     // 查询
     searchData() {

back/src/views/modules/ability/assignedScene/components/infrastructure-tree.vue

@@ -19,7 +19,11 @@
                                     <path d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z" p-id="2157"
                                         fill="#0058e1"></path>
                                 </svg>
-                                <span class="name">{{ val.name }}({{ val.channelCount }})</span>
+                                <el-tooltip  effect="dark"  placement="top-start">
+                                    <div class="tooltip-name" slot="content">{{val.name}}</div>
+                                    <span class="name">{{ val.name }}</span>
+                                </el-tooltip>
+                                <span class="num">({{ val.channelCount }})</span>
                             </div>
                             <span v-if="item.children.length < 0">{{ val.total }}</span>
                             <span v-else>
@@ -311,4 +315,21 @@ export default {
         }
     }
 }
+
+.name {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    word-break: break-all;
+    width: 190px;
+    text-align: left;
+}
+
+.num {
+    width: 40px;
+    text-align: right;
+}
+.tooltip-name {
+    max-width: 300px;
+}
 </style>

back/src/views/modules/ability/assignedScene/components/scene-one-input.vue

@@ -12,8 +12,8 @@
                     v-if="dataInfo.length > 1">删除
                 </el-button>
             </el-form-item>
-            <el-button class="add-btn" size="small" v-if="index == dataInfo.length - 1" @click="addItem"
+            <el-button class="add-btn" size="small" v-if="index == dataInfo.length - 1" @click="addItem" type="primary">
-                type="primary">添加
+                添加
             </el-button>
         </div>
     </div>
@@ -97,8 +97,19 @@ export default {
             })
         },
         // 删除
-        deleteItem(list, index) {
+        deleteItem(index) {
+            this.$confirm('确认是否删除?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                this.$message({
+                    type: 'success',
+                    message: '删除成功!'
+                });
                 this.dataInfo.splice(index, 1)
+            }).catch(() => {
+            });
         }
     }
 }

back/src/views/modules/ability/assignedScene/components/scene-use-step.vue

@@ -16,8 +16,8 @@
                     v-if="!disabledType && dataInfo.length > 1">删除
                 </el-button>
             </el-form-item>
-            <el-button class="add-btn" size="small"
+            <el-button class="add-btn" size="small" v-if="!disabledType && index == dataInfo.length - 1"
-                v-if="!disabledType && index == dataInfo.length - 1" @click="addItem" type="primary">添加
+                @click="addItem" type="primary">添加
             </el-button>
         </div>
 
@@ -100,8 +100,19 @@ export default {
             })
         },
         // 删除
-        deleteItem(list, index) {
+        deleteItem(index) {
+            this.$confirm('确认是否删除?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                this.$message({
+                    type: 'success',
+                    message: '删除成功!'
+                });
                 this.dataInfo.splice(index, 1)
+            }).catch(() => {
+            });
         }
     }
 }

back/src/views/modules/ability/assignedScene/index.vue

@@ -84,6 +84,11 @@ export default {
   },
   methods: {
     deleteRow(id) {
+      this.$confirm('确认是否删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         this.$http.delete('/fuse/delete', {
           data: [id]
         }).then(res => {
@@ -102,6 +107,8 @@ export default {
         }).catch(err => {
           this.$message.error(err);
         })
+      }).catch(() => {
+      });
     },
     // 查询
     searchData() {

back/src/views/modules/ability/components/common-question.vue

@@ -110,8 +110,19 @@ export default {
             })
         },
         // 删除
-        deleteItem(list, index) {
+        deleteItem(index) {
+            this.$confirm('确认是否删除?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                this.$message({
+                    type: 'success',
+                    message: '删除成功!'
+                });
                 this.dataInfo.splice(index, 1)
+            }).catch(() => {
+            });
         }
     }
 }

front/src/views/home/AbilityToApplyFor.vue

@@ -29,7 +29,8 @@
             p-id="5928"
           ></path>
         </svg>
-        <span class="btn" @click="falg = !falg">展开</span>
+        <span class="btn" style="font-weight:600" @click="falg = !falg">展开</span>
+        <span class="btn" @click="falg = !falg">(共{{totalDataNum}}条数据)</span>
       </div>
       <div class="btnBox" v-show="falg">
         <svg
@@ -49,7 +50,7 @@
             fill="#13227a"
           ></path>
         </svg>
-        <span class="btn" @click="falg = !falg">收起</span>
+        <span class="btn" style="font-weight:600" @click="falg = !falg">收起</span>
       </div>
     </div>
     <div
@@ -165,6 +166,7 @@
   })
   const falg = ref(false)
   let dataForm = ref([])
+  let totalDataNum = ref(0);
   const videoVisible = ref(false)
   const xVideoList = ref([])
   const xVideoListAll = ref([])
@@ -251,6 +253,16 @@
         })
     } 
       getDeptAllData(); 
+      const getDataTotalNum = () =>{
+        let totalNum  =0;
+       dataForm.value.forEach((item)=>{
+        totalNum = totalNum +item.arr.length;
+     });
+     totalDataNum.value = totalNum;
+    } 
+    getDataTotalNum();
+    //获取数据的总条数
+    
 </script> 
 
 <style scoped lang="less">