From 9a0487a24fc59f435b097f75c754a5ed1f548d2d Mon Sep 17 00:00:00 2001 From: zichen1019 <1510748736@qq.com> Date: Tue, 10 Aug 2021 18:56:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4websocket=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 16 ++++++++-------- .env.production | 2 +- .env.test | 2 +- src/store/modules/user.js | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.env.development b/.env.development index 1c60a2e..49cdc66 100644 --- a/.env.development +++ b/.env.development @@ -1,16 +1,16 @@ # 开发环境相关配置 -# 微服务IP -VUE_APP_SERVER_ADDRESS = 'test.sdma.mingansei.com' +# 项目名称 +VUE_APP_PROJECT_NAME = 'SJJY' -# 省局数据后台IP -VUE_APP_SJ_BASE_IP_ADDRESS = '192.168.1.130' +# 微服务IP +VUE_APP_SERVER_ADDRESS = '192.168.1.130' # 微服务地址 -VUE_APP_SERVER_API = 'http://${VUE_APP_SERVER_ADDRESS}' +VUE_APP_SERVER_API = 'http://${VUE_APP_SERVER_ADDRESS}:9100' -# 项目名称 -VUE_APP_PROJECT_NAME = 'SJJY' +# 省局数据后台IP +VUE_APP_SJ_BASE_IP_ADDRESS = '192.168.1.130' # 业务后台访问地址 VUE_APP_BASE_API = '${VUE_APP_SERVER_API}/sdma-manage/' @@ -25,4 +25,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-manage/websocket/' +VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-websocket/websocket/' diff --git a/.env.production b/.env.production index 93f2e3f..6ea4a3a 100644 --- a/.env.production +++ b/.env.production @@ -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-manage/websocket/' +VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-websocket/websocket/' diff --git a/.env.test b/.env.test index 97a0b2b..82c5c32 100644 --- a/.env.test +++ b/.env.test @@ -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-manage/websocket/' +VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-websocket/websocket/' diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 45acf9a..da39107 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -5,8 +5,8 @@ import global from '../../utils/common.js' import store from '../../store' import router, { resetRouter } from '../../router' import Vue from 'vue' -import { getOwnList, getRenwuListByPath } from '@/api/renwu' -import { getNeedRecordList } from '@/api/ysjl' +// import { getOwnList, getRenwuListByPath } from '@/api/renwu' +// import { getNeedRecordList } from '@/api/ysjl' const user = { state: { @@ -126,7 +126,7 @@ const user = { setToken() global.it = data.userVO.id // 查询相关待办条数 - const messagePush = [] + /* const messagePush = [] const departmentId = user.state.departmentId getOwnList({ // 我的任务 pageNum: 1, // 页码 @@ -263,7 +263,7 @@ const user = { }) }) } - user.state.messageCount = messagePush // 赋值要放在 set_user 后面，否则被冲刷掉了。 + user.state.messageCount = messagePush*/ // 赋值要放在 set_user 后面，否则被冲刷掉了。 // 查询路由 const asyncRouter = filterAsyncRouter(data.menuList) asyncRouter.push({ path: '*', redirect: '/404', hidden: true }) From 14e3b30dfd9d62f5eecd8d3833a96b8ea1657434 Mon Sep 17 00:00:00 2001 From: zichen1019 <1510748736@qq.com> Date: Tue, 10 Aug 2021 20:18:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=9B=B4=E6=96=B0=E6=96=87=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E5=8F=8A=E5=8E=86=E5=8F=B2=E6=96=87=E4=BB=B6=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=92=8C=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/document/index.vue | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/views/document/index.vue b/src/views/document/index.vue index f076b2a..2d7cef2 100644 --- a/src/views/document/index.vue +++ b/src/views/document/index.vue @@ -11,7 +11,6 @@ clearable @keyup.enter.native="crud.toQuery" /> - - + - - + + + + + Date: Wed, 11 Aug 2021 09:26:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E7=9A=84=E5=8A=A0=E8=BD=BD=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E6=A3=80=E9=AA=8C=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=88=97=E6=8E=A5=E5=8F=A3api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/template.js | 11 +++++++ src/components/drawerDialog/index.vue | 41 +++++++-------------------- 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/src/api/template.js b/src/api/template.js index 9314a13..3a54495 100644 --- a/src/api/template.js +++ b/src/api/template.js @@ -29,5 +29,16 @@ export default { return qs.stringify(params, { indices: false }) } }) + }, + deleteTemplateJyxm: (params) => { + console.log(params) + return api({ + url: '/templateJyxm', + method: 'delete', + params, + paramsSerializer: function(params) { + return qs.stringify(params, { indices: false }) + } + }) } } diff --git a/src/components/drawerDialog/index.vue b/src/components/drawerDialog/index.vue index d7e2587..39deb17 100644 --- a/src/components/drawerDialog/index.vue +++ b/src/components/drawerDialog/index.vue @@ -502,7 +502,7 @@ prop="writeMode" label-width="150px" > - + {{ item }} @@ -794,30 +794,6 @@ export default { break } }, - changeWriteMode() { - switch (this.form.writeMode) { - case 0: - case 2: - case 3: - this.form.tableMode = 0 - this.form.tableIndex = 1 - this.form.tableStartRow = 1 - this.form.tableRowCount = this.form.tableRowFindMode ? 0 : 1 - this.form.affiliatedTableStartRow = 0 - this.form.affiliatedTableRowCount = 0 - break - case 1: - this.form.tableMode = 1 - this.form.tableIndex = 0 - this.form.tableStartRow = 0 - this.form.tableRowCount = 0 - this.form.affiliatedTableStartRow = 0 - this.form.affiliatedTableRowCount = 0 - break - default: - break - } - }, changeTableRowFindMode() { this.form.tableRowCount = 0 this.form.affiliatedTableRowCount = 0 @@ -872,9 +848,10 @@ export default { // }) this.list = data.list this.totalCount = data.total * 1 + this.gridData = [] if (data.list[0]) { - this.getDemoList(data.list[0].id) this.templateSettingId = data.list[0].id + this.getDemoList() } }) }, @@ -888,7 +865,7 @@ export default { deleteFn(row, index) { const arr = [] arr.push(row.id) - TemplateApi.deleteSettingFn({ + TemplateApi.deleteTemplateJyxm({ ids: arr }).then((data) => { this.getDemoList() @@ -898,9 +875,13 @@ export default { // 表格序号 return (this.listQuery.pageNum - 1) * this.listQuery.pageRow + $index + 1 }, - getDemoList(id) { + getDemoList() { + if (!this.templateSettingId) { + this.$notify.error('未正确提供模板设置主键，无法加载检验项目列配置数据！') + return + } // 查询列表 - this.jyxmParams.templateSettingId = id + this.jyxmParams.templateSettingId = this.templateSettingId this.jyxmParams.templateId = this.id this.api({ url: '/templateJyxm/list', @@ -1150,7 +1131,7 @@ export default { } this.templateSettingId = row.id this.$refs.settingList.toggleRowSelection(row) - this.getDemoList(row.id) + this.getDemoList() }, clearForm() { this.formTemplate = {