From 321fe3c076e1b270db745200529e2e25e6fe9d07 Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Thu, 23 Dec 2021 10:07:29 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B0=83=E6=95=B4---=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/organization/examManage/index.vue | 2 +- src/views/publish/examRule/draft/editRule.vue | 5 +++-- src/views/publish/examRule/draft/rule.vue | 2 +- src/views/publish/examRule/index.vue | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/views/organization/examManage/index.vue b/src/views/organization/examManage/index.vue index b1f4ff0a2..186b195a7 100644 --- a/src/views/organization/examManage/index.vue +++ b/src/views/organization/examManage/index.vue @@ -94,7 +94,7 @@ export default { columnValue: (row) => { return row.abnormal ? '异常' : '正常'; }, - tagType: (row) => { return ''; } + tagType: (row) => { return row.abnormal ? 'danger' : 'success'; } }, { title: '开始时间', diff --git a/src/views/publish/examRule/draft/editRule.vue b/src/views/publish/examRule/draft/editRule.vue index c235cc857..234e283c2 100644 --- a/src/views/publish/examRule/draft/editRule.vue +++ b/src/views/publish/examRule/draft/editRule.vue @@ -2,12 +2,12 @@ - + - + @@ -146,6 +146,7 @@ export default { changeCourse(val) { this.operationTypeList = this.operationTypeMap[val]; this.topicNum = this.trainingTypeNums[val]; + this.form.operateType = ''; }, changeOperation(val) { if (val) { diff --git a/src/views/publish/examRule/draft/rule.vue b/src/views/publish/examRule/draft/rule.vue index 014ea7933..59344aae3 100644 --- a/src/views/publish/examRule/draft/rule.vue +++ b/src/views/publish/examRule/draft/rule.vue @@ -12,7 +12,7 @@ diff --git a/src/views/publish/examRule/index.vue b/src/views/publish/examRule/index.vue index 4ae4c5b15..3b7412f28 100644 --- a/src/views/publish/examRule/index.vue +++ b/src/views/publish/examRule/index.vue @@ -112,7 +112,7 @@ export default { columnValue: (row) => { return row.abnormal ? '异常' : '正常'; }, - tagType: (row) => { return ''; } + tagType: (row) => { return row.abnormal ? 'danger' : 'success'; } }, { type: 'button', From d7886eeb3f61273ba61513a2c3132bc4ce6ea3df Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Thu, 23 Dec 2021 13:53:57 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B0=83=E6=95=B4--=E8=A7=84=E5=88=99=E7=BD=AE=E7=81=B0?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/publish/examRule/draft/rule.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/publish/examRule/draft/rule.vue b/src/views/publish/examRule/draft/rule.vue index 59344aae3..d6941fc47 100644 --- a/src/views/publish/examRule/draft/rule.vue +++ b/src/views/publish/examRule/draft/rule.vue @@ -274,6 +274,7 @@ export default { } }, handleForm(data) { + this.changeCourseDisable(); this.indexCourse = data.$index; const list = JSON.stringify(data.row); const detail = JSON.parse(list); From b3fb8bff0a8dc0c6e7751c4ac1a7505d822a04ff Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Tue, 28 Dec 2021 09:37:14 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B0=83=E6=95=B4--=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=92=8C=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/management/exam.js | 24 +++- .../publish/examRule/checkOrRegenerate.vue | 109 ++++++++++++++++++ src/views/publish/examRule/index.vue | 17 +++ 3 files changed, 145 insertions(+), 5 deletions(-) create mode 100644 src/views/publish/examRule/checkOrRegenerate.vue diff --git a/src/api/management/exam.js b/src/api/management/exam.js index dbf029eca..aa15746f0 100644 --- a/src/api/management/exam.js +++ b/src/api/management/exam.js @@ -92,9 +92,23 @@ export function getExamListByMapIdAndPrdType(mapId, prdType) { } /** 更新试卷规则 */ export function updateExamRule(data) { - return request({ - url: `/api/exam/update/rules`, - method: 'put', - data:data - }); + return request({ + url: `/api/exam/update/rules`, + method: 'put', + data:data + }); +} +/** 检查并更新【规则数据异常】状态 */ +export function checkAndUpdateAbnormal(mapId) { + return request({ + url: `/api/exam/checkAndUpdateAbnormal/${mapId}`, + method: 'put' + }); +} +/** 重新生成考试规则 */ +export function regenerateRule (mapId) { + return request({ + url: `/api/exam/regenerateRules/${mapId}`, + method: 'put' + }); } diff --git a/src/views/publish/examRule/checkOrRegenerate.vue b/src/views/publish/examRule/checkOrRegenerate.vue new file mode 100644 index 000000000..302cd453f --- /dev/null +++ b/src/views/publish/examRule/checkOrRegenerate.vue @@ -0,0 +1,109 @@ + + + + diff --git a/src/views/publish/examRule/index.vue b/src/views/publish/examRule/index.vue index 3b7412f28..79dada655 100644 --- a/src/views/publish/examRule/index.vue +++ b/src/views/publish/examRule/index.vue @@ -8,6 +8,7 @@ + @@ -15,9 +16,13 @@ import { getExamList, deleteExam, setExamEfficacy, setExamEffectivey } from '@/api/management/exam'; import { UrlConfig } from '@/scripts/ConstDic'; import { getPublishMapListOnline } from '@/api/jmap/map'; +import CheckOrRegenerate from './checkOrRegenerate' export default { name: 'List', + components: { + CheckOrRegenerate + }, data() { return { BizTypeList: [], @@ -159,6 +164,8 @@ export default { actions: [ { text: this.$t('global.add'), btnCode: 'employee_insert', handler: this.handleNormalAdd }, { text: this.$t('global.back'), show: !this.$route.path.includes('device'), btnCode: 'employee_back', handler: this.handlerBack }, + { text: '检查', show: !this.$route.path.includes('device'), btnCode: 'employee_back', handler: this.handleCheck }, + { text: '重新生成', show: !this.$route.path.includes('device'), btnCode: 'employee_back', handler: this.handleRegenerate }, { text: '退出', show: this.$route.path.includes('device'), btnCode: 'employee_back', handler: this.handelQuit} ] } @@ -177,6 +184,7 @@ export default { reset: true } : { labelWidth: '160px', + leftSpan: 17, queryObject: { 'name': { type: 'text', @@ -298,6 +306,15 @@ export default { }, handelQuit() { window.close(); + }, + reload() { + this.queryList.reload(); + }, + handleCheck() { + this.$refs.checkOrRegenerate.doShow('check'); + }, + handleRegenerate() { + this.$refs.checkOrRegenerate.doShow('regenerate'); } } }; From ba80caeb82b180cf6babb19de4ee137813a3248c Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Wed, 29 Dec 2021 09:14:09 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/serverManage/add.vue | 18 +++++++++++++----- src/views/system/serverManage/index.vue | 6 +++++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/views/system/serverManage/add.vue b/src/views/system/serverManage/add.vue index 5893252d0..5164e4058 100644 --- a/src/views/system/serverManage/add.vue +++ b/src/views/system/serverManage/add.vue @@ -24,7 +24,8 @@ export default { formModel: { id: '', domainName: '', - project: '' + project: '', + resourcesDomainName: '' }, loading: false }; @@ -34,7 +35,8 @@ export default { const form = { labelWidth: '120px', items: [ - { prop: 'domainName', label: '域名', type: 'text', required: true, placeholder: '请输入域名' }, + { prop: 'domainName', label: '接口域名', type: 'text', required: true, placeholder: '请输入域名' }, + { prop: 'resourcesDomainName', label: '资源域名', type: 'text', required: true, placeholder: '请输入域名' }, { prop: 'project', label: '项目', type: 'select', required: true, options: this.projectList, placeholder: '请选择项目' } ] }; @@ -43,7 +45,10 @@ export default { rules() { const crules = { domainName: [ - { required: true, message: '请输入域名', trigger: 'blur' } + { required: true, message: '请输入接口域名', trigger: 'blur' } + ], + resourcesDomainName: [ + { required: true, message: '请输入资源域名', trigger: 'blur' } ], project: [ { required: true, message: '请选择项目', trigger: 'change' } @@ -63,6 +68,7 @@ export default { this.formModel.id = data.id; this.formModel.domainName = data.domainName; this.formModel.project = data.project; + this.formModel.resourcesDomainName = data.resourcesDomainName; } this.dialogVisible = true; }, @@ -72,7 +78,8 @@ export default { const data = { id: this.formModel.id, domainName: this.formModel.domainName, - project: this.formModel.project.toUpperCase() + project: this.formModel.project.toUpperCase(), + resourcesDomainName: this.formModel.resourcesDomainName }; if (data.id) { updateProjectServer(data.id, data).then(resp => { @@ -99,7 +106,8 @@ export default { this.formModel = { id: '', domainName: '', - project: '' + project: '', + resourcesDomainName: '' }; this.$refs.dataform.resetForm(); this.dialogVisible = false; diff --git a/src/views/system/serverManage/index.vue b/src/views/system/serverManage/index.vue index d94cb2698..a00b5c9a1 100644 --- a/src/views/system/serverManage/index.vue +++ b/src/views/system/serverManage/index.vue @@ -44,9 +44,13 @@ export default { indexShow: true, columns: [ { - title: '域名', + title: '接口域名', prop: 'domainName' }, + { + title: '资源域名', + prop: 'resourcesDomainName' + }, { title: '项目名称', prop: 'projectCode', From 68b9524cce8eea1f685940683f5c80ad80478f60 Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Wed, 29 Dec 2021 10:20:23 +0800 Subject: [PATCH 5/8] zanti --- src/store/modules/user.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 937e1b456..f38809366 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -81,7 +81,10 @@ const user = { }, setBaseUrl: (state, baseUrl) => { state.baseUrl = baseUrl; - } + }, + setResourcesUrl: (state, resourcesUrl) => { + state.resourcesUrl = resourcesUrl; + } }, actions: { @@ -213,6 +216,9 @@ const user = { setBaseUrl ({commit}, baseUrl) { commit('setBaseUrl', baseUrl); }, + setResourcesUrl({}, resourcesUrl) { + commit('setResourcesUrl', resourcesUrl); + }, setToken({commit}, token) { commit('SET_TOKEN', token); } From 3c2563e3d19de217440ab1fd54e1486cd0c7713e Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Wed, 29 Dec 2021 13:44:05 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/jlmap3d/assets3d.js | 2 +- src/components/QuillEditor/index.vue | 2 +- src/permission.js | 3 +++ src/store/modules/user.js | 5 +++-- src/views/drts/scene/trainingResult.vue | 2 +- src/views/drts/scene/voiceTraining.vue | 2 +- src/views/editor/index.vue | 2 +- src/views/messageBoard/index.vue | 2 +- src/views/newMap/chatView/chatContent.vue | 2 +- 9 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/api/jlmap3d/assets3d.js b/src/api/jlmap3d/assets3d.js index ea1a8238c..a7abce7b2 100644 --- a/src/api/jlmap3d/assets3d.js +++ b/src/api/jlmap3d/assets3d.js @@ -4,7 +4,7 @@ const publicPath = process.env.VUE_APP_PRO == 'local' ? '' : '/cbtc'; export const JL3D_LOCAL_STATIC = publicPath+"/static"; const BASE_UPLOAD_API = process.env.VUE_APP_UPLOAD_API; -export const BASE_ASSET_API = process.env.VUE_APP_VOICE_API; +export const BASE_ASSET_API = this.$store.user.state.resourcesUrl; // console.log(JL3D_LOCAL_STATIC); // console.log(BASE_UPLOAD_API); // console.log(BASE_ASSET_API); diff --git a/src/components/QuillEditor/index.vue b/src/components/QuillEditor/index.vue index 17795b027..37c7dd208 100644 --- a/src/components/QuillEditor/index.vue +++ b/src/components/QuillEditor/index.vue @@ -77,7 +77,7 @@ export default { size: 3, action: `${process.env.VUE_APP_UPLOAD_API}/api/upload/PICTURE?appId=00001&appSecret=joylink00001`, response: (res) => { - return `${process.env.VUE_APP_VOICE_API}${res.data}`; + return `${this.$store.user.state.resourcesUrl}${res.data}`; }, error: () => { that.$message.error('图片上传失败，请检查网络状态'); }, sizeError: () => { that.$message.error('图片上传失败，图片大小限制3MB'); } // 图片超过大小的回调 diff --git a/src/permission.js b/src/permission.js index f7fd84604..ad5a051dc 100644 --- a/src/permission.js +++ b/src/permission.js @@ -95,6 +95,9 @@ router.beforeEach( async (to, from, next) => { } else { store.dispatch('setBaseUrl', getBaseUrl()); } + if (resp && resp.data && resp.data.resourcesDomainName) { + store.dispatch('setResourcesUrl', resp.data.resourcesDomainName); + } } catch (e) { store.dispatch('setBaseUrl', getBaseUrl()); } diff --git a/src/store/modules/user.js b/src/store/modules/user.js index f38809366..ff71d64ee 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -21,7 +21,8 @@ const user = { companyAdmin: false, companyName: '', companyProjectList: [], - baseUrl:'' + baseUrl:'', + resourcesUrl: process.env.VUE_APP_VOICE_API }, mutations: { @@ -216,7 +217,7 @@ const user = { setBaseUrl ({commit}, baseUrl) { commit('setBaseUrl', baseUrl); }, - setResourcesUrl({}, resourcesUrl) { + setResourcesUrl({commit}, resourcesUrl) { commit('setResourcesUrl', resourcesUrl); }, setToken({commit}, token) { diff --git a/src/views/drts/scene/trainingResult.vue b/src/views/drts/scene/trainingResult.vue index 3351a9942..8f972d99a 100644 --- a/src/views/drts/scene/trainingResult.vue +++ b/src/views/drts/scene/trainingResult.vue @@ -95,7 +95,7 @@ export default { resultMap: {}, loading: false, audioPlayId: '', - baseUrl:process.env.VUE_APP_VOICE_API + baseUrl:this.$store.user.state.resourcesUrl }; }, watch: { diff --git a/src/views/drts/scene/voiceTraining.vue b/src/views/drts/scene/voiceTraining.vue index 2e1997c9b..ec950d496 100644 --- a/src/views/drts/scene/voiceTraining.vue +++ b/src/views/drts/scene/voiceTraining.vue @@ -84,7 +84,7 @@ export default { recordSendingId: null, audioDataMap: {}, audioPlayId: '', - baseUrl:process.env.VUE_APP_VOICE_API + baseUrl:this.$store.user.state.resourcesUrl }; }, watch: { diff --git a/src/views/editor/index.vue b/src/views/editor/index.vue index a1e85ad1f..dbe779aec 100644 --- a/src/views/editor/index.vue +++ b/src/views/editor/index.vue @@ -56,7 +56,7 @@ export default { }); uploadFile(action, that.formData).then(resp => { - const imgUrl = process.env.VUE_APP_VOICE_API + resp.data; + const imgUrl = this.$store.user.state.resourcesUrl + resp.data; insertImgFn(imgUrl); }).catch(error => { console.log(error); }); }; diff --git a/src/views/messageBoard/index.vue b/src/views/messageBoard/index.vue index e5dec87b1..8093202f4 100644 --- a/src/views/messageBoard/index.vue +++ b/src/views/messageBoard/index.vue @@ -204,7 +204,7 @@ export default { }, avatarUrl(val) { if (val && val.creatorAvatarPath) { - return process.env.VUE_APP_VOICE_API + val.creatorAvatarPath; + return this.$store.user.state.resourcesUrl + val.creatorAvatarPath; } else { return 'https://joylink.club/oss/wxmicro_assistant/userhead/defaultuser.png'; } diff --git a/src/views/newMap/chatView/chatContent.vue b/src/views/newMap/chatView/chatContent.vue index 15b245f94..71bed8c37 100644 --- a/src/views/newMap/chatView/chatContent.vue +++ b/src/views/newMap/chatView/chatContent.vue @@ -84,7 +84,7 @@ export default { // yuyin:yuyin, currentAudioIndex:0, isPlay:false, - baseUrl:process.env.VUE_APP_VOICE_API + baseUrl: this.$store.user.state.resourcesUrl }; }, watch:{ From c4e9ab23413f72a99fdf7f2ae99fe0676a617087 Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Wed, 29 Dec 2021 14:01:28 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=89=AC=E5=B7=9E=E5=B7=A5=E4=B8=9A?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/foshan_01/menus/menuDialog/helpAbout.vue | 8 ++++++-- .../theme/fuzhou_01/menus/menuDialog/helpAbout.vue | 3 ++- src/scripts/ProjectConfig.js | 4 ++++ .../newMap/displayNew/dispatherContest/contectUs.vue | 3 ++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/helpAbout.vue index d31b2e063..773909d2e 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuDialog/helpAbout.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/helpAbout.vue @@ -24,7 +24,7 @@ >确定
- 版权所有（C）2010-2011 北京玖琏科技有限公司 + 版权所有（C）2010-2011 北京玖琏科技有限公司
@@ -40,7 +40,8 @@