From 811e80a27ccab17351dff7ac8057f7e1df8430c8 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 18 Oct 2022 15:14:50 +0800
Subject: [PATCH 01/13] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/mixins/view-module.js                |    1 -
 back/src/router/index.js                      |    2 +-
 back/src/views/main-sidebar.vue               |   99 +-
 .../views/modules/devtools/generator-menu.vue |   13 +-
 .../views/modules/sys/menu-add-or-update.vue  |    3 +-
 back/src/views/modules/sys/menu.vue           |    7 +
 front/src/store/modules/user.js               |    7 +
 front/src/views/home/apply.vue                | 1660 +++++++++--------
 8 files changed, 972 insertions(+), 820 deletions(-)

diff --git a/back/src/mixins/view-module.js b/back/src/mixins/view-module.js
index 98b075fb..edd9378c 100644
--- a/back/src/mixins/view-module.js
+++ b/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 => {
diff --git a/back/src/router/index.js b/back/src/router/index.js
index c386dc1b..08f69ea5 100644
--- a/back/src/router/index.js
+++ b/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(() => {
diff --git a/back/src/views/main-sidebar.vue b/back/src/views/main-sidebar.vue
index 40f882b0..66f28d04 100644
--- a/back/src/views/main-sidebar.vue
+++ b/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
- * @LastEditTime: 2022-06-22 10:04:56
+ * @LastEditors: hisense.wuhongjian
+ * @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
 -->
@@ -25,7 +25,7 @@
           :menu="menu"
         >
         <span>sdddd</span>
-     
+
         </sub-menu>
       </div>
       </el-menu>
@@ -35,63 +35,64 @@
 
 <script>
 import http from '@/utils/request'
-import SubMenu from "./main-sidebar-sub-menu";
-import returnLocationStr from '@/utils/location';
+import SubMenu from './main-sidebar-sub-menu'
+import returnLocationStr from '@/utils/location'
 export default {
-  data() {
+  data () {
     return {
-      numObject:{}
-    };
+      numObject: {}
+    }
   },
   components: {
-    SubMenu,
+    SubMenu
   },
-  created() {
+  created () {
     this.getNum()
-    //this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
+    // this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
   },
   methods: {
-    getNum(){
+    getNum () {
       http.get('/act/task/myToDoTaskNum').then(({ data: res }) => {
-    this.numObject=res.data
-   let menuList= window.SITE_CONFIG["menuList"];
-   for(var i=0;i<menuList.length;i++){
-     let menu=menuList[i];
-      if(menu.id=='1541261628388888578'){//我的待办
-        let daibanNum=0
-      for(let j=0;j<menu.children.length;j++){
-        let children=menu.children[j]
-        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"){//会议室审核
-        children.total=Number(this.numObject.meetingroom_book)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545292602084827138"){//能力资源上架
-        children.total=Number(this.numObject.resourcemountapply)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545312045695377410"){//能力需求申请
-        children.total=Number(this.numObject.abilitydemandapply)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545313018614521857"){//能力需求下架
-        children.total=Number(this.numObject.resourcundercarriageapply)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545313754106699777"){//评论审核
-        children.total=Number(this.numObject.comment_review)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1554294862931562498"){//会议室 暂无
-        children.total=0
-         daibanNum=Number(daibanNum)+Number(children.total)
-      } 
-      }
-      menu.total=daibanNum
+        this.numObject = res.data
+        const menuList = window.SITE_CONFIG.menuList
+        for (var i = 0; i < menuList.length; i++) {
+          const menu = menuList[i]
+          if (menu.id == '1541261628388888578') { // 我的待办
+            let daibanNum = 0
+            for (let j = 0; j < menu.children.length; j++) {
+              const children = menu.children[j]
+              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') { // 会议室审核
+                children.total = Number(this.numObject.meetingroom_book)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545292602084827138') { // 能力资源上架
+                children.total = Number(this.numObject.resourcemountapply)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545312045695377410') { // 能力需求申请
+                children.total = Number(this.numObject.abilitydemandapply)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545313018614521857') { // 能力需求下架
+                children.total = Number(this.numObject.resourcundercarriageapply)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545313754106699777') { // 评论审核
+                children.total = Number(this.numObject.comment_review)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1554294862931562498') { // 会议室 暂无
+                children.total = 0
+                daibanNum = Number(daibanNum) + Number(children.total)
+              }
+            }
+            menu.total = daibanNum
+          }
+        }
+        this.$store.state.sidebarMenuList = menuList
+      })
     }
   }
-    this.$store.state.sidebarMenuList=menuList
-})
-  }
-}};
+}
 </script>
 <style scoped lang="scss">
 .aui-sidebar {
diff --git a/back/src/views/modules/devtools/generator-menu.vue b/back/src/views/modules/devtools/generator-menu.vue
index f940b8c5..c68eec82 100644
--- a/back/src/views/modules/devtools/generator-menu.vue
+++ b/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>
@@ -174,4 +175,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/back/src/views/modules/sys/menu-add-or-update.vue b/back/src/views/modules/sys/menu-add-or-update.vue
index ed7ddd49..318254cb 100644
--- a/back/src/views/modules/sys/menu-add-or-update.vue
+++ b/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(() => {})
     },
     // 获取信息
diff --git a/back/src/views/modules/sys/menu.vue b/back/src/views/modules/sys/menu.vue
index 4fe46da1..bbc70ae3 100644
--- a/back/src/views/modules/sys/menu.vue
+++ b/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">
diff --git a/front/src/store/modules/user.js b/front/src/store/modules/user.js
index 949868d6..08e03603 100644
--- a/front/src/store/modules/user.js
+++ b/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)) {
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 9a14cf73..1c1b8e18 100644
--- a/front/src/views/home/apply.vue
+++ b/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' } }"
-              :wrapper-col="{ style: { width: '230px' } }" labelAlign="left" autocomplete="off">
+            <a-form
+              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-input placeholder="请输入能力申请标题" v-model:value="formName.title" />
+                <a-form-item
+                  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"
-                  :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
+                  v-if="isCamera && isXiHaiAn"
+                  label="过期时间"
+                  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-input placeholder="请输入申请人" v-model:value="formName.user" disabled />
+                <a-form-item
+                  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="[
-                  {
-                    required: true,
-                    pattern: /^1[3456789]\d{9}$/,
-                    message: '请输入正确的电话号码',
-                  },
-                ]">
-                  <a-input placeholder="请输入申请人电话" v-model:value="formName.phone" />
+                <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-form-item>
-                <a-form-item label="单位" name="unit" :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">
+                <a-form-item
+                  label="单位"
+                  name="unit"
+                  :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"
-                    :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
+                    style="margin-bottom: 0"
+                    label="应用系统"
+                    name="applicationSystem"
+                    :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"
-                  :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
+                  class="applicationScene"
+                  label="应用领域"
+                  name="applicationScene"
+                  :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="[
-                  { required: true, message: '请输入需求依据' },
-                  { min: 50, message: '需求依据最少为50个字' },
-                ]">
-                  <a-textarea placeholder="请输入需求依据" v-model:value="formName.applicationBackground" :rows="4" />
+                <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-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-upload :max-count="1" accept=".doc,.docx,pdf" v-model:file-list="fileList"
-                        :action="`${apiURL}/upload`" @remove="handleRemove" @change="roomUpload">
+                    <a-form-item
+                      name="attachment"
+                      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>
@@ -117,249 +234,325 @@
   </div>
 </template>
 <script>
