first commit

h5-enginex-manager/baseUrl.js

@@ -5,7 +5,7 @@ switch (process.env.NODE_ENV) {
 	case 'development': // 开发环境代理地址
 		proxyObj = {
 			'/Riskmanage': {
-				target: 'http://47.102.125.25:80', // 开发环境
+				target: 'http://127.0.0.1:8082', // 开发环境
 				changeOrigin: true, // 是否跨域
 				pathRewrite: {
 					'^/Riskmanage': '/Riskmanage'
@@ -13,7 +13,7 @@ switch (process.env.NODE_ENV) {
 
 			},
 			'/trading': {
-				target: 'http://47.242.85.45:80', // 开发环境
+				target: 'http://127.0.0.1:8083', // 开发环境
 				changeOrigin: true, // 是否跨域
 				pathRewrite: {
 					'^/trading': '/trading'
@@ -84,6 +84,25 @@ switch (process.env.NODE_ENV) {
 			}
 		}
 		break
+	case 'produce': // 生产环境
+		proxyObj = {
+			'/Riskmanage': {
+				target: 'http://47.99.93.74:8099', // 生产环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/Riskmanage': '/Riskmanage'
+				}
+			},
+			'/trading': {
+				target: 'http://47.99.93.74:8099', // 开发环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/trading': '/trading'
+				}
+
+			}
+		}
+		break
 }
 
 module.exports = proxyObj

h5-enginex-manager/package.json

@@ -3,7 +3,7 @@
 	"version": "4.2.0",
 	"private": true,
 	"scripts": {
-		"serve": "vue-cli-service serve",
+		"serve": "vue-cli-service serve --mode development",
 		"serve:test": "vue-cli-service serve --mode test",
 		"serve:jia": "vue-cli-service serve --mode jia",
 		"serve:niu": "vue-cli-service serve --mode niu",

h5-enginex-manager/src/components/common/Header.vue

@@ -177,7 +177,7 @@
 			
 			go(value) {
 				var url = window.location.href
-
+        console.log(url.split('#')[0])
 				if (value[url.split('#')[0]]) {
 					window.open(value[url.split('#')[0]])
 				} else {

h5-enginex-manager/src/components/common/SCO/SCOManageRedact.vue

@@ -656,7 +656,10 @@
 
 					}
 					if (!value.weight && value.weight != 0) {
+            console.log(value.weight)
 						if (!Z.test(value.condition)) {
+              alert(value.condition)
+              console.log(value.condition)
 							issumm.is = false
 							issumm.msg = '请检查是否有范围未填'
 						}

h5-enginex-manager/src/components/common/listOperation/opType.vue

@@ -556,6 +556,7 @@
 			},
 
 			getdeepArr(obj) {
+        console.log(obj)
 				if (Array.isArray(obj)) {
 					return false
 				} else if (typeof obj == 'object') {
@@ -598,6 +599,7 @@
 				}
 			},
 			FieldUserArr() {
+        console.log(this.FieldUserObj)
 				if (this.FieldUserObj.length == 0) {
 					return []
 				} else {
@@ -613,7 +615,8 @@
 						obj.children = this.getdeepArr(JSON.parse(value.jsonValue))
 						return obj
 					})
-					// console.log(arr)
+          console.log(111111)
+					 console.log(arr)
 					return arr
 				}
 			},

h5-enginex-manager/src/components/upload/singleUpload.vue

@@ -3,7 +3,7 @@
     <el-upload
 	:headers="header"
       class="upload-demo"
-      action="Riskmanage/models/uploadAndParseFile"
+      action="/models/uploadAndParseFile"
       :on-remove="handleRemove"
       :before-remove="beforeRemove"
       :before-upload="beforeUpload"

h5-enginex-manager/src/utils/link.js

@@ -3,7 +3,7 @@ export default {
 			title: '数据中心',
 			'http://ex.fibo.cn/': 'http://dx.fibo.cn',
 			'http://ex.demo.fibo.cn/': 'http://dx.demo.fibo.cn',
-			'http://47.102.125.25/': 'http://47.102.125.25:81'
+			'http://localhost:1025/': 'http://127.0.0.1:1024'
 		},
 		{
 			title: '权限系统',
@@ -36,7 +36,7 @@ export default {
 			title: '数据中心',
 			'http://ax.fibo.cn/': 'http://dx.fibo.cn',
 			'http://ax.demo.fibo.cn/': 'http://dx.demo.fibo.cn',
-			'http://47.102.125.25:82/': 'http://47.102.125.25:81'
+			'http://127.0.0.1/': 'http://127.0.0.1/:1024'
 		},
 		
 	]