소스 검색

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

haojianlong 4 년 전
부모
커밋
98b5290399

+ 1 - 1
public/index.html

@@ -124,7 +124,7 @@
             it to continue.</strong>
     </noscript>
     <!-- 置顶条问题 -->
-    <div style="height:26px;background-color:#efefef;padding:0 10px" id="wd"></div>
+    <!-- <div style="height:26px;background-color:#efefef;padding:0 10px" id="wd"></div> -->
     <div id="app"></div>
 
 </body>

+ 6 - 1
src/components/404.vue

@@ -28,8 +28,13 @@ export default {
     mounted() {},
     methods: {
         goLogin() {
-            let ssoServer = 'http://oauth.wanda-dev.cn'
             this.$store.commit('SETSSOTOKEN', null)
+            let ssoServer = ''
+            if (window.location.host == 'http://glsms.wanda-dev.cn') {
+                ssoServer = 'http://oauth.wanda-dev.cn'
+            } else {
+                ssoServer = 'http://oauth.wanda.cn'
+            }
             let systemcode = 'CAD156',
                 signal = new Date().getTime(),
                 version = '1.0.0'

+ 3 - 0
src/components/viewLengend.vue

@@ -119,6 +119,9 @@ export default {
     mounted() {
         console.log(this.remarksText)
     },
+    updated(){
+        this.setSelected()
+    },
     created() {}
 }
 </script>

+ 2 - 2
src/store/index.js

@@ -8,9 +8,9 @@ import router from '../router'
 Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
-        ssoToken: 'admin:chuyushu',
+        // ssoToken: 'admin:chuyushu',
         // ssoToken: '',
-        // ssoToken: null,
+        ssoToken: null,
         plazaName: '',
         isPreview: false,
         lastRoute: '',

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

@@ -25,7 +25,13 @@
                 <tj-table v-else-if='dialogInfo.id.slice(0,4)=="TJQD"' :param='param'></tj-table>
                 <!-- 主要设备清单 标准设备表格 -->
                 <!-- 内部设备清单 -->
-                <standTable v-else-if='dialogInfo.id.slice(2,4)=="QD"' :param='param' :major='dialogInfo.id'></standTable>
+                <standTable
+                    v-else-if='dialogInfo.id.slice(2,4)=="QD"'
+                    :param='param'
+                    :major='dialogInfo.id'
+                    :systemName='systemName'
+                    :dialogInfo='dialogInfo'
+                ></standTable>
                 <!-- 电井商铺范围清单 -->
                 <djsp-table v-else-if='dialogInfo.id.slice(0,4)=="GJSP"' :param='param'></djsp-table>
                 <!-- 查看图纸 -->
@@ -339,6 +345,10 @@ export default {
             height: 100% !important;
         }
     }
+    .is-active {
+        color: #025baa !important;
+        border-color: #025baa !important;
+    }
     .el-tabs__item {
         padding: 5px 16px;
         height: 30px;
@@ -362,10 +372,6 @@ export default {
     .el-tabs__active-bar {
         background-color: transparent !important;
     }
-    .is-active {
-        color: #025baa;
-        border-color: #025baa;
-    }
     //动画
     .el-dialog__wrapper {
         transition-duration: 0.3s;

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

@@ -3,8 +3,8 @@
         <!-- 图例 -->
         <div class='legend-boxs'>
             <Legend :innerLeng='1' :floors='floors' type='0' :categoryId='`${typecode=="FBT1"?"FZQZL":"XFBFYCFL"}`'></Legend>
+            <floor-list v-if='floors.length>0' :changeDataFlag='false' :floorsArr='floors' @emitFloor='emitFloor' :id='"floor"'></floor-list>
         </div>
-        <floor-list v-if='floors.length>0' :changeDataFlag='false' :floorsArr='floors' @emitFloor='emitFloor' :id='"floor"'></floor-list>
         <div v-show='floors.length>0' class='canvas-box'>
             <floorMap ref='floorMap' :modalHeight='modalHeight' :loadName='""' :categoryId='`${typecode=="FBT1"?"FZQZL":"XFBFYCFL"}`' :type='"floor"'></floorMap>
         </div>

+ 2 - 0
src/views/equipment/table/djspTable.vue

@@ -6,6 +6,7 @@
                 placeholder='搜索电井间'
                 size='small'
                 @keyup.enter.native='getList'
+                @blur="getList"
                 prefix-icon='el-icon-search'
                 v-model='welldes'
                 clearable
@@ -15,6 +16,7 @@
                 placeholder='搜索商铺编号'
                 size='small'
                 @keyup.enter.native='getList'
+                @blur="getList"
                 prefix-icon='el-icon-search'
                 v-model='shopsnum'
                 clearable

+ 3 - 0
src/views/equipment/table/eqDetaileDialog.vue

@@ -12,6 +12,7 @@
                 v-model='sbjc'
                 clearable
                 @keyup.enter.native='queryTableList'
+                @blur='queryTableList'
             ></el-input>
             <Select v-model='sbglgs' width='180' tipPlace='top' caption='管理归属:' size='small' :selectdata='sbglgsOption' @change='queryTableList'></Select>
             <Select
@@ -32,6 +33,7 @@
                 prefix-icon='el-icon-search'
                 v-model='brand'
                 @keyup.enter.native='queryTableList'
+                @blur='queryTableList'
             ></el-input>
             <Select
                 width='150'
@@ -46,6 +48,7 @@
             <el-input
                 placeholder='搜索安装位置'
                 @keyup.enter.native='queryTableList'
+                @blur='queryTableList'
                 clearable
                 style='width:180px;margin-right:12px'
                 size='small'

+ 3 - 0
src/views/equipment/table/eqListTable.vue

@@ -6,6 +6,7 @@
                 placeholder='搜索设备名称'
                 size='small'
                 @keyup.enter.native='getList'
+                @blur="getList"
                 prefix-icon='el-icon-search'
                 v-model='sbjc'
                 clearable
@@ -15,6 +16,7 @@
                 placeholder='搜索品牌型号'
                 size='small'
                 @keyup.enter.native='getList'
+                @blur="getList"
                 clearable
                 prefix-icon='el-icon-search'
                 v-model='keyword'
@@ -35,6 +37,7 @@
                 clearable
                 size='small'
                 @keyup.enter.native='getList'
+                @blur="getList"
                 prefix-icon='el-icon-search'
                 v-model='manufacturer'
                 style='width:192px;'

+ 1 - 0
src/views/equipment/table/lookPageTable.vue

@@ -6,6 +6,7 @@
                 placeholder='搜索文件名'
                 size='small'
                 @keyup.enter.native='getList'
+                @blur="getList"
                 clearable
                 prefix-icon='el-icon-search'
                 v-model='keyword'

+ 1 - 0
src/views/equipment/table/otherTable.vue

@@ -10,6 +10,7 @@
                 v-model='keyword'
                 clearable
                 @keyup.enter.native='getList'
+                @blur='getList'
             ></el-input>
 
             <div class='picker-box'>

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

@@ -110,17 +110,17 @@ export default {
 </script>
 <style lang="less" scoped>
 </style>
-<style lang="less" scoped>
+<style lang="less">
 .detail-dialog {
     .el-dialog__wrapper {
         overflow: hidden !important;
     }
+    .el-dialog__header {
+        background: #fff !important;
+    }
     /deep/.el-dialog {
         margin-top: 7vh !important;
         overflow-y: scroll !important;
     }
-    /deep/.el-dialog__header {
-        background: #fff !important;
-    }
 }
 </style>

+ 3 - 0
src/views/equipment/table/standTable.vue

@@ -6,6 +6,7 @@
                 placeholder='搜索设备名称'
                 size='small'
                 @keyup.enter.native='getList'
+                @blur='getList'
                 prefix-icon='el-icon-search'
                 v-model='sbjc'
                 clearable
@@ -16,6 +17,7 @@
                 size='small'
                 clearable
                 @keyup.enter.native='getList'
+                @blur='getList'
                 prefix-icon='el-icon-search'
                 v-model='keyword'
                 style='width:192px;margin-right:12px'
@@ -35,6 +37,7 @@
                 placeholder='搜索生产厂商'
                 size='small'
                 @keyup.enter.native='getList'
+                @blur='getList'
                 prefix-icon='el-icon-search'
                 v-model='manufacturer'
                 style='width:192px;'

+ 2 - 0
src/views/equipment/table/tjTable.vue

@@ -7,6 +7,7 @@
                 placeholder='搜索类别'
                 size='small'
                 @keyup.enter.native='getList'
+                @blur='getList'
                 prefix-icon='el-icon-search'
                 v-model='lb'
                 style='width:192px;margin-right:12px'
@@ -16,6 +17,7 @@
                 placeholder='搜索品牌'
                 size='small'
                 @keyup.enter.native='getList'
+                @blur='getList'
                 prefix-icon='el-icon-search'
                 v-model='brand'
                 style='width:192px'

+ 3 - 1
src/views/equipment/table/wbTable.vue

@@ -6,6 +6,7 @@
                 placeholder='搜索设备名称编号'
                 size='small'
                 @keyup.enter.native='getList'
+                @blur='getList'
                 prefix-icon='el-icon-search'
                 v-model='sbjc'
                 clearable
@@ -15,6 +16,7 @@
                 placeholder='搜索重要事项记录描述'
                 size='small'
                 @keyup.enter.native='getList'
+                @blur='getList'
                 clearable
                 prefix-icon='el-icon-search'
                 v-model='matters'
@@ -111,7 +113,7 @@
             </el-table-column>
             <el-table-column prop='wonum' label='任务编号' show-overflow-tooltip resizable width='90'>
                 <template slot-scope='{row}'>
-                    <div v-if="row.wb_gzglid" @click.stop='ycgd(row)' style='cursor:pointer;color: #0091ff;'>{{row.wb_gzglid}}</div>
+                    <div v-if='row.wb_gzglid' @click.stop='ycgd(row)' style='cursor:pointer;color: #0091ff;'>{{row.wb_gzglid}}</div>
                     <div v-else>{{'--'}}</div>
                 </template>
             </el-table-column>

+ 2 - 0
src/views/equipment/table/wxTable.vue

@@ -6,6 +6,7 @@
                 placeholder='搜索设备名称编号'
                 size='small'
                 @keyup.enter.native='getList'
+                 @blur="getList"
                 clearable
                 prefix-icon='el-icon-search'
                 v-model='sbjc'
@@ -16,6 +17,7 @@
                 size='small'
                 clearable
                 @keyup.enter.native='getList'
+                 @blur="getList"
                 prefix-icon='el-icon-search'
                 v-model='matters'
                 style='width:192px;margin-right:12px'

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

@@ -30,6 +30,7 @@
                 v-model='ssfasm'
                 clearable
                 @keyup.enter.native='getList'
+                @blur='getList'
             ></el-input>
             <!-- 当前阶段 -->
             <Select

+ 1 - 0
src/views/legendRules/addList.vue

@@ -4,6 +4,7 @@
             <el-input
                 size='small'
                 @keyup.enter.native='queryAll'
+                @blur='queryAll'
                 prefix-icon='el-icon-search'
                 v-model='keyword'
                 style='width:192px;margin-right:12px;margin-top:20px;margin-bottom:12px'

+ 1 - 0
src/views/other/gcfz2.vue

@@ -14,6 +14,7 @@
             ></Select>
             <el-input
                 @keyup.enter.native='changelc'
+                @blur='changelc'
                 placeholder='搜索区域'
                 size='small'
                 style='width:200px;margin-right:12px;'

+ 1 - 1
src/views/other/otherDialog.vue

@@ -57,7 +57,7 @@ export default {
         font-size: 16px;
         font-family: PingFangSC-Medium, PingFang SC;
         font-weight: 500;
-        color: rgba(0, 0, 0, 0.85);
+        color:#fff;
         line-height: 24px;
     }
     .el-dialog__body {

+ 1 - 0
src/views/other/zhsxOtherTable1.vue

@@ -31,6 +31,7 @@
                 clearable
                 placeholder='搜索记录事项'
                 @keyup.enter.native='getZhjl'
+                @blur="getZhjl"
                 size='small'
                 prefix-icon='el-icon-search'
                 v-model='ssjlsx'

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

@@ -4,6 +4,7 @@
             <el-input
                 clearable
                 @keyup.enter.native='dsfjc'
+                @blur="dsfjc"
                 placeholder='搜索任务名称'
                 size='small'
                 prefix-icon='el-icon-search'
@@ -37,6 +38,7 @@
             <el-input
                 clearable
                 @keyup.enter.native='dsfjc'
+                 @blur="dsfjc"
                 placeholder='搜索部门'
                 size='small'
                 prefix-icon='el-icon-search'
@@ -46,6 +48,7 @@
             <el-input
                 clearable
                 @keyup.enter.native='dsfjc'
+                 @blur="dsfjc"
                 placeholder='搜索检测结论'
                 size='small'
                 prefix-icon='el-icon-search'

+ 2 - 0
src/views/room/detail.vue

@@ -5,6 +5,7 @@
             <el-input
                 clearable
                 @keyup.enter.native='queryDetail'
+                @blur='queryDetail'
                 placeholder='搜索设备名称编号'
                 style='width:196px;margin-right:12px'
                 size='small'
@@ -36,6 +37,7 @@
             <el-input
                 clearable
                 @keyup.enter.native='queryDetail'
+                @blur='queryDetail'
                 placeholder='搜索品牌型号'
                 style='width:196px;margin-right:12px'
                 size='small'

+ 48 - 1
src/views/room/index.vue

@@ -36,6 +36,7 @@
                             <el-input
                                 clearable
                                 @keyup.enter.native='Index1'
+                                @blur='Index1'
                                 v-model='ctbhInput'
                                 placeholder='搜索抽屉编号'
                                 size='small'
@@ -45,6 +46,7 @@
                             <el-input
                                 clearable
                                 @keyup.enter.native='Index1'
+                                @blur='Index1'
                                 v-model='cxggInput'
                                 placeholder='搜索出线规格'
                                 size='small'
@@ -54,6 +56,7 @@
                             <el-input
                                 clearable
                                 @keyup.enter.native='Index1'
+                                @blur='Index1'
                                 v-model='djbhInput'
                                 placeholder='搜索电井编号'
                                 size='small'
@@ -63,6 +66,7 @@
                             <el-input
                                 clearable
                                 @keyup.enter.native='Index1'
+                                @blur='Index1'
                                 v-model='kzhlInput'
                                 placeholder='搜索控制回路'
                                 size='small'
@@ -89,11 +93,13 @@
                                 prefix-icon='el-icon-search'
                                 v-model='sbjcInput'
                                 @keyup.enter.native='Index2'
+                                @blur='Index2'
                                 style='width:200px;margin-right:12px'
                             ></el-input>
                             <el-input
                                 clearable
                                 @keyup.enter.native='Index2'
+                                @blur='Index2'
                                 placeholder='搜索品牌、型号'
                                 size='small'
                                 prefix-icon='el-icon-search'
@@ -113,6 +119,7 @@
                             <el-input
                                 clearable
                                 @keyup.enter.native='Index2'
+                                @blur='Index2'
                                 placeholder='搜索生产厂商'
                                 size='small'
                                 prefix-icon='el-icon-search'
@@ -135,6 +142,7 @@
                             <el-input
                                 clearable
                                 @keyup.enter.native='Index3'
+                                @blur='Index3'
                                 placeholder='搜索设备名称、编号'
                                 size='small'
                                 prefix-icon='el-icon-search'
@@ -144,6 +152,7 @@
                             <el-input
                                 clearable
                                 @keyup.enter.native='Index3'
+                                @blur='Index3'
                                 placeholder='搜索重要事项记录、描述'
                                 size='small'
                                 prefix-icon='el-icon-search'
@@ -163,6 +172,7 @@
                             <el-input
                                 clearable
                                 @keyup.enter.native='Index3'
+                                @blur='Index3'
                                 placeholder='搜索工单编号'
                                 size='small'
                                 prefix-icon='el-icon-search'
@@ -253,6 +263,7 @@
                         <div class='compute-center'>
                             <el-input
                                 @keyup.enter.native='Index4'
+                                @blur='Index4'
                                 clearable
                                 placeholder='搜索设备名称、编号'
                                 size='small'
@@ -262,6 +273,7 @@
                             ></el-input>
                             <el-input
                                 @keyup.enter.native='Index4'
+                                @blur='Index4'
                                 clearable
                                 placeholder='搜索核心维保事项记录描述'
                                 size='small'
@@ -271,6 +283,7 @@
                             ></el-input>
                             <el-input
                                 @keyup.enter.native='Index4'
+                                @blur='Index4'
                                 clearable
                                 placeholder='搜索任务编号'
                                 size='small'
@@ -610,7 +623,7 @@ export default {
         // 核心设备
         Index2() {
             let postParams = {
-                locationsid: this.location
+                location: this.location
             }
             let data = {
                 plazaId: this.plazaId,
@@ -1146,4 +1159,38 @@ export default {
         }
     }
 }
+// compute-tab 1366px适配
+@media screen and (max-width: 1366px) {
+    // 表格高度设置
+    .compute-tab {
+        .el-tabs,
+        .el-tabs__content {
+            height: 470px !important;
+        }
+        // 机房内核心设备 padding设置
+        #pane-3 {
+            .compute-table .el-table td,
+            .compute-box .compute-table .el-table th {
+                padding: 3px 0 !important;
+            }
+        }
+        // 维修记录,维保记录 padding设置
+        #pane-4,
+        #pane-5 {
+            .compute-table .el-table td,
+            .compute-box .compute-table .el-table th {
+                padding: 0 !important;
+            }
+        }
+    }
+}
+@media screen and (max-width: 1600px) {
+    // 表格高度设置
+    .compute-tab {
+        .el-tabs,
+        .el-tabs__content {
+            height: 600px !important;
+        }
+    }
+}
 </style>