guoxiaohuan hace 4 años
padre
commit
e2128ca953

+ 5 - 5
public/systemConf.js

@@ -24,11 +24,11 @@ var __systemConf = {
     systemCode: 'wandaBmGuide',
     conf: {
         // 阿里云
-        // editerUrl: 'http://60.205.177.43:80/wandaEditer/', // 编辑器地址
-        // wandaBmGuideUrl: 'http://60.205.177.43:80/wandaBmGuide/', //管理书地址
+        editerUrl: 'http://60.205.177.43:80/wandaEditer/', // 编辑器地址
+        wandaBmGuideUrl: 'http://60.205.177.43:80/wandaBmGuide/', //管理书地址
         // http://glsms.wanda-dev.cn/ 测试服
-        editerUrl: 'http://glsms.wanda-dev.cn/wandaEditer/', // 编辑器地址
-        wandaBmGuideUrl: 'http://glsms.wanda-dev.cn/wandaBmGuide/', //管理书地址
+        // editerUrl: 'http://glsms.wanda-dev.cn/wandaEditer/', // 编辑器地址
+        // wandaBmGuideUrl: 'http://glsms.wanda-dev.cn/wandaBmGuide/', //管理书地址
     },
 }
-window.__systemConf = __systemConf
+window.__systemConf = __systemConf

+ 7 - 7
src/api/httputils.js

@@ -22,16 +22,16 @@ axiosservice.interceptors.request.use(
         config.withCredentials = true // 允许携带token ,这个是解决跨域产生的相关问题
         let token = store.getters['ssoToken']
         let isPreview = store.getters['isPreview']
-        if (config.url.indexOf('mapapp') < 0) {
-            config.headers = {
-                'sso-token': token,
-                isPreview: isPreview, //默认false,当预览开启的时候是true
-            }
-        }
+        // if (config.url.indexOf('mapapp') < 0) {
+        //     config.headers = {
+        //         'sso-token': token,
+        //         isPreview: isPreview, //默认false,当预览开启的时候是true
+        //     }
+        // }
         // if (config.url.indexOf('/data') > -1 && config.url !== '/data/data/auth/check') {
         if (config.url.indexOf('/data') > -1) {
             config.headers = {
-                'sso-token': 'admin:xiejialin1',
+                'sso-token': token,
             }
         }
         return config

+ 6 - 3
src/components/Rotation/src/rotation.vue

@@ -96,11 +96,14 @@ export default {
     .rotationCon {
         height: 100%;
         width: 100%;
+        overflow: auto;
     }
     img {
-        width: 100%;
-        height: 100%;
-        object-fit: fill;
+        // width: 100%;
+        // height: 100%;
+        // object-fit: fill;
+        // min-width: 100%;
+        min-height: 100%;
     }
 }
 </style>

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

@@ -104,6 +104,7 @@ export default {
                         this.fParser.parseData(res)
                         this.fParser.spaceList.forEach(t => {
                             this.scene.addItem(t)
+                            t.nameSize = 16
                             if (t.data.Name && this.bunkObj[t.data.Name]) {
                                 t.name = this.bunkObj[t.data.Name].detailtype
                             } else {

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

@@ -18,7 +18,7 @@
             <!-- 没有tab的页面 -->
             <div v-if='Object.keys(dialogInfo).length>0 && dialogInfo.children.length==0' style='margin:16px 0 0 24px;height:100%'>
                 <!-- 原理图 -->
-                <div v-if='dialogInfo.id.slice(2,4)=="YL"' style='width:100%;overflow:hidden;height:100%;margin:0 auto'>
+                <div v-if='dialogInfo.id.slice(2,4)=="YL"' style='width:100%;overflow:auto;height:100%;margin:0 auto'>
                     <rotation type='3' :rotationImg='rotationImg'></rotation>
                 </div>
                 <!-- 土建系统主要材料清单 -->
@@ -64,7 +64,7 @@
                                     v-if='value.id.slice(2,4)=="YL" && eve.count>0 && value.param.type_code.slice(0,3)!="FBT"'
                                 >
                                     <!-- 有tab的原理图 -->
-                                    <div style='width:100%;height:600px;overflow:hidden'>
+                                    <div style='width:100%;height:600px;'>
                                         <rotation type='3' :rotationImg='rotationImg'></rotation>
                                     </div>
                                 </el-tab-pane>

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

@@ -172,6 +172,7 @@ export default {
         },
         //工单详情
         innerTable(row) {
+            console.log(row)
             if (row.apptype == '外委' || row.apptype == '自维') {
                 if (row.wb_gzglid) {
                     window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)

+ 6 - 3
src/views/equipment/table/wxTable.vue

@@ -95,7 +95,11 @@
             </el-table-column>
             <el-table-column prop='brand' label='现场照片' width='80'>
                 <template slot-scope='{row}'>
-                    <div v-if='row.glsmsImage' style='cursor:pointer;color: #0091ff;' @click='clickPic(row.glsmsImage)'>{{row.glsmsImage.length+'张'}}</div>
+                    <div
+                        v-if='row.glsmsImage'
+                        style='cursor:pointer;color: #0091ff;'
+                        @click.prevent='clickPic(row.glsmsImage)'
+                    >{{row.glsmsImage.length+'张'}}</div>
                     <div v-else>{{'---'}}</div>
                 </template>
             </el-table-column>
@@ -189,8 +193,7 @@ export default {
                     diff: this.diff,
                     plazaId: this.$store.state.plazaId,
                     page: this.currentPage,
-                    size: this.size,
-                    
+                    size: this.size
                 }
             }
             //下拉

+ 6 - 6
src/views/other/index.vue

@@ -96,27 +96,27 @@ export default {
             let postParams = [
                 {
                     tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'f1' }
+                    params: { module: '1004', floor: 'f6' }
                 },
                 {
                     tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'f2' }
+                    params: { module: '1004', floor: 'f5' }
                 },
                 {
                     tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'f3' }
+                    params: { module: '1004', floor: 'f4' }
                 },
                 {
                     tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'f4' }
+                    params: { module: '1004', floor: 'f3' }
                 },
                 {
                     tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'f5' }
+                    params: { module: '1004', floor: 'f2' }
                 },
                 {
                     tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'f6' }
+                    params: { module: '1004', floor: 'f1' }
                 },
                 {
                     tableName: 'glsms_proimgup',

+ 2 - 2
src/views/other/zhsxOtherTable2.vue

@@ -154,8 +154,8 @@ export default {
         },
         //第三方任务
         innerTable(row) {
-            if (row.wbgzglid) {
-                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=DSF_GZGL&uniqueid=${row.wbgzglid}`, true)
+            if (row.id) {
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=DSF_GZGL&uniqueid=${row.id}`, true)
             }
         },
         changeSelect() {