From 454dfcf300f262e9f69161ed7240a8bacb2be2ff Mon Sep 17 00:00:00 2001 From: xiepeng Date: Fri, 21 Jun 2024 17:58:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user_practitioner/choiceadd.vue | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/views/enterprise_management/user_practitioner/choiceadd.vue b/src/views/enterprise_management/user_practitioner/choiceadd.vue index 1a6c386..4a17484 100644 --- a/src/views/enterprise_management/user_practitioner/choiceadd.vue +++ b/src/views/enterprise_management/user_practitioner/choiceadd.vue @@ -53,7 +53,7 @@ - + @@ -455,13 +455,16 @@ : '' " > - + @@ -1053,9 +1056,6 @@ const fnGetData = async (USER_ID) => { form.QUALIFICATION_CERTIFICATE_VALIDITY = [ item.ID_VALIDITY_START, item.ID_VALIDITY_END, - - - ]; form.QUALIFICATION_CERTIFICATE_VALIDITY_START = item.ID_VALIDITY_START; form.QUALIFICATION_CERTIFICATE_VALIDITY_END = item.ID_VALIDITY_END; @@ -1081,6 +1081,9 @@ const fnGetData = async (USER_ID) => { data.form.SHIFTDUTYONE = ""; data.form.SHIFTDUTYTWO = ""; data.form.BZ = ""; + data.form.IS_SAFETY = 0; + data.form.ISHEAD = "0"; + data.form.ISLEADER = "0"; }; const fnGetUserRole = async () => { @@ -1278,7 +1281,7 @@ const fnSubmit = debounce( // ElMessage.error("已超过可创建用户数量"); // return; // } - formData.append("choice","choice") + formData.append("choice", "choice"); await setPractitionerAdd(formData); } else { if ( From dc7bd92ac7b131768945076290a813ad8eb0de18 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Tue, 25 Jun 2024 11:50:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/useListData.js | 2 +- .../user_practitioner/components/select_person.vue | 11 ++--------- .../hidden_danger_government/rectification/index.vue | 11 +++++++++-- .../class_management/index.vue | 6 +----- .../course_management/view.vue | 6 +++++- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/assets/js/useListData.js b/src/assets/js/useListData.js index a1b79eb..c9d68de 100644 --- a/src/assets/js/useListData.js +++ b/src/assets/js/useListData.js @@ -104,4 +104,4 @@ export const layoutFnGetHiddenLevelList = async () => { DICTIONARIES_ID: "5e7cf8620ba54ad89719d0be62133c7a", }); return ref(resData); -}; \ No newline at end of file +}; diff --git a/src/views/enterprise_management/user_practitioner/components/select_person.vue b/src/views/enterprise_management/user_practitioner/components/select_person.vue index 55246eb..1382ad1 100644 --- a/src/views/enterprise_management/user_practitioner/components/select_person.vue +++ b/src/views/enterprise_management/user_practitioner/components/select_person.vue @@ -8,10 +8,7 @@ - + @@ -24,10 +21,7 @@ - + @@ -129,7 +123,6 @@ const fnSubmit = debounce( }, { atBegin: true } ); - diff --git a/src/views/hidden_danger_government/rectification/index.vue b/src/views/hidden_danger_government/rectification/index.vue index 27736a6..bcc20ef 100644 --- a/src/views/hidden_danger_government/rectification/index.vue +++ b/src/views/hidden_danger_government/rectification/index.vue @@ -15,7 +15,12 @@ - + @@ -128,7 +133,9 @@ import { useRouter } from "vue-router"; import { serialNumber, translationStatus } from "@/assets/js/utils"; import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js"; -import useListData, { layoutFnGetHiddenLevelList } from "@/assets/js/useListData.js"; +import useListData, { + layoutFnGetHiddenLevelList, +} from "@/assets/js/useListData.js"; import { getHiddenDangerListAll } from "@/request/hidden_danger_government.js"; import { ElMessage } from "element-plus"; diff --git a/src/views/training_process_management/class_management/index.vue b/src/views/training_process_management/class_management/index.vue index f99a02f..35b9bad 100644 --- a/src/views/training_process_management/class_management/index.vue +++ b/src/views/training_process_management/class_management/index.vue @@ -129,11 +129,7 @@ width="150" fixed="left" /> - + diff --git a/src/views/training_resource_management/course_management/view.vue b/src/views/training_resource_management/course_management/view.vue index 95d799e..123283e 100644 --- a/src/views/training_resource_management/course_management/view.vue +++ b/src/views/training_resource_management/course_management/view.vue @@ -42,7 +42,11 @@ {{ item.NAME || item.COURSEWARENAME }} - + 课件时长：{{ secondConversion(item.VIDEOTIME) }} Date: Tue, 25 Jun 2024 18:04:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?app=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/request/api.js | 2 ++ src/views/login/index.vue | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/request/api.js b/src/request/api.js index 0434b80..ebf0e20 100644 --- a/src/request/api.js +++ b/src/request/api.js @@ -28,3 +28,5 @@ export const setVideo = (params) => post("/app/audioOrVideo/createUploadVideo", params); // 阿里云上传视频 export const setVideoRefresh = (params) => post("/app/audioOrVideo/refreshUploadVideo", params); // 阿里云上传视频刷新凭证 +export const getAppVersion = (params) => + post("/app/versionmanager/getVersion", params); // 获取动态路由 diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 13520ea..4f62e6f 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -62,7 +62,7 @@ >
{ + const resData = await getAppVersion(); + data.qyAppSrc = VITE_FILE_URL + resData.pd.FILEURL; +}; +await fnAppVersion(); const fnLogin = debounce( 1000, () => {