Quellcode durchsuchen

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

YaolongHan vor 4 Jahren
Ursprung
Commit
17187fe208

+ 1 - 1
src/components/Legend/src/legend.vue

@@ -363,7 +363,7 @@ export default {
             const editerUrl = conf[process.env.NODE_ENV + '_editerUrl']
             let data = `categoryId=${categoryId}&projectId=${this.plazaId}&BuildingID=1&FloorID=${FloorID}&FloorName=${floorName}&fmapID=${this.fmapID}&seq=${seq}&token=${this.ssoToken}`
             let url = editerUrl + 'editer?' + encodeURIComponent(data)
-            window.open(url)
+            window.open(url, "edit")
         },
         handleSwich(val) {
             this.queryView(!val)

+ 2 - 2
src/components/menuList.vue

@@ -128,7 +128,7 @@ export default {
             const editerUrl = conf[process.env.NODE_ENV + '_editerUrl']
             let data = `projectId=${this.plazaId}&fmapID=${this.fmapID}&token=${this.$store.state.ssoToken}`
             let url = editerUrl + 'drafts?' + encodeURIComponent(data)
-            window.open(url)
+            window.open(url, "drafts")
         },
         currentTime() {
             this.times = moment().format('YYYY.MM.DD HH:mm')
@@ -179,7 +179,7 @@ export default {
         dumpLegend() {
             const { conf } = window.__systemConf
             const wandaBmGuideUrl = conf[process.env.NODE_ENV + '_wandaBmGuideUrl']
-            window.open(`${wandaBmGuideUrl}home/legendLibrary?token=${this.$store.state.ssoToken}`)
+            window.open(`${wandaBmGuideUrl}home/legendLibrary?token=${this.$store.state.ssoToken}`, "legendLibrary")
         }
     }
 }

+ 10 - 6
src/lib/items/SImageLegendItem.ts

@@ -85,11 +85,11 @@ export class SImageLegendItem extends SIconTextItem {
         if (data.Properties && data.Properties.Url) {
             this.img.url = data.Properties.Url;
         }
-        if (data.Properties && data.Properties.sWidth) {
-            this.sWidth = data.Properties.sWidth;
+        if (data.Properties && data.Properties.Size && data.Properties.Size.Width) {
+            this.sWidth = data.Properties.Size.Width;
         }
-        if (data.Properties && data.Properties.sHeight) {
-            this.sHeight = data.Properties.sHeight;
+        if (data.Properties && data.Properties.Size && data.Properties.Size.Height) {
+            this.sHeight = data.Properties.Size.Height;
         }
         if (data.Properties.ImgPos) {
             this.img.moveTo(data.Properties.ImgPos.X, data.Properties.ImgPos.Y);
@@ -125,10 +125,14 @@ export class SImageLegendItem extends SIconTextItem {
         this.data.Properties.Url = this.img.url;
         this.data.Properties.TextPos = { X: this.textItem.x, Y: this.textItem.y };
         this.data.Properties.ImgPos = { X: this.img.x, Y: this.img.y };
-        this.data.Properties.sWidth = this.sWidth;
-        this.data.Properties.sHeight = this.sHeight;
+        this.data.Properties.Size = {
+            Width: this.sWidth,
+            Height: this.sHeight
+        };
         this.data.Properties.font = this.font.size;
         this.data.Properties.color = this.color.value;
+        this.data.Properties.Font = this.font.size;
+        this.data.Properties.Coler = this.color.value;
         this.data.Properties.FrameColor = this.activeColor.value;
         this.data.Properties.IsActive = this.isActive;
         this.data.AnchorList = this.anchorList.map(t => {

+ 4 - 0
src/utils/format.js

@@ -3,6 +3,9 @@ const formatTime = (time) => {
     return time > 10 ? time : "0" + time
 }
 const formatter = (date) => {
+    return moment.unix(date / 1000).format("YYYY.MM.DD")
+}
+const formatterTime = (date) => {
     return moment.unix(date / 1000).format("YYYY.MM.DD hh:mm")
 }
 const number_format = (number, decimals, dec_point, thousands_sep) => {
@@ -39,5 +42,6 @@ const number_format = (number, decimals, dec_point, thousands_sep) => {
 module.exports = {
     formatTime,
     formatter,
+    formatterTime,
     number_format,
 }

Datei-Diff unterdrückt, da er zu groß ist
+ 721 - 697
src/views/analysis/CoreDeviceReport.vue


+ 1 - 0
src/views/analysis/GanttChart.vue

@@ -507,6 +507,7 @@ export default {
     getPictureOrReportData(type) {
       const { id, statusType } = this.curTask._pdata;
       let param = {
+        plazaId: this.plazaId,
         file_type: statusType,
         // file_type: 0,
         file_type_id: id,

+ 10 - 4
src/views/analysis/SpecificationUpdateRecord.vue

@@ -173,7 +173,6 @@ export default {
      * 跳转到工程信息化系统
      */
     changeToSystem(row) {
-      console.log('row', row)
       const { objtype } = row;
       let url;
       switch (objtype) {
@@ -181,14 +180,21 @@ export default {
           url = `http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=GCZXWXLINE&uniqueid=${row.id}`;
           break
         case 1: // 维保
-          url = `http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.id}`;
+          let value;
+          if (row.apptype === '外委' || row.apptype === '自维') {
+            value = 'WB_GZGL';
+          } else if (row.apptype === '安全维保') {
+            value = 'AQ_WB_GZGL';
+          } else {
+            return
+          }
+          url = `http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=${value}&uniqueid=${row.id}`;
           break
         case 2: // 第三方视图
           url = `http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=DSF_GZGL&uniqueid=${row.id}`;
           break
       }
-      console.log('url', url)
-      // window.open(url, '_blank');
+      window.open(url, '_blank');
     }
   },
 }

+ 5 - 2
src/views/equipment/eqDialog.vue

@@ -126,8 +126,8 @@ export default {
             dialogInfo: {},
             param: '', //区分清单tab
             typecode: '', //区分原理图的tab
-            diff: '', 
-            difference:'',//区分给水排水
+            diff: '',
+            difference: '', //区分给水排水
             rotationImg: [],
             tabLabel: '',
             tabCount: [],
@@ -322,6 +322,9 @@ export default {
 }
 </style>
 <style lang="less" >
+.el-dialog__wrapper {
+    z-index: 20001 !important;
+}
 .dialog-container {
     .el-dialog__header {
         padding: 16px 24px;

+ 4 - 4
src/views/equipment/table/wbTable.vue

@@ -107,10 +107,10 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop='reportdate' label='填报时间' width='140'>
-                    <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate):'--'}}</template>
+                    <template slot-scope='{row}'>{{row.reportdate?formatterTime(row.reportdate):'--'}}</template>
                 </el-table-column>
                 <el-table-column prop='sjjssj' label='验收时间' width='140'>
-                    <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
+                    <template slot-scope='{row}'>{{row.sjjssj?formatterTime(row.sjjssj): '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='wonum' label='任务编号' show-overflow-tooltip resizable width='90'>
                     <template slot-scope='{row}'>
@@ -139,7 +139,7 @@ import { queryWbsms } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 import { Select } from 'meri-design'
 import inputDialog from './inputDIalog'
-import { formatter, number_format } from '@/utils/format.js'
+import { formatterTime, number_format } from '@/utils/format.js'
 export default {
     components: { Select, inputDialog },
     data() {
@@ -152,7 +152,7 @@ export default {
             reportdate: '',
             ischange: '2',
             sbjc: '',
-            formatter,
+            formatterTime,
             number_format,
             changeOption: [
                 {

+ 7 - 5
src/views/equipment/table/wxTable.vue

@@ -107,10 +107,10 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop='reportdate' label='填报时间' width='140'>
-                    <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate): '--'}}</template>
+                    <template slot-scope='{row}'>{{row.reportdate?formatterTime(row.reportdate): '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='sjjssj' label='验收时间' width='140'>
-                    <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
+                    <template slot-scope='{row}'>{{row.sjjssj?formatterTime(row.sjjssj): '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='wonum' label='工单编号' show-overflow-tooltip resizable width='80'>
                     <template slot-scope='{row}'>
@@ -139,7 +139,7 @@ import { queryWx } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 import inputDialog from './inputDIalog'
 import { Select } from 'meri-design'
-import { formatter, number_format } from '@/utils/format.js'
+import { formatterTime, number_format } from '@/utils/format.js'
 export default {
     components: { Select, inputDialog },
     data() {
@@ -154,7 +154,7 @@ export default {
             sbjc: '',
             matters: '',
             wonum: '',
-            formatter,
+            formatterTime,
             number_format,
             imgUrl: [],
             changeOption: [
@@ -191,7 +191,9 @@ export default {
         },
         //跳转工单编号
         staff(row) {
-            window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=${row.wonum}`)
+            if (row.wonum) {
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=${row.wonum}`)
+            }
         },
         //多余输入框监听
         confirm(wonum) {

+ 1 - 1
src/views/equipment/table/zwTable.vue

@@ -275,7 +275,7 @@ export default {
                     smsxt: this.smsxt,
                     plazaId: this.$store.state.plazaId,
                     page: this.currentPage,
-                    diff: this.diff,
+                    difference: this.diff,
                     size: this.size
                 }
             }

+ 22 - 21
src/views/other/zhsxOtherTable1.vue

@@ -32,6 +32,7 @@
                 placeholder='搜索记录事项'
                 @keyup.enter.native='getZhjl'
                 @blur='getZhjl'
+                @change='getZhjl'
                 size='small'
                 prefix-icon='el-icon-search'
                 v-model='ssjlsx'
@@ -115,33 +116,33 @@ export default {
                 {
                     name: '供电系统原理图.png',
                     url:
-                        'http://10.199.204.168:9080/doclinks/MANAGEINS/2020061921294136524467354%E4%BE%9B%E7%94%B5%E7%B3%BB%E7%BB%9F%E5%8E%9F%E7%90%86%E5%9B%BE.png'
+                        'http://10.199.204.168:9080/doclinks/MANAGEINS/2020061921294136524467354%E4%BE%9B%E7%94%B5%E7%B3%BB%E7%BB%9F%E5%8E%9F%E7%90%86%E5%9B%BE.png',
                 },
                 {
                     name: '供电系统原理图.pdf',
-                    url: 'http://10.199.204.168:9080/doclinks/MANAGEINS/2020061921260429024467352%E5%8C%BA%E4%BD%8D%E5%9B%BE.png'
+                    url: 'http://10.199.204.168:9080/doclinks/MANAGEINS/2020061921260429024467352%E5%8C%BA%E4%BD%8D%E5%9B%BE.png',
                 },
                 {
                     name: '供电系统原理图.html',
                     url:
-                        'http://10.199.204.168:9080/doclinks/MANAGEINS/2020061921294136524467354%E4%BE%9B%E7%94%B5%E7%B3%BB%E7%BB%9F%E5%8E%9F%E7%90%86%E5%9B%BE.png'
+                        'http://10.199.204.168:9080/doclinks/MANAGEINS/2020061921294136524467354%E4%BE%9B%E7%94%B5%E7%B3%BB%E7%BB%9F%E5%8E%9F%E7%90%86%E5%9B%BE.png',
                 },
                 {
                     name: '供电系统原理图.png',
                     url:
-                        'http://10.199.204.168:9080/doclinks/MANAGEINS/2020061921294136524467354%E4%BE%9B%E7%94%B5%E7%B3%BB%E7%BB%9F%E5%8E%9F%E7%90%86%E5%9B%BE.png'
+                        'http://10.199.204.168:9080/doclinks/MANAGEINS/2020061921294136524467354%E4%BE%9B%E7%94%B5%E7%B3%BB%E7%BB%9F%E5%8E%9F%E7%90%86%E5%9B%BE.png',
                 },
                 {
                     name: '供电系统原理图.png',
-                    url: 'http://gcgl.wanda.cn/%E7%BB%B4%E4%BF%AE%E5%B7%A5%E5%8D%95%E4%B8%80/WORKORDER_846049_2019-11-19T15-37-42-716.jpg'
-                }
+                    url: 'http://gcgl.wanda.cn/%E7%BB%B4%E4%BF%AE%E5%B7%A5%E5%8D%95%E4%B8%80/WORKORDER_846049_2019-11-19T15-37-42-716.jpg',
+                },
             ],
             allArr: [
                 {
                     id: '全部',
-                    name: '全部'
-                }
-            ]
+                    name: '全部',
+                },
+            ],
         }
     },
     components: { Select },
@@ -149,10 +150,10 @@ export default {
         clickPic(row) {
             this.imgUrl = []
             if (row) {
-                row.forEach(el => {
+                row.forEach((el) => {
                     let obj = {
                         name: el.description,
-                        url: el.urlname
+                        url: el.urlname,
                     }
                     this.imgUrl.push(obj)
                 })
@@ -195,7 +196,7 @@ export default {
                 plazaId: this.$store.state.plazaId,
                 page: this.page,
                 size: this.size,
-                orderBy: 'createdate,0'
+                orderBy: 'createdate,0',
             }
             if (this.searVal && this.searVal != '全部') {
                 getParams.department = this.searVal
@@ -207,7 +208,7 @@ export default {
                 getParams.createdateStartDate = this.dateVal[0] + '000000'
                 getParams.createdateEndDate = this.dateVal[1] + '000000'
             }
-            queryGlams({ getParams }).then(res => {
+            queryGlams({ getParams }).then((res) => {
                 if (res.result == 'success') {
                     this.loading = false
                     this.total = res.count
@@ -225,22 +226,22 @@ export default {
             let postParams = [
                 {
                     columnName: { department: 'department' },
-                    tableName: 'sms_zhsxjl'
-                }
+                    tableName: 'sms_zhsxjl',
+                },
             ]
             let data = {
-                plazaId: this.$store.state.plazaId
+                plazaId: this.$store.state.plazaId,
             }
-            querySelect({ data, postParams }).then(res => {
+            querySelect({ data, postParams }).then((res) => {
                 //console.log('政府部门', res)
                 let department = [],
                     newArr = []
                 department = res.data.data.sms_zhsxjl.department ? res.data.data.sms_zhsxjl.department : []
                 if (department.length > 0) {
-                    department.forEach(el => {
+                    department.forEach((el) => {
                         let obj = {
                             id: el.key,
-                            name: el.value
+                            name: el.value,
                         }
                         newArr.push(obj)
                     })
@@ -253,12 +254,12 @@ export default {
             if (this.isOpen) {
                 // window.open('http://bing.com', true)
             }
-        }
+        },
     },
     mounted() {},
     created() {
         this.changeSelect()
-    }
+    },
 }
 </script>
 <style lang="less" scoped>

+ 4 - 4
src/views/room/detail.vue

@@ -125,7 +125,7 @@
                 <template slot-scope='{row}'>{{row.sbglgs||'--'}}</template>
             </el-table-column>
             <el-table-column prop='sbstatus' label='设备状态' :show-overflow-tooltip='true'>
-                <template slot-scope='{row}'>{{row.sbstatus||'--'}}</template>
+                <template slot-scope='{row}'>{{row.sb_status||'--'}}</template>
             </el-table-column>
             <el-table-column prop='brand' label='品牌' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.brand||'--'}}</template>
@@ -134,10 +134,10 @@
                 <template slot-scope='{row}'>{{row.sbxh||'--'}}</template>
             </el-table-column>
             <el-table-column prop='floor' label='楼层' width='70' :show-overflow-tooltip='true'>
-                <template slot-scope='{row}'>{{row.floor||'--'}}</template>
+                <template slot-scope='{row}'>{{row.floorcode||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='wzqy' label='安装位置' min-width='150' :show-overflow-tooltip='true'>
-                <template slot-scope='{row}'>{{row.wzqy||'--'}}</template>
+            <el-table-column prop='wzjc' label='安装位置' min-width='150' :show-overflow-tooltip='true'>
+                <template slot-scope='{row}'>{{row.wzjc||'--'}}</template>
             </el-table-column>
             <el-table-column prop='manufacturer' label='生产厂商' min-width='150' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.manufacturer||'--'}}</template>