diff --git a/.env.production b/.env.production index a827e24..2a03995 100644 --- a/.env.production +++ b/.env.production @@ -9,7 +9,7 @@ ENV = 'production' # 如果使用 Nginx 代理后端接口,那么此处需要改为 '/',文件查看 Docker 部署篇,Nginx 配置 # 接口地址,注意协议,如果你没有配置 ssl,需要将 https 改为 http -VUE_APP_BASE_API = 'https://baiyee.vip' +VUE_APP_BASE_API = 'http://8.130.96.163:8899' 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/api/index.js b/src/api/index.js index bc0411b..4e82846 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-10-21 10:06:23 - * @LastEditTime: 2023-07-04 14:30:03 + * @LastEditTime: 2023-07-04 14:33:35 * @LastEditors: 飘泊客 * @Description: In User Settings Edit * @FilePath: /byhl-taomi/src/api/index.js @@ -1110,6 +1110,7 @@ export function setLogSave(data) { data }) } + export function getCompensateInfo(params) { return request({ url: baseObj.url + 'api/boost/compensateInfo', @@ -1117,13 +1118,6 @@ export function getCompensateInfo(params) { params }) } -export function getCompensateInfo1111333(params) { - return request({ - url: baseObj.url + 'api/boost/compensateInfo', - method: 'get', - params - }) -} // export function getConsumptionInformation(url,params) { // return request({ diff --git a/src/views/tokerModular/currentTask.vue b/src/views/tokerModular/currentTask.vue index e2e5f27..04b4cf5 100644 --- a/src/views/tokerModular/currentTask.vue +++ b/src/views/tokerModular/currentTask.vue @@ -263,6 +263,7 @@ > - - + + 新增 + + + + @@ -319,6 +327,28 @@ title="编辑" width="520px" > + +
+
+ 线索开关 +
+ +
Tag @@ -397,6 +427,7 @@ import { mapGetters } from 'vuex' import Treeselect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import zanwu from '@/assets/images/zanwu.png' + const defaultForm = {} export default { name: 'CurrentTask', @@ -466,7 +497,8 @@ export default { tagStr: [], // tag isEncryption: false, remark: '', // 备注 - labelOrganizeId: '' + labelOrganizeId: '', + isDmpDelivery: true }, rules: { taskName: [ @@ -495,7 +527,9 @@ export default { }, permission: { withdraw: true - } + }, + switchValue: '', + currentId: ''// 当前正在编辑的任务id } }, computed: { @@ -634,7 +668,8 @@ export default { } }, // 任务弹框 - operationFun(obj = {}) { + async operationFun(obj = {}) { + console.log(this.switchValue, 'this.switchValue') const { type = '', idx, row } = obj if (type === 'distSwitch' || type === 'add') { this.taskDialog = !this.taskDialog @@ -657,10 +692,18 @@ export default { this.operationIndex = idx this.proportionPopover = false if (type === 'resourcesProp') { - this.resourcesDialog = true - queryDmpTask({ taskId: row.id }).then(res => { + this.currentId = row.id + const res = await queryDmpTask({ taskId: row.id }) + if (res.status === 0) { this.form.tagStr = res.data.tagStr - }) + if (res.data.isDmpDelivery === null) { + this.switchValue = false + this.resourcesDialog = true + } else { + this.switchValue = res.data.isDmpDelivery + this.resourcesDialog = true + } + } } this.crud.toQuery() } @@ -773,6 +816,7 @@ export default { arr.push(item.replace(/\s/g, '')) }) obj.tagStr = arr + obj.isDmpDelivery = this.switchValue updateDmpTask(obj).then(res => { if (res.data) { this.$message.error(`创建失败, ${res.data.join()} 重复`) @@ -892,6 +936,9 @@ export default { }, resetTaskCur() { this.operationIndex = '' + }, + editTagChange(data) { + data = !data } } } @@ -998,7 +1045,7 @@ export default { } } .label{ - min-width: 80px; + min-width: 88px; line-height: 32px; float: none; display: inline-block; @@ -1055,4 +1102,8 @@ export default { .text-hide-2 { line-height: 1.3; } +.editRow{ + display: flex; + align-items: center; +}