Преглед изворни кода

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

haojianlong пре 4 година
родитељ
комит
91c4ef4b0f

+ 1 - 1
src/components/mapClass/EditScence.js

@@ -593,7 +593,7 @@ export class EditScence extends SGraphScene {
                 borderStyle = SLineStyle.Dotted;
             }
             else if (val == 'solid') {
-                borderStyle = SLineStyle.Soild;
+                borderStyle = SLineStyle.Solid;
             }
             this.focusItem.lineStyle = borderStyle;
         }

+ 1 - 1
src/components/mapClass/EditScence.ts

@@ -609,7 +609,7 @@ export class EditScence extends SGraphScene {
             } else if (val == 'dotted') {
                 borderStyle = SLineStyle.Dotted
             } else if (val == 'solid') {
-                borderStyle = SLineStyle.Soild
+                borderStyle = SLineStyle.Solid
             }
             this.focusItem.lineStyle = borderStyle;
         }

+ 26 - 3
src/lib/items/SFHFQZoneLegendItem.ts

@@ -143,9 +143,19 @@ export class SFHFQZoneLegendItem extends SPolygonItem {
             if (data.Properties.font) {
                 this.font = new SFont("sans-serif", data.Properties.font);
             }
-            //    if( data.Properties.LineDash){
-            //     this.LineDash =this._legend.Properties.LineDash
-            //    }
+            switch (data.Properties.LineDash) {
+                case "solid":
+                    this.lineStyle = SLineStyle.Solid;
+                    break;
+                case "dotted":
+                    this.lineStyle = SLineStyle.Dotted;
+                    break;
+                case "dashed":
+                    this.lineStyle = SLineStyle.Dashed;
+                    break;
+                default:
+                    this.lineStyle = SLineStyle.Solid;
+            }
         }
         // 监听多边形创建完成事件,并动态计算文本位置
         this.connect("finishCreated", this, () => {
@@ -166,6 +176,19 @@ export class SFHFQZoneLegendItem extends SPolygonItem {
         this.data.Properties.FillColor = this.fillColor.value;
         this.data.Properties.StrokeColor = this.strokeColor.value;
         this.data.Properties.LineWidth = this.lineWidth;
+        switch (this.lineStyle) {
+            case SLineStyle.Solid:
+                this.data.Properties.LineDash = "solid";
+                break;
+            case SLineStyle.Dotted:
+                this.data.Properties.LineDash = "dotted";
+                break;
+            case SLineStyle.Dashed:
+                this.data.Properties.LineDash = "dashed";
+                break;
+            default:
+                this.data.Properties.LineDash = "solid";
+        }
         this.data.OutLine = this.getPointList.map(pos => {
             return {
                 X: pos.x,

+ 26 - 3
src/lib/items/SSCPZZoneLegendItem.ts

@@ -151,9 +151,19 @@ export class SSCPZZoneLegendItem extends SPolygonItem {
             if (data.Properties.font) {
                 this.font = new SFont("sans-serif", data.Properties.font);
             }
-            //    if( data.Properties.LineDash){
-            //     this.LineDash =this._legend.Properties.LineDash
-            //    }
+            switch (data.Properties.LineDash) {
+                case "solid":
+                    this.lineStyle = SLineStyle.Solid;
+                    break;
+                case "dotted":
+                    this.lineStyle = SLineStyle.Dotted;
+                    break;
+                case "dashed":
+                    this.lineStyle = SLineStyle.Dashed;
+                    break;
+                default:
+                    this.lineStyle = SLineStyle.Solid;
+            }
         }
         // 监听多边形创建完成事件,并动态计算文本位置
         this.connect("finishCreated", this, () => {
@@ -174,6 +184,19 @@ export class SSCPZZoneLegendItem extends SPolygonItem {
         this.data.Properties.FillColor = this.fillColor.value;
         this.data.Properties.StrokeColor = this.strokeColor.value;
         this.data.Properties.LineWidth = this.lineWidth;
+        switch (this.lineStyle) {
+            case SLineStyle.Solid:
+                this.data.Properties.LineDash = "solid";
+                break;
+            case SLineStyle.Dotted:
+                this.data.Properties.LineDash = "dotted";
+                break;
+            case SLineStyle.Dashed:
+                this.data.Properties.LineDash = "dashed";
+                break;
+            default:
+                this.data.Properties.LineDash = "solid";
+        }
         this.data.OutLine = this.getPointList.map(pos => {
             return {
                 X: pos.x,

+ 26 - 3
src/lib/items/SZoneLegendItem.ts

@@ -145,9 +145,19 @@ export class SZoneLegendItem extends SPolygonItem {
             if (data.Properties.font) {
                 this.font = new SFont("sans-serif", data.Properties.font);
             }
-            //    if( data.Properties.LineDash){
-            //     this.LineDash =this._legend.Properties.LineDash
-            //    }
+            switch (data.Properties.LineDash) {
+                case "solid":
+                    this.lineStyle = SLineStyle.Solid;
+                    break;
+                case "dotted":
+                    this.lineStyle = SLineStyle.Dotted;
+                    break;
+                case "dashed":
+                    this.lineStyle = SLineStyle.Dashed;
+                    break;
+                default:
+                    this.lineStyle = SLineStyle.Solid;
+            }
         }
         // 监听多边形创建完成事件,并动态计算文本位置
         this.connect("finishCreated", this, () => {
@@ -168,6 +178,19 @@ export class SZoneLegendItem extends SPolygonItem {
         this.data.Properties.FillColor = this.fillColor.value;
         this.data.Properties.StrokeColor = this.strokeColor.value;
         this.data.Properties.LineWidth = this.lineWidth;
+        switch (this.lineStyle) {
+            case SLineStyle.Solid:
+                this.data.Properties.LineDash = "solid";
+                break;
+            case SLineStyle.Dotted:
+                this.data.Properties.LineDash = "dotted";
+                break;
+            case SLineStyle.Dashed:
+                this.data.Properties.LineDash = "dashed";
+                break;
+            default:
+                this.data.Properties.LineDash = "solid";
+        }
         this.data.OutLine = this.getPointList.map(pos => {
             return {
                 X: pos.x,

+ 24 - 2
src/views/equipment/table/wbTable.vue

@@ -62,7 +62,7 @@
             </div>
             <input-dialog :type='2' @confirm='confirm'></input-dialog>
         </div>
-        <el-table :data='tableData' :border='true' style='width: 100%'>
+        <el-table :data='tableData' :border='true' style='width: 100%' @row-click='innerTable'>
             <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
             <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable width='460'>
                 <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
@@ -106,7 +106,9 @@
                 <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
             </el-table-column>
             <el-table-column prop='wonum' label='任务编号' show-overflow-tooltip resizable width='90'>
-                <template slot-scope='{row}'>{{row.wb_gzglid || '--'}}</template>
+                <template slot-scope='{row}'>
+                    <div @click='ycgd(row)'>{{row.wb_gzglid || '--'}}</div>
+                </template>
             </el-table-column>
         </el-table>
         <div class='foot'>
@@ -168,6 +170,26 @@ export default {
         indexMethod(index) {
             return (this.currentPage - 1) * this.size + index + 1
         },
+        //工单详情
+        innerTable(row) {
+            if (row.apptype == '外委' || row.apptype == '自维') {
+                if (row.wb_gzglid) {
+                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                }
+            } else if (row.apptype == '安全维保') {
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=AQ_WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+            }
+        },
+        // 工单
+        ycgd(row) {
+            if (row.apptype == '外委' || row.apptype == '自维') {
+                if (row.wb_gzglid) {
+                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                }
+            } else if (row.apptype == '安全维保') {
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+            }
+        },
         //多余输入框监听
         confirm(gzglid) {
             this.gzglid = gzglid

+ 6 - 1
src/views/equipment/table/wxTable.vue

@@ -62,7 +62,7 @@
             </div>
             <input-dialog :type='3' @confirm='confirm'></input-dialog>
         </div>
-        <el-table :data='tableData' :border='true' style='width: 100%'>
+        <el-table :data='tableData' :border='true' style='width: 100%' @row-click='innerTable'>
             <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
             <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable min-width='460'>
                 <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
@@ -168,6 +168,11 @@ export default {
         indexMethod(index) {
             return (this.currentPage - 1) * this.size + index + 1
         },
+        innerTable(row) {
+            if (row.workorderid) {
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=${row.workorderid}`, true)
+            }
+        },
         //多余输入框监听
         confirm(wonum) {
             this.wonum = wonum

+ 10 - 2
src/views/equipment/table/zwTable.vue

@@ -52,7 +52,7 @@
             <!-- placeholder='选择验收时间' -->
             <input-dialog v-if='statusOption.length>0' :statusOption='statusOption' :type='4' @confirm='confirm'></input-dialog>
         </div>
-        <el-table :data='tableData' :border='true' style='width: 100%'>
+        <el-table :data='tableData' :border='true' style='width: 100%' @row-click='innerTable'>
             <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
             <el-table-column prop='nd' label='年度' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.nd || '--'}}</template>
@@ -71,7 +71,10 @@
             </el-table-column>
             <el-table-column prop='ssfasm' label='实施方案说明' show-overflow-tooltip resizable min-width='320'>
                 <template slot-scope='{row}'>
-                    <a :href="`http://10.199.204.167:7001/maximo/ui/?event=loadapp&value=GCZXWXLINE&uniqueid=${row.ssfasm}`" target='_blank'>{{row.ssfasm || '--'}}</a>
+                    <a
+                        :href='`http://10.199.204.167:7001/maximo/ui/?event=loadapp&value=GCZXWXLINE&uniqueid=${row.ssfasm}`'
+                        target='_blank'
+                    >{{row.ssfasm || '--'}}</a>
                 </template>
             </el-table-column>
             <el-table-column prop='sxjd' label='当前阶段' show-overflow-tooltip resizable width='80'>
@@ -157,6 +160,11 @@ export default {
             this.currentPage = page
             this.getList()
         },
+        innerTable(row) {
+            if (row.gczxwx_lineid) {
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=GCZXWXLINE&uniqueid=${row.gczxwx_lineid}`, true)
+            }
+        },
         //下拉框查询
         tabFind() {
             let postParams = [

+ 7 - 0
src/views/other/zhsxOtherTable2.vue

@@ -54,6 +54,7 @@
             :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
             :data='dsfTable'
             style='width: 100%;margin-top:12px'
+            @row-click='innerTable'
         >
             <el-table-column label='序号' type='index' width='60' :index='indexMethod'></el-table-column>
             <el-table-column prop :show-overflow-tooltip='true' sortable label='任务名称' width='540'>
@@ -142,6 +143,12 @@ export default {
             this.page = page
             this.dsfjc()
         },
+        //第三方任务
+        innerTable(row) {
+            if (row.wbgzglid) {
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=DSF_GZGL&uniqueid=${row.wbgzglid}`, true)
+            }
+        },
         changeSelect() {
             this.department = []
             let postParams = [

+ 9 - 1
src/views/room/room4.vue

@@ -6,6 +6,7 @@
                 v-loading='loading'
                 :data='table4'
                 style='width: 100%'
+                @row-click='innerTable'
                 :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
             >
                 <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
@@ -44,7 +45,8 @@
                 </el-table-column>
                 <el-table-column prop label='现场照片' show-overflow-tooltip resizable width='80'>
                     <template slot-scope='{row}'>
-                        <div v-if="row.glsmsImage"
+                        <div
+                            v-if='row.glsmsImage'
                             style='cursor:pointer;color: #0091ff;'
                             @click='clickPic(row.glsmsImage)'
                         >{{row.glsmsImage.length+'张'}}</div>
@@ -102,6 +104,12 @@ export default {
         pageChanged(page) {
             this.page = page
             this.$emit('Index3Emit', page)
+        },
+        //工单详情
+        innerTable(row) {
+            if (row.workorderid) {
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+            }
         }
     }
 }

+ 24 - 1
src/views/room/room5.vue

@@ -6,6 +6,7 @@
                 v-loading='loading'
                 :data='table5'
                 style='width: 100%'
+                @row-click='innerTable'
                 :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
             >
                 <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
@@ -55,7 +56,9 @@
                 </el-table-column>
                 <el-table-column prop label='异常工单' align='center'>
                     <el-table-column prop label='异常工单编号' :show-overflow-tooltip='true' min-width='110'>
-                        <template slot-scope='{row}'>{{row.wonum||'--'}}</template>
+                        <template slot-scope='{row}'>
+                            <div @click='ycgd(row)'>{{row.wonum||'--'}}</div>
+                        </template>
                     </el-table-column>
                     <el-table-column prop label='描述' :show-overflow-tooltip='true' width='900'>
                         <template slot-scope='{row}'>{{row.description||'--'}}</template>
@@ -101,6 +104,26 @@ export default {
     components: { Select },
     mounted() {},
     methods: {
+        //工单详情
+        innerTable(row) {
+            if (row.apptype == '外委' || row.apptype == '自维') {
+                if (row.wb_gzglid) {
+                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                }
+            } else if (row.apptype == '安全维保') {
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=AQ_WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+            }
+        },
+        // 工单
+        ycgd(row) {
+            if (row.apptype == '外委' || row.apptype == '自维') {
+                if (row.wb_gzglid) {
+                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                }
+            } else if (row.apptype == '安全维保') {
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+            }
+        },
         indexMethod(index) {
             return (this.page - 1) * this.size + index + 1
         },