【前端pc】暂存

vue/public/config.js

@@ -0,0 +1,5 @@
+let sysConfig = {
+    authApi:'http://192.168.1.228:8066',
+    baseApi:'http://192.168.1.228:8092',
+    m100FleshTime:60000
+}

vue/public/index.html

@@ -6,6 +6,7 @@
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <script type="text/javascript" src="config.js"></script>
     <title><%= webpackConfig.name %></title>
 <!--    <link rel="stylesheet" href="./css/style.css" type="text/css" />-->
     <!-- <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"> -->

vue/src/axios/index.js

@@ -16,8 +16,8 @@ axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded
 //TODO:配置读取
 axios.defaults.headers['Accept-Language'] = "zh-Hans"
 
-
-axios.defaults.baseURL = config.base.ip + ':' + config.base.backend_port
+axios.defaults.baseURL = sysConfig.baseApi
+// axios.defaults.baseURL = config.base.ip + ':' + config.base.backend_port
 //axios.defaults.baseURL = 'http://localhost:44344'; //?? 登录调试
 
 
@@ -304,7 +304,8 @@ export default {
   },
   instancePosts(url, params) { // 登录
     var instance = axios.create({
-      baseURL: config.base.ip + ':' + config.base.auth_port
+      baseURL: sysConfig.authApi
+      // baseURL: config.base.ip + ':' + config.base.auth_port
     })
     if (params.tenant && params.tenant.trim() != '') {
       url = url + "?__tenant=" + params.tenant
@@ -342,7 +343,8 @@ export default {
   },
   getUserInfo(url) { // 获取用户信息
     var instance = axios.create({
-      baseURL: config.base.ip + ':' + config.base.auth_port
+      baseURL: sysConfig.authApi
+      // baseURL: config.base.ip + ':' + config.base.auth_port
     })
     instance.defaults.headers.Authorization = 'Bearer ' + getToken()
     return new Promise((resolve, reject) => {
@@ -364,7 +366,8 @@ export default {
   },
   getPermissions(url, params) {
     var instance = axios.create({
-      baseURL: config.base.ip + ':' + config.base.backend_port
+      baseURL: sysConfig.baseApi
+      // baseURL: config.base.ip + ':' + config.base.backend_port
     })
     instance.defaults.headers.Authorization = 'Bearer ' + getToken()
     return new Promise((resolve, reject) => {

vue/src/router/index.js

@@ -64,10 +64,10 @@ export const constantRoutes = [
   },
   {
     path: '/login',
-    //component: () => import('@/views/login/index'),
+    component: () => import('@/views/login/index'),
 	  //component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one
 	  //component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one
-	  component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
+	  // component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
     hidden: true
   },
   {

vue/src/utils/crmindex.js

@@ -400,7 +400,8 @@ export function parseTime(time, cFormat) {
 }
 
 export function downloadFileHttpRequest(apiurl,attachment){
-  let baseURL =config.base.ip + ':' + config.base.backend_port
+  let baseURL =sysConfig.baseApi
+  // let baseURL =config.base.ip + ':' + config.base.backend_port
 
   function createObjectURL(object) { 
     return (window.URL) ? window.URL.createObjectURL(object) : window.webkitURL.createObjectURL(object); 

vue/src/views/pg-fis/basedate/m100BIll/index.vue

@@ -1,4 +1,4 @@
-<!--总成模块信息管理页-->
+<!--总成模块信息管理页 todo-an:门板 -->
 <template>
   <div class="cr-body-content">
     <div ref="box">

vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue

@@ -1,4 +1,4 @@
-<!--重新打印门板模块-->
+<!--重新打印门板模块 todo-an:门板-->
 <template>
   <div class="cr-body-content">
     <div ref="box">

vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue

@@ -1,4 +1,4 @@
-<!--总成模块信息管理页-->
+<!--总成模块信息管理页 todo-an:门板-->
 <template>
   <div class="cr-body-content">
     <div ref="box">

vue/src/views/pg-fis/basedate/m100Online/detailMB.vue

@@ -1,4 +1,4 @@
-<!--总成模块信息管理页-->
+<!--总成模块信息管理页 todo-an:门板-->
 <template>
   <div class="cr-body-content">
     <div ref="box">

vue/src/views/pg-fis/basedate/m100Online/index.vue

@@ -1,4 +1,4 @@
-<!--总成模块信息管理页-->
+<!--总成模块信息管理页 todo-an:门板?-->
 
 <!--
 此

vue/src/views/pg-fis/basedate/r100Online/index.vue

@@ -1,4 +1,4 @@
-<!--总成模块信息管理页-->
+<!--总成模块信息管理页 todo-an:门板-->
 <template>
   <div class="cr-body-content">
     <div ref="box">

vue/src/views/pg-fis/basedate/repeatR100/index.vue

@@ -1,4 +1,4 @@
-<!--重复报文信息页-->
+<!--重复报文信息页 todo-an:门板-->
 <template>
   <div class="cr-body-content">
     <div ref="box">

vue/src/views/pg-fis/basedate/select/detailMB.vue

@@ -1,4 +1,4 @@
-<!--总成模块信息管理页-->
+<!--总成模块信息管理页 todo-an:门板-->
 <template>
   <div class="cr-body-content">
     <div ref="box">

vue/src/views/pg-fis/basedate/select/index.vue

@@ -1,4 +1,4 @@
-<!--M100查询模块-->
+<!--M100查询模块 todo-an:门板-->
 <template>
   <div class="cr-body-content">
     <div ref="box">

vue/src/views/pg-fis/basedate/weldingAssembly/index.vue

@@ -1,4 +1,4 @@
-<!--总成模块信息管理页-->
+<!--总成模块信息管理页 todo-an:门板-->
 <template>
   <div class="cr-body-content">
     <div ref="box">

vue/src/views/ux/billManage/SettleDoorPanel/index.vue

@@ -1,4 +1,4 @@
-<!--准时化结算门板价格差异-->
+<!--准时化结算门板价格差异 todo-an:门板-->
 <template>
   <div class="cr-body-content">
     <!--功能栏-->

vue/static/config.js

@@ -3,11 +3,11 @@ if (process.env.NODE_ENV === 'development') {
   configJSON = {
     base: {
 		// ip: 'http://192.168.0.140',
-		ip: 'http://127.0.0.1', //?? two//客户
+		ip: 'http://192.168.1.228', //?? two//客户
 		auth_port: '8066',
 		public_port: '8092',
 		// backend_port: '8092',
-		backend_port: '44344', //?? three//客户
+		backend_port: '8092', //?? three//客户
     },
     basic: {},
     upload: {