Quellcode durchsuchen

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

zhulizhen1111 vor 4 Jahren
Ursprung
Commit
a4b55b7a74

+ 21 - 0
src/components/floorMap/index.vue

@@ -690,6 +690,22 @@ export default {
                     })
             })
         },
+        /**
+         * @description 处理popover显隐
+         * 当点击位置不在canvas内部时 ( 如点击 页面空白,图例,楼层,设备设施左侧列表项时),将popover的display置为none,
+         * 当点击位置在canvas内部时,将popover的display设置为'block'
+         */
+        handlePopover(e) {
+            if (this.$refs.graphy.contains(e.target)) {
+                if (this.$refs.popover && this.$refs.popover.popperElm) {
+                    this.$refs.popover.popperElm.style.display = 'block'
+                }
+            } else {
+                if (this.$refs.popover && this.$refs.popover.popperElm) {
+                    this.$refs.popover.popperElm.style.display = 'none'
+                }
+            }
+        },
     },
     watch: {
         'view.scale': {
@@ -707,6 +723,11 @@ export default {
     mounted() {
         this.mapSize()
         this.getEvent()
+        // 添加监听点击事件,处理popover显隐
+        window.addEventListener('click', this.handlePopover, false)
+        this.$once('hook:beforeDestroy', () => {
+            window.removeEventListener('click', this.handlePopover)
+        })
     },
     created() {
         // document.addEventListener("mousedown", () => {

+ 14 - 20
src/utils/plugins/components.js

@@ -26,7 +26,7 @@ var system = [
                     param: { tab_code: "1592" },
                 },
                 {
-                    label: "维保事项",
+                    label: "主要设备维保事项",
                     id: "GDWB",
                     children: [
                         {
@@ -47,7 +47,7 @@ var system = [
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: "主要设备维修事项",
                     id: "GDWX",
                     children: [
                         {
@@ -142,7 +142,7 @@ var system = [
                     id: "NTQD",
                 },
                 {
-                    label: "维保事项",
+                    label: "主要设备维保事项",
                     children: [
                         {
                             label: "冷源机房内重要维保",
@@ -163,7 +163,7 @@ var system = [
                     id: "NTWB",
                 },
                 {
-                    label: "维修事项",
+                    label: "主要设备维修事项",
                     children: [
                         {
                             label: "冷源机房内重要维修",
@@ -253,7 +253,7 @@ var system = [
                     param: { tab_code: "xf01" },
                 },
                 {
-                    label: "维保事项",
+                    label: "主要设备维保事项",
                     id: "XFWB",
                     children: [
                         {
@@ -274,7 +274,7 @@ var system = [
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: "主要设备维修事项",
                     id: "XFWX",
                     children: [
                         {
@@ -369,7 +369,7 @@ var system = [
                     ],
                 },
                 {
-                    label: "维保事项",
+                    label: "主要设备维保事项",
                     id: "RDWB",
                     children: [
                         {
@@ -390,7 +390,7 @@ var system = [
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: "主要设备维修事项",
                     id: "RDWX",
                     children: [
                         {
@@ -465,7 +465,7 @@ var system = [
                     param: { tab_code: "gps01" },
                 },
                 {
-                    label: "维保事项",
+                    label: "主要设备维保事项",
                     id: "GSWB",
                     children: [
                         {
@@ -486,7 +486,7 @@ var system = [
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: "主要设备维修事项",
                     id: "GSWX",
                     children: [
                         {
@@ -566,7 +566,7 @@ var system = [
                     param: { tab_code: "dt01" },
                 },
                 {
-                    label: "维保事项",
+                    label: "主要设备维保事项",
                     id: "DTWB",
                     children: [
                         {
@@ -582,7 +582,7 @@ var system = [
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: "主要设备维修事项",
                     id: "DTWX",
                     children: [
                         {
@@ -642,7 +642,7 @@ var system = [
                     param: { tab_code: "rq01" },
                 },
                 {
-                    label: "维保事项",
+                    label: "主要设备维保事项",
                     id: "RQWB",
                     children: [
                         {
@@ -658,7 +658,7 @@ var system = [
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: "主要设备维修事项",
                     id: "RQWX",
                     children: [
                         {
@@ -732,12 +732,6 @@ var system = [
                     ],
                 },
                 {
-                    label: "主要材料清单",
-                    id: "TJQD",
-                    children: [],
-                    param: { tab_code: "tj01" },
-                },
-                {
                     label: "维保事项",
                     id: "TJWB",
                     children: [

+ 1 - 1
src/views/equipment/eqDialog.vue

@@ -22,7 +22,7 @@
                     <rotation type='3' v-if='rotationImg.length>0' :size='sizePic' :rotationImg='rotationImg'></rotation>
                 </div>
                 <!-- 土建装饰主要材料清单 -->
-                <tj-table v-else-if='dialogInfo.id.slice(0,4)=="TJQD"' :param='param'></tj-table>
+                <!-- <tj-table v-else-if='dialogInfo.id.slice(0,4)=="TJQD"' :param='param'></tj-table> -->
                 <!-- 主要设备清单 标准设备表格 -->
                 <!-- 内部设备清单 -->
                 <standTable

+ 8 - 2
src/views/equipment/table/rcwxTable.vue

@@ -218,10 +218,16 @@ export default {
                 getParams.data.keyword += `${this.sbjc}:sbmc,assetnum;`
             }
             if (this.matters) {
-                getParams.data.keyword += `${this.matters}:description,matters;`
+                getParams.data.keyword += `${this.matters}:description;`
             }
             if (this.locationName) {
-                getParams.data.keyword += `${this.locationName}:location`
+                getParams.data.keyword += `${this.locationName}:location;`
+            }
+            if (this.wonum2) {
+                getParams.data.keyword += `${this.wonum2}:wonum;`
+            }
+            if(this.people){
+                getParams.data.keyword += `${this.people}:lead;`
             }
             if (getParams.data.keyword == '') {
                 delete getParams.data.keyword

+ 7 - 6
src/views/room/index.vue

@@ -141,7 +141,7 @@
                             @Index2Emit='Index2Emit'
                         ></room-table3>
                     </el-tab-pane>
-                    <el-tab-pane label='日常维修' name='4'>
+                    <el-tab-pane label='核心设备日常维修' name='4'>
                         <div class='compute-center'>
                             <el-input
                                 clearable
@@ -264,7 +264,7 @@
                             @Index3Emit='Index3Emit'
                         ></room-table4>
                     </el-tab-pane>
-                    <el-tab-pane label='日常维保' name='5'>
+                    <el-tab-pane label='核心设备日常维保' name='5'>
                         <div class='compute-center'>
                             <el-input
                                 @keyup.enter.native='Index4'
@@ -426,8 +426,8 @@
     </div>
 </template>
 <script>
-import { queryEquipmentList } from '@/api/equipmentList.js'
-import { queryDygjcxline, queryHxsb, queryWxjf, queryWb, querySystem } from '@/api/room.js'
+import { queryEquipmentList ,queryWxzy} from '@/api/equipmentList.js'
+import { queryDygjcxline, queryHxsb, queryWxjf, queryWb, querySystem, } from '@/api/room.js'
 import roomTable1 from './room1'
 import roomTable2 from './room2'
 import roomTable3 from './room3'
@@ -549,10 +549,10 @@ export default {
             } else if (tab.label == '机房内核心设备') {
                 this.Index2()
                 this.$refs.roomTable3.computedHeight()
-            } else if (tab.label == '日常维修') {
+            } else if (tab.label == '核心设备日常维修') {
                 this.Index3()
                 this.$refs.roomTable4.computedHeight()
-            } else if (tab.label == '日常维保') {
+            } else if (tab.label == '核心设备日常维保') {
                 this.Index4()
                 this.changeSelect()
                 this.$refs.roomTable5.computedHeight()
@@ -743,6 +743,7 @@ export default {
                 getParams.sjjssjStartDate = this.yssjDate[0] + '000000'
                 getParams.sjjssjEndDate = this.yssjDate[1] + '000000'
             }
+
             queryWxjf({ getParams }).then((res) => {
                 //console.log('维修', res)
                 if (res.result == 'success') {

+ 153 - 143
src/views/room/room4.vue

@@ -1,166 +1,176 @@
 <template>
-    <div class='compute-item'>
-        <div ref='tableBox4' class='compute-table'>
-            <el-table
-                :border='true'
-                v-loading='loading'
-                :max-height='tableMaxHeight'
-                :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>
-                <el-table-column prop label='设备名称' show-overflow-tooltip resizable min-width='360'>
-                    <template slot-scope='{row}'>{{row.sbmc||'--'}}</template>
-                </el-table-column>
-                <el-table-column prop label='设备内码' show-overflow-tooltip resizable width='80'>
-                    <template slot-scope='{row}'>{{row.location||'--'}}</template>
-                </el-table-column>
-                <el-table-column prop label='事项类型' show-overflow-tooltip resizable min-width='120'>
-                    <template slot-scope='{row}'>{{row.matters||'--'}}</template>
-                </el-table-column>
-                <el-table-column prop label='事项描述' show-overflow-tooltip resizable min-width='310'>
-                    <template slot-scope='{row}'>{{row.description||'--'}}</template>
-                </el-table-column>
-                <el-table-column prop label='更换配件信息' align='center' show-overflow-tooltip resizable>
-                    <el-table-column prop label='是/否更换' show-overflow-tooltip resizable width='80'>
-                        <template slot-scope='{row}'>
-                            <div v-if='row.ismodel==0'>否</div>
-                            <div v-else-if='row.ismodel==1'>是</div>
-                            <div v-else>'--'</div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop label='配件名称型号' min-width='100' show-overflow-tooltip resizable>
-                        <template slot-scope='{row}'>{{row.model||'--'}}</template>
-                    </el-table-column>
-                    <el-table-column prop label='数量' show-overflow-tooltip resizable width='80'>
-                        <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
-                    </el-table-column>
-                    <el-table-column prop label='费用(万元)' min-width='110' show-overflow-tooltip resizable>
-                        <template slot-scope='{row}'>{{row.cost?number_format(row.cost):'--'}}</template>
-                    </el-table-column>
-                    <el-table-column prop label='费用出处' show-overflow-tooltip resizable width='80'>
-                        <template slot-scope='{row}'>{{row.source||'--'}}</template>
-                    </el-table-column>
-                </el-table-column>
-                <el-table-column prop label='现场照片' show-overflow-tooltip resizable width='80'>
-                    <template slot-scope='{row}'>
-                        <div
-                            v-if='row.glsmsImage'
-                            style='cursor:pointer;color: #0091ff;'
-                            @click.stop='clickPic(row.glsmsImage)'
-                        >{{row.glsmsImage.length+'张'}}</div>
-                        <div v-else>{{'--'}}</div>
-                    </template>
-                </el-table-column>
-                <el-table-column prop label='填报时间' show-overflow-tooltip resizable width='130'>
+  <div class="compute-item">
+    <div ref="tableBox4" class="compute-table">
+      <el-table
+        :border="true"
+        v-loading="loading"
+        :max-height="tableMaxHeight"
+        :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>
+        <el-table-column prop label="设备名称" show-overflow-tooltip resizable min-width="360">
+          <template slot-scope="{row}">{{row.sbmc||'--'}}</template>
+        </el-table-column>
+        <el-table-column prop label="位置名称" show-overflow-tooltip resizable min-width="120">
+          <template slot-scope="{row}">{{row.matters||'--'}}</template>
+        </el-table-column>
+        <el-table-column prop label="问题描述" show-overflow-tooltip resizable min-width="120">
+          <template slot-scope="{row}">{{row.matters||'--'}}</template>
+        </el-table-column>
+        <el-table-column prop label="工单编号" show-overflow-tooltip resizable min-width="120">
+          <template slot-scope="{row}">{{row.matters||'--'}}</template>
+        </el-table-column>
+        <el-table-column prop label="修报来源" show-overflow-tooltip resizable min-width="120">
+          <template slot-scope="{row}">{{row.matters||'--'}}</template>
+        </el-table-column>
+        <el-table-column prop label="执行人" show-overflow-tooltip resizable min-width="120">
+          <template slot-scope="{row}">{{row.matters||'--'}}</template>
+        </el-table-column>
+        <el-table-column prop label="要求完成时间" show-overflow-tooltip resizable min-width="120">
+          <template slot-scope="{row}">{{row.matters||'--'}}</template>
+        </el-table-column>
+        <el-table-column prop label="实际完工时间" show-overflow-tooltip resizable min-width="120">
+          <template slot-scope="{row}">{{row.matters||'--'}}</template>
+        </el-table-column>
+                <el-table-column prop label="设备内码" show-overflow-tooltip resizable width="80">
+          <template slot-scope="{row}">{{row.location||'--'}}</template>
+        </el-table-column>
+               <el-table-column prop label="位置内码" show-overflow-tooltip resizable min-width="120">
+          <template slot-scope="{row}">{{row.matters||'--'}}</template>
+        </el-table-column>
+        <el-table-column prop label="保修照片" show-overflow-tooltip resizable width="80">
+          <template slot-scope="{row}">
+            <div
+              v-if="row.glsmsImage"
+              style="cursor:pointer;color: #0091ff;"
+              @click.stop="clickPic(row.glsmsImage)"
+            >{{row.glsmsImage.length+'张'}}</div>
+            <div v-else>{{'--'}}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop label="完工照片" show-overflow-tooltip resizable width="80">
+          <template slot-scope="{row}">
+            <div
+              v-if="row.glsmsImage"
+              style="cursor:pointer;color: #0091ff;"
+              @click.stop="clickPic(row.glsmsImage)"
+            >{{row.glsmsImage.length+'张'}}</div>
+            <div v-else>{{'--'}}</div>
+          </template>
+        </el-table-column>
+
+        <!-- <el-table-column prop label='填报时间' show-overflow-tooltip resizable width='130'>
                     <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate):'--'}}</template>
-                </el-table-column>
-                <el-table-column prop label='验收时间' show-overflow-tooltip width='130' resizable>
+        </el-table-column>-->
+        <!-- <el-table-column prop label='验收时间' show-overflow-tooltip width='130' resizable>
                     <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj):'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='工单编号' show-overflow-tooltip resizable width='80'>
                     <template slot-scope='{row}'>{{row.wonum||'--'}}</template>
-                </el-table-column>
-            </el-table>
-        </div>
-        <pic-large ref='picLargeOpen'></pic-large>
+        </el-table-column>-->
+      </el-table>
+    </div>
+    <pic-large ref="picLargeOpen"></pic-large>
 
-        <div class='foot'>
-            <el-pagination
-                background
-                layout='prev, pager, next'
-                :total='total'
-                :page-size='size'
-                :current-page.sync="page"
-                @prev-click='pageChanged'
-                @next-click='pageChanged'
-                @current-change='pageChanged'
-            ></el-pagination>
-        </div>
+    <div class="foot">
+      <el-pagination
+        background
+        layout="prev, pager, next"
+        :total="total"
+        :page-size="size"
+        :current-page.sync="page"
+        @prev-click="pageChanged"
+        @next-click="pageChanged"
+        @current-change="pageChanged"
+      ></el-pagination>
     </div>
+  </div>
 </template>
 <script>
 // import Select from '@/components/Select/Select.vue'
-import { Select } from 'meri-design'
-import moment from 'moment'
-import { number_format } from '@/utils/format.js'
+import { Select } from "meri-design";
+import moment from "moment";
+import { number_format } from "@/utils/format.js";
 
 export default {
-    props: ['table4', 'total', 'page', 'size', 'loading'],
-    data() {
-        return {
-            dateVal: '',
-            value1: '',
-            searVal: '',
-            number_format,
-            tableMaxHeight: 0,
-            imgUrl: [],
-        }
+  props: ["table4", "total", "page", "size", "loading"],
+  data() {
+    return {
+      dateVal: "",
+      value1: "",
+      searVal: "",
+      number_format,
+      tableMaxHeight: 0,
+      imgUrl: []
+    };
+  },
+  components: { Select },
+  methods: {
+    indexMethod(index) {
+      return (this.page - 1) * this.size + index + 1;
     },
-    components: { Select },
-    methods: {
-        indexMethod(index) {
-            return (this.page - 1) * this.size + index + 1
-        },
-        formatter(date) {
-            return moment.unix(date / 1000).format('YYYY.MM.DD HH:mm')
-        },
-        pageChanged(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}`)
-            }
-        },
-        clickPic(row) {
-            this.imgUrl = []
-            if (row) {
-                row.forEach((el) => {
-                    let obj = {
-                        name: el.description,
-                        url: el.url,
-                    }
-                    this.imgUrl.push(obj)
-                })
-            }
-            this.$refs.picLargeOpen.open(this.imgUrl)
-        },
-        computedHeight() {
-            this.$nextTick(() => {
-                // 页面渲染完成后的回调
-                this.tableMaxHeight = this.$refs.tableBox4.offsetHeight
-            })
-        },
+    formatter(date) {
+      return moment.unix(date / 1000).format("YYYY.MM.DD HH:mm");
     },
-    updated() {
-        this.$nextTick(() => {
-            // 页面渲染完成后的回调
-            this.tableMaxHeight = this.$refs.tableBox4.offsetHeight
-        })
+    pageChanged(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}`
+        );
+      }
+    },
+    clickPic(row) {
+      this.imgUrl = [];
+      if (row) {
+        row.forEach(el => {
+          let obj = {
+            name: el.description,
+            url: el.url
+          };
+          this.imgUrl.push(obj);
+        });
+      }
+      this.$refs.picLargeOpen.open(this.imgUrl);
+    },
+    computedHeight() {
+      this.$nextTick(() => {
+        // 页面渲染完成后的回调
+        this.tableMaxHeight = this.$refs.tableBox4.offsetHeight;
+      });
+    }
+  },
+  updated() {
+    this.$nextTick(() => {
+      // 页面渲染完成后的回调
+      this.tableMaxHeight = this.$refs.tableBox4.offsetHeight;
+    });
+  }
+};
 </script>
 <style lang="less" scoped>
 </style>
 <style lang="less">
 .compute-item {
-    .compute-center {
-        display: flex;
-        align-items: center;
-        margin-bottom: 12px;
-    }
-    .foot {
-        height: 32px;
-        display: flex;
-        justify-content: flex-end;
-        margin-top: 28px;
-    }
-    /deep/.el-table td {
-        cursor: pointer;
-    }
+  .compute-center {
+    display: flex;
+    align-items: center;
+    margin-bottom: 12px;
+  }
+  .foot {
+    height: 32px;
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 28px;
+  }
+  /deep/.el-table td {
+    cursor: pointer;
+  }
 }
 </style>

+ 2 - 2
vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
             // 图例库服务
             "/serve": {
                 // target: 'http://192.168.200.87:8088',
-                target: 'http://10.199.143.129:8080',
-                // target: 'http://60.205.177.43',
+               // target: 'http://10.199.143.129:8080',
+                target: 'http://60.205.177.43:8080',
                 changeOrigin: true,
                 pathRewrite: {
                     "^/serve": "",