bug修复

back/src/mixins/view-module.js

@@ -107,7 +107,6 @@ export default {
         } else {
           this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
         }
-
         console.log('数据列表', this.dataList, this.mixinViewModuleOptions.getDataListURL)
         if (this.dataList[0].type === '组件服务') {
           this.dataList.map(val => {

back/src/router/index.js

@@ -104,7 +104,7 @@ router.beforeEach((to, from, next) => {
       Vue.prototype.$message.error(res.msg)
       return next({ name: 'login' })
     }
-    window.SITE_CONFIG.menuList = res.data
+    window.SITE_CONFIG.menuList = res.data.filter(item => item.site === 0)
     fnAddDynamicMenuRoutes(window.SITE_CONFIG.menuList)
     next({ ...to, replace: true })
   }).catch(() => {

back/src/views/main-sidebar.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: kongjun qdkongjun@gmail.com
  * @Date: 2022-06-20 09:29:59
- * @LastEditors: kongjun qdkongjun@gmail.com
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-22 10:04:56
+ * @LastEditTime: 2022-10-14 15:20:28
  * @FilePath: \back\src\views\main-sidebar.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -35,16 +35,16 @@
 
 <script>
 import http from '@/utils/request'
-import SubMenu from "./main-sidebar-sub-menu";
+import SubMenu from './main-sidebar-sub-menu'
-import returnLocationStr from '@/utils/location';
+import returnLocationStr from '@/utils/location'
 export default {
   data () {
     return {
       numObject: {}
-    };
+    }
   },
   components: {
-    SubMenu,
+    SubMenu
   },
   created () {
     this.getNum()
@@ -54,33 +54,33 @@ export default {
     getNum () {
       http.get('/act/task/myToDoTaskNum').then(({ data: res }) => {
         this.numObject = res.data
-   let menuList= window.SITE_CONFIG["menuList"];
+        const menuList = window.SITE_CONFIG.menuList
         for (var i = 0; i < menuList.length; i++) {
-     let menu=menuList[i];
+          const menu = menuList[i]
           if (menu.id == '1541261628388888578') { // 我的待办
             let daibanNum = 0
             for (let j = 0; j < menu.children.length; j++) {
-        let children=menu.children[j]
+              const children = menu.children[j]
-        if(children.id=="1541261780432408577"){//能力申请 v2
+              if (children.id == '1541261780432408577') { // 能力申请 v2
                 // 西海岸 v2  市局v3
                 children.total = returnLocationStr() == 'qingdao' ? Number(this.numObject.abilityprocess_v3) : Number(this.numObject.abilityprocess_v2)
                 daibanNum = Number(daibanNum) + Number(children.total)
-      } if(children.id=="1559376285703081986"){//会议室审核
+              } if (children.id == '1559376285703081986') { // 会议室审核
                 children.total = Number(this.numObject.meetingroom_book)
                 daibanNum = Number(daibanNum) + Number(children.total)
-      }if(children.id=="1545292602084827138"){//能力资源上架
+              } if (children.id == '1545292602084827138') { // 能力资源上架
                 children.total = Number(this.numObject.resourcemountapply)
                 daibanNum = Number(daibanNum) + Number(children.total)
-      }if(children.id=="1545312045695377410"){//能力需求申请
+              } if (children.id == '1545312045695377410') { // 能力需求申请
                 children.total = Number(this.numObject.abilitydemandapply)
                 daibanNum = Number(daibanNum) + Number(children.total)
-      }if(children.id=="1545313018614521857"){//能力需求下架
+              } if (children.id == '1545313018614521857') { // 能力需求下架
                 children.total = Number(this.numObject.resourcundercarriageapply)
                 daibanNum = Number(daibanNum) + Number(children.total)
-      }if(children.id=="1545313754106699777"){//评论审核
+              } if (children.id == '1545313754106699777') { // 评论审核
                 children.total = Number(this.numObject.comment_review)
                 daibanNum = Number(daibanNum) + Number(children.total)
-      }if(children.id=="1554294862931562498"){//会议室 暂无
+              } if (children.id == '1554294862931562498') { // 会议室 暂无
                 children.total = 0
                 daibanNum = Number(daibanNum) + Number(children.total)
               }
@@ -91,7 +91,8 @@ export default {
         this.$store.state.sidebarMenuList = menuList
       })
     }
-}};
+  }
+}
 </script>
 <style scoped lang="scss">
 .aui-sidebar {

back/src/views/modules/devtools/generator-menu.vue

@@ -81,7 +81,7 @@ export default {
     init () {
       this.visible = true
       this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
+        this.$refs.dataForm.resetFields()
         this.iconList = getIconList()
         this.dataForm.parentName = this.$t('menu.parentNameDefault')
         this.getMenuList()
@@ -89,11 +89,12 @@ export default {
     },
     // 获取菜单列表
     getMenuList () {
+      console.log('获取菜单位置1')
       return this.$http.get('/sys/menu/list?type=0').then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
-        this.menuList = res.data
+        this.menuList = res.data.filter(item => item.site === 0)
       }).catch(() => {})
     },
     // 上级菜单树, 设置默认值
@@ -114,11 +115,11 @@ export default {
     },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
+      this.$refs.dataForm.validate((valid) => {
         if (!valid) {
           return false
         }
-        this.$http['post']('/devtools/menu', this.dataForm).then(({ data: res }) => {
+        this.$http.post('/devtools/menu', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
@@ -133,7 +134,7 @@ export default {
           })
         }).catch(() => {})
       })
-    }, 1000, { 'leading': true, 'trailing': false })
+    }, 1000, { leading: true, trailing: false })
   }
 }
 </script>

back/src/views/modules/sys/menu-add-or-update.vue

@@ -123,11 +123,12 @@ export default {
     },
     // 获取菜单列表
     getMenuList () {
+      console.log('获取菜单位置2')
       return this.$http.get('/sys/menu/list?type=0').then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
-        this.menuList = res.data
+        this.menuList = res.data.filter(item => item.site === 0)
       }).catch(() => {})
     },
     // 获取信息

