Prechádzať zdrojové kódy

fix(附加数据):添加自定义功能

xiebeibei 4 rokov pred
rodič
commit
79678818c3
2 zmenil súbory, kde vykonal 358 pridanie a 159 odobranie
  1. 346 149
      src/views/equipment/addDataDialog.vue
  2. 12 10
      src/views/equipment/index.vue

+ 346 - 149
src/views/equipment/addDataDialog.vue

@@ -191,12 +191,34 @@
                                 on:{
                                     change(event){
                                         self.$set(self.addDataTableData[index],'manageScope',event.id);
+                                        if(event.id=='自定义'){
+                                            self.$set(self.addDataTableData[index],'manageScopeType','1');
+                                            self.$set(self.addDataTableData[index], 'manageScope','');
+                                        }else{
+                                            self.$set(self.addDataTableData[index],'manageScopeType','0');
+                                        }
+
                                     }
                                 }
                         },
                               );
+                            var childInput = self.$createElement("a-input", {
+                                attrs:{
+                                    value: row.manageScope,
+                                    placeholder:'请输入自定义内容',
+                                    maxLength:30,
+                                },
+                                on:{
+                                    change(event){
+                                        self.$set(self.addDataTableData[index], 'manageScope', event.target.value);
+                                    },
+                                    blur(){
+                                        // self.$set(self.addDataTableData[index], 'manageScope', self.addDataTableData[index].hostNum);
+                                    },
+                                }
+                            })
                             const obj = {
-                                children: row.isFm=='1'?child:childSelect,
+                                children: row.isFm=='1'?child:row.manageScopeType=='1'?childInput:childSelect,
                                 attrs: {},
                             };
                             obj.attrs.colSpan =  row.isFm=='1'?1:7
