Merge branch 'develop' of http://114.115.138.98:8900/isc-v3.1/isc-web-vue into develop

src/page/Business/Rcvsel/event/index.js

@@ -22,7 +22,7 @@ export default {
             }
 
             this.load = true;
-            let rtnmsg = await Api.post("/gjzf/msgsel/query", {
+            let rtnmsg = await Api.post("/frontend/msgsel/query", {
                 ...this.model.rcvp,
                 dir: ">",
                 pageNum: this.pagination.pageNum,

src/page/Business/Sndsel/event/index.js

@@ -22,7 +22,7 @@ export default {
             }
 
             this.load = true;
-            let rtnmsg = await Api.post("/gjzf/msgsel/query", {
+            let rtnmsg = await Api.post("/frontend/msgsel/query", {
                 ...this.model.sndp,
                 dir: "<",
                 pageNum: this.pagination.pageNum,

src/page/Frontend/Cpsmgs/event/index.js

@@ -22,7 +22,7 @@ export default {
             }
 
             this.load = true;
-            let rtnmsg = await Api.post("/gjzf/msgsel/query", {
+            let rtnmsg = await Api.post("/frontend/msgsel/query", {
                 ...this.model.sndp,
                 dir: ">",
                 pageNum: this.pagination.pageNum,

src/page/Frontend/Cpssxf/event/index.js

@@ -22,7 +22,7 @@ export default {
             }
 
             this.load = true;
-            let rtnmsg = await Api.post("/gjzf/msgsel/query", {
+            let rtnmsg = await Api.post("/frontend/msgsel/query", {
                 ...this.model.sndp,
                 dir: ">",
                 pageNum: this.pagination.pageNum,

src/page/Frontend/Cpswjz/event/index.js

@@ -22,7 +22,7 @@ export default {
             }
 
             this.load = true;
-            let rtnmsg = await Api.post("/gjzf/msgsel/query", {
+            let rtnmsg = await Api.post("/frontend/msgsel/query", {
                 ...this.model.sndp,
                 dir: ">",
                 pageNum: this.pagination.pageNum,

src/page/Frontend/Dblfxd/event/index.js

@@ -22,7 +22,7 @@ export default {
             }
 
             this.load = true;
-            let rtnmsg = await Api.post("/gjzf/msgsel/query", {
+            let rtnmsg = await Api.post("/frontend/msgsel/query", {
                 ...this.model.sndp,
                 dir: ">",
                 pageNum: this.pagination.pageNum,

src/page/Frontend/Fxdsdb/event/index.js

@@ -22,7 +22,7 @@ export default {
       }
 
       this.load = true;
-      let rtnmsg = await Api.post("/gjzf/fxdsdb/query", {
+      let rtnmsg = await Api.post("/frontend/fxdsdb/query", {
           ...this.model.fddp,
           pageNum: this.pagination.pageNum,
           pageSize: this.pagination.pageSize,

src/page/Frontend/Fxdsdb/views/addDialog.vue

@@ -3,7 +3,7 @@
     <el-dialog v-if="visible" v-dialogDrag :visible="visible" :modal-append-to-body="false" :close-on-click-modal="false"
       title="新增" destroy-on-close width="50%">
       <div>
-        <el-upload action="/webapi/gjzf/fxdsdb/upload" :before-upload="handleBeforeUpload" :on-success="handleSuccess" :limit="1" :show-file-list="false" accept=".xml">
+        <el-upload action="/webapi/frontend/fxdsdb/upload" :before-upload="handleBeforeUpload" :on-success="handleSuccess" :limit="1" :show-file-list="false" accept=".xml">
           <c-button slot="trigger" size="small" type="primary">导入</c-button>
         </el-upload>
         <el-table :data="stmData.data" :columns="stmData.columns" v-loading="load" style="width: 100%;margin-top: 10px;"

src/page/Frontend/Msgrsm/event/index.js

@@ -22,7 +22,7 @@ export default {
             }
 
             this.load = true;
-            let rtnmsg = await Api.post("/gjzf/msgsel/query", {
+            let rtnmsg = await Api.post("/frontend/msgsel/query", {
                 ...this.model.sndp,
                 dir: ">",
                 pageNum: this.pagination.pageNum,

src/page/Frontend/Msgrtm/event/index.js

@@ -22,7 +22,7 @@ export default {
             }
 
             this.load = true;
-            let rtnmsg = await Api.post("/gjzf/msgsel/query", {
+            let rtnmsg = await Api.post("/frontend/msgsel/query", {
                 ...this.model.sndp,
                 dir: ">",
                 pageNum: this.pagination.pageNum,

src/page/Frontend/Msgsel/event/index.js

@@ -23,7 +23,7 @@ export default {
             }
 
             this.load = true;
-            let rtnmsg = await Api.post("/gjzf/msgsel/query", {
+            let rtnmsg = await Api.post("/frontend/msgsel/query", {
                 ...this.model.sndp,
                 dir: "<",
                 pageNum: this.pagination.pageNum,

src/page/Frontend/Msgsep/event/index.js

@@ -22,7 +22,7 @@ export default {
             }
 
             this.load = true;
-            let rtnmsg = await Api.post("/gjzf/msgsel/query", {
+            let rtnmsg = await Api.post("/frontend/msgsel/query", {
                 ...this.model.sndp,
                 dir: ">",
                 pageNum: this.pagination.pageNum,

src/page/Frontend/Oftopn/event/index.js

@@ -24,7 +24,7 @@ export default {
 
             this.load = true;
             // TODO rewrite url
-            let rtnmsg = await Api.post("/gjzf/msgsel/query", {
+            let rtnmsg = await Api.post("/frontend/msgsel/query", {
                 ...this.model.oftp.rel,
                 pageNum: this.pagination.pageNum,
                 pageSize: this.pagination.pageSize,

src/page/Frontend/Qrtmgs/event/index.js

@@ -22,7 +22,7 @@ export default {
       }
 
       this.load = true;
-      let rtnmsg = await Api.post("/gjzf/case/query", {
+      let rtnmsg = await Api.post("/frontend/case/query", {
         ...this.model,
         pageNum: this.pagination.pageNum,
         pageSize: this.pagination.pageSize,

src/page/Frontend/Rcvsel/event/index.js

@@ -22,7 +22,7 @@ export default {
             }
 
             this.load = true;
-            let rtnmsg = await Api.post("/gjzf/msgsel/query", {
+            let rtnmsg = await Api.post("/frontend/msgsel/query", {
                 ...this.model.rcvp,
                 dir: ">",
                 pageNum: this.pagination.pageNum,

src/page/Frontend/Rcvselblk/event/index.js

@@ -22,7 +22,7 @@ export default {
             }
 
             this.load = true;
-            let rtnmsg = await Api.post("/gjzf/msgsel/query", {
+            let rtnmsg = await Api.post("/frontend/msgsel/query", {
                 ...this.model.rcvp,
                 dir: "<",
                 pageNum: this.pagination.pageNum,

src/page/Frontend/Rcvselcop/event/index.js

@@ -22,7 +22,7 @@ export default {
             }
 
             this.load = true;
-            let rtnmsg = await Api.post("/gjzf/msgsel/query", {
+            let rtnmsg = await Api.post("/frontend/msgsel/query", {
                 ...this.model.rcvp,
                 dir: "<",
                 pageNum: this.pagination.pageNum,

src/page/Frontend/Sndsel/event/index.js

@@ -22,7 +22,7 @@ export default {
             }
 
             this.load = true;
-            let rtnmsg = await Api.post("/gjzf/msgsel/query", {
+            let rtnmsg = await Api.post("/frontend/msgsel/query", {
                 ...this.model.sndp,
                 dir: "<",
                 pageNum: this.pagination.pageNum,

src/page/Frontend/Sndselcop/event/index.js

@@ -22,7 +22,7 @@ export default {
             }
 
             this.load = true;
-            let rtnmsg = await Api.post("/gjzf/msgsel/query", {
+            let rtnmsg = await Api.post("/frontend/msgsel/query", {
                 ...this.model.sndp,
                 dir: ">",
                 pageNum: this.pagination.pageNum,

src/page/Frontend/Usrmsg/event/index.js

@@ -22,7 +22,7 @@ export default {
             }
 
             this.load = true;
-            let rtnmsg = await Api.post("/gjzf/msgsel/query", {
+            let rtnmsg = await Api.post("/frontend/msgsel/query", {
                 ...this.model.sndp,
                 dir: ">",
                 pageNum: this.pagination.pageNum,

vue.config.js

 const path = require('path')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
 const publicPath = require('./src/config/isc-publicPath.js')
-// const baseData = require('./src/config/isc-baseData-local.js')
-const baseData = require('./src/config/isc-baseData.js')
+ const baseData = require('./src/config/isc-baseData-local.js')
+//const baseData = require('./src/config/isc-baseData.js')
 let moment = require("moment")
 
 process.env.VUE_APP_BASETHEME = 'purple';
@@ -36,11 +36,11 @@ module.exports = {
 					'^/webapi/funds': '/funds'
 				}
 			},
-			'/webapi/gjzf/': {
+			'/webapi/frontend/': {
 				target: baseData.schemes + '://' + baseData.hostGjzf,
 				changeOrigin: false,
 				pathRewrite: {
-					'^/webapi/gjzf': '/gjzf'
+					'^/webapi/frontend': '/frontend'
 				}
 			},	
 			'/webapi/manager/': {