lcw

src/permission.js

@@ -14,42 +14,45 @@ const whiteList = ['/login','/', '/oatuh_login', '/sso_redirect', '/editPassword
  *  next 往下走
  */
 let onRun = true;
-// router.beforeEach(async (to, from, next) => {
+router.beforeEach(async (to, from, next) => {
-//   // 存在 token ，进入主页
+  // 存在 token ，进入主页
-//   // if (store.state.user.token) {
+  // if (store.state.user.token) {
-//   // 快捷访问
+  // 快捷访问
-//   if (store.getters.token) {
+  if (store.getters.token) {
-//     // 判断用户资料是否获取
+    // 判断用户资料是否获取
-//     // 若不存在用户信息，则需要获取用户信息
+    // 若不存在用户信息，则需要获取用户信息
-//     // 触发获取用户信息的 action，并获取用户当前权限
+    // 触发获取用户信息的 action，并获取用户当前权限
-//     await store.commit('permission/setRouteReady', true)
+    await store.commit('permission/setRouteReady', true)
-//     // 添加完动态路由之后，需要在进行一次主动跳转
+    // 添加完动态路由之后，需要在进行一次主动跳转
-//     const afterMenuList = await getItem('menusPermission');
+    const afterMenuList = await getItem('menusPermission');
-//     // 处理用户权限，筛选出需要添加的权限
+    // 处理用户权限，筛选出需要添加的权限
-//     if (store.state.permission.routes == 0) {
+    if (store.state.permission.routes == 0) {
-//       const filterRoutes = await store.dispatch('permission/filterRoutes', afterMenuList)
+      const filterRoutes = await store.dispatch('permission/filterRoutes', afterMenuList)
-//       filterRoutes.forEach(item => {
+
-//         router.addRoute(item)
+      console.log(filterRoutes);
-//       })
+
-//       next({
+      filterRoutes.forEach(item => {
-//         ...to,
+        router.addRoute(item)
-//         replace: true
+      })
-//       })
+      next({
-//     } else {
+        ...to,
-//       next()
+        replace: true
-//     }
+      })
-//     // 利用 addRoute 循环添加
+    } else {
-//   } else {
+      next()
-//     const isOatuh = getItem('isOatuh')
+    }
-//     // 没有token的情况下，可以进入白名单
+    // 利用 addRoute 循环添加
-//     if (whiteList.indexOf(to.path) > -1) {
+  } else {
-//       next()
+    const isOatuh = getItem('isOatuh')
-//     } else {
+    // 没有token的情况下，可以进入白名单
-//       if (isOatuh) {
+    if (whiteList.indexOf(to.path) > -1) {
-//         next('/oatuh_login')
+      next()
-//       } else {
+    } else {
-//         next('/login')
+      if (isOatuh) {
-//       }
+        next('/oatuh_login')
-//     }
+      } else {
-//   }
+        next('/login')
-// })
+      }
+    }
+  }
+})

src/views/Training/SecurityTrainingSyllabus/components/detailForm.vue

@@ -49,7 +49,7 @@ const formList = reactive([
     { label: "学时安排", prop: "gksc", type: "input" },
   ],
   [
-    { label: "上传附件", prop: "fj", type: "upload" },
+    { label: "上传附件", prop: "fj", type: "upload", isAll: true, showBtn: true, isImg: false },
   ],
 ])
 
