diff --git a/.env.production b/.env.production index c0c909d..f242ec6 100644 --- a/.env.production +++ b/.env.production @@ -3,13 +3,13 @@ # @Autor: 飘泊客 # @Date: 2023-05-05 16:18:03 # @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git - # @LastEditTime: 2023-10-09 15:31:18 + # @LastEditTime: 2023-10-16 12:57:34 ### ENV = 'production' # 如果使用 Nginx 代理后端接口,那么此处需要改为 '/',文件查看 Docker 部署篇,Nginx 配置 # 接口地址,注意协议,如果你没有配置 ssl,需要将 https 改为 http -VUE_APP_BASE_API = 'http://39.100.77.21:8013' -VUE_APP_BASE_IMG = 'http://39.100.77.21:8013' +VUE_APP_BASE_API = 'https://baiyee.vip' +VUE_APP_BASE_IMG = 'https://baiyee.vip' # 如果接口是 http 形式, wss 需要改为 ws VUE_APP_WS_API = 'wss://baiyee.vip' \ No newline at end of file diff --git a/src/views/home.vue b/src/views/home.vue index 9099126..310cb0a 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -1,2804 +1,2804 @@ - - - - - + + + + + diff --git a/src/views/internationalWaters/index.vue b/src/views/internationalWaters/index.vue index d6529fa..6b7f1c4 100644 --- a/src/views/internationalWaters/index.vue +++ b/src/views/internationalWaters/index.vue @@ -1,1220 +1,1220 @@ - - - + + + diff --git a/src/views/system/down/tripartiteDownload.vue b/src/views/system/down/tripartiteDownload.vue index 75813dc..bf68af1 100644 --- a/src/views/system/down/tripartiteDownload.vue +++ b/src/views/system/down/tripartiteDownload.vue @@ -3,7 +3,7 @@ * @Autor: 飘泊客 * @Date: 2022-01-13 15:43:13 * @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git - * @LastEditTime: 2023-10-13 11:29:17 + * @LastEditTime: 2023-10-13 16:27:05 --> - - - - + + + + + diff --git a/src/views/teamMember/resources/currentIndex.vue b/src/views/teamMember/resources/currentIndex.vue index cee4346..6241e96 100644 --- a/src/views/teamMember/resources/currentIndex.vue +++ b/src/views/teamMember/resources/currentIndex.vue @@ -447,8 +447,10 @@ {{ item }} - - +
+ + +
@@ -1063,7 +1065,7 @@ export default { clueId: index != null ? this.crud.data[index].id : this.taskDetail.id, optimisticVersion: index != null ? this.crud.data[index].optimisticVersion : this.taskDetail.optimisticVersion } - if ((type === 'labsub' && this.radioLabel === '有意向') || type === 'update') { + if ((type === 'labsub' && this.radioLabel === '有意向') || (type === 'update' && this.radioLabel === '有意向')) { const reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/ if (!reg_tel.test(this.newNid)) { this.$message({ @@ -1085,7 +1087,7 @@ export default { } if (type === 'update') { this.loadingSub = true - // 判断是否是有意向标签 + // 判断是否打标 if (this.radioLabel) { delete data.optimisticVersion data.sourceLabel = [this.radioLabel] diff --git a/src/views/teamMember/resources/tokerIndex.vue b/src/views/teamMember/resources/tokerIndex.vue index 40346ed..5ebed26 100644 --- a/src/views/teamMember/resources/tokerIndex.vue +++ b/src/views/teamMember/resources/tokerIndex.vue @@ -385,8 +385,10 @@ {{ item }}
- - +
+ + +
@@ -966,7 +968,7 @@ export default { clueId: index != null ? this.crud.data[index].id : this.taskDetail.id, optimisticVersion: index != null ? this.crud.data[index].optimisticVersion : this.taskDetail.optimisticVersion } - if ((type === 'labsub' && this.radioLabel === '有意向') || type === 'update') { + if ((type === 'labsub' && this.radioLabel === '有意向') || (type === 'update' && this.radioLabel === '有意向')) { const reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/ if (!reg_tel.test(this.newNid)) { this.$message({ @@ -988,7 +990,7 @@ export default { } if (type === 'update') { this.loadingSub = true - // 判断是否是有意向标签 + // 判断是否打标 if (this.radioLabel) { delete data.optimisticVersion data.sourceLabel = [this.radioLabel] diff --git a/src/views/tokerModular/tokerTask.vue b/src/views/tokerModular/tokerTask.vue index 2bf19e3..eda90a1 100644 --- a/src/views/tokerModular/tokerTask.vue +++ b/src/views/tokerModular/tokerTask.vue @@ -139,7 +139,7 @@ inactive-text="是否开启" />
- +