-import AbilityToApplyFor from './AbilityToApplyFor.vue'
-import HomeHeader from '@/views/home/components/header'
-import { reactive, ref, watch, onBeforeUnmount } from 'vue'
-import { useRouter } from 'vue-router'
-import { message } from 'ant-design-vue'
-import qs from 'qs'
-import { Upload } from 'ant-design-vue'
-import {
-  lastestPage,
-  tabilityapplication,
-  startOfBusinessKey,
-  updateInstanceId,
-  submitApply,
-  applyAllApplication,
-  getUser,
-  getUserInfo,
-  relaunch,
-  selectOne,
-} from '@/api/home'
-import { getDeptAll } from '@/api/user'
-import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
-import mybus from '@/myplugins/mybus'
-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 * as moment from 'moment'
+  import AbilityToApplyFor from './AbilityToApplyFor.vue'
+  import HomeHeader from '@/views/home/components/header'
+  import { reactive, ref, watch, onBeforeUnmount } from 'vue'
+  import { useRouter } from 'vue-router'
+  import { message } from 'ant-design-vue'
+  import qs from 'qs'
+  import { Upload } from 'ant-design-vue'
+  import {
+    lastestPage,
+    tabilityapplication,
+    startOfBusinessKey,
+    updateInstanceId,
+    submitApply,
+    applyAllApplication,
+    getUser,
+    getUserInfo,
+    relaunch,
+    selectOne,
+  } from '@/api/home'
+  import { getDeptAll } from '@/api/user'
+  import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
+  import mybus from '@/myplugins/mybus'
+  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 {
-  name: '',
-  props: {},
-  components: {
-    HomeHeader,
-    AbilityToApplyFor,
-  },
-  setup() {
-    const router = useRouter()
-    const disabled = ref(false)
-    const flag = ref(false)
-    const list = ref(JSON.parse(localStorage.getItem('applyList')))
-    const deptNameAll = ref([]) //所有部门名称
-    const deptFlage = ref(true) //判断是否存在默认部门名称
-    const applyAll = router.currentRoute.value.query.applyAll
-    // 融合服务id
-    const integrationServicesId =
-      router.currentRoute.value.query.integrationServicesId
-    // 融合服务详情
-    const integrationServicesItemInfo = ref(null)
-    const num = ref(0)
-    // 过期时间
-    const expireDateOptions = [
-      {
-        value: moment().add(30, 'days').format('YYYY-MM-DD HH:mm:ss'),
-        label: '30天',
-      },
-      {
-        value: moment().add(60, 'days').format('YYYY-MM-DD HH:mm:ss'),
-        label: '60天',
-      },
-      {
-        value: moment().add(90, 'days').format('YYYY-MM-DD HH:mm:ss'),
-        label: '90天',
-      },
-    ]
-    const apiURL = window.SITE_CONFIG.apiURL
+  export default {
+    name: '',
+    props: {},
+    components: {
+      HomeHeader,
+      AbilityToApplyFor,
+    },
+    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')))
+      const deptNameAll = ref([]) //所有部门名称
+      const deptFlage = ref(true) //判断是否存在默认部门名称
+      const applyAll = router.currentRoute.value.query.applyAll
+      // 融合服务id
+      const integrationServicesId =
+        router.currentRoute.value.query.integrationServicesId
+      // 融合服务详情
+      const integrationServicesItemInfo = ref(null)
+      const num = ref(0)
+      // 过期时间
+      const expireDateOptions = [
+        {
+          value: moment().add(30, 'days').format('YYYY-MM-DD HH:mm:ss'),
+          label: '30天',
+        },
+        {
+          value: moment().add(60, 'days').format('YYYY-MM-DD HH:mm:ss'),
+          label: '60天',
+        },
+        {
+          value: moment().add(90, 'days').format('YYYY-MM-DD HH:mm:ss'),
+          label: '90天',
+        },
+      ]
+      const apiURL = window.SITE_CONFIG.apiURL
 
-    if (!applyAll) {
-      list.value.map((item) => {
-        item.arr.map((val) => {
-          let obj = item.children
-            ? item.children.filter((type) => type.id == val.id)[0]
-            : val.type !== '应用资源'
-          if (obj) {
-            if (obj.type !== '应用资源') {
-              flag.value = true
+      if (!applyAll) {
+        list.value.map((item) => {
+          item.arr.map((val) => {
+            let obj = item.children
+              ? item.children.filter((type) => type.id == val.id)[0]
+              : val.type !== '应用资源'
+            if (obj) {
+              if (obj.type !== '应用资源') {
+                flag.value = true
+              }
             }
+          })
+          if (item.checkedList) {
+            console.log(item)
+            num.value += Number(item.checkedList.length)
           }
         })
-        if (item.checkedList) {
-          console.log(item)
-          num.value += Number(item.checkedList.length)
-        }
-      })
-    }
-    console.log('list', list.value)
-    const baseURL = window.SITE_CONFIG.apiURL
-    let record = ref('1')
-    const text = ref('')
-    // 西海岸-特殊处理
-    let wrjAndDbText = ['单兵设备', '无人机']
-    const isXiHaiAn = ref(whoShow.itShowXiHaiAn)
-    // 西海岸-判断是否是基础设施-摄像头
-    const isCamera = ref(false)
-    // 西海岸-是否是开发区公安分局，是的话，增加上传附件字段
-    let note1 = JSON.parse(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 &&
-      list.value[0].arr[0] &&
-      list.value[0].arr[0].type == '基础设施'
-    ) {
-      isCamera.value = true
-    }
-    const formName = reactive({
-      title: applyAll
-        ? '全部应用资源申请'
-        : wrjAndDbText.includes(
-          list.value[0].arr &&
-          list.value[0].arr[0] &&
-          list.value[0].arr[0].type
+      }
+      console.log('list', list.value)
+      const baseURL = window.SITE_CONFIG.apiURL
+      let record = ref('1')
+      const text = ref('')
+      // 西海岸-特殊处理
+      let wrjAndDbText = ['单兵设备', '无人机']
+      const isXiHaiAn = ref(whoShow.itShowXiHaiAn)
+      // 西海岸-判断是否是基础设施-摄像头
+      const isCamera = ref(false)
+      // 西海岸-是否是开发区公安分局，是的话，增加上传附件字段
+      let note1 = JSON.parse(
+        (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 &&
+        list.value[0].arr[0] &&
+        list.value[0].arr[0].type == '基础设施'
+      ) {
+        isCamera.value = true
+      }
+      const formName = reactive({
+        title: applyAll
+          ? '全部应用资源申请'
+          : wrjAndDbText.includes(
+              list.value[0].arr &&
+                list.value[0].arr[0] &&
+                list.value[0].arr[0].type
+            )
           ? list.value[0].arr[0].type + '申请'
           : list.value[0].children
-            ? '申请' +
+          ? '申请' +
             list.value[0].children
               .filter((val) => val.id == list.value[0].checkedList[0])[0]
               .resourceName.concat(
                 num.value > 1 ? '等' + num.value + '项能力' : ''
               )
-            : '申请' + list.value[0].arr[0].resourceName, // 标题
-      // applicationSystem: '', // 应用系统
-      applicationScene: [], // 应用领域
-      applicationBackground: '', // 应用背景
-      effectWish: '', // 期望效果
-      user: '',
-      userId: '',
-      phone: '',
-      unit: '',
-      deptId: '',
-      system: [],
-      enclosure: '', //附件
-      enclosureName: '', //附件
-    })
-    const dataList = ref([])
-    const id = router.currentRoute.value.query.id
-    const taskId = router.currentRoute.value.query.taskId
-    const businessKey = ref(router.currentRoute.value.query.id)
-    if (id) {
-      getApplyForm(id).then((res) => {
-        console.log('修改==============>', res.data.data)
-        formName.applicationSystem = res.data.data.applicationSystem || ''
-        formName.applicationScene = res.data.data.applicationScene || []
-        formName.applicationBackground =
-          res.data.data.applicationBackground || ''
-        formName.effectWish = res.data.data.effectWish || ''
-        formName.phone = res.data.data.phone || ''
-        formName.enclosure = res.data.data.enclosure || ''
-        formName.enclosureName = res.data.data.enclosureName || ''
-        if (res.data.data.enclosure) {
-          fileList.value.push({
-            name: res.data.data.enclosureName,
-            url: res.data.data.enclosure,
-          })
-        }
+          : '申请' + list.value[0].arr[0].resourceName, // 标题
+        // applicationSystem: '', // 应用系统
+        applicationScene: [], // 应用领域
+        applicationBackground: '', // 应用背景
+        effectWish: '', // 期望效果
+        user: '',
+        userId: '',
+        phone: '',
+        unit: '',
+        deptId: '',
+        system: [],
+        enclosure: '', //附件
+        enclosureName: '', //附件
       })
-    }
-    getUser().then((res) => {
-      formName.user = res.data.data.realName
-      formName.userId = res.data.data.id
-      getUserInfo(formName.userId).then((res) => {
-        if (res.data.data.mobile) {
-          formName.phone = res.data.data.mobile
-        }
-        formName.unit = res.data.data.deptName
-        if (!formName.unit) {
-          deptFlage.value = false
-          //调用查询所有部门名称的接口
-          getDeptAll().then((res) => {
-            deptNameAll.value = res.data.data
-          })
-        }
-      })
-    })
-    //归属部门选中改变事件
-    const deptIdChangeFunction = (name) => {
-      deptNameAll.value.map((item) => {
-        if (item.name == name) {
-          formName.deptId = item.id
-        }
-      })
-      console.log(formName)
-    }
-    const applicationSceneOpthion = ref([])
-    getCategoryTreePage({
-      page: 1,
-      limit: 20,
-      dictTypeId: '1513712507692818433',
-      deFlage: 0,
-    }).then((res) => {
-      res.data.data.list.map((val) => {
-        applicationSceneOpthion.value.push({
-          value: val.dictLabel,
-          label: val.dictLabel,
+      const dataList = ref([])
+      const id = router.currentRoute.value.query.id
+      const taskId = router.currentRoute.value.query.taskId
+      const businessKey = ref(router.currentRoute.value.query.id)
+      if (id) {
+        getApplyForm(id).then((res) => {
+          console.log('修改==============>', res.data.data)
+          formName.applicationSystem = res.data.data.applicationSystem || ''
+          formName.applicationScene = res.data.data.applicationScene || []
+          formName.applicationBackground =
+            res.data.data.applicationBackground || ''
+          formName.effectWish = res.data.data.effectWish || ''
+          formName.phone = res.data.data.phone || ''
+          formName.enclosure = res.data.data.enclosure || ''
+          formName.enclosureName = res.data.data.enclosureName || ''
+          if (res.data.data.enclosure) {
+            fileList.value.push({
+              name: res.data.data.enclosureName,
+              url: res.data.data.enclosure,
+            })
+          }
+        })
+      }
+      getUser().then((res) => {
+        formName.user = res.data.data.realName
+        formName.userId = res.data.data.id
+        getUserInfo(formName.userId).then((res) => {
+          if (res.data.data.mobile) {
+            formName.phone = res.data.data.mobile
+          }
+          formName.unit = res.data.data.deptName
+          if (!formName.unit) {
+            deptFlage.value = false
+            //调用查询所有部门名称的接口
+            getDeptAll().then((res) => {
+              deptNameAll.value = res.data.data
+            })
+          }
         })
       })
-    })
-    const formRef = ref()
-    const applySuccess = ref(true)
-    const dataForm = {
-      processDefinitionKey: 'abilityprocess',
-    }
-    const callbacks = {
-      startProcessSuccessCallback: null,
-      startProcessErrorCallback: null,
-      formSaveSuccessCallback: null,
-      formSaveErrorCallback: null,
-    }
-    const instanceIdUrl = '/processForm/tabilityapplication/updateInstanceId'
-    const formUrl = '/processForm/tabilityapplication'
-    //退出返回上一页
-    const resetFields = () => {
-      window.history.go(-1)
-    }
-
-    // 跳转到能力集市
-    const jumpToDetailsPageconetent = () => {
-      setTimeout(() => {
-        router.push({
-          path: '/DetailsPageconetent',
-          query: {
-            select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
-          },
+      //归属部门选中改变事件
+      const deptIdChangeFunction = (name) => {
+        deptNameAll.value.map((item) => {
+          if (item.name == name) {
+            formName.deptId = item.id
+          }
         })
-      }, 1000)
-    }
+        console.log(formName)
+      }
+      const applicationSceneOpthion = ref([])
+      getCategoryTreePage({
+        page: 1,
+        limit: 20,
+        dictTypeId: '1513712507692818433',
+        deFlage: 0,
+      }).then((res) => {
+        res.data.data.list.map((val) => {
+          applicationSceneOpthion.value.push({
+            value: val.dictLabel,
+            label: val.dictLabel,
+          })
+        })
+      })
+      const formRef = ref()
+      const applySuccess = ref(true)
+      const dataForm = {
+        processDefinitionKey: 'abilityprocess',
+      }
+      const callbacks = {
+        startProcessSuccessCallback: null,
+        startProcessErrorCallback: null,
+        formSaveSuccessCallback: null,
+        formSaveErrorCallback: null,
+      }
+      const instanceIdUrl = '/processForm/tabilityapplication/updateInstanceId'
+      const formUrl = '/processForm/tabilityapplication'
+      //退出返回上一页
+      const resetFields = () => {
+        window.history.go(-1)
+      }
 
-    // 提交申请
-    let submitFlag = true
-    const processStartHandle = () => {
-      formRef.value.validate().then(() => {
-        if (submitFlag) {
-          submitFlag = false
-          if (!formUrl) {
-            return message.error('请设置保存表单的URL')
-          }
-          if (!formName) {
-            return message.error('请设置表单名称')
-          }
-          
-          if (id) {
-            endProcess({ instanceId: taskId }).then((end) => {
-              if (end.data.code == 0) {
+      // 跳转到能力集市
+      const jumpToDetailsPageconetent = () => {
+        setTimeout(() => {
+          router.push({
+            path: '/DetailsPageconetent',
+            query: {
+              select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
+            },
+          })
+        }, 1000)
+      }
+
+      // 提交申请
+      let submitFlag = true
+      const processStartHandle = () => {
+        formRef.value.validate().then(() => {
+          if (submitFlag) {
+            submitFlag = false
+            if (!formUrl) {
+              return message.error('请设置保存表单的URL')
+            }
+            if (!formName) {
+              return message.error('请设置表单名称')
+            }
+
+            if (id) {
+              endProcess({ instanceId: taskId }).then((end) => {
+                if (end.data.code == 0) {
+                  let ids = []
+                  let falgNum = 0
+                  let sxt = true
+                  formName.system = []
+                  console.log('list==================', list.value)
+                  list.value.map((val) => {
+                    val.arr.map((item) => {
+                      if (item.type !== '基础设施') {
+                        falgNum++
+                      }
+                    })
+                  })
+                  list.value.map((val) => {
+                    val.arr.map((item) => {
+                      if (item.type !== '基础设施') {
+                        formName.system.push({
+                          resourceId: item.resourceId,
+                          resourceName: item.resourceName,
+                        })
+                        falgNum++
+                        console.log(item.id)
+                        if (item.id) {
+                          ids.push(item.id)
+                        }
+                      } else {
+                        infrastructureConfirm(item, falgNum, sxt)
+                      }
+                    })
+                  })
+                  if (formName.system.length !== 0) {
+                    if (formName.applicationSystem.length == 0) {
+                      formName.applicationSystem = ''
+                    }
+                    submitApply(formName).then((res) => {
+                      message.success('申请提交成功，请到消息中心查看！')
+                      console.log('能力申请================>', res)
+                      if (res.data.code == 0) {
+                        if (ids && ids.length > 0) {
+                          sgcDel({ ids: ids }).then((res) => {
+                            if (res.data.msg === 'success') {
+                              mybus.emit('getSgcNum')
+                              jumpToDetailsPageconetent()
+                            }
+                          })
+                        } else {
+                          // 融合服务
+                          if (integrationServicesId) {
+                            getIntegrationServicesDeatil(
+                              integrationServicesId
+                            ).then((res) => {
+                              updateIntegrationServiceAction()
+                            })
+                          }
+                          jumpToDetailsPageconetent()
+                        }
+                      } else {
+                        message.error('申请失败！')
+                      }
+                    })
+                  }
+                }
+              })
+            } else {
+              if (!applyAll) {
                 let ids = []
                 let falgNum = 0
                 let sxt = true
@@ -389,10 +582,20 @@ export default {
                     }
                   })
                 })
+                console.log('formName--ids-提交数据--------->', formName, ids)
                 if (formName.system.length !== 0) {
-                  if (formName.applicationSystem.length == 0) {
+                  if (
+                    formName.applicationSystem &&
+                    formName.applicationSystem.length == 0
+                  ) {
                     formName.applicationSystem = ''
                   }
+                  // 西海岸：单兵设备、无人机单独调取其他接口
+                  if (wrjAndDbText.includes(list.value[0].arr[0].type)) {
+                    handleWrjApply(formName)
+                    return
+                  }
+
                   submitApply(formName).then((res) => {
                     message.success('申请提交成功，请到消息中心查看！')
                     console.log('能力申请================>', res)
@@ -420,529 +623,462 @@ export default {
                     }
                   })
                 }
-              }
-            })
-          } else {
-            if (!applyAll) {
-              let ids = []
-              let falgNum = 0
-              let sxt = true
-              formName.system = []
-              console.log('list==================', list.value)
-              list.value.map((val) => {
-                val.arr.map((item) => {
-                  if (item.type !== '基础设施') {
-                    falgNum++
-                  }
-                })
-              })
-              list.value.map((val) => {
-                val.arr.map((item) => {
-                  if (item.type !== '基础设施') {
-                    formName.system.push({
-                      resourceId: item.resourceId,
-                      resourceName: item.resourceName,
-                    })
-                    falgNum++
-                    console.log(item.id)
-                    if (item.id) {
-                      ids.push(item.id)
-                    }
-                  } else {
-                    infrastructureConfirm(item, falgNum, sxt)
-                  }
-                })
-              })
-              console.log('formName--ids-提交数据--------->', formName, ids)
-              if (formName.system.length !== 0) {
-                if (
-                  formName.applicationSystem &&
-                  formName.applicationSystem.length == 0
-                ) {
-                  formName.applicationSystem = ''
-                }
-                // 西海岸：单兵设备、无人机单独调取其他接口
-                if (wrjAndDbText.includes(list.value[0].arr[0].type)) {
-                  handleWrjApply(formName)
-                  return
-                }
-
-                submitApply(formName).then((res) => {
-                  message.success('申请提交成功，请到消息中心查看！')
-                  console.log('能力申请================>', res)
+              } else {
+                formName.applicationSystem = ''
+                applyAllApplication(formName).then((res) => {
                   if (res.data.code == 0) {
-                    if (ids && ids.length > 0) {
-                      sgcDel({ ids: ids }).then((res) => {
-                        if (res.data.msg === 'success') {
-                          mybus.emit('getSgcNum')
-                          jumpToDetailsPageconetent()
-                        }
-                      })
-                    } else {
-                      // 融合服务
-                      if (integrationServicesId) {
-                        getIntegrationServicesDeatil(
-                          integrationServicesId
-                        ).then((res) => {
-                          updateIntegrationServiceAction()
-                        })
-                      }
-                      jumpToDetailsPageconetent()
-                    }
+                    message.success('申请提交成功，请到消息中心查看！')
+                    jumpToDetailsPageconetent()
                   } else {
                     message.error('申请失败！')
                   }
                 })
               }
-            } else {
-              formName.applicationSystem = ''
-              applyAllApplication(formName).then((res) => {
-                if (res.data.code == 0) {
+            }
+          }
+        })
+      }
+
+      // 基础设施--数据下发
+      const infrastructureConfirm = (item, falgNum, sxt) => {
+        let obj = {}
+        Object.assign(obj, formName)
+        console.log('摄像头===============>', obj, item)
+        obj.system = []
+        if (item.note1 && typeof item.note1 == 'string') {
+          item.note1 = JSON.parse(item.note1)
+        }
+        item.note1 &&
+          item.note1.map((jcss) => {
+            if (!jcss) {
+              return
+            }
+            let _itemData = {
+              resourceId: (jcss.idtCameraChannel || '') + '',
+              resourceName: jcss.channelName,
+              cameraId: jcss.channelId, // 改接口后删除
+              channelCode: jcss.channelCode,
+              channelId: jcss.channelId,
+              channelName: jcss.channelName,
+              checkStatus: jcss.checkStatus + '',
+              gpsX: jcss.gpsX,
+              gpsY: jcss.gpsY,
+              idtCameraChannel: (jcss.idtCameraChannel || '') + '',
+              nodeName: jcss.nodeName,
+              parentId: jcss.parentId,
+              status: jcss.status + '',
+            }
+            // 西海岸
+            if (isXiHaiAn.value) {
+              _itemData.managementUnitName = jcss.managementUnitName
+              _itemData.cameraPointTypeName = jcss.cameraPointTypeName
+            }
+            obj.system.push(_itemData)
+          })
+        submitApply(obj).then((res) => {
+          // applySuccess.value = false
+          console.log('摄像头申请================>', res)
+          if (item.id) {
+            sgcDel({ ids: [item.id] }).then((res1) => {
+              if (res1.data.msg === 'success') {
+                if (falgNum == 0 && sxt) {
                   message.success('申请提交成功，请到消息中心查看！')
-                  jumpToDetailsPageconetent()
-                } else {
-                  message.error('申请失败！')
+                  sxt = false
                 }
-              })
-            }
-          }
-        }
-      })
-    }
-
-    // 基础设施--数据下发
-    const infrastructureConfirm = (item, falgNum, sxt) => {
-      let obj = {}
-      Object.assign(obj, formName)
-      console.log('摄像头===============>', obj, item)
-      obj.system = []
-      if (item.note1 && typeof item.note1 == 'string') {
-        item.note1 = JSON.parse(item.note1)
-      }
-      item.note1 &&
-        item.note1.map((jcss) => {
-          if (!jcss) {
-            return
-          }
-          let _itemData = {
-            resourceId: (jcss.idtCameraChannel || '') + '',
-            resourceName: jcss.channelName,
-            cameraId: jcss.channelId, // 改接口后删除
-            channelCode: jcss.channelCode,
-            channelId: jcss.channelId,
-            channelName: jcss.channelName,
-            checkStatus: jcss.checkStatus + '',
-            gpsX: jcss.gpsX,
-            gpsY: jcss.gpsY,
-            idtCameraChannel: (jcss.idtCameraChannel || '') + '',
-            nodeName: jcss.nodeName,
-            parentId: jcss.parentId,
-            status: jcss.status + '',
-          }
-          // 西海岸
-          if (isXiHaiAn.value) {
-            _itemData.managementUnitName = jcss.managementUnitName
-            _itemData.cameraPointTypeName = jcss.cameraPointTypeName
-          }
-          obj.system.push(_itemData)
-        })
-      submitApply(obj).then((res) => {
-        // applySuccess.value = false
-        console.log('摄像头申请================>', res)
-        if (item.id) {
-          sgcDel({ ids: [item.id] }).then((res1) => {
-            if (res1.data.msg === 'success') {
-              if (falgNum == 0 && sxt) {
-                message.success('申请提交成功，请到消息中心查看！')
-                sxt = false
+                mybus.emit('getSgcNum')
+                jumpToDetailsPageconetent()
               }
-              mybus.emit('getSgcNum')
-              jumpToDetailsPageconetent()
-            }
-          })
-        } else {
-          if (res.data.msg === 'success' && falgNum == 0 && sxt) {
-            message.success('申请提交成功，请到消息中心查看！')
-            sxt = false
-          }
-          jumpToDetailsPageconetent()
-        }
-      })
-    }
-
-    // 启动流程
-    const startProcess = (processDefinitionKey, businessKey, formData) => {
-      var data = {
-        processDefinitionKey: processDefinitionKey,
-        businessKey: businessKey,
-        variables: formData,
-      }
-      startOfBusinessKey(data)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            if (callbacks.startProcessErrorCallback) {
-              callbacks.startProcessErrorCallback(res.data)
-            }
-          }
-          message({
-            message: '操作成功',
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              if (callbacks.startProcessSuccessCallback) {
-                callbacks.startProcessSuccessCallback(res.data)
-              }
-            },
-          })
-          if (instanceIdUrl) {
-            var params = qs.stringify({
-              processInstanceId: res.data.processInstanceId,
-              processDefinitionKey: processDefinitionKey,
-              businessKey: businessKey,
             })
-            updateInstanceId(params).then(() => { })
-          }
-        })
-        .catch(() => { })
-    }
-    const options = ref([
-      {
-        value: '政法委',
-        label: '政法委',
-      },
-      {
-        value: '公安局',
-        label: '公安局',
-      },
-      {
-        value: '卫健委',
-        label: '卫健委',
-      },
-      {
-        value: '城市管理局',
-        label: '城市管理局',
-      },
-      {
-        value: '生态环境局',
-        label: '生态环境局',
-      },
-      {
-        value: '交通运输局',
-        label: '交通运输局',
-      },
-    ])
-    const systemOptions = ref([])
-    const systemOptions2 = ref([])
-    const fileList = ref([])
-    // 应用系统下拉
-    const systemHandleChange = (value) => {
-      console.log(`selected ${value}`)
-    }
-    const systemHandleSearch = (value) => {
-      let valueArray = []
-      systemOptions.value.map((val) => {
-        valueArray.push(val.value)
-      })
-      if (valueArray.indexOf(value) == -1) {
-        systemOptions.value.push({
-          value: value,
-          label: value,
-        })
-      }
-    }
-    pageWithAttrs({
-      pageNum: 1,
-      pageSize: 99999,
-      type: '应用资源',
-      name: '',
-      infoList: [],
-    }).then((res) => {
-      if (res.data.code == 0) {
-        if (res.data.data.records.length == 0) {
-          message.warning('该关键词，暂无应用资源！')
-        } else {
-          res.data.data.records.map((val) => {
-            systemOptions2.value.push({
-              value: val.name,
-              label: val.name,
-            })
-          })
-          // console.log('第一次获取===================>', systemOptions2.value)
-        }
-      } else {
-        message.error('应用系统获取数据失败!')
-      }
-    })
-    const handleBlur = () => {
-      console.log('blur')
-    }
-    const handleFocus = () => {
-      console.log('focus')
-      let arrId = []
-      for (var valueIndex of systemOptions2.value) {
-        if (arrId.indexOf(valueIndex['value']) == -1) {
-          arrId.push(valueIndex['value'])
-          systemOptions.value.push(valueIndex)
-        }
-      }
-    }
-
-    onBeforeUnmount(() => {
-      mybus.off('reomveOldData')
-    })
-
-    // 融合服务-更新
-    const updateIntegrationServiceAction = () => {
-      let _applyCount =
-        Number(integrationServicesItemInfo.value.applyCount || 0) + 1
-      let _data = Object.assign({}, integrationServicesItemInfo.value, {
-        applyCount: _applyCount,
-      })
-      updateIntegrationServices(_data)
-        .then((res) => {
-          console.log('res---更新--------->', res)
-        })
-        .catch((err) => {
-          console.log('err----更新-------->', err)
-        })
-    }
-
-    // 融合服务--详情
-    const getIntegrationServicesDeatil = (id) => {
-      return new Promise((resolve, reject) => {
-        getIntegrationDetail(id).then(
-          (res) => {
-            resolve(res)
-            if (res.data.code !== 0) {
-              return message.error(res.data.msg)
-            }
-            integrationServicesItemInfo.value = res.data.data || {}
-          },
-          (err) => {
-            reject(err)
-            message.error(err)
-          }
-        )
-      })
-    }
-
-    // 西海岸：单兵设备、无人机提交申请
-    const handleWrjApply = (formName) => {
-      let _data = {
-        deviceId:
-          formName.system &&
-          formName.system[0] &&
-          formName.system[0].resourceId,
-        deviceName:
-          formName.system &&
-          formName.system[0] &&
-          formName.system[0].resourceName,
-        title: formName.title,
-        name: formName.user,
-        phone: formName.phone,
-        dept: formName.unit, // 单位
-        applicationSystem: formName.applicationSystem, // 应用系统
-        applicationArea: JSON.stringify(formName.applicationScene), // 应用领域
-        demand: formName.applicationBackground, // 需求依据
-      }
-      soldierApply(_data)
-        .then((res) => {
-          if (res.data.msg === 'success') {
-            message.success('申请提交成功，请到消息中心查看！')
-            setTimeout(() => {
-              router.push({
-                path: '/DetailsPageconetent',
-                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
-                },
-              })
-            }, 1000)
           } else {
-            message.error('申请失败！')
+            if (res.data.msg === 'success' && falgNum == 0 && sxt) {
+              message.success('申请提交成功，请到消息中心查看！')
+              sxt = false
+            }
+            jumpToDetailsPageconetent()
           }
         })
-        .catch((err) => {
-          message.error(err)
-        })
-    }
-
-    //文件上传成功回调
-    const roomUpload = (response) => {
-      if (response.file.response !== undefined) {
-        fileList.value = response.fileList
-        formName.attachment = response.file.response.data
       }
-    }
 
-    return {
-      deptIdChangeFunction,
-      formRef,
-      formName,
-      deptNameAll,
-      instanceIdUrl,
-      formUrl,
-      processStartHandle,
-      resetFields,
-      startProcess,
-      options,
-      fileList,
-      list,
-      deptFlage,
-      headers: {
-        authorization: 'authorization-text',
-      },
-      // handleChange,
-      applySuccess,
-      disabled,
-      baseURL,
-      // beforeUpload,
-      dataList,
-      systemHandleChange,
-      systemHandleSearch,
-      handleBlur,
-      handleFocus,
-      systemOptions,
-      applicationSceneOpthion,
-      flag,
-      applyAll,
-      getIntegrationServicesDeatil,
-      isCamera,
-      isXiHaiAn,
-      expireDateOptions,
-      apiURL,
-      roomUpload,
-      iskfq,
-    }
-  },
-}
+      // 启动流程
+      const startProcess = (processDefinitionKey, businessKey, formData) => {
+        var data = {
+          processDefinitionKey: processDefinitionKey,
+          businessKey: businessKey,
+          variables: formData,
+        }
+        startOfBusinessKey(data)
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              if (callbacks.startProcessErrorCallback) {
+                callbacks.startProcessErrorCallback(res.data)
+              }
+            }
+            message({
+              message: '操作成功',
+              type: 'success',
+              duration: 500,
+              onClose: () => {
+                if (callbacks.startProcessSuccessCallback) {
+                  callbacks.startProcessSuccessCallback(res.data)
+                }
+              },
+            })
+            if (instanceIdUrl) {
+              var params = qs.stringify({
+                processInstanceId: res.data.processInstanceId,
+                processDefinitionKey: processDefinitionKey,
+                businessKey: businessKey,
+              })
+              updateInstanceId(params).then(() => {})
+            }
+          })
+          .catch(() => {})
+      }
+      const options = ref([
+        {
+          value: '政法委',
+          label: '政法委',
+        },
+        {
+          value: '公安局',
+          label: '公安局',
+        },
+        {
+          value: '卫健委',
+          label: '卫健委',
+        },
+        {
+          value: '城市管理局',
+          label: '城市管理局',
+        },
+        {
+          value: '生态环境局',
+          label: '生态环境局',
+        },
+        {
+          value: '交通运输局',
+          label: '交通运输局',
+        },
+      ])
+      const systemOptions = ref([])
+      const systemOptions2 = ref([])
+      const fileList = ref([])
+      // 应用系统下拉
+      const systemHandleChange = (value) => {
+        console.log(`selected ${value}`)
+      }
+      const systemHandleSearch = (value) => {
+        let valueArray = []
+        systemOptions.value.map((val) => {
+          valueArray.push(val.value)
+        })
+        if (valueArray.indexOf(value) == -1) {
+          systemOptions.value.push({
+            value: value,
+            label: value,
+          })
+        }
+      }
+      pageWithAttrs({
+        pageNum: 1,
+        pageSize: 99999,
+        type: '应用资源',
+        name: '',
+        infoList: [],
+      }).then((res) => {
+        if (res.data.code == 0) {
+          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)
+          }
+        } else {
+          message.error('应用系统获取数据失败!')
+        }
+      })
+      const handleBlur = () => {
+        console.log('blur')
+      }
+      const handleFocus = () => {
+        console.log('focus')
+        let arrId = []
+        for (var valueIndex of systemOptions2.value) {
+          if (arrId.indexOf(valueIndex['value']) == -1) {
+            arrId.push(valueIndex['value'])
+            systemOptions.value.push(valueIndex)
+          }
+        }
+      }
+
+      onBeforeUnmount(() => {
+        mybus.off('reomveOldData')
+      })
+
+      // 融合服务-更新
+      const updateIntegrationServiceAction = () => {
+        let _applyCount =
+          Number(integrationServicesItemInfo.value.applyCount || 0) + 1
+        let _data = Object.assign({}, integrationServicesItemInfo.value, {
+          applyCount: _applyCount,
+        })
+        updateIntegrationServices(_data)
+          .then((res) => {
+            console.log('res---更新--------->', res)
+          })
+          .catch((err) => {
+            console.log('err----更新-------->', err)
+          })
+      }
+
+      // 融合服务--详情
+      const getIntegrationServicesDeatil = (id) => {
+        return new Promise((resolve, reject) => {
+          getIntegrationDetail(id).then(
+            (res) => {
+              resolve(res)
+              if (res.data.code !== 0) {
+                return message.error(res.data.msg)
+              }
+              integrationServicesItemInfo.value = res.data.data || {}
+            },
+            (err) => {
+              reject(err)
+              message.error(err)
+            }
+          )
+        })
+      }
+
+      // 西海岸：单兵设备、无人机提交申请
+      const handleWrjApply = (formName) => {
+        let _data = {
+          deviceId:
+            formName.system &&
+            formName.system[0] &&
+            formName.system[0].resourceId,
+          deviceName:
+            formName.system &&
+            formName.system[0] &&
+            formName.system[0].resourceName,
+          title: formName.title,
+          name: formName.user,
+          phone: formName.phone,
+          dept: formName.unit, // 单位
+          applicationSystem: formName.applicationSystem, // 应用系统
+          applicationArea: JSON.stringify(formName.applicationScene), // 应用领域
+          demand: formName.applicationBackground, // 需求依据
+        }
+        soldierApply(_data)
+          .then((res) => {
+            if (res.data.msg === 'success') {
+              message.success('申请提交成功，请到消息中心查看！')
+              setTimeout(() => {
+                router.push({
+                  path: '/DetailsPageconetent',
+                  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,
+                  },
+                })
+              }, 1000)
+            } else {
+              message.error('申请失败！')
+            }
+          })
+          .catch((err) => {
+            message.error(err)
+          })
+      }
+
+      //文件上传成功回调
+      const roomUpload = (response) => {
+        if (response.file.response !== undefined) {
+          fileList.value = response.fileList
+          formName.attachment = response.file.response.data
+        }
+      }
+
+      return {
+        deptIdChangeFunction,
+        formRef,
+        formName,
+        deptNameAll,
+        instanceIdUrl,
+        formUrl,
+        processStartHandle,
+        resetFields,
+        startProcess,
+        options,
+        fileList,
+        list,
+        deptFlage,
+        headers: {
+          authorization: 'authorization-text',
+        },
+        // handleChange,
+        applySuccess,
+        disabled,
+        baseURL,
+        // beforeUpload,
+        dataList,
+        systemHandleChange,
+        systemHandleSearch,
+        handleBlur,
+        handleFocus,
+        systemOptions,
+        applicationSceneOpthion,
+        flag,
+        applyAll,
+        getIntegrationServicesDeatil,
+        isCamera,
+        isXiHaiAn,
+        expireDateOptions,
+        apiURL,
+        roomUpload,
+        iskfq,
+      }
+    },
+  }
 </script>
 <style scoped lang="less">
-#apply-container {
-  // background-color: #f5f8fc;
-  height: 100%;
-  width: 100%;
-  margin: 0.8rem auto 0;
-  display: flex;
-  justify-content: space-between;
-
-  aside {
-    width: 282px;
-    height: 96%;
-    overflow-y: auto;
-    background-color: #fff;
-    margin: 1% 0 3%;
-  }
-
-  article {
-    width: 1090px;
-    height: 99%;
-    overflow-y: auto;
-    background-color: #fff;
-    margin: 1% auto;
-  }
-
-  .form-container {
-    padding: 20px 20px 30px 20px;
-
-    .title {
-      font-size: 20px;
-      color: #000;
-      font-weight: bold;
-      margin-bottom: 20px;
-    }
-  }
-
-  .base-info {
+  #apply-container {
+    // background-color: #f5f8fc;
+    height: 100%;
+    width: 100%;
+    margin: 0.8rem auto 0;
     display: flex;
     justify-content: space-between;
-  }
 
-  .flex-row-start {
-    justify-content: flex-start;
-    align-items: center;
-  }
+    aside {
+      width: 282px;
+      height: 96%;
+      overflow-y: auto;
+      background-color: #fff;
+      margin: 1% 0 3%;
+    }
 
-  :deep(.ant-form-item-label) {
-    label {
-      color: #666;
-      font-size: 16px;
+    article {
+      width: 1090px;
+      height: 99%;
+      overflow-y: auto;
+      background-color: #fff;
+      margin: 1% auto;
+    }
 
-      &::after {
-        content: '';
+    .form-container {
+      padding: 20px 20px 30px 20px;
+
+      .title {
+        font-size: 20px;
+        color: #000;
+        font-weight: bold;
+        margin-bottom: 20px;
       }
     }
-  }
 
-  :deep(.ant-form-item-required) {
-    &::before {
-      font-size: 8px;
-      margin-right: 10px;
+    .base-info {
+      display: flex;
+      justify-content: space-between;
+    }
+
+    .flex-row-start {
+      justify-content: flex-start;
+      align-items: center;
+    }
+
+    :deep(.ant-form-item-label) {
+      label {
+        color: #666;
+        font-size: 16px;
+
+        &::after {
+          content: '';
+        }
+      }
+    }
+
+    :deep(.ant-form-item-required) {
+      &::before {
+        font-size: 8px;
+        margin-right: 10px;
+      }
+    }
+
+    :deep(.ant-input) {
+      border: 1px solid #e0e0e0;
+      border-radius: 6px;
+    }
+
+    .success {
+      div {
+        width: 100px;
+        margin: 80px auto 40px;
+      }
+
+      text-align: center;
+      font-size: 20px;
+      font-weight: bold;
+      color: #000;
     }
   }
 
-  :deep(.ant-input) {
-    border: 1px solid #e0e0e0;
+  .applicationScene {
+    :deep(.ant-select-selector) {
+      overflow-x: scroll;
+    }
+
+    :deep(.ant-select-selection-overflow) {
+      flex-wrap: nowrap;
+    }
+  }
+
+  textarea {
+    resize: none;
+    font-size: 14px;
+  }
+
+  .bottom-btn {
+    display: flex;
+    justify-content: center;
+    // position: fixed;
+  }
+
+  .cancel-apply {
+    width: 80px;
+    height: 38px;
+    margin-right: 20px;
+    background: #e1edfa;
+    color: #0087ff;
+    font-size: 14px;
     border-radius: 6px;
-  }
-
-  .success {
-    div {
-      width: 100px;
-      margin: 80px auto 40px;
-    }
-
+    border: none;
+    padding: 0;
     text-align: center;
-    font-size: 20px;
-    font-weight: bold;
-    color: #000;
-  }
-}
-
-.applicationScene {
-  :deep(.ant-select-selector) {
-    overflow-x: scroll;
   }
 
-  :deep(.ant-select-selection-overflow) {
-    flex-wrap: nowrap;
+  .confirm-apply {
+    width: 80px;
+    height: 38px;
+    background: #0087ff;
+    color: #fff;
+    font-size: 14px;
+    border-radius: 6px;
+    border: none;
+    padding: 0;
+    text-align: center;
   }
-}
-
-textarea {
-  resize: none;
-  font-size: 14px;
-}
-
-.bottom-btn {
-  display: flex;
-  justify-content: center;
-  // position: fixed;
-}
-
-.cancel-apply {
-  width: 80px;
-  height: 38px;
-  margin-right: 20px;
-  background: #e1edfa;
-  color: #0087ff;
-  font-size: 14px;
-  border-radius: 6px;
-  border: none;
-  padding: 0;
-  text-align: center;
-}
-
-.confirm-apply {
-  width: 80px;
-  height: 38px;
-  background: #0087ff;
-  color: #fff;
-  font-size: 14px;
-  border-radius: 6px;
-  border: none;
-  padding: 0;
-  text-align: center;
-}
 </style>

From e96c0c11b1f771813ee7c129605a6539c768ee11 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 18 Oct 2022 15:23:33 +0800
Subject: [PATCH 02/13] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/main-sidebar.vue | 87 +++++++++++++++++----------------
 1 file changed, 45 insertions(+), 42 deletions(-)

diff --git a/back/src/views/main-sidebar.vue b/back/src/views/main-sidebar.vue
index b11a8017..62dc4831 100644
--- a/back/src/views/main-sidebar.vue
+++ b/back/src/views/main-sidebar.vue
@@ -2,7 +2,7 @@
  * @Author: kongjun qdkongjun@gmail.com
  * @Date: 2022-06-20 09:29:59
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-18 15:15:37
+ * @LastEditTime: 2022-10-18 15:22:45
  * @FilePath: \back\src\views\main-sidebar.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -35,8 +35,8 @@
 
 <script>
 import http from '@/utils/request'
-import SubMenu from "./main-sidebar-sub-menu";
-import returnLocationStr from '@/utils/location';
+import SubMenu from './main-sidebar-sub-menu'
+import returnLocationStr from '@/utils/location'
 import bus from '@/views/bus.js'
 export default {
   data () {
@@ -49,51 +49,54 @@ export default {
   },
   created () {
     this.getNum()
-    //this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
-    //更新我的待办得数量
+    // this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
+    // 更新我的待办得数量
     bus.$off('updateTaskNum')
     bus.$on('updateTaskNum', () => {
       this.getNum()
     })
   },
   methods: {
-    getNum(){
-    http.get('/act/task/myToDoTaskNum').then(({ data: res }) => {
-    this.numObject=res.data
-   let menuList= window.SITE_CONFIG["menuList"];
-   console.log('menuList====>',menuList);
-   console.log('this.numObject====>',this.numObject);
-   for(var i=0;i<menuList.length;i++){
-     let menu=menuList[i];
-      if(menu.id=='1541261628388888578'){//我的待办
-        let daibanNum=0
-      for(let j=0;j<menu.children.length;j++){
-        let children=menu.children[j]
-        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"){//会议室审核
-        children.total=Number(this.numObject.meetingroom_book)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545292602084827138"){//能力资源上架
-        children.total=Number(this.numObject.resourcemountapply)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545312045695377410"){//能力需求申请
-        children.total=Number(this.numObject.abilitydemandapply)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545313018614521857"){//能力需求下架
-        children.total=Number(this.numObject.resourcundercarriageapply)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1545313754106699777"){//评论审核
-        children.total=Number(this.numObject.comment_review)
-         daibanNum=Number(daibanNum)+Number(children.total)
-      }if(children.id=="1554294862931562498"){//会议室 暂无
-        children.total=0
-         daibanNum=Number(daibanNum)+Number(children.total)
-      } 
-      }
-      menu.total=daibanNum
+    getNum () {
+      http.get('/act/task/myToDoTaskNum').then(({ data: res }) => {
+        this.numObject = res.data
+        const menuList = window.SITE_CONFIG.menuList
+        console.log('menuList====>', menuList)
+        console.log('this.numObject====>', this.numObject)
+        for (var i = 0; i < menuList.length; i++) {
+          const menu = menuList[i]
+          if (menu.id == '1541261628388888578') { // 我的待办
+            let daibanNum = 0
+            for (let j = 0; j < menu.children.length; j++) {
+              const children = menu.children[j]
+              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') { // 会议室审核
+                children.total = Number(this.numObject.meetingroom_book)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545292602084827138') { // 能力资源上架
+                children.total = Number(this.numObject.resourcemountapply)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545312045695377410') { // 能力需求申请
+                children.total = Number(this.numObject.abilitydemandapply)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545313018614521857') { // 能力需求下架
+                children.total = Number(this.numObject.resourcundercarriageapply)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1545313754106699777') { // 评论审核
+                children.total = Number(this.numObject.comment_review)
+                daibanNum = Number(daibanNum) + Number(children.total)
+              } if (children.id == '1554294862931562498') { // 会议室 暂无
+                children.total = 0
+                daibanNum = Number(daibanNum) + Number(children.total)
+              }
+            }
+            menu.total = daibanNum
+          }
+        }
+      })
     }
   }
 }

From b13577d4b44f70a1f3ec5a0d5d116c988ddf94a3 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 18 Oct 2022 15:34:46 +0800
Subject: [PATCH 03/13] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/main-sidebar.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/back/src/views/main-sidebar.vue b/back/src/views/main-sidebar.vue
index 62dc4831..9c881026 100644
--- a/back/src/views/main-sidebar.vue
+++ b/back/src/views/main-sidebar.vue
@@ -2,7 +2,7 @@
  * @Author: kongjun qdkongjun@gmail.com
  * @Date: 2022-06-20 09:29:59
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-18 15:22:45
+ * @LastEditTime: 2022-10-18 15:34:00
  * @FilePath: \back\src\views\main-sidebar.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -49,7 +49,7 @@ export default {
   },
   created () {
     this.getNum()
-    // this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
+    this.$store.state.sidebarMenuList = window.SITE_CONFIG.menuList
     // 更新我的待办得数量
     bus.$off('updateTaskNum')
     bus.$on('updateTaskNum', () => {

From a139bd809b44d966de6d88ea6fc1e982bb07f21b Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 18 Oct 2022 15:35:14 +0800
Subject: [PATCH 04/13] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/main-sidebar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/back/src/views/main-sidebar.vue b/back/src/views/main-sidebar.vue
index 9c881026..40867a8d 100644
--- a/back/src/views/main-sidebar.vue
+++ b/back/src/views/main-sidebar.vue
@@ -31,7 +31,7 @@
       </el-menu>
     </div>
   </aside>
-</template>
+</template>\
 
 <script>
 import http from '@/utils/request'

From c41028ffaa74ff6d23260038b47442e4c211e31a Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 18 Oct 2022 15:42:53 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/abilityStatistics/index.vue | 82 +++++++++++++++++--
 1 file changed, 77 insertions(+), 5 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index 75686078..b6041468 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -94,6 +94,11 @@
             $t('reset')
           }}</el-button>
         </el-form-item>
+        <!-- 导出 -->
+        <a class='export' :href="exportExcel+exportExcelType+'?'+exportExcelCondition+'&token='+token">导出</a>
+        <!-- <el-form-item>
+          <el-button type="primary" @click="exportExcel()">导出</el-button>
+        </el-form-item> -->
       </el-form>
       <el-card shadow="never" class="aui-card--fill" v-if="homeIsShow">
         <div class="mod-demand__bsdemand">
@@ -273,11 +278,12 @@
 
 </template>
 <script>
+import Cookies from 'js-cookie'
 import componentServices from './componentServices.vue'
 import AbilityDetail from './components/abilityDetails'
 import applicationResources from './applicationResources.vue'
 import ComponentUsed from './componentUsed.vue'
-
+import qs from 'qs'
 import { mapState } from 'vuex'
 // const props = defineProps({
 //   processDefinitionName: { type: String, default: null },
@@ -291,6 +297,10 @@ export default {
   components: { componentServices, applicationResources, ComponentUsed, AbilityDetail },
   data () {
     return {
+      exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/census/center/export',
+      exportExcelCondition: '',
+      exportExcelType: '',
+      token: Cookies.get('ucsToken'),
       detailType: '',
       detailParamss: {},
       isBack: true,
@@ -374,7 +384,7 @@ export default {
         { name: '基础设施', key: 3 },
         { name: '数据资源', key: 4 },
         { name: '知识库', key: 5 },
-        { name: '会议室', value: 6}
+        { name: '会议室', value: 6 }
       ],
       tableData: [],
       tableData2: [
@@ -399,7 +409,7 @@ export default {
         { name: '通用开发组件', value: 3 },
         { name: '页面开发组件', value: 4 },
         { name: '应用资源', value: 5 },
-        { name: '会议室', value: 6}
+        { name: '会议室', value: 6 }
       ], // 类型备选列表
       detailFlag: false, // 明细返回按钮显示标志位
       startDate: '', // 开始时间
@@ -482,7 +492,7 @@ export default {
         this.status = '审核中'
       } else if (this.examineStatus == '1') {
         this.status = '通过'
-      }else if (this.examineStatus == '2') {
+      } else if (this.examineStatus == '2') {
         this.status = '不通过'
       } else {
         this.status = this.examineStatus
@@ -530,6 +540,12 @@ export default {
           }
           this.tableData = res.data.data
           this.total = res.data.data.total
+          this.exportExcelCondition = qs.stringify({
+            approveStatus: this.status,
+            deptId: this.abilityDepartment,
+            startDate: this.startDate,
+            endDate: this.endDate
+          })
         })
     },
     // 组件服务部门使用情况列表-改为能力使用统计
@@ -588,6 +604,12 @@ export default {
           }
           this.tableData = res.data.data
           this.total = res.data.data.total
+          this.exportExcelCondition = qs.stringify({
+            approveStatus: this.status,
+            deptId: this.abilityDepartment,
+            startDate: this.startDate,
+            endDate: this.endDate
+          })
         })
     },
     // 点击查看详情
@@ -641,7 +663,7 @@ export default {
         this.status = '审核中'
       } else if (this.examineStatus == '1') {
         this.status = '通过'
-      }  else if (this.examineStatus == '2') {
+      } else if (this.examineStatus == '2') {
         this.status = '不通过'
       } else {
         this.status = this.examineStatus
@@ -662,6 +684,12 @@ export default {
           console.log('111111', this.tableData, res.data.data)
           this.tableData = res.data.data
           this.total = res.data.data.total
+          this.exportExcelCondition = qs.stringify({
+            approveStatus: this.status,
+            deptId: this.abilityDepartment,
+            startDate: this.startDate,
+            endDate: this.endDate
+          })
         })
     },
     // 能力使用明细
@@ -693,6 +721,12 @@ export default {
         .then((res) => {
           this.tableData = res.data.data
           this.total = res.data.data.total
+          this.exportExcelCondition = qs.stringify({
+            approveStatus: this.status,
+            deptId: this.abilityDepartment,
+            startDate: this.startDate,
+            endDate: this.endDate
+          })
         })
     },
     getReleaseTree (page) {
@@ -799,6 +833,7 @@ export default {
           if (!this.detailFlag) {
             this.detailFlag = !this.detailFlag
           }
+          this.exportExcelType = 'SelectDeptDetailTypeCountList'
           this.getFirstTree()
         } else if (this.choseId === 1) {
           // this.getReleaseTree()
@@ -808,6 +843,7 @@ export default {
           if (!this.detailFlag) {
             this.detailFlag = !this.detailFlag
           }
+          this.exportExcelType = 'SelectApplyDeptDetailTypeCountList'
           this.getSecondTree()
         } else {
           // this.getUsedTree()
@@ -815,6 +851,7 @@ export default {
       } else if (index === 3) {
         this.detailFlag = false
         if (this.choseId === 0) {
+          this.exportExcelType = 'SelectCensusResourceTable'
           this.getOneDetail()
         } else {
           // this.getUsedTree()
@@ -822,6 +859,7 @@ export default {
       } else if (index === 4) {
         this.detailFlag = false
         if (this.choseId === 0) {
+          this.exportExcelType = 'SelectCensusApplyTable'
           this.getTwoDetail()
         } else {
           // this.getUsedTree()
@@ -911,6 +949,13 @@ export default {
       this.examineStatus = ''
       this.abilityDepartment = ''
       this.abilityType = ''
+      this.approveStatus = ''
+      this.exportExcelCondition = qs.stringify({
+        approveStatus: this.status,
+        deptId: this.abilityDepartment,
+        startDate: this.startDate,
+        endDate: this.endDate
+      })
       if (this.departmentId === 1) {
         // if (this.detailFlag) {
         //   this.handleChose(3)
@@ -1100,4 +1145,31 @@ input::placeholder {
   text-overflow: ellipsis;
   word-break: break-all;
 }
+.export {
+  display: inline-block;
+  width: 70px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  border-radius: 5px;
+  background: #fff;
+  border: 1px solid #dcdfe6;
+  color: #000;
+}
+.export:hover {
+  border-color: #c5ddfd;
+  background-color: #ecf4fe;
+  color: #0058e1;
+  text-decoration: none;
+}
+.export:active {
+  border-color: #c5ddfd;
+  background-color: #ecf4fe;
+  color: #0058e1;
+  text-decoration: none;
+}
+.export:visited {
+  color: #fff;
+  text-decoration: none;
+}
 </style>

From 8e6fac427be11f38be9409138e432a4130d3ddd6 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 18 Oct 2022 15:48:34 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8Fbug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/main-sidebar.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/back/src/views/main-sidebar.vue b/back/src/views/main-sidebar.vue
index 40867a8d..78596756 100644
--- a/back/src/views/main-sidebar.vue
+++ b/back/src/views/main-sidebar.vue
@@ -2,7 +2,7 @@
  * @Author: kongjun qdkongjun@gmail.com
  * @Date: 2022-06-20 09:29:59
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-18 15:34:00
+ * @LastEditTime: 2022-10-18 15:46:51
  * @FilePath: \back\src\views\main-sidebar.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -31,7 +31,7 @@
       </el-menu>
     </div>
   </aside>
-</template>\
+</template>
 
 <script>
 import http from '@/utils/request'
@@ -49,7 +49,7 @@ export default {
   },
   created () {
     this.getNum()
-    this.$store.state.sidebarMenuList = window.SITE_CONFIG.menuList
+    // this.$store.state.sidebarMenuList = window.SITE_CONFIG.menuList
     // 更新我的待办得数量
     bus.$off('updateTaskNum')
     bus.$on('updateTaskNum', () => {
@@ -96,6 +96,7 @@ export default {
             menu.total = daibanNum
           }
         }
+        this.$store.state.sidebarMenuList = menuList
       })
     }
   }

From 2ee2d988cca63296814f67973d9cb2b9fcb4bdde Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Tue, 18 Oct 2022 15:51:23 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD=E5=B7=A6=E4=BE=A7=E6=A0=91?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA=E7=88=B6=E7=BA=A7?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=B1=95=E5=BC=80=E7=AC=AC=E4=B8=80=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/detailsPageInfrastructureTree.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/front/src/views/home/detailsPageInfrastructureTree.vue b/front/src/views/home/detailsPageInfrastructureTree.vue
index 0adb69d9..b30661cb 100644
--- a/front/src/views/home/detailsPageInfrastructureTree.vue
+++ b/front/src/views/home/detailsPageInfrastructureTree.vue
@@ -91,6 +91,10 @@ export default defineComponent({
           })
         }
         treeData.value = res.data && res.data.data || []
+        // 只有一个，默认展开到二级菜单
+        if(res.data && res.data.data.length == 1) {
+          showBottom(treeData.value[0])
+        }
       }
     }
     mybus.on('getDeptList', () => {

From cdb47c705b4e2bda1b3e49f88bda1d415a331320 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Tue, 18 Oct 2022 15:52:07 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD--=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E5=A2=9E=E5=8A=A0=E8=BF=9C=E9=9B=84?=
 =?UTF-8?q?url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/static/config/basicConfig.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js
index 58b8b10b..d72f5cde 100644
--- a/front/public/static/config/basicConfig.js
+++ b/front/public/static/config/basicConfig.js
@@ -8,8 +8,8 @@
 var _global = {}
 var CONFIGITEM = {
   // version: 'qingdao', //青岛
-  // version: 'xihaian', // 西海岸
-  version: 'qingdao', // 开发
+  version: 'xihaian', // 西海岸
+  // version: 'qingdao', // 开发
   // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
   // version: 'qingdao', // 测试
   //version: 'frp', // 内网穿透
@@ -28,7 +28,8 @@ var CONFIGITEM = {
       previewUrl: 'http://15.72.183.90:7008/',
       //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
       //apiURL: 'http://15.72.183.90:8000/renren-admin',
-      websocketURL: '15.72.183.90:8000/renren-admin',
+      // websocketURL: '15.72.183.90:8000/renren-admin',
+      // websocketURL: '192.168.124.233:8888/renren-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -62,8 +63,9 @@ var CONFIGITEM = {
       },
       // 获取摄像头的后端接口地址
       camreaInfo: {
-        // cameraUrl: '10.134.135.92:9537', // 测试环境
-        cameraUrl: '10.134.135.9:9537', // 生产环境
+        // cameraUrl: '10.134.135.92:9537', // 西海岸-测试环境
+        // cameraUrl: '10.134.135.9:9537', // 西海岸-生产环境
+        cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连）
       },
       backUrl: 'http://10.134.135.9:9797',
       previewUrl: 'http://10.134.135.9:9796/',

From 2258b051846dee407b54e0f9b43e944639ffd79b Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 18 Oct 2022 17:44:46 +0800
Subject: [PATCH 09/13] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/utils/location.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/back/src/utils/location.js b/back/src/utils/location.js
index 82fc8775..25cd9f33 100644
--- a/back/src/utils/location.js
+++ b/back/src/utils/location.js
@@ -1,12 +1,12 @@
 /*
  * @Author: hisense.guoyue
  * @Date: 2022-08-23 10:30:11
- * @LastEditors: hisense.guoyue
- * @LastEditTime: 2022-10-02 14:47:05
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-10-18 17:44:33
  * @Description: 判断当前环境是西海岸还是青岛市局
  */
 const returnLocationStr = () => {
-  return CONFIGITEM.version
+  return CONFIGITEM.version === 'xihaian' ? 'xihaian' : 'qingdao'
 }
 
 export default returnLocationStr

From d3466d45213ceb5a92005fceb5dc62913a5ec668 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 18 Oct 2022 19:42:57 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modules/abilityStatistics/index.vue | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index b6041468..c401c161 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -58,6 +58,7 @@
           <el-select
             v-model="abilityDepartment"
             placeholder="请选择部门"
+            filterable
             clearable
           >
             <el-option label="全部" value=""></el-option>
@@ -218,6 +219,8 @@
 
           <el-table
             :data="tableData"
+            :header-cell-style="{ textAlign: 'center',height:'96px' }"
+            :cell-style="{ textAlign: 'center' }"
             style="width: 100%"
             v-show="this.departmentId === 3 || this.departmentId === 4"
           >
@@ -284,7 +287,7 @@ import AbilityDetail from './components/abilityDetails'
 import applicationResources from './applicationResources.vue'
 import ComponentUsed from './componentUsed.vue'
 import qs from 'qs'
-import { mapState } from 'vuex'
+// import { mapState } from 'vuex'
 // const props = defineProps({
 //   processDefinitionName: { type: String, default: null },
 //   businessKey: { type: String, default: null },
@@ -297,6 +300,7 @@ export default {
   components: { componentServices, applicationResources, ComponentUsed, AbilityDetail },
   data () {
     return {
+      departmentSelects: [],
       exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/census/center/export',
       exportExcelCondition: '',
       exportExcelType: '',
@@ -417,6 +421,13 @@ export default {
     }
   },
   created () {
+    this.$http.get('/sys/dept/all').then(res => {
+      console.log('获取部门=========>', res)
+      this.departmentSelects = []
+      res.data.data.map(val => {
+        this.departmentSelects.push({ label: val.name, value: val.name })
+      })
+    })
     // 当前设定的日期时间
     // const d = new Date()
     // let year1, month1, day1
@@ -442,7 +453,7 @@ export default {
     }
   },
   computed: {
-    ...mapState(['departmentSelects'])
+    // ...mapState(['departmentSelects'])
   },
   methods: {
     closeModal () {

From 55398620f0342130d00ada9d0fb3a938a3ac4204 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Wed, 19 Oct 2022 10:45:15 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/DetailsPageconetent.vue  | 56 ++++++++++++++++++-
 .../components/integrationServiceOrder.vue    |  1 +
 .../home/components/searchResultList.vue      | 17 +++++-
 front/src/views/home/infrastructurePage.vue   | 13 ++---
 .../components/CapabilityConvergence.vue      | 22 +++++---
 5 files changed, 90 insertions(+), 19 deletions(-)

diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index b8fcc4c9..49d2ed6f 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -262,7 +262,7 @@
         </div>
       </div>
       <div class="top-content-father">
-        <infrastructurePage ref="camera" :searchValue="searchValue" />
+        <infrastructurePage ref="camera" :searchValue="searchValue" :searchType="searchType"  />
       </div>
     </div>
     <div class="top" v-else>
@@ -409,7 +409,7 @@
       <div class="resultListSearchInput-father" style="background: unset">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
+          <a-input-search v-model:value="searchValue"   placeholder="请输入关键词" enter-button="搜索" size="large"
             @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
           <button class="button-reset" @click="chongzhi()">重置</button>
         </div>
@@ -494,8 +494,11 @@ export default defineComponent({
     const router = useRouter()
     let select = router.currentRoute.value.query.select || DETAIL_PAGE_CONTENT_DEFAULT_TAB
     const select2 = router.currentRoute.value.query.select
+    const type2 = router.currentRoute.value.query.type
+    const queryName=ref('')
     const str = router.currentRoute.value.query.str
     const searchValue = ref(str)
+    const searchType= ref(str)
     let tecHnosphere = router.currentRoute.value.query.tecHnosphere
     let appLiCation = router.currentRoute.value.query.appLiCation
     const Cardsname = ref(select)
@@ -682,6 +685,7 @@ export default defineComponent({
       }
 
       ListContent.records.forEach((val) => {
+       
         if (!val) {
           return
         }
@@ -689,6 +693,7 @@ export default defineComponent({
           paramsGetResources.infoList = paramsGetResources.infoList.filter(
             (item) => item.attrType !== name
           )
+      
           if (
             val.selectedTags &&
             val.selectedTags.indexOf(tag.dict_label) == -1
@@ -798,7 +803,34 @@ export default defineComponent({
         ListContentCopy.value = JSON.parse(JSON.stringify(dataCopy))
         ListContent.records = []
         ListContent.records = JSON.parse(JSON.stringify(dataCopy))
-
+        if(select2=='组件服务'){
+            queryName.value='组件类型'
+           }else if(select2=='应用资源'){
+            queryName.value='应用领域'
+           }else{
+            queryName.value=''
+           }
+        ListContent.records.forEach((val) => {
+           
+           if (!val) {
+             return
+           }
+           if (val.name === queryName.value ) {
+             if (
+               val.selectedTags &&
+               val.selectedTags.indexOf(type2) == -1
+             ) {
+               val.selectedTags = [type2]
+             } else {
+               val.selectedTags &&
+                 val.selectedTags.splice(
+                   val.selectedTags.indexOf(type2),
+                   1
+                 )
+             }
+   
+           }
+         })
         // 智能算法-特殊处理
         if (whoShow1.value.itShowXiHaiAn) {
           if (!storageSearchInfo) {
@@ -859,6 +891,7 @@ export default defineComponent({
     // 校验
     const re = /^[0-9\u4E00-\u9FA5]*$/
     const getAppResources2 = () => {
+ 
       globalFlag.value = false
       if (
         whoShow1.value.itShowQingDao &&
@@ -1236,7 +1269,24 @@ export default defineComponent({
         if (searchValue.value && !select2) {
           globalSearch()
         } else {
+           paramsGetResources.infoList=[]
+           if(select2=='组件服务'){
+            queryName.value='组件类型'
+           }else if(select2=='应用资源'){
+            queryName.value='应用领域'
+           }else if(select2=='基础设施'){
+            searchType.value=type2
+          }else{
+            queryName.value=type2
+            searchType.value=''
+           }
+           let info={attrType:queryName.value, attrValue: type2}
+          paramsGetResources.infoList.push(info)
+          paramsGetResources.type=select2
           getAppResources2()
+         
+         
+      listKey.value++
         }
       }
     })
diff --git a/front/src/views/home/components/integrationServiceOrder.vue b/front/src/views/home/components/integrationServiceOrder.vue
index 0c62dfb6..fc13a08c 100644
--- a/front/src/views/home/components/integrationServiceOrder.vue
+++ b/front/src/views/home/components/integrationServiceOrder.vue
@@ -47,6 +47,7 @@ const integrationOrder = reactive({
 
 // 融合服务--排序
 const changeOrder = (i, val, type) => {
+  
   console.log('i, val, type------------>', i, val, type);
   integrationOrder.orderField = val
   integrationOrder.orderType = type;
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 96d345a2..99d22fcc 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -230,6 +230,21 @@
                   </span>
                 </template>
               </div>
+              <div
+                v-if="
+                  selectCardsname === '打包模式'
+                "
+                class="label-content1"
+              >
+              发布时间：
+                <template v-if="item.createDate">
+                  <span>
+                    {{ item.createDate.substring(0, 10) + ' ' }}
+                  </span>
+                  <span>{{ item.createDate.substring(11, 19) }}</span>
+                </template>
+                <template v-else>--</template>
+              </div>
               <div v-else>
                 发布时间：
                 <template v-if="item.createDate">
@@ -989,7 +1004,7 @@
           margin: 0 10px 0 0;
 
           .header-right {
-            display: flex;
+           // display: flex;
             font-size: 14px;
             color: #212121;
 
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 7c45e006..2f108dc6 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -480,6 +480,7 @@ import moment from 'moment'
 const props = defineProps({
   // 模糊查
   searchValue: { type: String, default: '' },
+  searchType: { type: String, default: '' },
 })
 const current = ref(1)
 const videoTotal = ref(0)
@@ -621,6 +622,9 @@ const lookData = ref({})
 if (props.searchValue) {
   mapSearchParam.value.cameraName = props.searchValue
 }
+if (props.searchType) {
+  tabClick(0, props.searchType.value)
+}
 // 消息列表页面
 let formPage = router.currentRoute.value.query.formPage || ''
 // 设施类型--无人机和单兵设备
@@ -834,6 +838,7 @@ const look = (row) => {
 }
 //   搜索
 const onSearch = (searchValue) => {
+  debugger
   searchData()
   chengguoSearch()
 }
@@ -1127,14 +1132,6 @@ const selectType = ref('政务云资源')
 let tableHeight = ref('600')
 //tab切换点击事件
 const tabClick = (indexFather, name) => {
-  console.log(
-    '点击tab================>',
-    indexFather,
-    name,
-    clickList.value,
-    clickList.value[indexFather]
-  )
-
   selectedRowKeys.value = []
   selectedList.value = []
   if (clickList.value[indexFather].content.indexOf(name) != -1) {
diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue
index 6982e05b..8e3d9c3a 100644
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@@ -146,17 +146,18 @@ const getAppResources = (type, obj) => {
                 num: res.data.data[key],
               })
             }
-          } else if(key !== '云资源') {  //云资源--暂时隐藏
+          } 
+          else  {  
             jcList.value.push({
               name: key,
               num: res.data.data[key],
             })
           }
         }
-         jcList.value.push({
-              name: '会客厅',
-              num: 4,
-            })
+        //  jcList.value.push({
+        //       name: '会客厅',
+        //       num: 4,
+        //     })
         // 西海岸-单兵设备、无人机 获取数量
         if (whoShow1.value.itShowXiHaiAn) {
           getSoldierData('无人机')
@@ -328,11 +329,18 @@ const selectOne11 = (name) => {
   })
 }
 const selectOne2 = (name) => {
-  console.log('点击===============》', name)
+  let names=''
+  if(name ==='云资源'){
+    names='政务云资源'
+  } else if(name ==='会客厅'){
+    names='城市云脑会客厅'
+  }else{
+    names=name
+  }
   router.push({
     path: '/DetailsPageconetent',
     query: {
-      type: name,
+      type: names,
       select: '基础设施',
     },
   })

From e6a102ce3f1884fb6144b2b5cdd4e940cf2d3692 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Wed, 19 Oct 2022 11:32:09 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/abilityStatistics/index.vue | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index c401c161..2add8b39 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -140,9 +140,12 @@
            <span v-if='this.choseId===0' :class="[departmentId===4?'departmentStyle':'']"  @click="handleChose(4)">
                 能力使用明细
             </span> -->
-            <span v-if="detailFlag" class="detail-button" @click="goToDetail()">
-              明细
-            </span>
+            <template v-if="detailFlag">
+              <el-checkbox v-model="checked" @change='chagneCheckbox' style="position: absolute;right: 150px;margin-top: -15px;">隐藏空数据</el-checkbox>
+              <span class="detail-button" @click="goToDetail()">
+                明细
+              </span>
+            </template>
             <span v-else class="detail-button" @click="goToBack()"> 返回 </span>
           </div>
           <div class="line-style"></div>
@@ -287,6 +290,7 @@ import AbilityDetail from './components/abilityDetails'
 import applicationResources from './applicationResources.vue'
 import ComponentUsed from './componentUsed.vue'
 import qs from 'qs'
+import Template from '../devtools/template.vue'
 // import { mapState } from 'vuex'
 // const props = defineProps({
 //   processDefinitionName: { type: String, default: null },
@@ -297,9 +301,10 @@ import qs from 'qs'
 //   showType: { type: String, default: null },
 // })
 export default {
-  components: { componentServices, applicationResources, ComponentUsed, AbilityDetail },
+  components: { componentServices, applicationResources, ComponentUsed, AbilityDetail, Template },
   data () {
     return {
+      checked: false,
       departmentSelects: [],
       exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/census/center/export',
       exportExcelCondition: '',
@@ -391,6 +396,7 @@ export default {
         { name: '会议室', value: 6 }
       ],
       tableData: [],
+      tableDataClone: [],
       tableData2: [
         {
           approveStatus: '',
@@ -456,6 +462,15 @@ export default {
     // ...mapState(['departmentSelects'])
   },
   methods: {
+    chagneCheckbox () {
+      if (this.checked) {
+        this.tableData = this.tableDataClone.filter(val => val.count !== 0)
+        this.total = this.tableData.length
+      } else {
+        this.tableData = this.tableDataClone
+        this.total = this.tableData.length
+      }
+    },
     closeModal () {
       this.detailsVisible = false
     },
@@ -550,6 +565,7 @@ export default {
               parseInt(result[i].hys)
           }
           this.tableData = res.data.data
+          this.tableDataClone = res.data.data
           this.total = res.data.data.total
           this.exportExcelCondition = qs.stringify({
             approveStatus: this.status,
@@ -614,6 +630,7 @@ export default {
               parseInt(result[i].hys)
           }
           this.tableData = res.data.data
+          this.tableDataClone = res.data.data
           this.total = res.data.data.total
           this.exportExcelCondition = qs.stringify({
             approveStatus: this.status,
@@ -694,6 +711,7 @@ export default {
         .then((res) => {
           console.log('111111', this.tableData, res.data.data)
           this.tableData = res.data.data
+          this.tableDataClone = res.data.data
           this.total = res.data.data.total
           this.exportExcelCondition = qs.stringify({
             approveStatus: this.status,
@@ -731,6 +749,7 @@ export default {
         })
         .then((res) => {
           this.tableData = res.data.data
+          this.tableDataClone = res.data.data
           this.total = res.data.data.total
           this.exportExcelCondition = qs.stringify({
             approveStatus: this.status,
@@ -838,6 +857,7 @@ export default {
     //   },
     // 选择发布or使用表格
     handleChose (index) {
+      this.checked = false
       this.departmentId = index
       if (index === 1) {
         if (this.choseId === 0) {
@@ -910,6 +930,7 @@ export default {
     },
     // 返回按钮
     goToBack () {
+      this.checked = false
       // departmentId 1，3  2，4 两个值共同判断
       this.detailFlag = !this.detailFlag
       if (this.departmentId === 3) {

From b24e925c5a36126cd58c7c0153613adc00030d46 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Wed, 19 Oct 2022 11:46:29 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AbilityApplication.vue              | 14 +++++++++++++-
 .../personalCenter/components/PutOnTheShelf .vue   |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue
index 3230512e..ef1a6069 100644
--- a/front/src/views/personalCenter/components/AbilityApplication.vue
+++ b/front/src/views/personalCenter/components/AbilityApplication.vue
@@ -62,7 +62,7 @@
             <a-button type="primary" @click="modify(props.refObj.id, item)" v-if="item.backToFirst">
               修改
             </a-button>
-            <a-popconfirm v-if="!item.ended" title="是否终止此流程?" ok-text="是" cancel-text="否"
+            <a-popconfirm class="aaa"  v-if="!item.ended" title="是否撤回此流程?" ok-text="是" cancel-text="否"
               @confirm="endThis(item.instanceId)" @cancel="cancel">
               <a-button type="primary" danger style="margin-left: 10px">
                 撤回申请
@@ -463,7 +463,19 @@ const openView = (url) => {
 }
 
 </script>
+
 <style lang="less" scoped>
+.aaa{
+  margin-right: 30px;
+}
+ :deep(.ant-popover-inner) {
+    position: fixed !important;
+  
+    margin-right: 100px;
+  
+    
+    
+  }
 .title {
   font-size: 0.18rem;
   color: #000;
diff --git a/front/src/views/personalCenter/components/PutOnTheShelf .vue b/front/src/views/personalCenter/components/PutOnTheShelf .vue
index cc37393a..b23a28aa 100644
--- a/front/src/views/personalCenter/components/PutOnTheShelf .vue	
+++ b/front/src/views/personalCenter/components/PutOnTheShelf .vue	
@@ -13,7 +13,7 @@
       <div class="title">基本信息</div>
       <a-popconfirm
         v-if="!props.refObj.ended"
-        title="是否终止此流程?"
+        title="是否撤回此流程?"
         ok-text="是"
         cancel-text="否"
         @confirm="endThis"