@@ -263,34 +285,53 @@
                         },},
                     {dataIndex: 'smokeCount', title: '烟感数量', align: 'center', customRender: (text, row, index) => {
                             var self = this;
-                            var child = self.$createElement("a-input", {
+                            var child = self.$createElement("el-tooltip", {
                                 attrs:{
-                                    type:'number',
-                                    value: text,
-                                    placeholder:'请输入',
-                                    min:0,
-                                    class:row.errorMsg1?'input-box':'input-box input-box-error'
+                                    placement:"top",
+                                    content:'仅允许填写大于等于0的整数,请按规则填写',
+                                    manual:true,
+                                    disabled:row.tooltipMsg1,
+                                    value:!row.tooltipMsg1,
                                 },
-                                on:{
-                                    keydown(e){
-                                        self.keydown(e);
-                                    },
-                                    input(e){
-                                        if(row.isFm=='1') {
-                                            self.input(e);
-                                            self.$set(self.addDataTableData[index], 'smokeCount',e.target.value);
-                                        }
+                            },[
+                                self.$createElement("a-input", {
+                                    attrs:{
+                                        type:'number',
+                                        value: text,
+                                        placeholder:'请输入',
+                                        min:0,
+                                        class:row.errorMsg1?'input-box':'input-box input-box-error'
                                     },
-                                    blur(e){
-                                        if(e.target.value>1200){
-                                            self.$set( self.addDataTableData[index],'errorMsg1',false);
-                                        }else{
-                                            self.$set( self.addDataTableData[index],'errorMsg1',true)
+                                    on:{
+                                        keydown(e){
+                                            self.keydown(e);
+                                            if(  e.key!=0&& e.key!=1&& e.key!=2&& e.key!=3&& e.key!=4&& e.key!=5&& e.key!=6&& e.key!=7&& e.key!=8&& e.key!=9){
+                                                self.$set( self.addDataTableData[index],'tooltipMsg1',false);
+                                                self.$set( self.addDataTableData[index],'errorMsg1',false)
+                                            }else{
+                                                self.$set( self.addDataTableData[index],'tooltipMsg1',true);
+                                                self.$set( self.addDataTableData[index],'errorMsg1',true)
+                                            }
+                                            self.$forceUpdate();
+                                        },
+                                        input(e){
+                                            if(row.isFm=='1') {
+                                                self.input(e);
+                                                self.$set(self.addDataTableData[index], 'smokeCount',e.target.value);
+                                            }
+                                        },
+                                        blur(e){
+                                            if(e.target.value>1200){
+                                                self.$set( self.addDataTableData[index],'errorMsg1',false);
+                                            }else{
+                                                self.$set( self.addDataTableData[index],'errorMsg1',true)
+                                            }
+                                            self.$set( self.addDataTableData[index],'tooltipMsg1',true);
+                                            self.$forceUpdate();
                                         }
-                                        self.$forceUpdate();
                                     }
-                                }
-                            });
+                                })
+                            ]);
                             const obj = {
                                 children: row.isFm=='1'?child:text,
                                 attrs: {},
@@ -302,35 +343,53 @@
                         },},
                     {dataIndex: 'warmCount', title: '温感数量', align: 'center', customRender: (text, row, index) => {
                             var self = this;
-                            var child = self.$createElement("a-input", {
+                            var child = self.$createElement("el-tooltip", {
                                 attrs:{
-                                    value: text,
-                                    placeholder:'请输入',
-                                    max:9999,
-                                    min:0,
-                                    type:'number',
-                                    class:row.errorMsg2?'input-box':'input-box input-box-error'
+                                    placement:"top",
+                                    content:'仅允许填写大于等于0的整数,请按规则填写',
+                                    manual:true,
+                                    disabled:row.tooltipMsg2,
+                                    value:!row.tooltipMsg2,
                                 },
-                                on:{
-                                    keydown(e){
-                                        self.keydown(e);
-                                    },
-                                    input(e){
-                                        if(row.isFm=='1') {
-                                            self.input(e);
-                                            self.$set(self.addDataTableData[index], 'warmCount',e.target.value);
-                                        }
+                            },[
+                                self.$createElement("a-input", {
+                                    attrs:{
+                                        type:'number',
+                                        value: text,
+                                        placeholder:'请输入',
+                                        min:0,
+                                        class:row.errorMsg2?'input-box':'input-box input-box-error'
                                     },
-                                    blur(e){
-                                        if(e.target.value>400){
-                                            self.$set( self.addDataTableData[index],'errorMsg2',false)
-                                        }else{
-                                            self.$set( self.addDataTableData[index],'errorMsg2',true)
+                                    on:{
+                                        keydown(e){
+                                            self.keydown(e);
+                                            if(  e.key!=0&& e.key!=1&& e.key!=2&& e.key!=3&& e.key!=4&& e.key!=5&& e.key!=6&& e.key!=7&& e.key!=8&& e.key!=9){
+                                                self.$set( self.addDataTableData[index],'tooltipMsg2',false);
+                                                self.$set( self.addDataTableData[index],'errorMsg2',false)
+                                            }else{
+                                                self.$set( self.addDataTableData[index],'tooltipMsg2',true);
+                                                self.$set( self.addDataTableData[index],'errorMsg2',true)
+                                            }
+                                            self.$forceUpdate();
+                                        },
+                                        input(e){
+                                            if(row.isFm=='1') {
+                                                self.input(e);
+                                                self.$set(self.addDataTableData[index], 'warmCount',e.target.value);
+                                            }
+                                        },
+                                        blur(e){
+                                            if(e.target.value>1200){
+                                                self.$set( self.addDataTableData[index],'errorMsg2',false);
+                                            }else{
+                                                self.$set( self.addDataTableData[index],'errorMsg2',true)
+                                            }
+                                            self.$set( self.addDataTableData[index],'tooltipMsg2',true);
+                                            self.$forceUpdate();
                                         }
-                                        self.$forceUpdate();
                                     }
-                                }
-                            });
+                                })
+                            ]);
                             const obj = {
                                 children: row.isFm=='1'?child:text,
                                 attrs: {},
@@ -342,34 +401,53 @@
                         },},
                     {dataIndex: 'handNewCount', title: '手报数量', align: 'center',  customRender: (text, row, index) => {
                             var self = this;
-                            var child = self.$createElement("a-input", {
+                            var child = self.$createElement("el-tooltip", {
                                 attrs:{
-                                    type:'number',
-                                    value: text,
-                                    placeholder:'请输入',
-                                    min:0,
-                                    class:row.errorMsg3?'input-box':'input-box input-box-error'
+                                    placement:"top",
+                                    content:'仅允许填写大于等于0的整数,请按规则填写',
+                                    manual:true,
+                                    disabled:row.tooltipMsg3,
+                                    value:!row.tooltipMsg3,
                                 },
-                                on:{
-                                    keydown(e){
-                                        self.keydown(e);
-                                    },
-                                    input(e){
-                                        if(row.isFm=='1') {
-                                            self.input(e);
-                                            self.$set(self.addDataTableData[index], 'handNewCount',  e.target.value);
-                                        }
+                            },[
+                                self.$createElement("a-input", {
+                                    attrs:{
+                                        type:'number',
+                                        value: text,
+                                        placeholder:'请输入',
+                                        min:0,
+                                        class:row.errorMsg3?'input-box':'input-box input-box-error'
                                     },
-                                    blur(e){
-                                        if(e.target.value>200){
-                                            self.$set( self.addDataTableData[index],'errorMsg3',false)
-                                        }else{
-                                            self.$set( self.addDataTableData[index],'errorMsg3',true)
+                                    on:{
+                                        keydown(e){
+                                            self.keydown(e);
+                                            if(  e.key!=0&& e.key!=1&& e.key!=2&& e.key!=3&& e.key!=4&& e.key!=5&& e.key!=6&& e.key!=7&& e.key!=8&& e.key!=9){
+                                                self.$set( self.addDataTableData[index],'tooltipMsg3',false);
+                                                self.$set( self.addDataTableData[index],'errorMsg3',false)
+                                            }else{
+                                                self.$set( self.addDataTableData[index],'tooltipMsg3',true);
+                                                self.$set( self.addDataTableData[index],'errorMsg3',true)
+                                            }
+                                            self.$forceUpdate();
+                                        },
+                                        input(e){
+                                            if(row.isFm=='1') {
+                                                self.input(e);
+                                                self.$set(self.addDataTableData[index], 'handNewCount',e.target.value);
+                                            }
+                                        },
+                                        blur(e){
+                                            if(e.target.value>1200){
+                                                self.$set( self.addDataTableData[index],'errorMsg3',false);
+                                            }else{
+                                                self.$set( self.addDataTableData[index],'errorMsg3',true)
+                                            }
+                                            self.$set( self.addDataTableData[index],'tooltipMsg3',true);
+                                            self.$forceUpdate();
                                         }
-                                        self.$forceUpdate();
                                     }
-                                }
-                            });
+                                })
+                            ]);
                             const obj = {
                                 children: row.isFm=='1'?child:text,
                                 attrs: {},
@@ -381,34 +459,53 @@
                         },},
                     {dataIndex: 'fireHydrantCount', title: '消火栓数量', align: 'center',width:87, customRender: (text, row, index) => {
                             var self = this;
-                            var child = self.$createElement("a-input", {
+                            var child = self.$createElement("el-tooltip", {
                                 attrs:{
-                                    type:'number',
-                                    value: text,
-                                    placeholder:'请输入',
-                                    min:0,
-                                    class:row.errorMsg4?'input-box':'input-box input-box-error'
+                                    placement:"top",
+                                    content:'仅允许填写大于等于0的整数,请按规则填写',
+                                    manual:true,
+                                    disabled:row.tooltipMsg4,
+                                    value:!row.tooltipMsg4,
                                 },
-                                on:{
-                                    keydown(e){
-                                        self.keydown(e);
-                                    },
-                                    input(e){
-                                        if(row.isFm=='1') {
-                                            self.input(e);
-                                            self.$set(self.addDataTableData[index], 'fireHydrantCount',  e.target.value);
-                                        }
+                            },[
+                                self.$createElement("a-input", {
+                                    attrs:{
+                                        type:'number',
+                                        value: text,
+                                        placeholder:'请输入',
+                                        min:0,
+                                        class:row.errorMsg4?'input-box':'input-box input-box-error'
                                     },
-                                    blur(e){
-                                        if(e.target.value>200){
-                                            self.$set( self.addDataTableData[index],'errorMsg4',false)
-                                        }else{
-                                            self.$set( self.addDataTableData[index],'errorMsg4',true)
+                                    on:{
+                                        keydown(e){
+                                            self.keydown(e);
+                                            if(  e.key!=0&& e.key!=1&& e.key!=2&& e.key!=3&& e.key!=4&& e.key!=5&& e.key!=6&& e.key!=7&& e.key!=8&& e.key!=9){
+                                                self.$set( self.addDataTableData[index],'tooltipMsg4',false);
+                                                self.$set( self.addDataTableData[index],'errorMsg4',false)
+                                            }else{
+                                                self.$set( self.addDataTableData[index],'tooltipMsg4',true);
+                                                self.$set( self.addDataTableData[index],'errorMsg4',true)
+                                            }
+                                            self.$forceUpdate();
+                                        },
+                                        input(e){
+                                            if(row.isFm=='1') {
+                                                self.input(e);
+                                                self.$set(self.addDataTableData[index], 'fireHydrantCount',e.target.value);
+                                            }
+                                        },
+                                        blur(e){
+                                            if(e.target.value>1200){
+                                                self.$set( self.addDataTableData[index],'errorMsg4',false);
+                                            }else{
+                                                self.$set( self.addDataTableData[index],'errorMsg4',true)
+                                            }
+                                            self.$set( self.addDataTableData[index],'tooltipMsg4',true);
+                                            self.$forceUpdate();
                                         }
-                                        self.$forceUpdate();
                                     }
-                                }
-                            });
+                                })
+                            ]);
                             const obj = {
                                 children: row.isFm=='1'?child:text,
                                 attrs: {},
@@ -420,34 +517,53 @@
                         },},
                     {dataIndex: 'moduleCount', title: '模块数量', align: 'center', customRender: (text, row, index) => {
                             var self = this;
-                            var child = self.$createElement("a-input", {
+                            var child = self.$createElement("el-tooltip", {
                                 attrs:{
-                                    value: text,
-                                    placeholder:'请输入',
-                                    min:0,
-                                    type:'number',
-                                    class:row.errorMsg5?'input-box':'input-box input-box-error'
+                                    placement:"top",
+                                    content:'仅允许填写大于等于0的整数,请按规则填写',
+                                    manual:true,
+                                    disabled:row.tooltipMsg5,
+                                    value:!row.tooltipMsg5,
                                 },
-                                on:{
-                                    keydown(e){
-                                        self.keydown(e);
-                                    },
-                                    input(e){
-                                        if(row.isFm=='1') {
-                                            self.input(e);
-                                            self.$set(self.addDataTableData[index], 'moduleCount',  e.target.value);
-                                        }
+                            },[
+                                self.$createElement("a-input", {
+                                    attrs:{
+                                        type:'number',
+                                        value: text,
+                                        placeholder:'请输入',
+                                        min:0,
+                                        class:row.errorMsg5?'input-box':'input-box input-box-error'
                                     },
-                                    blur(e){
-                                        if(e.target.value>800){
-                                            self.$set( self.addDataTableData[index],'errorMsg5',false)
-                                        }else{
-                                            self.$set( self.addDataTableData[index],'errorMsg5',true)
+                                    on:{
+                                        keydown(e){
+                                            self.keydown(e);
+                                            if(  e.key!=0&& e.key!=1&& e.key!=2&& e.key!=3&& e.key!=4&& e.key!=5&& e.key!=6&& e.key!=7&& e.key!=8&& e.key!=9){
+                                                self.$set( self.addDataTableData[index],'tooltipMsg5',false);
+                                                self.$set( self.addDataTableData[index],'errorMsg5',false)
+                                            }else{
+                                                self.$set( self.addDataTableData[index],'tooltipMsg5',true);
+                                                self.$set( self.addDataTableData[index],'errorMsg5',true)
+                                            }
+                                            self.$forceUpdate();
+                                        },
+                                        input(e){
+                                            if(row.isFm=='1') {
+                                                self.input(e);
+                                                self.$set(self.addDataTableData[index], 'moduleCount',e.target.value);
+                                            }
+                                        },
+                                        blur(e){
+                                            if(e.target.value>1200){
+                                                self.$set( self.addDataTableData[index],'errorMsg5',false);
+                                            }else{
+                                                self.$set( self.addDataTableData[index],'errorMsg5',true)
+                                            }
+                                            self.$set( self.addDataTableData[index],'tooltipMsg5',true);
+                                            self.$forceUpdate();
                                         }
-                                        self.$forceUpdate();
                                     }
-                                }
-                            });
+                                })
+                            ]);
                             const obj = {
                                 children: row.isFm=='1'?child:text,
                                 attrs: {},
@@ -530,8 +646,7 @@
                     },
                 ],
                 examplesTableHeaderREdit: [
-                    {
-                        dataIndex: 'fireZone', title: '分区', align: 'center',  customRender: (text, row, index) => {
+                    {dataIndex: 'fireZone', title: '分区', align: 'center',  customRender: (text, row, index) => {
 
                             var self = this;
                             var child = self.$createElement("el-tooltip", {
@@ -590,37 +705,82 @@
                                 obj.attrs.rowSpan = 0;
                             }
                             return obj;
-                        },
-                    },
+                        },},
                  {dataIndex: 'system', align: 'center', title: '系统'},
-                    {dataIndex: 'monitorCount', title: '数量', align: 'center',customRender:(text,row,index)=>{
+                 {dataIndex: 'monitorCount', title: '数量', align: 'center',customRender:(text,row,index)=>{
                             var self = this;
-                            var child = self.$createElement("a-input", {
-                                attrs:{
-                                    value:row.monitorCount||row.baCount||row.ddcCount||row.accessCount,
-                                    placeholder:'请输入',
-                                    min:0,
-                                    type:'number',
-                                    class:row.errorMsg?'input-box':'input-box input-box-error'
-                                },
-                                on:{
-                                    keydown(e){
-                                        self.keydown(e);
-                                    },
-                                    input(e){
-                                        self.input(e);
-                                        self.$set(self.addDataTableData[index], row.system =='监控系统'?'monitorCount':row.system=='BA系统'?'baCount':row.system=='DDC'?'ddcCount':'accessCount',  e.target.value);
-                                    },
-                                    blur(e){
-                                        if(e.target.value>300){
-                                            self.$set( self.addDataTableData[index],'errorMsg',false)
-                                        }else{
-                                            self.$set( self.addDataTableData[index],'errorMsg',true)
-                                        }
-                                        self.$forceUpdate();
-                                    }
-                                }
-                            });
+                         var child = self.$createElement("el-tooltip", {
+                             attrs:{
+                                 placement:"top",
+                                 content:'仅允许填写大于等于0的整数,请按规则填写',
+                                 manual:true,
+                                 disabled:row.tooltipMsg,
+                                 value:!row.tooltipMsg,
+                             },
+                         },[
+                             self.$createElement("a-input", {
+                                 attrs:{
+                                     value:row.monitorCount||row.baCount||row.ddcCount||row.accessCount,
+                                     placeholder:'请输入',
+                                     min:0,
+                                     type:'number',
+                                     class:row.errorMsg?'input-box':'input-box input-box-error'
+                                 },
+                                 on:{
+                                     keydown(e){
+                                         self.keydown(e);
+                                         if(  e.key!=0&& e.key!=1&& e.key!=2&& e.key!=3&& e.key!=4&& e.key!=5&& e.key!=6&& e.key!=7&& e.key!=8&& e.key!=9){
+                                             self.$set( self.addDataTableData[index],'tooltipMsg',false);
+                                             self.$set( self.addDataTableData[index],'errorMsg',false)
+                                         }else{
+                                             self.$set( self.addDataTableData[index],'tooltipMsg',true);
+                                             self.$set( self.addDataTableData[index],'errorMsg',true)
+                                         }
+                                         self.$forceUpdate();
+                                     },
+                                     input(e){
+                                         self.input(e);
+                                         self.$set(self.addDataTableData[index], row.system =='监控系统'?'monitorCount':row.system=='BA系统'?'baCount':row.system=='DDC'?'ddcCount':'accessCount',  e.target.value);
+                                     },
+                                     blur(e){
+                                         if(e.target.value>300){
+                                             self.$set( self.addDataTableData[index],'errorMsg',false)
+                                         }else{
+                                             self.$set( self.addDataTableData[index],'errorMsg',true)
+                                         }
+                                         self.$set( self.addDataTableData[index],'tooltipMsg',true);
+                                         self.$forceUpdate();
+                                     }
+                                 }
+                             })
+                         ]);
+                            // var child =
+                            //     self.$createElement("a-input", {
+                            //     attrs:{
+                            //         value:row.monitorCount||row.baCount||row.ddcCount||row.accessCount,
+                            //         placeholder:'请输入',
+                            //         min:0,
+                            //         type:'number',
+                            //         class:row.errorMsg?'input-box':'input-box input-box-error'
+                            //     },
+                            //     on:{
+                            //         keydown(e){
+                            //             self.keydown(e);
+                            //         },
+                            //         input(e){
+                            //             self.input(e);
+                            //             self.$set(self.addDataTableData[index], row.system =='监控系统'?'monitorCount':row.system=='BA系统'?'baCount':row.system=='DDC'?'ddcCount':'accessCount',  e.target.value);
+                            //         },
+                            //         blur(e){
+                            //             if(e.target.value>300){
+                            //                 self.$set( self.addDataTableData[index],'errorMsg',false)
+                            //             }else{
+                            //                 self.$set( self.addDataTableData[index],'errorMsg',true)
+                            //             }
+                            //             self.$forceUpdate();
+                            //         }
+                            //     }
+                            // });
                             const obj = {
                                 children: child,
                                 attrs: {},
@@ -655,6 +815,7 @@
             if(this.systemName=='弱电系统') {
                 this.addDataTableData.map((item,index) => {
                     item.errorMsg = true;
+                    item.tooltipMsg = true;
                     item.tooltipDisableFize = true;
                     item.key = ''+ new Date().getTime()+index;
                 })
@@ -662,6 +823,11 @@
             if(this.systemName=='消防系统'){
                 this.addDataTableData.map((item,index) => {
                     item.key = ''+new Date().getTime()+index;
+                    item.tooltipMsg1 = true;
+                    item.tooltipMsg2 = true;
+                    item.tooltipMsg3 = true;
+                    item.tooltipMsg4 = true;
+                    item.tooltipMsg5 = true;
                     item.errorMsg1 = true;
                     item.errorMsg2 = true;
                     item.errorMsg3 = true;
@@ -745,11 +911,21 @@
                         fireHydrantCount:"",
                         moduleCount:"",
                         manageScope:'',
+                        manageScopeType:'',
                         errorMsg1:true,
                         errorMsg2:true,
                         errorMsg3:true,
                         errorMsg4:true,
                         errorMsg5:true,
+                       tooltipDisableFize : true,
+                       tooltipDisablHost : true,
+                       tooltipDisablLoop : true,
+                        tooltipMsg1 : true,
+                        tooltipMsg2 : true,
+                        tooltipMsg3 : true,
+                        tooltipMsg4 : true,
+                        tooltipMsg5 : true,
+
                     };
                     this.$set( this.addDataTableData,index,obj)
                 }
@@ -765,6 +941,7 @@
                                 system: '监控系统',
                                 monitorCount: '',
                                 errorMsg:true,
+                                tooltipMsg:true,
                                 tooltipDisableFize: true
                             },
                             {
@@ -772,6 +949,7 @@
                                 system: 'BA系统',
                                 baCount: '',
                                 errorMsg:true,
+                                tooltipMsg:true,
                                 tooltipDisableFize: true
                             },
                             {
@@ -779,6 +957,7 @@
                                 system: 'DDC',
                                 ddcCount: '',
                                 errorMsg:true,
+                                tooltipMsg:true,
                                 tooltipDisableFize: true
                             },
                             {
@@ -786,6 +965,7 @@
                                 system: '门禁系统',
                                 accessCount: '',
                                 errorMsg:true,
+                                tooltipMsg:true,
                                 tooltipDisableFize: true
                             },
                         ];
@@ -810,6 +990,7 @@
                            fireHydrantCount:"",
                            moduleCount:"",
                            manageScope:'',
+                           manageScopeType:'',
                            errorMsg1:true,
                            errorMsg2:true,
                            errorMsg3:true,
@@ -818,6 +999,11 @@
                            tooltipDisableFize : true,
                            tooltipDisablHost : true,
                            tooltipDisablLoop : true,
+                           tooltipMsg1 : true,
+                           tooltipMsg2 : true,
+                           tooltipMsg3 : true,
+                           tooltipMsg4 : true,
+                           tooltipMsg5 : true,
                        };
                        this.addDataTableData.push(obj)
                    }else{
@@ -835,6 +1021,7 @@
                             system: '监控系统',
                             monitorCount: '',
                             errorMsg:true,
+                            tooltipMsg:true,
                             tooltipDisableFize: true
                         },
                         {
@@ -843,6 +1030,7 @@
                             system: 'BA系统',
                             baCount: '',
                             errorMsg:true,
+                            tooltipMsg:true,
                             tooltipDisableFize: true
                         },
                         {
@@ -851,6 +1039,7 @@
                             system: 'DDC',
                             ddcCount: '',
                             errorMsg:true,
+                            tooltipMsg:true,
                             tooltipDisableFize: true
                         },
                         {
@@ -859,6 +1048,7 @@
                             system: '门禁系统',
                             accessCount: '',
                             errorMsg:true,
+                            tooltipMsg:true,
                             tooltipDisableFize: true
                         },
                     ];
@@ -877,6 +1067,7 @@
                         fireHydrantCount:"",  //消火栓数量
                         moduleCount:"",       //模块数量
                         manageScope:'',
+                        manageScopeType:'',
                         errorMsg1:true,
                         errorMsg2:true,
                         errorMsg3:true,
@@ -885,6 +1076,11 @@
                        tooltipDisableFize : true,
                        tooltipDisablHost : true,
                        tooltipDisablLoop : true,
+                        tooltipMsg1 : true,
+                        tooltipMsg2 : true,
+                        tooltipMsg3 : true,
+                        tooltipMsg4 : true,
+                        tooltipMsg5 : true,
                     };
                     this.addDataTableData.push(obj)
                 }
@@ -916,7 +1112,8 @@
                     let obj1 = {
                         fireZone:item.fireZone,       //防火分区
                         isFm:item.isFm,               //是否属于工程物业管理范围,0:否,1:是
-                        manageScope:item.manageScope   //管理范围
+                        manageScope:item.manageScope ,  //管理范围
+                        manageScopeType:item.manageScopeType ,  //管理范围
 
                     }
                     if(item.isFm=='1'){

+ 12 - 10
src/views/equipment/index.vue

@@ -74,23 +74,25 @@
                 ref="additionalBox"
                 v-if="fqPic.length > 0 && (smsxt == '1003' || smsxt == '1004')"
               >
-
-                  <el-badge :is-dot="visibleTooltip" class="item" >
-                    <a-tooltip  v-if="showView === 3" placement="bottomRight" :defaultVisible="visibleTooltip" overlayClassName="additional-box-tooltip" :visible="visibleTooltip">
+                  <a-tooltip   placement="bottomRight"  overlayClassName="additional-box-tooltip" >
                       <template slot="title">
-                        <span>数据填写不完整,请检查并完善</span>
+                          <span>数据填写不完整,请检查并完善</span>
                       </template>
-                    <div
+                  <el-badge :is-dot="visibleTooltip" class="item" >
+
+                    <div v-if="showView === 3"
                             class="additional2"
                             @click="additionalColl"
                             >
                       <img src="../../assets/imgs/bg2.png" alt />
                     </div>
-                </a-tooltip>
-                    <div class="additional" @click="additionalColl" v-else>
-                      <img src="../../assets/imgs/bg.png" alt />
-                    </div>
+                        <div class="additional" @click="additionalColl" v-else>
+                            <img src="../../assets/imgs/bg.png" alt />
+                        </div>
                   </el-badge>
+                </a-tooltip>
+
+
 
 
 
@@ -852,6 +854,7 @@ export default {
               width: 12px;
               height: 12px;
               background: #F54E45;
+              cursor: pointer!important;
             }
           }
           .additional-box {
@@ -977,7 +980,6 @@ export default {
 </style>
 <style lang="less">
   .additional-box-tooltip{
-      z-index: 3;
     /deep/ .ant-tooltip-inner{
       background: linear-gradient(180deg, #369CF7 0%, #025BAA 100%)!important;
     }