Merge branch 'dev' of http://47.92.113.182:3000/wangpeng/integrated_traffic_vue into dev

src/assets/js/useListData.js

@@ -104,4 +104,4 @@ export const layoutFnGetHiddenLevelList = async () => {
     DICTIONARIES_ID: "5e7cf8620ba54ad89719d0be62133c7a",
   });
   return ref(resData);
-};
+};

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); // 获取动态路由

src/views/enterprise_management/user_practitioner/choiceadd.vue

@@ -53,7 +53,7 @@
 
         <el-col :span="8">
           <el-form-item label="手机号" prop="PHONE">
-            <el-input v-model="data.form.PHONE" placeholder="请输入" disabled/>
+            <el-input v-model="data.form.PHONE" placeholder="请输入" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -455,13 +455,16 @@
                         : ''
                     "
                   >
-                    <el-select v-model="data.form.DRIVING_MODEL_ARR" disabled multiple>
+                    <el-select
+                      v-model="data.form.DRIVING_MODEL_ARR"
+                      disabled
+                      multiple
+                    >
                       <el-option
                         v-for="item in data.drivingModelList"
                         :key="item.DICTIONARIES_ID"
                         :label="item.NAME"
                         :value="item.DICTIONARIES_ID"
-
                       />
                     </el-select>
                   </el-form-item>
@@ -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 (

src/views/enterprise_management/user_practitioner/components/select_person.vue

@@ -8,10 +8,7 @@
       <el-row>
         <el-col :span="5">
           <el-form-item label="姓名" prop="NAME">
-            <el-input
+            <el-input v-model="searchForm.NAME" placeholder="请输入姓名" />
-              v-model="searchForm.NAME"
-              placeholder="请输入姓名"
-            />
           </el-form-item>
         </el-col>
         <el-col :span="5">
@@ -24,10 +21,7 @@
         </el-col>
         <el-col :span="5">
           <el-form-item label="手机号" prop="PHONE">
-            <el-input
+            <el-input v-model="searchForm.PHONE" placeholder="请输入手机号" />
-              v-model="searchForm.PHONE"
-              placeholder="请输入手机号"
-            />
           </el-form-item>
         </el-col>
         <el-col :span="5">
@@ -129,7 +123,6 @@ const fnSubmit = debounce(
   },
   { atBegin: true }
 );
-
 </script>
 
 <style scoped lang="scss"></style>

src/views/hidden_danger_government/rectification/index.vue

@@ -15,7 +15,12 @@
           <el-col :span="6">
             <el-form-item label="隐患级别：" prop="HIDDENLEVEL">
               <el-select v-model="searchForm.HIDDENLEVEL" placeholder="请选择">
-                <el-option v-for="item in hiddenLevelList" :key="item.BIANMA" :label="item.NAME" :value="item.BIANMA" />
+                <el-option
+                  v-for="item in hiddenLevelList"
+                  :key="item.BIANMA"
+                  :label="item.NAME"
+                  :value="item.BIANMA"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -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";
 

src/views/login/index.vue

@@ -62,7 +62,7 @@
         >
           <div>
             <layout-qr-code
-              src="https://file.zcloudchina.com/YTHFile/TrafficFile/uploadFiles/app/traffic_prevention_app.apk"
+              :src="data.qyAppSrc"
               :width="120"
               :height="120"
               :margin="false"
@@ -86,11 +86,12 @@ import { useRouter } from "vue-router";
 import { ElMessage } from "element-plus";
 import Verification from "@/components/verification/index";
 import { useUserStore } from "@/pinia/user";
-import { Login } from "@/request/api";
+import { getAppVersion, Login } from "@/request/api";
 import { debounce } from "throttle-debounce";
 import useFormValidate from "@/assets/js/useFormValidate.js";
 import LayoutQrCode from "@/components/qr_code/index.vue";
 
+const VITE_FILE_URL = import.meta.env.VITE_FILE_URL;
 const router = useRouter();
 const formRef = ref(null);
 const verificationPass = ref(false);
@@ -104,8 +105,14 @@ const data = reactive({
     username: [{ required: true, message: "请输入用户名", trigger: "blur" }],
     password: [{ required: true, message: "请输入密码", trigger: "blur" }],
   },
+  qyAppSrc: "",
 });
 
+const fnAppVersion = async () => {
+  const resData = await getAppVersion();
+  data.qyAppSrc = VITE_FILE_URL + resData.pd.FILEURL;
+};
+await fnAppVersion();
 const fnLogin = debounce(
   1000,
   () => {

src/views/training_process_management/class_management/index.vue

@@ -129,11 +129,7 @@
           width="150"
           fixed="left"
         />
-        <el-table-column
+        <el-table-column label="培训类型" prop="TRAININGTYPE_NAME" width="70" />
-          label="培训类型"
-          prop="TRAININGTYPE_NAME"
-          width="70"
-        />
         <el-table-column label="岗位类型" prop="POSTTYPE_NAME" width="150" />
         <el-table-column label="培训等级" prop="TRAINLEVEL_NAME" width="150" />
         <el-table-column label="负责人" prop="PRINCIPAL" width="150" />

src/views/training_resource_management/course_management/view.vue

@@ -42,7 +42,11 @@
           <span class="directory_name" style="margin-right: 20px">
             {{ item.NAME || item.COURSEWARENAME }}
           </span>
-          <span v-if="item.COURSEWARENAME" class="directory_type" style="margin-right: 20px">
+          <span
+            v-if="item.COURSEWARENAME"
+            class="directory_type"
+            style="margin-right: 20px"
+          >
             课件时长：{{ secondConversion(item.VIDEOTIME) }}
           </span>
           <el-button