From e97d1a690efbdd43a51246c7e0aaf1fc627d2cf4 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Wed, 18 Aug 2021 19:43:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=8B=E8=AF=95=E7=8E=AF?=
=?UTF-8?q?=E5=A2=83=E4=B8=8B=E7=9A=84=E8=AE=BF=E9=97=AE=E5=9C=B0=E5=9D=80?=
=?UTF-8?q?=E5=8F=8A=E5=85=B6=E4=BB=96=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.test | 8 ++++----
.gitignore | 2 +-
public/index.html | 2 +-
src/store/modules/user.js | 2 +-
src/views/flow/template.vue | 25 +++++++++++++++++++++----
vue.config.js | 2 +-
6 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/.env.test b/.env.test
index 82c5c32..135c37a 100644
--- 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/'
diff --git a/.gitignore b/.gitignore
index f3794e0..450ff73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
.DS_Store
node_modules
-/jinan
+/sdmaFront
# local env files
.env.local
diff --git a/public/index.html b/public/index.html
index 7d61bc0..64e7f55 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
- JNFront
+ SdmaFront
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index da39107..523cae4 100644
--- 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) => {
diff --git a/src/views/flow/template.vue b/src/views/flow/template.vue
index 814c923..8d02bb9 100644
--- a/src/views/flow/template.vue
+++ b/src/views/flow/template.vue
@@ -63,6 +63,19 @@
:value="item.value"
/>
+
+
+
查询
@@ -274,14 +287,18 @@ export default {
{
value: 'YSJL',
label: '原始记录'
- },
- {
+ }, {
value: 'JYBG',
label: '检验报告'
- },
- {
+ }, {
value: 'OTHER',
label: '其他'
+ }, {
+ value: 'HZD',
+ label: '回执单'
+ }, {
+ value: 'RWD',
+ label: '任务单'
}
],
formTemplate: {},
diff --git a/vue.config.js b/vue.config.js
index 1fc0e8e..0ed2f6b 100644
--- 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,