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

src/api/equipmentList.js

@@ -33,7 +33,10 @@ export function queryWx({ data, getParams }) {
 export function queryWxzy({ data, getParams }) {
     return httputils.getJson(`/data/sms_wxzy/query`, data, getParams)
 }
-
+//设备设施-维修-查图片
+export function queryWxzyImg({ data, getParams }) {
+    return httputils.getJson(`/data/sms_wxzy/queryImg`, data, getParams)
+}
 // 设备设施-专维
 export function queryZw({ data, getParams }) {
     return httputils.getJson(`/data/sms_zw/query`, data, getParams)

src/components/floorMap/index.vue

@@ -214,16 +214,16 @@ export default {
             }
         },
         // 查看浮层设备详情
-        // handleClickEquipDetail(row) {
-        //     if (row.assetnum) {
-        //         this.$refs.equipDetail.open({ row: JSON.stringify(row) })
-        //     }
-        // },
         handleClickEquipDetail(row) {
-            if (row.assetuid) {
-                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=assetdevic&uniqueid=${row.assetuid}`)
+            if (row.assetnum) {
+                this.$refs.equipDetail.open({ row: JSON.stringify(row) })
             }
         },
+        // handleClickEquipDetail(row) {
+        //     if (row.assetuid) {
+        //         window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=assetdevic&uniqueid=${row.assetuid}`)
+        //     }
+        // },
         // 查看浮层位置详情
         handleClickPointDeatil(point) {
             if (point.id && this.activeItem) this.$refs.boxRoom.open({ name: this.activeItem.name, type: this.type, location: point.id })

src/utils/plugins/components.js

@@ -26,16 +26,16 @@ var system = [
                     param: { tab_code: "1592" },
                 },
                 {
-                    label: "维保事项",
+                    label: "主要设备维保事项",
                     id: "GDWB",
                     children: [
                         {
-                            label: "配电室内重要维保事项",
+                            label: "配电室内重要维保",
                             id: "GDWB1",
                             param: { tab_code: "1592", diff: "in" },
                         },
                         {
-                            label: "配电室外重要维保事项",
+                            label: "配电室外重要维保",
                             id: "GDWB2",
                             param: { tab_code: "1593", diff: "out" },
                         },
@@ -47,16 +47,16 @@ var system = [
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: "主要设备维修事项",
                     id: "GDWX",
                     children: [
                         {
-                            label: "配电室内重要维修事项",
+                            label: "配电室内重要维修",
                             id: "GDWX1",
                             param: { tab_code: "1592", diff: "in" },
                         },
                         {
-                            label: "配电室外重要维修事项",
+                            label: "配电室外重要维修",
                             id: "GDWX2",
                             param: { tab_code: "1593", diff: "out" },
                         },
@@ -142,15 +142,15 @@ var system = [
                     id: "NTQD",
                 },
                 {
-                    label: "维保事项",
+                    label: "主要设备维保事项",
                     children: [
                         {
-                            label: "冷源机房内重要维保事项",
+                            label: "冷源机房内重要维保",
                             id: "NTWB1",
                             param: { tab_code: "1592", diff: "in" },
                         },
                         {
-                            label: "冷源机房外重要维保事项",
+                            label: "冷源机房外重要维保",
                             id: "NTWB2",
                             param: { tab_code: "1593", diff: "out" },
                         },
@@ -163,15 +163,15 @@ var system = [
                     id: "NTWB",
                 },
                 {
-                    label: "维修事项",
+                    label: "主要设备维修事项",
                     children: [
                         {
-                            label: "冷源机房内重要维修事项",
+                            label: "冷源机房内重要维修",
                             id: "NTWX1",
                             param: { tab_code: "1592", diff: "in" },
                         },
                         {
-                            label: "冷源机房外重要维修事项",
+                            label: "冷源机房外重要维修",
                             id: "NTWX2",
                             param: { tab_code: "1593", diff: "out" },
                         },
@@ -253,16 +253,16 @@ var system = [
                     param: { tab_code: "xf01" },
                 },
                 {
-                    label: "维保事项",
+                    label: "主要设备维保事项",
                     id: "XFWB",
                     children: [
                         {
-                            label: "中控室/消防泵房内重要维保事项",
+                            label: "中控室/消防泵房内重要维保",
                             id: "XFWB1",
                             param: { tab_code: "1573", diff: "in" },
                         },
                         {
-                            label: "中控室/消防泵房外重要维保事项",
+                            label: "中控室/消防泵房外重要维保",
                             id: "XFWB2",
                             param: { tab_code: "1572", diff: "out" },
                         },
@@ -274,16 +274,16 @@ var system = [
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: "主要设备维修事项",
                     id: "XFWX",
                     children: [
                         {
-                            label: "中控室/消防泵房内重要维修事项",
+                            label: "中控室/消防泵房内重要维修",
                             id: "XFWX1",
                             param: { tab_code: "1573", diff: "in" },
                         },
                         {
-                            label: "中控室/消防泵房外重要维修事项",
+                            label: "中控室/消防泵房外重要维修",
                             id: "XFWX2",
                             param: { tab_code: "1572", diff: "out" },
                         },
@@ -369,16 +369,16 @@ var system = [
                     ],
                 },
                 {
-                    label: "维保事项",
+                    label: "主要设备维保事项",
                     id: "RDWB",
                     children: [
                         {
-                            label: "慧云机房内重要维保事项",
+                            label: "慧云机房内重要维保",
                             id: "RDWB1",
                             param: { tab_code: "1592", diff: "in" },
                         },
                         {
-                            label: "慧云机房外重要维保事项",
+                            label: "慧云机房外重要维保",
                             id: "RDWB2",
                             param: { tab_code: "1593", diff: "out" },
                         },
@@ -390,16 +390,16 @@ var system = [
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: "主要设备维修事项",
                     id: "RDWX",
                     children: [
                         {
-                            label: "慧云机房内重要维修事项",
+                            label: "慧云机房内重要维修",
                             id: "RDWX1",
                             param: { tab_code: "1592", diff: "in" },
                         },
                         {
-                            label: "慧云机房外重要维修事项",
+                            label: "慧云机房外重要维修",
                             id: "RDWX2",
                             param: { tab_code: "1593", diff: "out" },
                         },
@@ -465,16 +465,16 @@ var system = [
                     param: { tab_code: "gps01" },
                 },
                 {
-                    label: "维保事项",
+                    label: "主要设备维保事项",
                     id: "GSWB",
                     children: [
                         {
-                            label: "给水系统重要维保事项",
+                            label: "给水系统重要维保",
                             id: "GSWB1",
                             param: { tab_code: "gps01", diff: "gs" },
                         },
                         {
-                            label: "排水系统重要维保事项",
+                            label: "排水系统重要维保",
                             id: "GSWB2",
                             param: { tab_code: "gps02", diff: "ps" },
                         },
@@ -486,16 +486,16 @@ var system = [
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: "主要设备维修事项",
                     id: "GSWX",
                     children: [
                         {
-                            label: "给水系统重要维修事项",
+                            label: "给水系统重要维修",
                             id: "GSWX1",
                             param: { tab_code: "1592", diff: "gs" },
                         },
                         {
-                            label: "排水系统重要维修事项",
+                            label: "排水系统重要维修",
                             id: "GSWX2",
                             param: { tab_code: "1593", diff: "ps" },
                         },
@@ -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: [

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
@@ -319,6 +319,9 @@ export default {
                     })
                 })
             }
+            if(this.smsxt != '1008'){
+                data.onlyMainAsset = true
+            }
             queryTab({ data, postParams }).then((res) => {
                 this.tabCount = []
                 let data = res.data.data || []

src/views/equipment/table/eqDetaileDialog.vue

@@ -206,6 +206,9 @@ export default {
                 major: major,
                 plazaId: this.$store.state.plazaId,
             }
+            if(major!='土建'){
+                data.onlyMainAsset = true
+            }
             querySelect({ data, postParams }).then((res) => {
                 //console.log(res)
                 let sb_status = res.data.data.sms_asset.sb_status
@@ -259,6 +262,10 @@ export default {
                 page: this.page,
                 size: this.size,
             }
+            //区分主要设备
+            if(this.major != '土建'){
+                data.onlyMainAsset = true
+            }
             //输入框搜索
             data.keyword = ''
             if (this.sbjc) {

src/views/equipment/table/eqListTable.vue

@@ -115,13 +115,13 @@ export default {
             floor: '1',
             type_name: '',
             floorAllSelect: [],
-            sign:1,
+            sign: 1,
         }
     },
     computed: {
         ...mapGetters(['floorSelect']),
     },
-    props: ['param', 'major', 'systemName', 'InfoName','smsxt','diff'],
+    props: ['param', 'major', 'systemName', 'InfoName', 'smsxt', 'diff'],
     methods: {
         indexMethod(index) {
             return (this.currentPage - 1) * this.size + index + 1
@@ -146,6 +146,10 @@ export default {
                 plazaId: this.$store.state.plazaId,
                 major: this.major,
             }
+            //区分土建主要设备
+            if (this.smsxt != '1008') {
+                data.onlyMainAsset = true
+            }
             //下拉
             if (this.floor && this.floor != 1) {
                 postParams.gname = this.floor
@@ -229,6 +233,12 @@ export default {
         margin-top: 28px;
     }
 }
+/deep/ .el-dialog__body {
+    padding: 0;
+}
+/deep/.el-dialog {
+    margin-top: 5vh !important;
+}
 @media screen and (max-width: 1600px) {
     /deep/ .el-dialog__body {
         padding: 0;

src/views/equipment/table/equipDetail.vue

@@ -162,6 +162,10 @@ export default {
                 brand: this.row.brand || '--',
                 assetnum: this.assetnum,
             }
+            //区分主要设备
+            if (this.smsxt != '1008') {
+                data.onlyMainAsset = true
+            }
             queryAsset({ data, postParams }).then((res) => {
                 //console.log(res)
                 this.tableData = res.data.data
@@ -234,6 +238,21 @@ export default {
     /deep/.el-table td {
         cursor: pointer;
     }
+    .el-dialog__header {
+        padding: 16px 24px;
+        color: #fff;
+        background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+    }
+    .el-dialog__headerbtn .el-dialog__close {
+        color: #fff;
+    }
+    .el-dialog__title {
+        font-size: 16px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #fff;
+        line-height: 24px;
+    }
     .qdxq-bottom {
         .el-tabs--bottom .el-tabs__item.is-bottom:nth-child(2),
         .el-tabs--bottom .el-tabs__item.is-top:nth-child(2),

src/views/equipment/table/otherTable.vue

@@ -187,6 +187,9 @@ export default {
                 major: major,
                 plazaId: this.$store.state.plazaId
             }
+             if(major!='土建'){
+                data.onlyMainAsset = true
+            }
             querySelect({ data, postParams }).then(res => {
                 //console.log(res)
                 let handleresults = res.data.data?res.data.data.sms_qtsx.handleresults:[]

src/views/equipment/table/rcwbTable.vue

@@ -250,6 +250,9 @@ export default {
             let data = {
                 plazaId: this.plazaId,
             }
+            if(this.smsxt!='1008'){
+                data.onlyMainAsset = true
+            }
             querySelect({ data, postParams }).then((res) => {
                 let status = [],
                     zt = [],
@@ -288,6 +291,10 @@ export default {
                 size: this.size,
                 orderBy: 'wb_gzglid,0;assetnum,1;reportedby,0;',
             }
+            //区分主要设备和全部设备
+            if(this.smsxt != '1008'){
+                data.onlyMainAsset = true
+            }
             if (this.assetnum) {
                 data.assetnum = this.assetnum
             }

src/views/equipment/table/rcwxTable.vue

@@ -1,165 +1,230 @@
 <!-- 维修-->
 <template>
-    <div class='rcwx-list'>
-        <div class='eq-list-top'>
-            <el-input
-                placeholder='搜索设备名称编号'
-                size='small'
-                @keyup.enter.native='getList'
-                @blur='getList'
-                clearable
-                prefix-icon='el-icon-search'
-                v-model='sbjc'
-                style='width:192px;margin-right:12px'
-            ></el-input>
-            <el-input
-                placeholder='搜索描述'
-                size='small'
-                clearable
-                @keyup.enter.native='getList'
-                @blur='getList'
-                prefix-icon='el-icon-search'
-                v-model='matters'
-                style='width:192px;margin-right:12px'
-            ></el-input>
-            <el-input
-                placeholder='搜索工单编号'
-                size='small'
-                clearable
-                @keyup.enter.native='getList'
-                @blur='getList'
-                prefix-icon='el-icon-search'
-                v-model='wonum2'
-                style='width:192px;margin-right:12px'
-            ></el-input>
-            <Select
-                @change='getList'
-                style='margin-right:12px;'
-                v-model='source'
-                width='180'
-                tipPlace='top'
-                caption='报修来源：'
-                :selectdata='sourceOption'
-            ></Select>
-            <el-input
-                placeholder='搜索执行人'
-                size='small'
-                clearable
-                @keyup.enter.native='getList'
-                @blur='getList'
-                prefix-icon='el-icon-search'
-                v-model='people'
-                style='width:192px;margin-right:12px'
-            ></el-input>
-            <input-dialog :type='5' @confirm='confirm'></input-dialog>
-        </div>
-        <div ref='tableBox'>
-            <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>
-                </el-table-column>
-                <el-table-column prop='assetnum' label='设备内码' show-overflow-tooltip resizable width='80'>
-                    <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
-                </el-table-column>
-                <el-table-column prop='description' label='问题描述' show-overflow-tooltip resizable min-width='340'>
-                    <template slot-scope='{row}'>{{row.description || '--'}}</template>
-                </el-table-column>
-                <el-table-column prop='description' label='工单编号' show-overflow-tooltip resizable min-width='80'>
-                    <template slot-scope='{row}'>
-                        <div v-if='row.wonum' @click.stop='staff(row)' style='cursor:pointer;color: #0091ff;'>{{row.wonum}}</div>
-                        <div v-else>{{'--'}}</div>
-                    </template>
-                </el-table-column>
-                <el-table-column prop='description' label='报修来源' show-overflow-tooltip resizable min-width='340'>
-                    <template slot-scope='{row}'>{{row.bxfwlymc || '--'}}</template>
-                </el-table-column>
-                <el-table-column prop='description' label='执行人' show-overflow-tooltip resizable min-width='80'>
-                    <template slot-scope='{row}'>{{row.lead || '--'}}</template>
-                </el-table-column>
-                <el-table-column prop='reportdate' label='要求完成时间' width='140'>
-                    <template slot-scope='{row}'>{{row.schedfinish?formatterTime(row.schedfinish): '--'}}</template>
-                </el-table-column>
-                <el-table-column prop='sjjssj' label='实际完工时间' width='140'>
-                    <template slot-scope='{row}'>{{row.wotjyssj?formatterTime(row.wotjyssj): '--'}}</template>
-                </el-table-column>
-                <el-table-column prop='matters' label='位置名称' width='240' show-overflow-tooltip resizable>
-                    <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
-                </el-table-column>
-                <el-table-column prop='description' label='位置内码' show-overflow-tooltip resizable min-width='80'>
-                    <template slot-scope='{row}'>{{row.location || '--'}}</template>
-                </el-table-column>
-                <el-table-column prop='brand' label='报修照片' width='80'>
-                    <template slot-scope='{row}'>
-                        <div
-                            v-if='row.repair_photos_num'
-                            style='cursor:pointer;color: #0091ff;'
-                            @click.stop='clickPic(row.repair_photos_num)'
-                        >{{row.repair_photos_num.length+'张'}}</div>
-                        <div v-else>{{'--'}}</div>
-                    </template>
-                </el-table-column>
-                <el-table-column prop='brand' label='完工照片' width='80'>
-                    <template slot-scope='{row}'>
-                        <div
-                            v-if='row.finish_photos_num'
-                            style='cursor:pointer;color: #0091ff;'
-                            @click.stop='clickPic(row.finish_photos_num)'
-                        >{{row.finish_photos_num.length+'张'}}</div>
-                        <div v-else>{{'--'}}</div>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
-        <div class='foot'>
-            <el-pagination
-                background
-                layout='prev, pager, next'
-                :total='total'
-                :page-size='size'
-                @prev-click='pageChanged'
-                @next-click='pageChanged'
-                @current-change='pageChanged'
-            ></el-pagination>
-            <pic-large :imgUrl='imgUrl' ref='picLargeOpen'></pic-large>
-        </div>
+  <div class="rcwx-list">
+    <div class="eq-list-top">
+      <el-input
+        placeholder="搜索设备名称或内码"
+        size="small"
+        @keyup.enter.native="getList"
+        @blur="getList"
+        clearable
+        prefix-icon="el-icon-search"
+        v-model="sbjc"
+        style="width:192px;margin-right:12px"
+      ></el-input>
+       <el-input
+        placeholder="搜索位置名称或内码"
+        size="small"
+        @keyup.enter.native="getList"
+        @blur="getList"
+        clearable
+        prefix-icon="el-icon-search"
+        v-model="wzjc"
+        style="width:192px;margin-right:12px"
+      ></el-input>
+      <el-input
+        placeholder="搜索描述"
+        size="small"
+        clearable
+        @keyup.enter.native="getList"
+        @blur="getList"
+        prefix-icon="el-icon-search"
+        v-model="matters"
+        style="width:192px;margin-right:12px"
+      ></el-input>
+      <el-input
+        placeholder="搜索工单编号"
+        size="small"
+        clearable
+        @keyup.enter.native="getList"
+        @blur="getList"
+        prefix-icon="el-icon-search"
+        v-model="wonum2"
+        style="width:192px;margin-right:12px"
+      ></el-input>
+      <Select
+        @change="getList"
+        style="margin-right:12px;"
+        v-model="status"
+        width="180"
+        tipPlace="top"
+        caption="任务状态描述："
+        :selectdata="statusOption"
+      ></Select>
+      <Select
+        @change="getList"
+        style="margin-right:12px;"
+        v-model="source"
+        width="180"
+        tipPlace="top"
+        caption="报修来源："
+        :selectdata="sourceOption"
+      ></Select>
+      <el-input
+        placeholder="搜索执行人"
+        size="small"
+        clearable
+        @keyup.enter.native="getList"
+        @blur="getList"
+        prefix-icon="el-icon-search"
+        v-model="people"
+        style="width:192px;margin-right:12px"
+      ></el-input>
+      <input-dialog :type="5" @confirm="confirm"></input-dialog>
     </div>
+    <div ref="tableBox">
+      <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="100">
+          <template slot-scope="{row}">{{row.sbmc || '--'}}</template>
+        </el-table-column>
+        <el-table-column prop="matters" label="位置名称" width="240" show-overflow-tooltip resizable>
+          <template slot-scope="{row}">{{row.wzjc || '--'}}</template>
+        </el-table-column>
+        <el-table-column
+          prop="description"
+          label="问题描述"
+          show-overflow-tooltip
+          resizable
+          min-width="280"
+        >
+          <template slot-scope="{row}">{{row.description || '--'}}</template>
+        </el-table-column>
+        <el-table-column
+          prop="description"
+          label="工单编号"
+          show-overflow-tooltip
+          resizable
+          min-width="80"
+        >
+          <template slot-scope="{row}">
+            <div
+              v-if="row.wonum"
+              @click.stop="staff(row)"
+              style="cursor:pointer;color: #0091ff;"
+            >{{row.wonum}}</div>
+            <div v-else>{{'--'}}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="description"
+          label="报修来源"
+          show-overflow-tooltip
+          resizable
+          min-width="200"
+        >
+          <template slot-scope="{row}">{{row.bxfwlymc || '--'}}</template>
+        </el-table-column>
+        <el-table-column
+          prop="description"
+          label="任务状态描述"
+          show-overflow-tooltip
+          resizable
+          min-width="200"
+        >
+          <template slot-scope="{row}">{{row.status || '--'}}</template>
+        </el-table-column>
+        <el-table-column
+          prop="description"
+          label="执行人"
+          show-overflow-tooltip
+          resizable
+          min-width="80"
+        >
+          <template slot-scope="{row}">{{row.lead || '--'}}</template>
+        </el-table-column>
+        <el-table-column prop="reportdate" label="要求完成时间" width="140">
+          <template slot-scope="{row}">{{row.schedfinish?formatterTime(row.schedfinish): '--'}}</template>
+        </el-table-column>
+        <el-table-column prop="sjjssj" label="实际完工时间" width="140">
+          <template slot-scope="{row}">{{row.wotjyssj?formatterTime(row.wotjyssj): '--'}}</template>
+        </el-table-column>
+        <el-table-column prop="assetnum" label="设备内码" show-overflow-tooltip resizable width="80">
+          <template slot-scope="{row}">{{row.assetnum || '--'}}</template>
+        </el-table-column>
+        <el-table-column
+          prop="description"
+          label="位置内码"
+          show-overflow-tooltip
+          resizable
+          min-width="80"
+        >
+          <template slot-scope="{row}">{{row.location || '--'}}</template>
+        </el-table-column>
+        <el-table-column prop="brand" label="报修照片" width="80">
+          <template slot-scope="{row}">
+            <div
+              v-if="row.repair_photos_num"
+              style="cursor:pointer;color: #0091ff;"
+             @click.stop='clickPicRepair(row)'
+            >{{row.repair_photos_num+'张'}}</div>
+            <div v-else>{{'--'}}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="brand" label="完工照片" width="80">
+          <template slot-scope="{row}">
+            <div
+              v-if="row.finish_photos_num"
+              style="cursor:pointer;color: #0091ff;"
+              @click.stop='clickPicFinish(row)'
+            >{{row.finish_photos_num+'张'}}</div>
+            <div v-else>{{'--'}}</div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="foot">
+      <el-pagination
+        background
+        layout="prev, pager, next"
+        :total="total"
+        :page-size="size"
+        @prev-click="pageChanged"
+        @next-click="pageChanged"
+        @current-change="pageChanged"
+      ></el-pagination>
+      <pic-large :imgUrl="imgUrl" ref="picLargeOpen"></pic-large>
+    </div>
+  </div>
 </template>
 <script>
-import { queryWxzy } from '@/api/equipmentList.js'
+import { queryWxzy, queryWxzyImg } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 import inputDialog from './inputDIalog'
 import { Select } from 'meri-design'
 import { querySelect } from '@/api/public.js'
 import { formatterTime, number_format } from '@/utils/format.js'
 export default {
-    components: { Select, inputDialog },
-    data() {
-        return {
-            tableData: [],
-            total: 0,
-            currentPage: 1,
-            reportdate: '',
-            sjjssj: '',
-            sbjc: '',
-            matters: '',
-            wonum2: '',
-            wonum: '',
-            sourceOption: [],
-            source: '全部',
-            formatterTime,
-            number_format,
-            imgUrl: [],
-            people: '',
-            locationName: '',
-            keyword: '',
-        }
-    },
-    computed: {
-        ...mapGetters(['floorSelect']),
-    },
-    props: ['smsxt', 'diff', 'tabLabel', 'size', 'assetnum'],
-    methods: {
+  components: { Select, inputDialog },
+  data() {
+    return {
+      tableData: [],
+      total: 0,
+      currentPage: 1,
+      reportdate: "",
+      sjjssj: "",
+      sbjc: "",
+      wzjc:"",
+      matters: "",
+      wonum2: "",
+      wonum: "",
+      sourceOption: [],
+      statusOption: [],
+      source: "全部",
+      formatterTime,
+      number_format,
+      imgUrl: [],
+      people: "",
+      locationName: "",
+      keyword: "",
+      status: "全部" //搜索状态描述
+    };
+  },
+  computed: {
+    ...mapGetters(["floorSelect"])
+  },
+  props: ["smsxt", "diff", "tabLabel", "size", "assetnum"],
+  methods: {
         //序号的方法
         indexMethod(index) {
             return (this.currentPage - 1) * this.size + index + 1
@@ -197,6 +262,10 @@ export default {
                     size: this.size,
                 },
             }
+            //区分主要设备和全部设备
+            if (this.smsxt != '1008') {
+                getParams.data.onlyMainAsset = true
+            }
             if (this.assetnum) {
                 getParams.data.assetnum = this.assetnum
             }
@@ -210,18 +279,33 @@ export default {
                 getParams.data.wotjyssjEndDate = this.real[1] + '000000'
             }
             if (this.source && this.source != '全部') {
-                getParams.data.bxfwlymc = this.source
+                getParams.data.bxfwlymc = this.source;
+                 getParams.data.bxfwly = this.source
+
+            }
+             if (this.status && this.status != '全部') {
+                getParams.data.status = this.status
             }
             //输入框搜索
             getParams.data.keyword = ''
+
             if (this.sbjc) {
                 getParams.data.keyword += `${this.sbjc}:sbmc,assetnum;`
             }
+            if (this.wzjc) {
+                getParams.data.keyword += `${this.wzjc}:wzjc,location;`
+            }
             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
@@ -231,22 +315,57 @@ export default {
                 this.total = res.count
             })
         },
-        clickPic(row) {
-            this.imgUrl = []
-            if (row) {
-                row.forEach((el) => {
-                    let obj = {
-                        name: el.description,
-                        url: el.url,
-                    }
-                    this.imgUrl.push(obj)
-                })
+        clickPicRepair(row) {
+            let getParams = {
+                data: {
+                    plazaId: this.$store.state.plazaId,
+                    ticketuid: row.ticketuid,
+                    type: 0,
+                    workorderid: row.workorderid,
+                },
+            }
+            queryWxzyImg(getParams).then((res) => {
+                let url = res.data
+                this.imgUrl = []
+                if (url) {
+                    url.forEach((el) => {
+                        let obj = {
+                            name: el.description,
+                            url: el.urlname,
+                        }
+                        this.imgUrl.push(obj)
+                    })
+                }
+                this.$refs.picLargeOpen.open(this.imgUrl)
+            })
+        },
+        clickPicFinish(row) {
+            let getParams = {
+                data: {
+                    plazaId: this.plazaId,
+                    ticketuid: row.ticketuid,
+                    type: 1,
+                    workorderid: row.workorderid,
+                },
             }
-            this.$refs.picLargeOpen.open(this.imgUrl)
+            queryWxzyImg(getParams).then((res) => {
+                let url = res.data
+                this.imgUrl = []
+                if (url) {
+                    url.forEach((el) => {
+                        let obj = {
+                            name: el.description,
+                            url: el.urlname,
+                        }
+                        this.imgUrl.push(obj)
+                    })
+                }
+                this.$refs.picLargeOpen.open(this.imgUrl)
+            })
         },
         startMethods() {
-            // this.tabFind()
-            // this.getList()
+            this.tabFind()
+            this.getList()
         },
         //下拉框查询
         tabFind() {
@@ -262,6 +381,9 @@ export default {
             let data = {
                 plazaId: this.$store.state.plazaId,
             }
+            if (this.smsxt != '1008') {
+                data.onlyMainAsset = true
+            }
             querySelect({ data, postParams }).then((res) => {
                 //console.log(res)
                 let bxfwlymc = res.data && res.data.data && res.data.data.sms_wxzy ? res.data.data.sms_wxzy.bxfwly : []
@@ -277,83 +399,110 @@ export default {
                     })
                 })
             })
+                  // 2任务状态
+      let postParams2 = [
+        {
+          columnName: { status: "status" },
+          params: {
+            smsxt: this.smsxt
+          },
+          tableName: "sms_wxzy" //视图名称
+        }
+      ];
+      querySelect({ data, postParams: postParams2 }).then(res => {
+        let bxfwlymc =
+          res.data && res.data.data && res.data.data.sms_wxzy
+            ? res.data.data.sms_wxzy.status
+            : [];
+        this.statusOption = [];
+        this.statusOption.push({
+          name: "全部",
+          id: "全部"
+        });
+        bxfwlymc.forEach(el => {
+          this.statusOption.push({
+            name: el.value,
+            id: el.key
+          });
+        });
+      });
         },
+  },
+  watch: {
+    diff(newV, oldV) {
+      if (newV !== oldV) {
+        this.startMethods();
+      }
     },
-    watch: {
-        diff(newV, oldV) {
-            if (newV !== oldV) {
-                this.startMethods()
-            }
-        },
-        tabLabel(newV, oldV) {
-            if (newV !== oldV) {
-                this.startMethods()
-            }
-        },
-    },
-    mounted() {
-        this.startMethods()
-    },
-}
+    tabLabel(newV, oldV) {
+      if (newV !== oldV) {
+        this.startMethods();
+      }
+    }
+  },
+  mounted() {
+    this.startMethods();
+  }
+};
 </script>
 <style lang="less" scoped>
 .rcwx-list {
-    .eq-list-top {
-        display: flex;
-        margin-bottom: 12px;
-        .picker-box {
-            display: flex;
-            align-items: center;
-            background: #fff;
-            padding: 0 6px;
-            border: 1px solid #dcdfe6;
-            border-radius: 4px;
-            height: 32px;
-            box-sizing: border-box;
-            margin-right: 12px;
-            .picker-span {
-                margin-right: 6px;
-                color: rgba(0, 0, 0, 0.65);
-            }
-        }
-    }
-    td {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-    }
-    .foot {
-        height: 32px;
-        display: flex;
-        justify-content: flex-end;
-        margin-top: 28px;
+  .eq-list-top {
+    display: flex;
+    margin-bottom: 12px;
+    .picker-box {
+      display: flex;
+      align-items: center;
+      background: #fff;
+      padding: 0 6px;
+      border: 1px solid #dcdfe6;
+      border-radius: 4px;
+      height: 32px;
+      box-sizing: border-box;
+      margin-right: 12px;
+      .picker-span {
+        margin-right: 6px;
+        color: rgba(0, 0, 0, 0.65);
+      }
     }
+  }
+  td {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .foot {
+    height: 32px;
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 28px;
+  }
 }
 </style>
 <style lang="less" >
 .rcwx-list {
-    .picker-box {
-        .el-input__inner {
-            border: none;
-        }
-        .el-range-editor.el-input__inner {
-            padding: 3px 0px;
-        }
-        .el-icon-date {
-            display: none;
-        }
-        .el-range__close-icon {
-            position: absolute;
-            right: 0px;
-            top: 2px;
-        }
-        .el-range-editor--mini .el-range-input {
-            font-size: 14px;
-            color: rgb(31, 36, 41);
-        }
+  .picker-box {
+    .el-input__inner {
+      border: none;
+    }
+    .el-range-editor.el-input__inner {
+      padding: 3px 0px;
+    }
+    .el-icon-date {
+      display: none;
+    }
+    .el-range__close-icon {
+      position: absolute;
+      right: 0px;
+      top: 2px;
     }
-    /deep/.el-table td {
-        cursor: pointer;
+    .el-range-editor--mini .el-range-input {
+      font-size: 14px;
+      color: rgb(31, 36, 41);
     }
+  }
+  /deep/.el-table td {
+    cursor: pointer;
+  }
 }
 </style>

src/views/equipment/table/standTable.vue

@@ -107,10 +107,10 @@ export default {
             manufacturer: '',
             type_name: '',
             floorAllSelect: [],
-            sign:1
+            sign: 1,
         }
     },
-    props: ['major', 'param', 'InfoName','smsxt','diff'],
+    props: ['major', 'param', 'InfoName', 'smsxt', 'diff'],
     components: { EqDetail, Select },
     computed: {
         ...mapGetters(['floorSelect']),
@@ -152,6 +152,10 @@ export default {
                 major: major,
                 // floor:this.floor
             }
+            //区分土建主要设备
+            if (this.smsxt != '1008') {
+                data.onlyMainAsset = true
+            }
             //下拉
             if (this.floor && this.floor != 1) {
                 postParams.gname = this.floor
@@ -234,6 +238,12 @@ export default {
         margin-top: 28px;
     }
 }
+/deep/ .el-dialog__body {
+    padding: 0;
+}
+/deep/.el-dialog {
+    margin-top: 5vh !important;
+}
 @media screen and (max-width: 1600px) {
     /deep/ .el-dialog__body {
         padding: 0;

src/views/equipment/table/wbTable.vue

@@ -221,6 +221,10 @@ export default {
                     size: this.size,
                 },
             }
+            //区分主要设备和全部设备
+            if(this.smsxt != '1008'){
+                getParams.data.onlyMainAsset = true
+            }
             if (this.diff) {
                 getParams.data.diff = this.diff
             }

src/views/equipment/table/wxTable.vue

@@ -211,6 +211,10 @@ export default {
                     size: this.size,
                 },
             }
+            //区分主要设备
+            if(this.smsxt != '1008'){
+                getParams.data.onlyMainAsset = true
+            }
             if (this.diff) {
                 getParams.data.diff = this.diff
             }

src/views/equipment/table/zwTable.vue

@@ -63,13 +63,7 @@
             <input-dialog v-if='statusOption.length>0' :statusOption='statusOption' :type='4' @confirm='confirm'></input-dialog>
         </div>
         <div ref='tableBox'>
-            <el-table
-                :data='tableData'
-                :border='true'
-                style='width: 100%'
-                @row-click='innerTable'
-                v-if='tableData.length>=0'
-            >
+            <el-table :data='tableData' :border='true' style='width: 100%' @row-click='innerTable' v-if='tableData.length>=0'>
                 <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
                 <el-table-column prop='nd' label='年度' show-overflow-tooltip resizable width='60'>
                     <template slot-scope='{row}'>{{row.nd || '--'}}</template>
@@ -215,6 +209,9 @@ export default {
                 major: major,
                 plazaId: this.$store.state.plazaId,
             }
+            if (this.major != '土建') {
+                data.onlyMainAsset = true
+            }
             querySelect({ data, postParams }).then((res) => {
                 //console.log(res)
                 let lb = res.data.data.sms_zw.lb

src/views/other/index.vue

@@ -108,6 +108,9 @@ export default {
                     postParams.push(obj)
                 })
             }
+             if(this.smsxt != '1008'){
+                data.onlyMainAsset = true
+            }
             queryTab({ data, postParams }).then((res) => {
                 //console.log('查询哪几层楼有图', res)
                 this.floorData = []

src/views/room/room4.vue

@@ -1,166 +1,240 @@
 <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'>
-                    <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate):'--'}}</template>
-                </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>
+  <div class="compute-item">
+    <div ref="tableBox4" class="compute-table">
+      <el-table :data="table4" :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="100">
+          <template slot-scope="{row}">{{row.sbmc || '--'}}</template>
+        </el-table-column>
+        <el-table-column prop="matters" label="位置名称" width="240" show-overflow-tooltip resizable>
+          <template slot-scope="{row}">{{row.wzjc || '--'}}</template>
+        </el-table-column>
+        <el-table-column
+          prop="description"
+          label="问题描述"
+          show-overflow-tooltip
+          resizable
+          min-width="280"
+        >
+          <template slot-scope="{row}">{{row.description || '--'}}</template>
+        </el-table-column>
+        <el-table-column
+          prop="description"
+          label="工单编号"
+          show-overflow-tooltip
+          resizable
+          min-width="80"
+        >
+          <template slot-scope="{row}">
+            <div
+              v-if="row.wonum"
+              @click.stop="staff(row)"
+              style="cursor:pointer;color: #0091ff;"
+            >{{row.wonum}}</div>
+            <div v-else>{{'--'}}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="description"
+          label="报修来源"
+          show-overflow-tooltip
+          resizable
+          min-width="200"
+        >
+          <template slot-scope="{row}">{{row.bxfwlymc || '--'}}</template>
+        </el-table-column>
+        <el-table-column
+          prop="description"
+          label="任务状态描述"
+          show-overflow-tooltip
+          resizable
+          min-width="200"
+        >
+          <template slot-scope="{row}">{{row.status || '--'}}</template>
+        </el-table-column>
+        <el-table-column
+          prop="description"
+          label="执行人"
+          show-overflow-tooltip
+          resizable
+          min-width="80"
+        >
+          <template slot-scope="{row}">{{row.lead || '--'}}</template>
+        </el-table-column>
+        <el-table-column prop="reportdate" label="要求完成时间" width="140">
+          <template slot-scope="{row}">{{row.schedfinish?formatterTime(row.schedfinish): '--'}}</template>
+        </el-table-column>
+        <el-table-column prop="sjjssj" label="实际完工时间" width="140">
+          <template slot-scope="{row}">{{row.wotjyssj?formatterTime(row.wotjyssj): '--'}}</template>
+        </el-table-column>
+        <el-table-column prop="assetnum" label="设备内码" show-overflow-tooltip resizable width="80">
+          <template slot-scope="{row}">{{row.assetnum || '--'}}</template>
+        </el-table-column>
+        <el-table-column
+          prop="description"
+          label="位置内码"
+          show-overflow-tooltip
+          resizable
+          min-width="80"
+        >
+          <template slot-scope="{row}">{{row.location || '--'}}</template>
+        </el-table-column>
+        <el-table-column prop="brand" label="报修照片" width="80">
+          <template slot-scope="{row}">
+            <div
+              v-if="row.repair_photos_num"
+              style="cursor:pointer;color: #0091ff;"
+              @click.stop="clickPicRepair(row)"
+            >{{row.repair_photos_num +'张'}}</div>
+            <div v-else>{{'--'}}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="brand" label="完工照片" width="80">
+          <template slot-scope="{row}">
+            <div
+              v-if="row.finish_photos_num"
+              style="cursor:pointer;color: #0091ff;"
+              @click.stop="clickPicFinish(row)"
+            >{{row.finish_photos_num +'张'}}</div>
+            <div v-else>{{'--'}}</div>
+          </template>
+        </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 { formatterTime, number_format } from "@/utils/format.js";
+import { queryWxzyImg } from "@/api/equipmentList.js";
 export default {
-    props: ['table4', 'total', 'page', 'size', 'loading'],
-    data() {
-        return {
-            dateVal: '',
-            value1: '',
-            searVal: '',
-            number_format,
-            tableMaxHeight: 0,
-            imgUrl: [],
-        }
+  props: ["table4", "sjjssj", "total", "page", "size", "loading"],
+  data() {
+    return {
+      dateVal: "",
+      value1: "",
+      searVal: "",
+      number_format,
+      formatterTime,
+      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}`
+        );
+      }
+    },
+    clickPicRepair(row) {
+      let getParams = {
+        data: {
+          plazaId: this.$store.state.plazaId,
+          ticketuid: row.ticketuid,
+          type: 0,
+          workorderid: row.workorderid
+        }
+      };
+      queryWxzyImg(getParams).then(res => {
+        let url = res.data;
+        this.imgUrl = [];
+        if (url) {
+          url.forEach(el => {
+            let obj = {
+              name: el.description,
+              url: el.urlname
+            };
+            this.imgUrl.push(obj);
+          });
+        }
+        this.$refs.picLargeOpen.open(this.imgUrl);
+      });
+    },
+    clickPicFinish(row) {
+      let getParams = {
+        data: {
+          plazaId: this.$store.state.plazaId,
+          ticketuid: row.ticketuid,
+          type: 1,
+          workorderid: row.workorderid
+        }
+      };
+      queryWxzyImg(getParams).then(res => {
+        let url = res.data;
+        this.imgUrl = [];
+        if (url) {
+          url.forEach(el => {
+            let obj = {
+              name: el.description,
+              url: el.urlname
+            };
+            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>

vue.config.js

@@ -5,7 +5,7 @@ module.exports = {
         proxy: {
             "/data": {
                 target: "http://60.205.177.43",
-                //target: "http://10.199.143.126",
+                // target: "http://10.199.143.126",
                 // target: 'http://192.168.200.11:9003', //yll
                 // target: 'http://localhost:6040/data/',
                 changeOrigin: true,
@@ -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": "",