Browse Source

bug修改

zhangyu 5 years ago
parent
commit
88eac0c088

+ 1 - 1
config/dev.env.js

@@ -4,7 +4,7 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
     NODE_ENV: '"development"',
-    BASE_URL: '"http://172.16.0.239"', //线上iframe地址
+    BASE_URL: '"http://172.16.0.239"', //测试iframe地址
     SSO_SERVER: '"http://192.168.20.101:8004"' //测试环境
     // SSO_SERVER: '"http://sso.sagacloud.cn"'  //正式环境
 })

+ 2 - 1
config/prod.env.js

@@ -1,7 +1,8 @@
 'use strict'
 module.exports = {
     NODE_ENV: '"production"',
-    BASE_URL: '"http://172.16.0.239"', //线上iframe地址
+    // BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
+    BASE_URL: '"http://172.16.0.239"', //测试iframe地址
     SSO_SERVER: '"http://192.168.20.101:8004"' //测试环境
     // SSO_SERVER: '"http://sso.sagacloud.cn"'  //正式环境
 }

+ 1 - 0
src/components/common/handsontable.vue

@@ -171,6 +171,7 @@
                     manualColumnMove: true,
                     dropdownMenu: [
                         "filter_by_condition",
+                        "filter_by_value",
                         "filter_action_bar"
                     ],
                     afterOnCellMouseDown: this.tableDown, //鼠标单击

+ 2 - 2
src/views/rent/rentlist/index.vue

@@ -368,8 +368,8 @@ export default {
       this.tenantID = infos.TenantID //要操作的数据id
       //点击操作跳转详情
       if (val === "caozuo") {
-        this.$message("请设置要跳转的详情页地址")
-        // window.open(`http://47.94.89.44:8058/spread?id=${infos.id}&pid=${this.projectId}&secret=${this.secret}`,"_blank")
+
+        window.open(`${process.env.BASE_URL}:8889/#/details?perjectId=${this.projectId}&secret=${this.secret}&FmId=${this.tenantID}&type=0&code=VOTn`,"_blank")
       }
       //点击关联的元空间
       if (val === "RoomCount") {