Merge branch 'portal' of http://git.mes123.com/zhouyx/mes-ui into portal

components/page/imgUploadFile.vue

@@ -90,7 +90,7 @@ export default {
     }
   },
   created() {
-    this.fileUrlPath = iconImg + this.imgUrl
+    this.fileUrlPath = "/" +this.imgUrl
   },
   props: {
     value: [String, Number, Array, Object],

components/page/productNumberSelect.vue

@@ -52,7 +52,7 @@ export default {
       }
     },
     getCodes(e) {
-      let url = `${routeUrl}/orderproductcode/getbyorderid`
+      let url = `${PlanUrl}/orderproductcode/getbyorderid`
       if (this.eid) {
         this.$api.get(url, { id: this.eid }).then((r) => {
           if (r.success) {

pages/account/login/index.vue

@@ -129,11 +129,11 @@ export default {
     width: 500px;
     height: 540px;
     padding: 20px 50px;
-    margin: 200px auto auto;
     border-radius: 10px;
     left: 50%;
-    margin-left: -250px;;
+    top:50%;
     color: #ddd;
+    transform: translate(-50%,-50%);
     box-shadow: 1px 15px 35px #022d36;
     .mt20 {
       margin-top: 50px;

static/config.js

 const systemApi = {
-    //本地测试：
-    // dev:'192.168.0.88',
-    dev: '39.100.148.168',
-  
-    bjdev: 'localhost',
-  
-  
-    //本地88服务器：
-    localServer: '39.100.148.168',
-    local: '192.168.0.88',
-    // localServer:'192.168.0.159',
-  
-    //云上228服务器：
-    cloudServer: '39.100.148.168',
-    product:"49.232.68.61",
-  
-    //云上113服务器：
-    //cloudServer:'47.92.111.113',
-    //上传文件
-    fileServer: '192.168.0.204',
-    //此处添加其他环境：
-    //……
-  }
-  
-  //环境切换（只修改此处）：
-  //let address=systemApi.dev;
-  
-  let local = systemApi.dev;
-  let hostAddress = "localhost"; //192.168.0.159
-  let filePath = '39.100.148.168'; //文件上传ip
-  let filePathDown = '39.100.148.168'; //文件上传ip
-  let apsAdress = '47.92.102.113'
-  let address = systemApi.cloudServer;
-  //占位符自动替换：
-  window.systemUrl = `http://${address}:10020/api/services/app`; //System-api 系统管理（基础数据）
-  window.authUrl = `http://${address}:10010`; //Authentication-api //统一登陆认证
-  
-  window.designUrl = `http://${address}:10030/api/services/app`; //Process-api  工艺规程
-  window.PlanUrl = `http://${address}:10050/api/services/app`; //Process-api
-  window.routeUrl = `http://${address}:10050/api/services/app`; //Process-api
-  window.bugUrl = `http://${address}:10070/api/services/app`; //Process-api
-  window.fileUrl = `http://${filePath}:10080/fileServer`; //文件上传url
-  window.fileUrlDown = `http://${filePathDown}:80`; //文件下载url
-  window.resourceUrl = `http://${address}:10040/api/services/app`; // 制造资源地址
-  window.workflowUrl = `http://${address}:10060/api/services/app`; // 工作流地址
-  window.certificateUrl = `http://${address}:10090/api/services/app`; //Process-api
-  window.crmUrl = `http://${address}:10100/api/services/app`; //crm客户、合同、项目管理
-  window.iconImg = `http://${hostAddress}:3000/imgicon/`; //待办任务图标路径
-  window.apsManualUrl = `http://${apsAdress}:10091/api/services/app`;//aps手工排产
-  window.apsUrl = `http://${apsAdress}:10110/api/services/app`;//aps排产
-  //oidc配置：
-  window.authConfig = {
-    authority: `http://${address}:10010`,
-    client_id: 'js',
-    redirect_uri: `http://${hostAddress}:3006/callback`,
-    response_type: 'code',
-    scope: 'openid profile system process plan resource qms bug workflow crm aps',
-    post_logout_redirect_uri: `http://${hostAddress}:3006/`
-  };
\ No newline at end of file
+  local: 'localhost',
+  product: '39.100.148.168',
+  dev:"49.232.68.61",
+  aps:'47.92.102.113'
+}
+//环境切换（只修改此处）：
+let address=systemApi.dev;
+//let address=systemApi.product;
+//let address=systemApi.local;
+
+window.systemUrl = `http://${address}:10000/system`; //System-api 系统管理（基础数据）
+window.authUrl = `http://${address}:10010`; //Authentication-api //统一登陆认证  
+window.designUrl = `http://${address}:10000/process`; // 工艺规程
+window.PlanUrl = `http://${address}:10000/plan`; //订单
+window.bugUrl = `http://${address}:10000/bug`; //bug
+window.fileUrl = `http://${address}:10080/fileServer`; //文件上传url
+window.fileUrlDown = `http://${address}`; //文件下载url
+window.resourceUrl = `http://${address}:10000/resource`; // 制造资源地址
+window.workflowUrl = `http://${address}:10000/workflow`; // 工作流地址
+window.certificateUrl = `http://${address}:10000/qms`; //质量
+window.crmUrl = `http://${address}:10000/crm`; //crm客户、合同、项目管理
+window.apsUrl = `http://${systemApi.aps}:10000/aps`;//aps排产
\ No newline at end of file

static/config2.js

+const systemApi = {
+  local: 'localhost',
+  product: '39.100.148.168',
+  dev:"49.232.68.61",
+  aps:'47.92.102.113'
+}
+
+//环境切换（只修改此处）：
+let address=systemApi.dev;
+//let address=systemApi.product;
+//let address=systemApi.local;
+//占位符自动替换：
+window.systemUrl = `http://${address}:10000/system`; //System-api 系统管理（基础数据）
+window.authUrl = `http://${address}:10010`; //Authentication-api //统一登陆认证  
+window.designUrl = `http://${address}:10000/process`; // 工艺规程
+window.PlanUrl = `http://${address}:10000/plan`; //订单
+window.bugUrl = `http://${address}:10000/bug`; //bug
+window.fileUrl = `http://${address}:10080/fileServer`; //文件上传url
+window.fileUrlDown = `http://${address}`; //文件下载url
+window.resourceUrl = `http://${address}:10000/resource`; // 制造资源地址
+window.workflowUrl = `http://${address}:10000/workflow`; // 工作流地址
+window.certificateUrl = `http://${address}:10000/qms`; //质量
+window.crmUrl = `http://${address}:10000/crm`; //crm客户、合同、项目管理
+window.apsUrl = `http://${systemApi.aps}:10000/aps`;//aps排产
\ No newline at end of file