@@ -63,8 +63,8 @@ const init = (type, id,) => {
 };
 
 function getDateById (id) {
-  qcckPost({},`/bagl/mosty-base/baxx/jxda/getInfo/${id}`).then((res) => {
+  qcckPost({},`/mosty-base/baxx/jxda/getInfo/${id}`).then((res) => {
-    res.fj = res.fj ? res.fj.split(','):[]
+    res.fj = res.fj ? JSON.parse(res.fj):[]
     listQuery.value = res || {};
   })
 }
@@ -74,7 +74,11 @@ const save = () => {
     loading.value = true;
     let url = title.value == '新增' ? `/bagl/mosty-base/baxx/jxda/add` : `/bagl/mosty-base/baxx/jxda/edit`;
     let params = { ...val }
-    params.fj = params.fj ? params.fj.join(','):''
+    params.fj = params.fj ? JSON.stringify(params.fj):''
+
+    console.log(params, val);
+
+    return
     qcckPost(params, url).then(() => {
       loading.value = false;
       proxy.$message.success("保存成功");
@@ -87,7 +91,7 @@ const save = () => {
 }
 const close = () => {
   dialogForm.value = false;
-  listQuery.value = {fj:[]}
+  listQuery.value.fj = []
   FormRef.value.reset()
 };;
 

src/views/login/index.vue

@@ -142,6 +142,8 @@ const handleLogin = () => {
         // 登录后操作;
         if (res.deptList.length === 1) {
           router.push("/");
+          console.log("xxxxxxx");
+
           // window.location.href = "/";
         } else {
           deptList.value = [...res.deptList];

src/views/securityManagement/trainingManagement/trainingProject/components/addPxxm.vue

@@ -57,11 +57,10 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="授课教员" :prop="`pxkcList[${index}].skjy`" style="width: 100%;" :rules="rules.skjy">
-                          <el-input v-model="item.skjy" placeholder="请选择授课教员" style="width: 100%;"></el-input>
+                          <!-- <el-input v-model="item.skjy" placeholder="请选择授课教员" style="width: 100%;"></el-input> -->
-                            <!-- <el-select v-model="item.skjy" placeholder="请选择授课教员" style="width: 100%;">
+                            <el-select v-model="item.skjy" placeholder="请选择授课教员" style="width: 100%;">
-                                <el-option label="张三" value="张三"></el-option>
+                                <el-option v-for="items in cyryList" :key="items.id" :label="items?.xm" :value="items.id"></el-option>
-                                <el-option label="李四" value="李四"></el-option>
+                            </el-select>
-                            </el-select> -->
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -102,6 +101,7 @@ import SelectPersonnelDialog from "./selectPersonnelDialog.vue";
 const { proxy } = getCurrentInstance()
 const visible = ref(false)
 const showDialog = ref(false)
+const cyryList = ref([])
 const formData = ref({
     pxkcList: [{
         pxkcxm: '', //课程名称
@@ -173,6 +173,7 @@ const delItem = (item,index) => {
 }
 
 const init = () => {
+  getCyryList()
   showDialog.value = true
 }
 
@@ -197,6 +198,18 @@ const handleChange = (val) => {
   pageData.tableData = [...pageData.tableData, ...val]?.filter((i, index, arr) => arr?.findIndex(s => i?.id === s?.id) === index)
 }
 
+// 获取授课教员
+const getCyryList = async () => {
+  const res = await qcckPost({
+    pxgsid: "",
+    gw: '04'
+  }, `/mosty-base//baxx/cyry/list`)
+
+  if (res) {
+    cyryList.value = res
+  }
+}
+
 const save = () => {
   if (pageData.tableData.length === 0) return proxy.$message.warning('请选择培训保安人员')
   const ryidList = pageData.tableData?.map(i => i?.id)

src/views/securityManagement/unitManagement/unitInformation/components/viewDetailsDialog.vue

@@ -11,7 +11,7 @@
       <el-descriptions column="3" border label-width="180px">
         <el-descriptions-item label="单位名称(营业执照登记名称)">{{ formData.dwmc }}</el-descriptions-item>
         <el-descriptions-item label="统一社会信用代码">{{ formData.xydm }}</el-descriptions-item>
-        <el-descriptions-item label="娱乐场所图片" :rowspan="4">
+        <el-descriptions-item label="单位图片" :rowspan="4">
           <div class="imgWrapper">
             <Upload v-model="formData.cszp" />
           </div>