back/src/views/modules/sys/menu.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Author: hisense.wuhongjian
+ * @Date: 2022-06-14 09:30:23
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-10-17 14:54:26
+ * @Description: 告诉大家这是什么
+-->
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__menu">

front/src/store/modules/user.js

@@ -15,6 +15,7 @@ const state = () => ({
   accessToken: getAccessToken(),
   username: '',
   realName: '',
+  deptName: '',
   userId: '',
   avatar: '',
   role: 0, // 用户管理员权限
@@ -26,6 +27,7 @@ const getters = {
   avatar: (state) => state.avatar,
   role: (state) => state.role,
   userId: (state) => state.userId,
+  deptName: (state) => state.deptName,
 }
 const mutations = {
   /**
@@ -64,6 +66,10 @@ const mutations = {
   setUserId(state, id) {
     state.userId = id
   },
+  // 设置用户单位
+  setDeptName(state, name) {
+    state.deptName = name
+  },
   /**
    * @author chuzhixin 1204505056@qq.com
    * @description 设置头像
@@ -136,6 +142,7 @@ const actions = {
     commit('setRealname', res.data.data.realName)
     commit('setRole', res.data.data.roleIdList.length)
     commit('setUserId', res.data.data.id)
+    commit('setDeptName', res.data.data.deptName)
     // TODO 获取用户信息，后续执行部分操作
     // let { username, avatar, roles, ability } = data
     // if (username && roles && Array.isArray(roles)) {

front/src/views/home/apply.vue

@@ -8,36 +8,93 @@
         </div>
         <div class="form-container">
           <div v-if="applySuccess">
-            <a-form ref="formRef" :model="formName" name="basic" :label-col="{ style: { width: '106px' } }"
+            <a-form
-              :wrapper-col="{ style: { width: '230px' } }" labelAlign="left" autocomplete="off">
+              ref="formRef"
+              :model="formName"
+              name="basic"
+              :label-col="{ style: { width: '106px' } }"
+              :wrapper-col="{ style: { width: '230px' } }"
+              labelAlign="left"
+              autocomplete="off"
+            >
               <div class="base-info flex-row-start">
-                <a-form-item label="申请标题" name="title" :rules="[{ required: true, message: '请输入申请标题' }]">
+                <a-form-item
-                  <a-input placeholder="请输入能力申请标题" v-model:value="formName.title" />
+                  label="申请标题"
+                  name="title"
+                  :rules="[{ required: true, message: '请输入申请标题' }]"
+                >
+                  <a-input
+                    placeholder="请输入能力申请标题"
+                    v-model:value="formName.title"
+                  />
                 </a-form-item>
                 <!-- 西海岸-摄像头-增加过期时间 -->
-                <a-form-item v-if="isCamera && isXiHaiAn" label="过期时间" name="expireDate"
+                <a-form-item
-                  :rules="[{ required: true, message: '请选择过期时间' }]" style="margin-left: 22px">
+                  v-if="isCamera && isXiHaiAn"
-                  <a-select v-model:value="formName.expireDate" placeholder="请选择过期时间" style="width: 200px"
+                  label="过期时间"
-                    :options="expireDateOptions"></a-select>
+                  name="expireDate"
+                  :rules="[{ required: true, message: '请选择过期时间' }]"
+                  style="margin-left: 22px"
+                >
+                  <a-select
+                    v-model:value="formName.expireDate"
+                    placeholder="请选择过期时间"
+                    style="width: 200px"
+                    :options="expireDateOptions"
+                  ></a-select>
                 </a-form-item>
               </div>
               <div class="base-info">
-                <a-form-item label="申请人信息" name="user" :rules="[{ required: true, message: '请输入申请人' }]">
+                <a-form-item
-                  <a-input placeholder="请输入申请人" v-model:value="formName.user" disabled />
+                  label="申请人信息"
+                  name="user"
+                  :rules="[{ required: true, message: '请输入申请人' }]"
+                >
+                  <a-input
+                    placeholder="请输入申请人"
+                    v-model:value="formName.user"
+                    disabled
+                  />
                 </a-form-item>
-                <a-form-item style="margin: 0 22px" label="电话" name="phone" :rules="[
+                <a-form-item
+                  style="margin: 0 22px"
+                  label="电话"
+                  name="phone"
+                  :rules="[
                     {
                       required: true,
                       pattern: /^1[3456789]\d{9}$/,
                       message: '请输入正确的电话号码',
                     },
-                ]">
+                  ]"
-                  <a-input placeholder="请输入申请人电话" v-model:value="formName.phone" />
+                >
+                  <a-input
+                    placeholder="请输入申请人电话"
+                    v-model:value="formName.phone"
+                  />
                 </a-form-item>
-                <a-form-item label="单位" name="unit" :rules="[{ required: true, message: '请输入单位' }]">
+                <a-form-item
-                  <a-input placeholder="请输入单位" v-model:value="formName.unit" disabled v-if="deptFlage" />
+                  label="单位"
-                  <a-select v-else placeholder="请选择归属部门" v-model:value="formName.unit" @change="deptIdChangeFunction">
+                  name="unit"
-                    <a-select-option v-for="(item, index) in deptNameAll" :key="`${index}-${item}`" :value="item.name">
+                  :rules="[{ required: true, message: '请输入单位' }]"
+                >
+                  <a-input
+                    placeholder="请输入单位"
+                    v-model:value="formName.unit"
+                    disabled
+                    v-if="deptFlage"
+                  />
+                  <a-select
+                    v-else
+                    placeholder="请选择归属部门"
+                    v-model:value="formName.unit"
+                    @change="deptIdChangeFunction"
+                  >
+                    <a-select-option
+                      v-for="(item, index) in deptNameAll"
+                      :key="`${index}-${item}`"
+                      :value="item.name"
+                    >
                       {{ item.name }}
                     </a-select-option>
                   </a-select>
@@ -45,29 +102,63 @@
               </div>
               <div class="base-info" v-if="flag">
                 <div style="margin-bottom: 24px">
-                  <a-form-item style="margin-bottom: 0" label="应用系统" name="applicationSystem"
+                  <a-form-item
-                    :rules="[{ required: true, message: '请选择应用系统' }]">
+                    style="margin-bottom: 0"
-                    <a-select v-model:value="formName.applicationSystem" show-search placeholder="请选择应用系统"
+                    label="应用系统"
-                      style="width: 230px" :options="systemOptions" @focus="handleFocus" @blur="handleBlur"
+                    name="applicationSystem"
-                      @change="systemHandleChange" @search="systemHandleSearch"></a-select>
+                    :rules="[{ required: true, message: '请选择应用系统' }]"
+                  >
+                    <a-select
+                      v-model:value="formName.applicationSystem"
+                      show-search
+                      placeholder="请选择应用系统"
+                      style="width: 230px"
+                      :options="systemOptions"
+                      @focus="handleFocus"
+                      @blur="handleBlur"
+                      @change="systemHandleChange"
+                      @search="systemHandleSearch"
+                    ></a-select>
                   </a-form-item>
-                  <span style="font-size: 12px; color: #666; padding-left: 106px">
+                  <span
+                    style="font-size: 12px; color: #666; padding-left: 106px"
+                  >
                     如选项没有系统请新增
                   </span>
                 </div>
-                <a-form-item class="applicationScene" label="应用领域" name="applicationScene"
+                <a-form-item
-                  :rules="[{ required: true, message: '请选择应用领域' }]" style="width: 6.93rem">
+                  class="applicationScene"
-                  <a-select v-model:value="formName.applicationScene" :options="applicationSceneOpthion" mode="tags"
+                  label="应用领域"
-                    :size="size" placeholder="请选择应用领域" :filterOption="false" :searchValue="false"
+                  name="applicationScene"
-                    style="width: 5.87rem"></a-select>
+                  :rules="[{ required: true, message: '请选择应用领域' }]"
+                  style="width: 6.93rem"
+                >
+                  <a-select
+                    v-model:value="formName.applicationScene"
+                    :options="applicationSceneOpthion"
+                    mode="tags"
+                    :size="size"
+                    placeholder="请选择应用领域"
+                    :filterOption="false"
+                    :searchValue="false"
+                    style="width: 5.87rem"
+                  ></a-select>
                 </a-form-item>
               </div>
               <div>
-                <a-form-item label="需求依据" name="applicationBackground" :rules="[
+                <a-form-item
+                  label="需求依据"
+                  name="applicationBackground"
+                  :rules="[
                     { required: true, message: '请输入需求依据' },
                     { min: 50, message: '需求依据最少为50个字' },
-                ]">
+                  ]"
-                  <a-textarea placeholder="请输入需求依据" v-model:value="formName.applicationBackground" :rows="4" />
+                >
+                  <a-textarea
+                    placeholder="请输入需求依据"
+                    v-model:value="formName.applicationBackground"
+                    :rows="4"
+                  />
                 </a-form-item>
               </div>
 
@@ -75,9 +166,20 @@
               <div v-if="iskfq && isXiHaiAn">
                 <a-row style="margin-top: 0.4rem">
                   <a-col :span="24">
-                    <a-form-item name="attachment" label="附件上传" class="introduction" :rules="[{ required: true, message: '请上传附件' }]">
+                    <a-form-item
-                      <a-upload :max-count="1" accept=".doc,.docx,pdf" v-model:file-list="fileList"
+                      name="attachment"
-                        :action="`${apiURL}/upload`" @remove="handleRemove" @change="roomUpload">
+                      label="附件上传"
+                      class="introduction"
+                      :rules="[{ required: true, message: '请上传附件' }]"
+                    >
+                      <a-upload
+                        :max-count="1"
+                        accept=".doc,.docx,pdf"
+                        v-model:file-list="fileList"
+                        :action="`${apiURL}/upload`"
+                        @remove="handleRemove"
+                        @change="roomUpload"
+                      >
                         <a-button>
                           <upload-outlined>选择上传附件</upload-outlined>
                         </a-button>
@@ -90,16 +192,31 @@
                 </a-row>
                 <a-row>
                   <a-col :span="24" style="margin-left: 106px">
-                    <a href="/static/download/感知资源申请表.doc" download="感知资源申请表">感知资源申请表模板下载</a>
+                    <a
+                      href="/static/download/感知资源申请表.doc"
+                      download="感知资源申请表"
+                    >
+                      感知资源申请表模板下载
+                    </a>
                   </a-col>
                 </a-row>
               </div>
 
               <div class="bottom-btn">
-                <a-button class="cancel-apply" type="primary" html-type="cancle" @click="resetFields()">
+                <a-button
+                  class="cancel-apply"
+                  type="primary"
+                  html-type="cancle"
+                  @click="resetFields()"
+                >
                   退出申请
                 </a-button>
-                <a-button class="confirm-apply" type="primary" html-type="submit" @click="processStartHandle()">
+                <a-button
+                  class="confirm-apply"
+                  type="primary"
+                  html-type="submit"
+                  @click="processStartHandle()"
+                >
                   提交申请
                 </a-button>
               </div>
@@ -143,6 +260,7 @@ import { sgcDel, getApplyForm } from '@/api/personalCenter'
   import { pageWithAttrs, updateIntegrationServices } from '@/api/home'
   import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   import { getIntegrationDetail, soldierApply } from '@/api/home'
+  import { useStore } from 'vuex'
   import * as moment from 'moment'
 
   export default {
@@ -154,6 +272,8 @@ export default {
     },
     setup() {
       const router = useRouter()
+      const store = useStore()
+      const deptName = store.getters['user/deptName']
       const disabled = ref(false)
       const flag = ref(false)
       const list = ref(JSON.parse(localStorage.getItem('applyList')))
@@ -211,8 +331,17 @@ export default {
       // 西海岸-判断是否是基础设施-摄像头
       const isCamera = ref(false)
       // 西海岸-是否是开发区公安分局，是的话，增加上传附件字段
-    let note1 = JSON.parse(list.value[0] && list.value[0].arr && list.value[0].arr[0].note1 || "[]");
+      let note1 = JSON.parse(
-    let iskfq = ref(note1.some(v => v.managementUnitName == '开发区公安局' || v.managementUnitName == '开发区公安分局'))
+        (list.value[0] && list.value[0].arr && list.value[0].arr[0].note1) ||
+          '[]'
+      )
+      let iskfq = ref(
+        note1.some(
+          (v) =>
+            v.managementUnitName == '开发区公安局' ||
+            v.managementUnitName == '开发区公安分局'
+        )
+      )
       if (
         list.value[0] &&
         list.value[0].arr &&
@@ -661,11 +790,14 @@ export default {
           if (res.data.data.records.length == 0) {
             message.warning('该关键词，暂无应用资源！')
           } else {
+            // 过滤本单位的应用系统
             res.data.data.records.map((val) => {
+              if (val.deptName === deptName) {
                 systemOptions2.value.push({
                   value: val.name,
                   label: val.name,
                 })
+              }
             })
             // console.log('第一次获取===================>', systemOptions2.value)
           }
@@ -755,7 +887,11 @@ export default {
                   query: {
                     select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
                     // 基础设施类型
-                  facilitiesType: list.value[0] && list.value[0].arr && list.value[0].arr[0] && list.value[0].arr[0].type
+                    facilitiesType:
+                      list.value[0] &&
+                      list.value[0].arr &&
+                      list.value[0].arr[0] &&
+                      list.value[0].arr[0].type,
                   },
                 })
               }, 1000)