From ec6bc0cbc2675567be7b1d7e70438a4d4aca2515 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 11 八月 2025 15:32:47 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/donationdetails/index.vue | 4 ++--
vue.config.js | 20 ++++++++++++++------
package.json | 8 ++++----
src/views/project/externalperson/index.vue | 2 +-
4 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/package.json b/package.json
index f73bffb..e01c9c9 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
"clipboard": "2.0.6",
"core-js": "3.8.1",
"dayjs": "^1.11.1",
- "dingtalk-jsapi": "^3.0.33",
+ "dingtalk-jsapi": "^3.1.1",
"echarts": "4.9.0",
"element-china-area-data": "^5.0.2",
"element-ui": "2.15.6",
@@ -53,9 +53,9 @@
"js-beautify": "1.13.0",
"js-cookie": "2.2.1",
"jsencrypt": "3.0.0-rc.1",
- "lodash": "^4.17.21",
- "moment": "^2.29.4",
+ "moment": "^2.29.3",
"nprogress": "0.2.0",
+ "pdfjs-dist": "^3.8.162",
"prettier": "^1.8.1",
"quill": "1.3.7",
"screenfull": "5.0.2",
@@ -73,7 +73,7 @@
"devDependencies": {
"@vue/cli-plugin-babel": "4.4.6",
"@vue/cli-plugin-eslint": "4.4.6",
- "@vue/cli-service": "^5.0.8",
+ "@vue/cli-service": "4.4.6",
"babel-eslint": "10.1.0",
"chalk": "4.1.0",
"connect": "3.6.6",
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 089abcd..ab5ff0e 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -1667,11 +1667,11 @@
align="left"
label="绛惧瓧鏃堕棿"
label-width="120px"
- prop="coorinatorSignTime"
+ prop="coordinatorSignTime"
>
<el-date-picker
clearable
- v-model="witnessform.coorinatorSignTime"
+ v-model="witnessform.coordinatorSignTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="閫夋嫨鎵嬫湳缁撴潫鏃堕棿"
diff --git a/src/views/project/externalperson/index.vue b/src/views/project/externalperson/index.vue
index a7be87d..2e594a1 100644
--- a/src/views/project/externalperson/index.vue
+++ b/src/views/project/externalperson/index.vue
@@ -271,7 +271,7 @@
v-for="dict in dict.type.sys_professionaltitle"
:key="dict.value"
:label="dict.label"
- :value="dict.value"
+ :value="dict.label"
></el-option>
</el-select>
</el-form-item>
diff --git a/vue.config.js b/vue.config.js
index b845512..d788a6c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,7 +5,7 @@
return path.join(__dirname, dir)
}
-const name = process.env.VUE_APP_TITLE || '娴欐睙鐪丱PO鏁板瓧鍖栫鐞嗙郴缁�' // 缃戦〉鏍囬
+const name = process.env.VUE_APP_TITLE || '鑻ヤ緷绠＄悊绯荤粺' // 缃戦〉鏍囬
const port = process.env.port || process.env.npm_config_port || 80 // 绔彛
@@ -25,22 +25,30 @@
lintOnSave: process.env.NODE_ENV === 'development',
// 濡傛灉浣犱笉闇�瑕佺敓浜х幆澧冪殑 source map锛屽彲浠ュ皢鍏惰缃负 false 浠ュ姞閫熺敓浜х幆澧冩瀯寤恒��
productionSourceMap: false,
- // webpack-dev-server 鐩稿叧閰嶇疆w
+ // webpack-dev-server 鐩稿叧閰嶇疆
devServer: {
host: '0.0.0.0',
port: port,
open: true,
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
- [process.env.VUE_APP_BASE_API]: {
+ [process.env.VUE_APP_BASE_API]: {
target:`http://localhost:8080`,
- // target:`http://192.168.1.10:8080`,
- // target:`http://116.62.18.175:8080`,
- // target:`https://slb.hospitalstar.com:9093`,
+ //target:`http://116.62.18.175:8080`,
+ // target:`http://192.168.1.4:8086`,
+ // target: `https://slb.hospitalstar.com:9093`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
}
+ },
+ //褰損df鍜屾暟鎹帴鍙ｄ笉鍦ㄥ悓涓�涓姹傚湴鍧�涓嬫椂,涓簆df棰勮杩藉姞涓�涓唬鐞�
+ '/pdf': {
+ target: 'http://192.168.1.4/pdf/data',
+ changOrigin: true,
+ pathRewrite: {
+ '^/pdf': ''
+ }
}
},
disableHostCheck: true
--
Gitblit v1.9.3