Explorar o código

'1.综合事项修改;2.解决点击绑定位置的空间出现空白弹窗问题;'

zhangyu %!s(int64=4) %!d(string=hai) anos
pai
achega
275a8d629e

+ 1 - 1
src/components/floorMap/index.vue

@@ -165,13 +165,13 @@ export default {
     methods: {
         handleClickLegendItem(item, events) {
             this.tabData = { tableData: [], pointData: [] }
+            this.equipIds = []
             this.showBtnWell = false
             this.visible = false
             this.activeItem = null
             this.isLoading = true
             if (item.data.AttachObjectIds && item.data.AttachObjectIds.length) {
                 const e = events[0]
-                this.equipIds = []
                 this.activeItem = item
                 item.data.AttachObjectIds.forEach((v) => {
                     if (v.type == 'Image') {

+ 2 - 1
src/lib/items/SCustomLegendItem.ts

@@ -211,7 +211,8 @@ export class SCustomLegendItem extends SPolygonItem {
     onMouseDown(event: SMouseEvent): boolean {
         if (event.buttons == 1)
         this.$emit("legendItemClick", event);
-        return super.onMouseDown(event);
+        super.onMouseDown(event);
+        return true;
     } // Function onMouseDown()
 
     toData(): any {

+ 2 - 1
src/lib/items/SFHFQZoneLegendItem.ts

@@ -206,7 +206,8 @@ export class SFHFQZoneLegendItem extends SPolygonItem {
     onMouseDown(event: SMouseEvent): boolean {
         if (event.buttons == 1)
         this.$emit("legendItemClick", event);
-        return super.onMouseDown(event);
+        super.onMouseDown(event);
+        return true;
     } // Function onMouseDown()
 
     toData(): any {

+ 2 - 1
src/lib/items/SSCPZZoneLegendItem.ts

@@ -214,7 +214,8 @@ export class SSCPZZoneLegendItem extends SPolygonItem {
     onMouseDown(event: SMouseEvent): boolean {
         if (event.buttons == 1)
         this.$emit("legendItemClick", event);
-        return super.onMouseDown(event);
+        super.onMouseDown(event);
+        return true;
     } // Function onMouseDown()
 
     toData(): any {

+ 2 - 1
src/lib/items/SZoneLegendItem.ts

@@ -207,7 +207,8 @@ export class SZoneLegendItem extends SPolygonItem {
     onMouseDown(event: SMouseEvent): boolean {
         if (event.buttons == 1)
         this.$emit("legendItemClick", event);
-        return super.onMouseDown(event);
+        super.onMouseDown(event);
+        return true;
     } // Function onMouseDown()
 
     toData(): any {

+ 5 - 3
src/views/other/zhsxOtherTable1.vue

@@ -51,10 +51,12 @@
             <el-table-column prop sortable label='日期' width='100' resizable>
                 <template slot-scope='{row}'>{{formatter(row.createdate)||'--'}}</template>
             </el-table-column>
-            <el-table-column prop label='政府部门' :show-overflow-tooltip='true' width='160'>
-                <template slot-scope='{row}'>{{row.department||'--'}}</template>
+            <el-table-column prop label='政府部门' :show-overflow-tooltip='true' width='200'>
+                <template slot-scope='{row}'>
+                    {{row.department?row.department == '其他部门'?`${row.department} - ${row.otherdescription}`:row.department:'--'}}
+                </template>
             </el-table-column>
-            <el-table-column prop label='记录事项' :show-overflow-tooltip='true' min-width='700'>
+            <el-table-column prop label='记录事项' :show-overflow-tooltip='true' min-width='660'>
                 <template slot-scope='{row}'>{{row.recordsx||'--'}}</template>
             </el-table-column>
             <el-table-column prop label='工作要求' :show-overflow-tooltip='true' width='160'>