Procházet zdrojové kódy

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

shaun-sheep před 4 roky
rodič
revize
b8ab464498

+ 2 - 2
src/api/other.js

@@ -8,8 +8,8 @@ export function queryDsfrw({ getParams }) {
     return httputils.getJson(`/data/data/v_glsms_dsfrw/query`, getParams)
 }
 //综合事项管理-综合记录事项弹框
-export function xx({ getParams }) {
-    return httputils.getJson(`/data/xx`, getParams)
+export function queryZhsxjl({ getParams }) {
+    return httputils.getJson(`/data/data/v_glsms_zhsxjl/queryWindown`, getParams)
 }
 
 // 辅助用房管理-广场辅助用房汇总统计报

+ 4 - 0
src/api/room.js

@@ -29,3 +29,7 @@ export function queryWxjf({ getParams }) {
 export function queryWb({ data, postParams }) {
     return httputils.fetchJson(`/data/data/v_glsms_wbzy/query`, data, postParams)
 }
+// 查询位置属于哪个系统
+export function querySystem({ getParams }) {
+    return httputils.getJson(`/data/data/t_system_wzfl/querySystem`, getParams)
+}

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

@@ -17,6 +17,7 @@
                             @changeSwitch='handleSwich'
                             :remarksText='remarksText'
                             ref='viewLengend'
+                            :systemName='systemName'
                         ></lengend-view>
                     </div>
                 </div>
@@ -93,7 +94,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters(['plazaId','fmapID'])
+        ...mapGetters(['plazaId', 'fmapID'])
     },
     props: ['systemName'],
     components: { lengendView, legendRemarks, lengendEdit },

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

@@ -35,19 +35,19 @@ export default {
             loading: false,
             view: null,
             isQuerying: false, // 限制重复查询
-            urlMsg: {},
+            urlMsg: {}
             // fmapID:'1001012_42'
         }
     },
     components: { RoomBox, canvasFun },
     computed: {
-        ...mapGetters(['plazaId','fmapID']),
+        ...mapGetters(['plazaId', 'fmapID'])
     },
     methods: {
         ...mapActions(['getfmapID']),
         init(floorid) {
-            if(!this.fmapID){
-                this.getfmapID().then(()=>{
+            if (!this.fmapID) {
+                this.getfmapID().then(() => {
                     this.urlMsg.fmapID = this.fmapID
                     this.getMap(floorid)
                 })
@@ -55,7 +55,7 @@ export default {
             }
             this.getMap(floorid)
         },
-        getMap(floorid){
+        getMap(floorid) {
             if (this.isQuerying) {
                 console.log('正在查询...')
                 return
@@ -118,7 +118,7 @@ export default {
             if (floor == 'g80') {
                 // 屋顶
                 if (fengmap.frImg) {
-                    let imgItem = new SImageItem(null,`${this.mapServerURL}/webtheme/${this.fmapID}/${fengmap.frImg}`)
+                    let imgItem = new SImageItem(null, `${this.mapServerURL}/webtheme/${this.fmapID}/${fengmap.frImg}`)
                     this.scene.addItem(imgItem)
                     this.view.scene = this.scene
                     this.view.fitSceneToView()
@@ -200,7 +200,7 @@ export default {
             return readGroup(data)
         }
     },
-    watch: { },
+    watch: {},
     mounted() {
         if (window.screen.height == '768') {
             this.canvasWidth = this.$refs.graphy.offsetWidth

+ 45 - 4
src/components/menuList.vue

@@ -1,7 +1,13 @@
 <template>
     <!-- 顶部路由 -->
     <div class='menu'>
-        <div class='home' @click='$emit("update:modelNum", 0)'>{{plazas.length>0?formatter(plazaId,plazas):'--'}}</div>
+        <div class='home' @click='$emit("update:modelNum", 0)'>
+            <div class='downright'></div>
+            <div class='home-box'>
+                <img src='@/assets/imgs/logo.png' alt />
+                <span>{{plazas.length>0?formatter(plazaId,plazas):'--'}}</span>
+            </div>
+        </div>
         <div>
             <div
                 v-for='(item, index) in list'
@@ -121,17 +127,52 @@ export default {
     font-size: 16px;
     background: rgba(255, 255, 255, 1);
     box-shadow: 0px 2px 10px 0px rgba(31, 35, 41, 0.1);
+    overflow: hidden;
     .home {
-        width: 430px;
+        width: 265px;
         height: 48px;
-        font-size: 20px;
-        line-height: 48px;
+        // line-height: 48px;
         text-align: center;
         cursor: pointer;
         color: #ffffff;
         float: left;
         margin-right: 83px;
+        // background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
         background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+        position: relative;
+        .downright {
+            position: absolute;
+            width: 0;
+            height: 0;
+            border-left: 20px solid transparent;
+            border-bottom: 48px solid #fff;
+            right: 0px;
+            top: 0;
+        }
+        .home-box {
+            height: 100%;
+            display: flex;
+            align-items: center;
+            img {
+                width: 28px;
+                height: 28px;
+                margin-left: 20px;
+                margin-right: 24px;
+                margin-top: -3px;
+            }
+            span {
+                font-size: 20px;
+                font-family: MicrosoftYaHei;
+                height: 27px;
+                line-height: 27px;
+                margin-top: -4px;
+                &:after {
+                    content: '|';
+                    position: absolute;
+                    left: 60px;
+                }
+            }
+        }
     }
     & > div:nth-of-type(2) {
         & > div {

+ 64 - 38
src/components/viewLengend.vue

@@ -5,50 +5,76 @@
 */
 <template>
     <div class='view'>
-        <el-table
-            v-loading='loading'
-            ref='dataTable'
-            :data='viewTable'
-            tooltip-effect='dark'
-            style='width:100%;'
-            @selection-change='handleSelectionChange'
-            :header-cell-style='{background:"rgba(2,91,170,0.1)",fontFamily:"PingFangSC-Medium,PingFang SC;",color:"rgba(0,0,0,0.85);",fontSize:"12px"}'
-        >
-            <el-table-column type='selection' width='45'></el-table-column>
-            <el-table-column prop='Name' :show-overflow-tooltip='true' label='项目' width='100'>
-                <template slot-scope='{row}'>{{row.Name||'--'}}</template>
-            </el-table-column>
-            <el-table-column prop='Num' label='数量'>
-                <template slot-scope='{row}'>
-                    <span v-if='row.Num || row.Num==0'>{{row.Num}}</span>
-                    <span v-else>--</span>
-                </template>
-            </el-table-column>
-            <el-table-column prop='Unit' label='单位' width='70'>
-                <template slot-scope='{row}'>{{row.Unit||'--'}}</template>
-            </el-table-column>
-            <el-table-column prop='Url' label='图例'>
-                <template slot-scope='{row}'>
-                    <div v-if='row.Url' class='Url-img'>
-                        <img :src='`/serve/topology-wanda/Picture/query/${row.Url}`' alt />
-                    </div>
-                    <div v-else>{{'--'}}</div>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class='swich'>
-            <el-switch v-model='swich' @change='handleSwich(swich)'></el-switch>
-            <span>隐藏数量为0的项目</span>
+        <div v-if='systemName=="土建系统"'>
+            <el-table
+                v-loading='loading'
+                ref='dataTable'
+                :data='viewTable'
+                tooltip-effect='dark'
+                style='width:100%;'
+                :header-cell-style='{background:"rgba(2,91,170,0.1)",fontFamily:"PingFangSC-Medium,PingFang SC;",color:"rgba(0,0,0,0.85);",fontSize:"12px"}'
+            >
+                <el-table-column prop label='说明'>
+                    <template slot-scope='{row}'>
+                        <span>{{'--'}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop label='图例' width='60'>
+                    <template slot-scope='{row}'>
+                        <div v-if='row.Url' class='Url-img'>
+                            <img :src='`/serve/topology-wanda/Picture/query/${row.Url}`' alt />
+                        </div>
+                        <div v-else>{{'--'}}</div>
+                    </template>
+                </el-table-column>
+            </el-table>
         </div>
-        <div class='remark' v-if='remarksText'>
-            <span class='remark-title'>注:</span>
-            <div v-html='remarksText' class='remark-text'></div>
+        <div v-else>
+            <el-table
+                v-loading='loading'
+                ref='dataTable'
+                :data='viewTable'
+                tooltip-effect='dark'
+                style='width:100%;'
+                @selection-change='handleSelectionChange'
+                :header-cell-style='{background:"rgba(2,91,170,0.1)",fontFamily:"PingFangSC-Medium,PingFang SC;",color:"rgba(0,0,0,0.85);",fontSize:"12px"}'
+            >
+                <el-table-column type='selection' width='45'></el-table-column>
+                <el-table-column prop='Name' :show-overflow-tooltip='true' label='项目' width='100'>
+                    <template slot-scope='{row}'>{{row.Name||'--'}}</template>
+                </el-table-column>
+                <el-table-column prop='Num' label='数量'>
+                    <template slot-scope='{row}'>
+                        <span v-if='row.Num || row.Num==0'>{{row.Num}}</span>
+                        <span v-else>--</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop='Unit' label='单位' width='70'>
+                    <template slot-scope='{row}'>{{row.Unit||'--'}}</template>
+                </el-table-column>
+                <el-table-column prop='Url' label='图例'>
+                    <template slot-scope='{row}'>
+                        <div v-if='row.Url' class='Url-img'>
+                            <img :src='`/serve/topology-wanda/Picture/query/${row.Url}`' alt />
+                        </div>
+                        <div v-else>{{'--'}}</div>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class='swich'>
+                <el-switch v-model='swich' @change='handleSwich(swich)'></el-switch>
+                <span>隐藏数量为0的项目</span>
+            </div>
+            <div class='remark' v-if='remarksText'>
+                <span class='remark-title'>注:</span>
+                <div v-html='remarksText' class='remark-text'></div>
+            </div>
         </div>
     </div>
 </template>
 <script>
 export default {
-    props: ['viewTable', 'loading', 'remarksText'],
+    props: ['viewTable', 'loading', 'remarksText', 'systemName'],
     data() {
         return {
             swich: true,

+ 1 - 1
src/views/floorFunc/index.vue

@@ -36,7 +36,7 @@ export default {
     methods: {
         emitFloor(item) {
             this.floorInfo = item
-            this.$refs.floorMap.init(this.floorInfo.gname)
+            // this.$refs.floorMap.init(this.floorInfo.gname)
         },
         additionalColl() {
             this.show = !this.show

+ 8 - 2
src/views/other/index.vue

@@ -16,7 +16,7 @@
                 </ul>
             </div>
             <!-- 楼层 -->
-            <div class='other-right' v-if='matterId!=1 && picFloorImg'>
+            <div class='other-right' v-if='matterId!=1 && picFloorImg.length>0'>
                 <floor-list @emitFloor='emitFloor'></floor-list>
             </div>
             <!-- 图例 -->
@@ -56,7 +56,7 @@ export default {
                 floorId: 'f1'
             },
             picFloor: '',
-            picFloorImg: '',
+            picFloorImg: [],
             dialogInfo: {}
         }
     },
@@ -86,6 +86,12 @@ export default {
             queryPic({ getParams }).then(res => {
                 console.log('库房管理图', res)
                 this.picFloorImg = res.data
+                console.log(this.picFloorImg)
+                if (this.picFloorImg) {
+                    console.log(1111)
+                } else {
+                    console.log(222222)
+                }
             })
         }
     },

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

@@ -29,6 +29,7 @@ import Select from '@/components/Select/Select.vue'
 import ZhsxDialog from './zhsxDialog'
 import zhsxOtherTable1 from './zhsxOtherTable1'
 import zhsxOtherTable2 from './zhsxOtherTable2'
+import { queryZhsxjl } from '@/api/other.js'
 export default {
     data() {
         return {
@@ -39,6 +40,12 @@ export default {
     components: { ZhsxDialog, Select, zhsxOtherTable1, zhsxOtherTable2 },
     methods: {
         zhsxLog() {
+            let params = {
+                getParams: {}
+            }
+            queryZhsxjl(params).then(res => {
+                console.log('综合事项弹框', res)
+            })
             this.$refs.Dialog.open()
         },
         handleClick(tab) {

+ 1 - 1
src/views/overview/index.vue

@@ -101,7 +101,7 @@
                                 <el-table-column label='联系人' prop width='65'>
                                     <template slot-scope='{row}'>{{row.lxr||'-'}}</template>
                                 </el-table-column>
-                                <el-table-column prop='phone' label='联系电话' width='100'>
+                                <el-table-column prop='phone' label='联系电话' width='110'>
                                     <template slot-scope='{row}'>{{row.lxdh||'-'}}</template>
                                 </el-table-column>
                             </el-table>

+ 52 - 34
src/views/room/index.vue

@@ -142,7 +142,6 @@
                                 v-model='zysxInput4'
                                 style='width:200px;margin-right:12px'
                             ></el-input>
-
                             <Select
                                 @change='Index3'
                                 width='200'
@@ -153,6 +152,15 @@
                                 :placeholder='"请选择"'
                                 style='margin-right:12px'
                             ></Select>
+                            <el-input
+                                clearable
+                                @change='Index3'
+                                placeholder='搜索工单编号'
+                                size='small'
+                                prefix-icon='el-icon-search'
+                                v-model='gdbhInput4'
+                                style='width:200px;'
+                            ></el-input>
                         </div>
                         <div class='dialog-none'>
                             <div class='input-dialog'>
@@ -189,7 +197,7 @@
                                             end-placeholder
                                         ></el-date-picker>
                                     </p>
-                                    <p class='input-dialog-p'>工单编号</p>
+                                    <!-- <p class='input-dialog-p'>工单编号</p>
                                     <p class='input-dialog-p2'>
                                         <el-input
                                             clearable
@@ -199,7 +207,7 @@
                                             prefix-icon='el-icon-search'
                                             v-model='gdbhInput4'
                                         ></el-input>
-                                    </p>
+                                    </p>-->
                                     <p class='input-dialog-foot'>
                                         <el-button @click='dialogFormVisible = false' size='mini'>取 消</el-button>
                                         <el-button type='primary' @click='confirm
@@ -257,6 +265,25 @@
                                 :placeholder='"请选择"'
                                 style='margin-right:12px'
                             ></Select>
+                            <Select
+                                width='220'
+                                tipPlace='top'
+                                v-model='iszcSelect5'
+                                caption='是否正常:'
+                                v-if='zt.length>0'
+                                :selectdata='zt'
+                                :placeholder='"请选择"'
+                                style='margin-right:12px'
+                            ></Select>
+                            <el-input
+                                @change='Index4'
+                                clearable
+                                placeholder='异常工单编号'
+                                size='small'
+                                prefix-icon='el-icon-search'
+                                v-model='ycgdbhInput5'
+                                style='margin-right:12px;width:220px;'
+                            ></el-input>
                         </div>
                         <div class='dialog-none'>
                             <div class='input-dialog'>
@@ -294,31 +321,6 @@
                                             end-placeholder
                                         ></el-date-picker>
                                     </p>
-
-                                    <p class='input-dialog-p'>维保结果</p>
-                                    <p class='input-dialog-p2'>
-                                        <Select
-                                            width='200'
-                                            tipPlace='top'
-                                            caption='是否正常:'
-                                            v-if='zt.length>0'
-                                            :selectdata='zt'
-                                            v-model='iszcSelect5'
-                                            :placeholder='"请选择"'
-                                            style='margin-right:12px'
-                                        ></Select>
-                                    </p>
-                                    <p class='input-dialog-p'>异常工单编号</p>
-                                    <p class='input-dialog-p2'>
-                                        <el-input
-                                            clearable
-                                            placeholder
-                                            style='width:200px;'
-                                            size='mini'
-                                            prefix-icon='el-icon-search'
-                                            v-model='ycgdbhInput5'
-                                        ></el-input>
-                                    </p>
                                     <p class='input-dialog-p'>异常工单填报日期</p>
                                     <p class='input-dialog-p2'>
                                         <el-date-picker
@@ -371,7 +373,7 @@
 </template>
 <script>
 import { queryEquipmentList } from '@/api/equipmentList.js'
-import { queryDygjcxline, queryHxsb, queryWxjf, queryWb } from '@/api/room.js'
+import { queryDygjcxline, queryHxsb, queryWxjf, queryWb, querySystem } from '@/api/room.js'
 import roomTable1 from './room1'
 import roomTable2 from './room2'
 import roomTable3 from './room3'
@@ -493,10 +495,10 @@ export default {
             this.picFloor = this.$cookie.get('floorNow')
             let getParams = {
                 typename: '位置布置图',
-                location: '1198',
+                location: '1809',
                 module: '1002',
-                system: '1001',
-                floor: this.picFloor,
+                system: '1002',
+                // floor: this.picFloor,
                 plazaId: this.$store.state.plazaId
             }
             queryPic({ getParams }).then(res => {
@@ -662,7 +664,7 @@ export default {
         Index4() {
             let postParams = {}
             let data = {
-                location: '1175',
+                location: '28160',
                 plazaId: this.$store.state.plazaId,
                 page: this.page4,
                 size: this.size4,
@@ -777,12 +779,24 @@ export default {
                 }
             })
         },
+        init() {
+            let params = {
+                getParams: {
+                    locationid: '5209',
+                    plazaId: this.$store.state.plazaId
+                }
+            }
+            querySystem(params).then(res => {
+                console.log('系统', res)
+            })
+        },
         open(name) {
             this.visible = true
             this.systemName = name
         }
     },
     mounted() {
+        this.init()
         this.Index()
     },
     watch: {}
@@ -838,7 +852,7 @@ export default {
                 background: rgba(255, 255, 255, 1);
                 border-radius: 4px;
                 border: 1px solid rgba(195, 199, 203, 1);
-                z-index: 9999;
+                z-index: 99999;
                 position: absolute;
                 top: -20px;
                 right: 0px;
@@ -915,6 +929,10 @@ export default {
             color: rgba(31, 36, 41, 1);
             border: 1px solid rgba(195, 199, 203, 1);
         }
+        .el-tabs,
+        .el-tabs__content {
+            height: 800px;
+        }
         .el-tabs__active-bar {
             background-color: transparent !important;
         }

+ 4 - 1
src/views/room/room2.vue

@@ -67,7 +67,10 @@ export default {
     },
     components: { Select },
     methods: {
-        pageChanged(page) {}
+        pageChanged(page) {
+            console.log(page)
+            this.$emit('Index2Emit', page)
+        }
     },
     mounted() {}
 }

+ 3 - 3
src/views/room/room4.vue

@@ -41,10 +41,10 @@
                 <el-table-column prop label='现场照片' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.pics || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='填报时间' show-overflow-tooltip resizable>
+                <el-table-column prop label='填报时间' show-overflow-tooltip resizable width='130'>
                     <template slot-scope='{row}'>{{row.reportedby?formatter(row.reportedby):'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='验收时间' show-overflow-tooltip resizable>
+                <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>
@@ -81,7 +81,7 @@ export default {
     components: { Select },
     methods: {
         formatter(date) {
-            return moment.unix(date / 1000).format('YYYY.MM.DD')
+            return moment.unix(date / 1000).format('YYYY.MM.DD HH:mm')
         },
         pageChanged(page) {
             this.page = page

+ 6 - 6
src/views/room/room5.vue

@@ -38,17 +38,17 @@
                     <el-table-column prop label='任务状态' :show-overflow-tooltip='true'>
                         <template slot-scope='{row}'>{{row.status||'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='开始时间' :show-overflow-tooltip='true' width='90'>
+                    <el-table-column prop label='开始时间' :show-overflow-tooltip='true' width='130'>
                         <template slot-scope='{row}'>{{row.sjkssj?formatter(row.sjkssj):'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='完成时间' :show-overflow-tooltip='true' width='90'>
+                    <el-table-column prop label='完成时间' :show-overflow-tooltip='true' width='130'>
                         <template slot-scope='{row}'>{{row.sjwcsj?formatter(row.sjwcsj):'--'}}</template>
                     </el-table-column>
                     <el-table-column prop label='执行耗时(天)' :show-overflow-tooltip='true' min-width='130' :sortable='true'>
                         <template slot-scope='{row}'>{{row.sjcxsjt||'--'}}</template>
                     </el-table-column>
                 </el-table-column>
-                <el-table-column prop label='是否正常' :show-overflow-tooltip='true'>
+                <el-table-column prop label='是否正常' :show-overflow-tooltip='true' width='80'>
                     <template slot-scope='{row}'>{{row.zt||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='异常工单' align='center'>
@@ -58,10 +58,10 @@
                     <el-table-column prop label='描述' :show-overflow-tooltip='true'>
                         <template slot-scope='{row}'>{{row.description||'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='填报时间' :show-overflow-tooltip='true' width='90'>
+                    <el-table-column prop label='填报时间' :show-overflow-tooltip='true' width='130'>
                         <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate):'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='验收时间' :show-overflow-tooltip='true' width='90'>
+                    <el-table-column prop label='验收时间' :show-overflow-tooltip='true' width='130'>
                         <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj):'--'}}</template>
                     </el-table-column>
                 </el-table-column>
@@ -103,7 +103,7 @@ export default {
             this.$emit('Index4')
         },
         formatter(date) {
-            return moment.unix(date / 1000).format('YYYY.MM.DD')
+            return moment.unix(date / 1000).format('YYYY.MM.DD HH:mm')
         },
         clickPic(row) {
             this.imgUrl = []