From c4af4ee9969717d83f7472f1d5aa6fd85badfa3d Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Wed, 22 Dec 2021 13:34:52 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=AF=95=E5=8D=B7=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/api/management/exam.js | 8 ++++ src/utils/baseUrl.js | 4 +- src/views/organization/examManage/index.vue | 10 +++++ src/views/publish/examRule/draft/index.vue | 12 ++++-- src/views/publish/examRule/draft/rule.vue | 48 ++++++++++++++++++++- 5 files changed, 75 insertions(+), 7 deletions(-) diff --git a/src/api/management/exam.js b/src/api/management/exam.js index 0bd53c1a7..dbf029eca 100644 --- a/src/api/management/exam.js +++ b/src/api/management/exam.js @@ -90,3 +90,11 @@ export function getExamListByMapIdAndPrdType(mapId, prdType) { params: { prdType: prdType } }); } +/** 更新试卷规则 */ +export function updateExamRule(data) { + return request({ + url: `/api/exam/update/rules`, + method: 'put', + data:data + }); +} diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 810bf8b53..85ac2f3b5 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -3,14 +3,14 @@ export function getBaseUrl() { if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; // BASE_API = 'https://test.joylink.club/jlcloud'; - BASE_API = 'http://114.116.51.125/jlcloud'; + // BASE_API = 'http://114.116.51.125/jlcloud'; // BASE_API = 'http://192.168.8.152:9000'; // 袁琪 // BASE_API = 'http://192.168.8.172:9200'; // 旭强 // BASE_API = 'http://192.168.8.109:9000'; // 张赛 // BASE_API = 'http://192.168.8.140:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 - // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 + BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 } else { BASE_API = process.env.VUE_APP_BASE_API; } diff --git a/src/views/organization/examManage/index.vue b/src/views/organization/examManage/index.vue index 0424ce711..b1f4ff0a2 100644 --- a/src/views/organization/examManage/index.vue +++ b/src/views/organization/examManage/index.vue @@ -86,6 +86,16 @@ export default { }, tagType: (row) => { return ''; } }, + { + title: '试卷规则状态', + prop: 'abnormal', + type: 'tag', + width: '80', + columnValue: (row) => { + return row.abnormal ? '异常' : '正常'; + }, + tagType: (row) => { return ''; } + }, { title: '开始时间', prop: 'startTime' diff --git a/src/views/publish/examRule/draft/index.vue b/src/views/publish/examRule/draft/index.vue index 1eb8e3a15..d20741d12 100644 --- a/src/views/publish/examRule/draft/index.vue +++ b/src/views/publish/examRule/draft/index.vue @@ -62,13 +62,13 @@ export default { return this.display == 2; }, isNextStep() { - return this.display == 1 && this.$route.params.mode != 'edit'; + return this.display == 1; }, isUpdate() { - return this.display == 1 && this.$route.params.mode == 'edit'; + return this.$route.params.mode == 'edit'; }, isCreate() { - return this.display == 2; + return this.display == 2 && this.$route.params.mode !== 'edit'; }, isFastCreate() { return this.display == 1 && this.$route.params.mode != 'edit' && Number(this.$route.params.ruleId); @@ -149,7 +149,11 @@ export default { this.$refs.exam.checkedForm('goNextStep'); }, update() { - this.$refs.exam.updateForm(); + if(this.display === 1) { + this.$refs.exam.updateForm(); + } else if (this.display === 2) { + this.$refs.rule.updateOk(); + } }, create() { this.$refs.rule.creatOk(); diff --git a/src/views/publish/examRule/draft/rule.vue b/src/views/publish/examRule/draft/rule.vue index 20a1d6c73..9c5cfe099 100644 --- a/src/views/publish/examRule/draft/rule.vue +++ b/src/views/publish/examRule/draft/rule.vue @@ -38,7 +38,7 @@ + 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 8/9] =?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 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 9/9] =?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 @@