优化测试环境下的访问地址及其他优化

3 years ago · e97d1a690e
6 changed files with 29 additions and 12 deletions
--- a/.env.test
+++ b/.env.test
@ -1,13 +1,13 @@
 # 测试环境相关配置

 # 微服务IP
-VUE_APP_SERVER_ADDRESS = 'test.mingansei.com'
+VUE_APP_SERVER_ADDRESS = 'test.sdma.mingansei.com'

 # 省局数据后台IP
-VUE_APP_SJ_BASE_IP_ADDRESS = 'test.mingansei.com'
+VUE_APP_SJ_BASE_IP_ADDRESS = 'test.sdma.mingansei.com'

 # 微服务地址
-VUE_APP_SERVER_API = 'http://${VUE_APP_SERVER_ADDRESS}:9100'
+VUE_APP_SERVER_API = 'http://${VUE_APP_SERVER_ADDRESS}'

 # 业务后台访问地址
 VUE_APP_BASE_API = '${VUE_APP_SERVER_API}/sdma-manage/'
@ -22,4 +22,4 @@ VUE_APP_SJ_API = 'http://${VUE_APP_SJ_BASE_IP_ADDRESS}:9092/SJSE/'
 VUE_APP_PREVIEW_API = '${VUE_APP_SERVER_API}/sdma-preview/'

 # websocket连接地址
-VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-websocket/websocket/'
+VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}/sdma-websocket/websocket/'
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,6 @@
 .DS_Store
 node_modules
-/jinan
+/sdmaFront

 # local env files
 .env.local
--- a/public/index.html
+++ b/public/index.html
@ -5,7 +5,7 @@
  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
  <meta name="renderer" content="webkit">
  <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <title>JNFront</title>
+  <title>SdmaFront</title>
 </head>
 <body>
 <div id="app"></div>
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@ -22,7 +22,7 @@ const user = {
    allUser: [],
    allCategory: [],
    messageCount: [],
-    prodName: process.env.NODE_ENV === 'test' ? '/jinan' : '' // 开发环境下为空，生产环境下请设置为tomcat项目名称。(例如：/dist)
+    prodName: process.env.NODE_ENV === 'test' ? '/sdmaFront' : '' // 开发环境下为空，生产环境下请设置为tomcat项目名称。(例如：/dist)
  },
  mutations: {
    SET_USER: (state, userInfo) => {
--- a/src/views/flow/template.vue
+++ b/src/views/flow/template.vue
@ -63,6 +63,19 @@
              :value="item.value"
            />
          </el-select>
+          <el-select
+            v-model="listQuery.tempCategory"
+            placeholder="模板类型"
+            style="width: 200px"
+            clearable
+          >
+            <el-option
+              v-for="item in categoryList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
          <el-button type="primary" icon="el-icon-search" @click="handleFilter">
            查询
          </el-button>
@ -274,14 +287,18 @@ export default {
        {
          value: 'YSJL',
          label: '原始记录'
-        },
-        {
+        }, {
          value: 'JYBG',
          label: '检验报告'
-        },
-        {
+        }, {
          value: 'OTHER',
          label: '其他'
+        }, {
+          value: 'HZD',
+          label: '回执单'
+        }, {
+          value: 'RWD',
+          label: '任务单'
        }
      ],
      formTemplate: {},
--- a/vue.config.js
+++ b/vue.config.js
@ -10,7 +10,7 @@ const name = pkg.name || 'sdma-front' // page title
 const port = process.env.NODE_ENV === 'development' ? 9527 : 8090
 console.log(process.env.NODE_ENV === 'development')
 module.exports = {
-  publicPath: './',
+  publicPath: process.env.NODE_ENV === 'test' ? '/sdmaFront' : './',
  outputDir: 'sdmaFront',
  assetsDir: 'static',
  lintOnSave: process.env.NODE_ENV === 'development' ? 'error' : false,