Browse Source

Merge branch 'feature/work-jyf' of http://git.tjyourong.com.cn/ctop/adsp-vue into feature/work-jyf

jiayufei 3 years ago
parent
commit
2a1c495aa5

+ 1 - 1
src/utils/request.js

@@ -19,7 +19,7 @@ else if (process.env.NODE_ENV === 'debug') {
 }
 else if (process.env.NODE_ENV === 'production') {
 	// axios.defaults.baseURL = 'http://apipre.tjyourong.com.cn/jeecg-boot'; // 预生产
-    // axios.defaults.baseURL = 'http://139.186.165.84:8806/jeecg-boot';
+    // axios.defaults.baseURL = 'http://gateway.tjyourong.com.cn/jeecg-boot'; // 测试
 	axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot'; // 生产环境
 }
 const service = axios.create({

+ 11 - 0
src/views/modules/policy-management/policy-management-server.js

@@ -0,0 +1,11 @@
+/**
+ * @file 账户配置API
+ * @author jiayufei
+ */
+
+//  export const urlAcount = 'http://118.24.244.213:8808'; // 线上
+ // export const urlAcount = 'http://apipre.tjyourong.com.cn'; // 预生产
+ // export const urlAcount = 'http://192.168.1.43:8808'; // 子安
+ // export const urlAcount = 'http://139.186.165.84:8808'; // 测试
+ export const urlAcount = 'http://192.168.1.8:9999'; // 学超
+ 

+ 2 - 2
src/views/modules/policy-management/policy-management.less

@@ -52,7 +52,7 @@
     }
 }
 /deep/ .audit-policy-class {
-    width: 730px !important;
+    width: 930px !important;
     .ant-modal-body {
         height: 420px;
         overflow-y: auto;
@@ -80,7 +80,7 @@
                 }
                 .line-right-spn {
                     display: inline-block;
-                    width: 140px;
+                    width: 220px;
                     overflow: hidden;
                     white-space: nowrap;
                     text-overflow: ellipsis;

File diff suppressed because it is too large
+ 639 - 273
src/views/modules/policy-management/policy-management.vue


+ 2 - 2
vue.config.js

@@ -87,8 +87,8 @@ module.exports = {
 				// target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
 				// target:'http://118.24.244.213:8804',
 				// target: 'http://192.168.1.43:9090', // 子安
-				// target: 'http://192.168.1.8:8806', // 学超
-				target:'http://139.186.165.84:8806', //测试
+				target: 'http://192.168.1.8:9999', // 学超
+				// target:'http://gateway.tjyourong.com.cn', //测试
 				// target:'http://apipre.tjyourong.com.cn', //预生产
 
 				ws: false,