Browse Source

adm:fix> 解决redmine bug

shaun-sheep 4 năm trước cách đây
mục cha
commit
ed2b92fd8d
4 tập tin đã thay đổi với 22 bổ sung15 xóa
  1. 1 1
      config/dev.env.js
  2. 8 8
      config/index.js
  3. 1 1
      config/prod.env.js
  4. 12 5
      src/components/ledger/lib/system.vue

+ 1 - 1
config/dev.env.js

@@ -10,7 +10,7 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"http://192.168.20.236"', //(新)测试iframe地址
   // SSO_SERVER: '"http://192.168.20.236:8086"', //(新)测试环境
   // MQTT_SERVICE: '"ws://172.16.42.210:61614/stomp/"' //MQ测试环境地址
-  BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
+  BASE_URL: '"http://192.168.64.14:8081"', //线上iframe地址
   SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
   MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址
 })

+ 8 - 8
config/index.js

@@ -12,14 +12,14 @@ module.exports = {
 
     proxyTable: {//正式环境
       '/admin': {
-        target: 'http://mbi.sagacloud.cn:8080',
+        target: ' http://192.168.64.14:8080/',
         changeOrigin: true,
         pathRewrite: {
           "^/admin": "/"
         }
       },
       '/api': {
-        target: 'http://mbi.sagacloud.cn:8080',
+        target: ' http://192.168.64.14:8080/',
         changeOrigin: true,
         pathRewrite: {
           "^/api": "/"
@@ -40,7 +40,7 @@ module.exports = {
       },
       '/pointconfig': {
         // 目标 API 地址
-        target: 'http://mbi.sagacloud.cn:8080/',
+        target: ' http://192.168.64.14:8080/',
         // 如果要代理 websockets
         ws: true,
         // 将主机标头的原点更改为目标URL
@@ -64,7 +64,7 @@ module.exports = {
       },
       '/ScanBuilding': {
         // 目标 API 地址
-        target: 'http://mbi.sagacloud.cn:8080/',
+        target: ' http://192.168.64.14:8080/',
         // 如果要代理 websockets
         ws: true,
         // 将主机标头的原点更改为目标URL
@@ -72,7 +72,7 @@ module.exports = {
       },
       '/scanbuilding-2': {
         // 目标 API 地址
-        target: 'http://mbi.sagacloud.cn:8080/',
+        target: ' http://192.168.64.14:8080/',
         // 如果要代理 websockets
         ws: true,
         // 将主机标头的原点更改为目标URL
@@ -87,14 +87,14 @@ module.exports = {
         }
       },
       '/modelapi': {
-        target: 'http://mbi.sagacloud.cn:8080',
+        target: ' http://192.168.64.14:8080/',
         changeOrigin: true,
         pathRewrite: {
           "^/modelapi": "/revit-algorithm/"
         }
       },
       '/schedulerapi': {
-        target: 'http://mbi.sagacloud.cn:8080',
+        target: ' http://192.168.64.14:8080/',
         changeOrigin: true,
         pathRewrite: {
           "^/schedulerapi": "/scheduler/"
@@ -167,7 +167,7 @@ module.exports = {
     //     },
     // '/scanbuilding-2': {
     //   // 目标 API 地址
-    //   target: 'http://mbi.sagacloud.cn:8080/',
+    //   target: ' http://192.168.64.14:8080//',
     //   // 如果要代理 websockets
     //   ws: true,
     //   // 将主机标头的原点更改为目标URL

+ 1 - 1
config/prod.env.js

@@ -1,7 +1,7 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_URL: '"http://192.168.64.148081"', //测试iframe地址
+  BASE_URL: '"http://192.168.64.14:8081"', //测试iframe地址
   // SSO_SERVER: '"http://192.168.12.238:8081"', //测试环境
   // BASE_URL: '"http://192.168.20.236"', //(新)测试iframe地址
   // SSO_SERVER: '"http://192.168.20.236:8086"', //(新)测试环境

+ 12 - 5
src/components/ledger/lib/system.vue

@@ -1,16 +1,19 @@
 <template>
   <div id="cascaderMap">
     <span class="buildFloor" style="padding-right: 12px;">所属专业系统类型</span>
-    <el-select v-model="value" placeholder="请选择" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small" @change="changeVal">
-      <el-option v-for="item in options" :key="item.Category" :label="item.CategoryName" :value="item.Category"></el-option>
+    <el-select v-model="value" placeholder="请选择" :props="props" filterable :style="isWidth ? '' : 'width:160px;'"
+               size="small" @change="changeVal">
+      <el-option v-for="item in options" :key="item.Category" :label="item.CategoryName"
+                 :value="item.Category"></el-option>
     </el-select>
     <!-- <el-cascader placeholder="请选择" :options="options" v-model="value" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small"
       @change="changeVal" change-on-select></el-cascader> -->
   </div>
 </template>
 <script>
-import { mapGetters } from 'vuex';
-import { queryLinkSys, queryPhysicsAllType } from "@/api/scan/request";
+import {mapGetters} from 'vuex';
+import {queryLinkSys, queryPhysicsAllType} from "@/api/scan/request";
+
 export default {
   name: "getCode",
   props: {
@@ -82,6 +85,9 @@ export default {
         if (this.value) {
           this.changeVal(this.value)
         }
+        if (res.Content.length < 1) {
+          this.value = ''
+        }
       })
     },
     getAllData() {
@@ -95,7 +101,7 @@ export default {
     changeArr(arr) {
       let data = [];
       arr.forEach(item => {
-        data.push({ Category: item.Code, CategoryName: item.Name });
+        data.push({Category: item.Code, CategoryName: item.Name});
       });
       return data;
     }
@@ -106,6 +112,7 @@ export default {
 #cascaderMap {
   float: left;
   margin-left: 10px;
+
   .buildFloor {
     color: #999999;
     font-size: 14px;