diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue
index 4f23d218..84cf6400 100644
--- a/front/src/views/home/AbilityToApplyFor.vue
+++ b/front/src/views/home/AbilityToApplyFor.vue
@@ -89,11 +89,15 @@
               </span>
               <span>{{ val.type }}</span>
             </div>
+            <!-- (item.note1 && JSON.parse(item.note1) &&
+                      JSON.parse(item.note1)[0] &&
+                      JSON.parse(item.note1)[0].channelName -->
+
             <div class="description">
               {{
                 val.description ||
                 ((val.note1 || '') &&
-                  (JSON.parse(val.note1)[0].channelName || '--') +
+                  (JSON.parse(val.note1) && JSON.parse(val.note1)[0] && JSON.parse(val.note1)[0].channelName || '--') +
                     '等' +
                     JSON.parse(val.note1).length +
                     '个摄像头') ||
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 074472f4..71624d81 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -8,159 +8,69 @@
         </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>
                 </a-form-item>
               </div>
               <div class="base-info" v-if="flag">
-                <a-form-item
-                  label="应用系统"
-                  name="applicationSystem"
-                  :rules="[{ required: true, message: '请选择应用系统' }]"
-                >
+                <a-form-item label="应用系统" name="applicationSystem" :rules="[{ required: true, message: '请选择应用系统' }]">
                   <a-tooltip>
                     <template #title>
                       请输入关键字（如选项没有系统请新增）
                     </template>
-                    <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-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-tooltip>
                 </a-form-item>
-                <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>
               <div class="bottom-btn">
-                <a-button
-                  style="
+                <a-button style="
                     width: 80px;
                     height: 38px;
                     margin-right: 20px;
@@ -171,15 +81,10 @@
                     border: none;
                     padding: 0;
                     text-align: center;
-                  "
-                  type="primary"
-                  html-type="cancle"
-                  @click="resetFields()"
-                >
+                  " type="primary" html-type="cancle" @click="resetFields()">
                   退出申请
                 </a-button>
-                <a-button
-                  style="
+                <a-button style="
                     width: 80px;
                     height: 38px;
                     background: #0087ff;
@@ -189,11 +94,7 @@
                     border: none;
                     padding: 0;
                     text-align: center;
-                  "
-                  type="primary"
-                  html-type="submit"
-                  @click="processStartHandle()"
-                >
+                  " type="primary" html-type="submit" @click="processStartHandle()">
                   提交申请
                 </a-button>
               </div>
@@ -211,306 +112,242 @@
   </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 * 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天',
-        },
-      ]
+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天',
+      },
+    ]
 
-      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)
           }
         })
-      }
-      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)
-      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
-            )
+        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)
+    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,
-            })
-          }
-        })
-      }
-      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,
+            : '申请' + 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,
           })
+        }
+      })
+    }
+    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 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 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,
-            },
-          })
-        }, 1000)
-      }
+    // 跳转到能力集市
+    const jumpToDetailsPageconetent = () => {
+      setTimeout(() => {
+        router.push({
+          path: '/DetailsPageconetent',
+          query: {
+            select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
+          },
+        })
+      }, 1000)
+    }
 
-      // 提交申请
-      const processStartHandle = () => {
-        formRef.value.validate().then(() => {
-          if (!formUrl) {
-            return message.error('请设置保存表单的URL')
-          }
-          if (!formName) {
-            return message.error('请设置表单名称')
-          }
+    // 提交申请
+    const processStartHandle = () => {
+      formRef.value.validate().then(() => {
+        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) {
+        if (id) {
+          endProcess({ instanceId: taskId }).then((end) => {
+            if (end.data.code == 0) {
               let ids = []
               let falgNum = 0
               let sxt = true
@@ -540,16 +377,10 @@
                   }
                 })
               })
-              console.log('formName--ids-提交数据--------->', formName, ids)
               if (formName.system.length !== 0) {
                 if (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)
@@ -577,433 +408,507 @@
                   }
                 })
               }
-            } else {
-              formName.applicationSystem = ''
-              applyAllApplication(formName).then((res) => {
+            }
+          })
+        } 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.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)
                 if (res.data.code == 0) {
-                  message.success('申请提交成功，请到消息中心查看！')
-                  jumpToDetailsPageconetent()
+                  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('申请失败！')
                 }
               })
             }
-          }
-        })
-      }
-
-      // 基础设施--数据下发
-      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.map((sxt) => {
-          let _itemData = {
-            resourceId: sxt.idtCameraChannel + '',
-            resourceName: sxt.channelName,
-            cameraId: sxt.channelId, // 改接口后删除
-            channelCode: sxt.channelCode,
-            channelId: sxt.channelId,
-            channelName: sxt.channelName,
-            checkStatus: sxt.checkStatus + '',
-            gpsX: sxt.gpsX,
-            gpsY: sxt.gpsY,
-            idtCameraChannel: sxt.idtCameraChannel + '',
-            nodeName: sxt.nodeName,
-            parentId: sxt.parentId,
-            status: sxt.status + '',
-          }
-          // 西海岸
-          if (isXiHaiAn.value) {
-            _itemData.managementUnitName = sxt.managementUnitName
-            _itemData.cameraPointTypeName = sxt.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')
+          } else {
+            formName.applicationSystem = ''
+            applyAllApplication(formName).then((res) => {
+              if (res.data.code == 0) {
+                message.success('申请提交成功，请到消息中心查看！')
                 jumpToDetailsPageconetent()
+              } else {
+                message.error('申请失败！')
               }
             })
-          } 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 handleChange = (info) => {
-        if (info.file.status !== 'uploading') {
-          // console.log(info.file, info.fileList)
-        }
-        if (info.file.status === 'done') {
-          message.success(`${info.file.name} 上传成功`)
-          formName.enclosure = info.file.response.data
-          formName.enclosureName = info.file.name
-        } else if (info.file.status === 'error') {
-          message.error(`${info.file.name} 上传失败`)
-        }
-      }
-      const beforeUpload = (file) => {
-        const isPNG =
-          file.type === 'image/png' ||
-          'image/doc' ||
-          'image/docx' ||
-          'image/jpg' ||
-          'image/png' ||
-          'image/jpeg' ||
-          'image/pdf' ||
-          'image/xlxs' ||
-          'image/ppt'
-        if (!isPNG) {
-          message.error(`上传失败`)
-        }
-        return isPNG || Upload.LIST_IGNORE
-      }
-      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 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) {
+          _itemData.managementUnitName = jcss.managementUnitName;
+          _itemData.cameraPointTypeName = jcss.cameraPointTypeName;
+        }
+        obj.system.push(_itemData)
       })
-
-      // 融合服务-更新
-      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)
+      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
               }
-              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.code == 0) {
-              message.success(res.data.msg)
+              mybus.emit('getSgcNum')
               jumpToDetailsPageconetent()
-            } else {
-              message.error('申请失败！')
             }
           })
-          .catch((err) => {
-            message.error(err)
-          })
-      }
+        } else {
+          if (res.data.msg === 'success' && falgNum == 0 && sxt) {
+            message.success('申请提交成功，请到消息中心查看！')
+            sxt = false
+          }
+          jumpToDetailsPageconetent()
+        }
+      })
+    }
 
-      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,
+    // 启动流程
+    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 handleChange = (info) => {
+      if (info.file.status !== 'uploading') {
+        // console.log(info.file, info.fileList)
+      }
+      if (info.file.status === 'done') {
+        message.success(`${info.file.name} 上传成功`)
+        formName.enclosure = info.file.response.data
+        formName.enclosureName = info.file.name
+      } else if (info.file.status === 'error') {
+        message.error(`${info.file.name} 上传失败`)
+      }
+    }
+    const beforeUpload = (file) => {
+      const isPNG =
+        file.type === 'image/png' ||
+        'image/doc' ||
+        'image/docx' ||
+        'image/jpg' ||
+        'image/png' ||
+        'image/jpeg' ||
+        'image/pdf' ||
+        'image/xlxs' ||
+        'image/ppt'
+      if (!isPNG) {
+        message.error(`上传失败`)
+      }
+      return isPNG || Upload.LIST_IGNORE
+    }
+    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.code == 0) {
+            message.success(res.data.msg)
+            jumpToDetailsPageconetent()
+          } else {
+            message.error('申请失败！')
+          }
+        })
+        .catch((err) => {
+          message.error(err)
+        })
+    }
+
+    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,
+    }
+  },
+}
 </script>
 <style scoped lang="less">
-  #apply-container {
-    // background-color: #f5f8fc;
-    height: 100%;
-    width: 100%;
-    margin: 0.8rem auto 0;
+#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 {
     display: flex;
     justify-content: space-between;
+  }
 
-    aside {
-      width: 282px;
-      height: 96%;
-      overflow-y: auto;
-      background-color: #fff;
-      margin: 1% 0 3%;
-    }
+  .flex-row-start {
+    justify-content: flex-start;
+    align-items: center;
+  }
 
-    article {
-      width: 1090px;
-      height: 99%;
-      overflow-y: auto;
-      background-color: #fff;
-      margin: 1% auto;
-    }
+  :deep(.ant-form-item-label) {
+    label {
+      color: #666;
+      font-size: 16px;
 
-    .form-container {
-      padding: 20px 20px 30px 20px;
-
-      .title {
-        font-size: 20px;
-        color: #000;
-        font-weight: bold;
-        margin-bottom: 20px;
+      &::after {
+        content: '';
       }
     }
-
-    .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;
-    }
   }
 
-  .applicationScene {
-    :deep(.ant-select-selector) {
-      overflow-x: scroll;
-    }
-
-    :deep(.ant-select-selection-overflow) {
-      flex-wrap: nowrap;
+  :deep(.ant-form-item-required) {
+    &::before {
+      font-size: 8px;
+      margin-right: 10px;
     }
   }
 
-  textarea {
-    resize: none;
-    font-size: 14px;
+  :deep(.ant-input) {
+    border: 1px solid #e0e0e0;
+    border-radius: 6px;
   }
 
-  .bottom-btn {
-    display: flex;
-    justify-content: center;
-    // position: fixed;
+  .success {
+    div {
+      width: 100px;
+      margin: 80px auto 40px;
+    }
+
+    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;
+  }
+}
+
+textarea {
+  resize: none;
+  font-size: 14px;
+}
+
+.bottom-btn {
+  display: flex;
+  justify-content: center;
+  // position: fixed;
+}
 </style>
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index ac566f31..1912d8a3 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -453,14 +453,14 @@
             批量预览
           </a-button>
           <!-- 添加至申购车 -->
-          <a-button
+          <!-- <a-button
             v-if="isXiHaiAn"
             type="primary"
             @click="addShoppingCart"
             class="buttonAdd"
           >
             添加至申购车
-          </a-button>
+          </a-button> -->
           <!-- 一键申请 -->
           <a-button
             v-if="isXiHaiAn"
@@ -1412,6 +1412,8 @@
           tabList.value[1].title = '视频标签'
         }
         selectType.value = '视频资源'
+        console.log('444------------>', 444);
+        
       } else if (name == '政务云资源') {
         room.value = true
         tableHeight.value = 600
@@ -1479,7 +1481,12 @@
             mapSearchParam.value.labelCodes.push(item.labelCode)
           })
         }
-        console.log('选中的标签code', mapSearchParam.value)
+        // todo
+        mapSearchParam.value.gpsX = ''
+        mapSearchParam.value.gpsY = ''
+        mapSearchParam.value.radius = ''
+        mapSearchParam.value.type = ''
+        console.log('mapSearchParam----->查询条件', mapSearchParam.value)
         mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
         emits('add', 1)
         getCamera()
@@ -1863,7 +1870,6 @@
           mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
         pageNum: mapSearchParam.value.pageNum,
         pageSize: mapSearchParam.value.pageSize,
-        name: mapSearchParam.value.cameraName || '',
         longitude: mapSearchParam.value.gpsX || '',
         latitude: mapSearchParam.value.gpsY || '',
         radius: mapSearchParam.value.radius || '',
diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue
index 84244d7d..9f6affdc 100644
--- a/front/src/views/personalCenter/components/PurchaseVehicle.vue
+++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue
@@ -93,8 +93,11 @@
             :checked="val.checked"
             @click.stop="checkedDept(val)"
           ></a-checkbox>
-          <span style="margin-left: 0.2rem">
-            {{ val.deptName + '(' + val.count + ')' }}
+          <span style="margin-left: 0.2rem" v-if="itShowXiHaiAn">
+            {{ val.deptName}}
+          </span>
+          <span style="margin-left: 0.2rem" v-else>
+            {{ val.deptName  + '(' + val.count + ')' }}
           </span>
         </div>
         <DownOutlined v-show="!val.show" />
@@ -113,13 +116,13 @@
                 <a-list-item-meta
                   :description="
                     item.description ||
-                    (JSON.parse(item.note1) &&
+                    (item.note1 && JSON.parse(item.note1) &&
                       JSON.parse(item.note1)[0] &&
                       JSON.parse(item.note1)[0].channelName +
                         '等' +
                         JSON.parse(item.note1).length +
                         '个摄像头') ||
-                    '--'
+                    ''
                   "
                   style="position: relative"
                 >
@@ -144,8 +147,9 @@
                       </a-tooltip>
                       <span class="type">{{ item.type }}</span>
                     </div>
+                    <!-- // todo -->
                     <span class="time">
-                      加购时间:{{ item.time }}
+                      <span v-if="!itShowXiHaiAn">加购时间:{{ item.time }}</span>
                       <a-popconfirm
                         title="是否删除该记录?"
                         ok-text="是"
@@ -318,6 +322,7 @@
   const name = ref('')
   const type = ref('')
   const list = ref([])
+  const itShowXiHaiAn = whoShow.itShowXiHaiAn;
   // 初始化
   onMounted(() => {
     getList('init')
@@ -498,7 +503,8 @@
       pageSize: pageSize.value,
       name: name.value,
     }).then((res) => {
-      console.log('res-----selectResourceCarGroupByDept------->', res);
+      console.log('res---获取信息--------->', res);
+      
       let statistics = 0
       res.data.data.list.map((val) => {
         val.initLoading = true
@@ -541,13 +547,19 @@
   // 通过deptid查询列表
   const getListByDeptId = (item) => {
     console.log(item, 'item')
-    if (item.children && item.children.length == 0) {
-      selectResourceListByDept({
+    if (item.children.length == 0) {
+      let _obj = {
         pageNum: item.pageNum,
         pageSize: item.pageSize,
-        deptId: item.deptId,
+        deptId: item.deptId || '',
         name: name.value,
-      }).then((res) => {
+      }
+      // 西海岸 todo
+      if(whoShow.itShowXiHaiAn) {
+        _obj.key = item.deptName
+      }
+      selectResourceListByDept(_obj).then((res) => {
+        console.log('res----根据部门查询-------->', res);
         // console.log(
         //   '根据部门查询=============>',
         //   item,
@@ -625,16 +637,17 @@
   }
   // 点击部门多选框
   const checkedDept = (item) => {
-    // console.log(
-    //   '点击部门多选框==================>',
-    //   item,
-    //   checkedList.value,
-    //   checkAll.value
-    // )
+    console.log(
+      '点击部门多选框==================>',
+      item,
+      checkedList.value,
+      checkAll.value
+    )
     item.checked = !item.checked
     if (item.checked) {
       if (item.children.length > 0) {
         item.children.map((val) => {
+          console.log('val.id------------>', val.id);
           if (checkedListAbility.value.indexOf(val.id) == -1) {
             checkedListAbility.value.push(val.id)
             item.checkedList.push(val.id)
@@ -822,8 +835,15 @@
     } else {
       let arr = []
       let delArr = []
+      console.log('list.value------------>', list.value);
+      
       list.value.map((val) => {
         val.arr = val.children.filter((item) => {
+          if(whoShow.itShowXiHaiAn) {
+            item.type = '基础设施';
+            item.resourceName = '摄像头列表';
+            item.resourceId = '1522550195055828996';
+          }
           console.log('选择的数据=============>', item)
           if (checkedListAbility.value.indexOf(item.id) > -1) {
             if (item.delFlag == 0) {
@@ -841,6 +861,7 @@
       if (arr.length > 0) {
         console.log('一键申请===================>', arr)
         localStorage.setItem('applyList', JSON.stringify(arr))
+        return;
         router.push({
           path: '/apply',
         })
diff --git a/front/src/views/personalCenter/components/asideMenu.vue b/front/src/views/personalCenter/components/asideMenu.vue
index 8e64a0a8..1b47ce7d 100644
--- a/front/src/views/personalCenter/components/asideMenu.vue
+++ b/front/src/views/personalCenter/components/asideMenu.vue
@@ -1,136 +1,137 @@
 <template>
   <div id="aside-menu-container">
-    <a-menu
-      id="aside-menu"
-      v-model:openKeys="openKeys"
-      v-model:selectedKeys="selectedKeys"
-      mode="inline"
-    >
-      <a-menu-item
-        class="aside-menu-item"
-        v-for="item in menuList"
-        :key="item.key"
-        @click="handleClick(item)"
-      >
-        <i
-          class="icon"
-          :style="{
-            backgroundImage:
-              selectedKeys == item.key
-                ? 'url(' + item.imgActive + ')'
-                : 'url(' + item.img + ')',
-          }"
-        ></i>
+    <a-menu id="aside-menu" v-model:openKeys="openKeys" v-model:selectedKeys="selectedKeys" mode="inline">
+      <a-menu-item class="aside-menu-item" v-for="item in menuList" :key="item.key" @click="handleClick(item)">
+        <i class="icon" :style="{
+          backgroundImage:
+            selectedKeys == item.key
+              ? 'url(' + item.imgActive + ')'
+              : 'url(' + item.img + ')',
+        }"></i>
         <span>{{ item.title }}</span>
       </a-menu-item>
     </a-menu>
   </div>
 </template>
 <script>
-  import { defineComponent, ref } from 'vue'
-  import mybus from '@/myplugins/mybus'
-  export default defineComponent({
-    components: {},
+import { defineComponent, ref, onMounted } from 'vue'
+import mybus from '@/myplugins/mybus'
+export default defineComponent({
+  components: {},
+  setup() {
+    const menuList = [
+      // {
+      //   title: '申购车',
+      //   img: require('@/assets/personalCenter/demand.png'),
+      //   imgActive: require('@/assets/personalCenter/demandactive.png'),
+      //   key: 'PurchaseVehicle',
+      // },
+      {
+        title: '我的发布',
+        img: require('@/assets/personalCenter/push.png'),
+        imgActive: require('@/assets/personalCenter/pushactive.png'),
+        key: 'push',
+      },
+      {
+        title: '我的申请',
+        img: require('@/assets/personalCenter/apply.png'),
+        imgActive: require('@/assets/personalCenter/applyactive.png'),
+        key: 'apply',
+      },
+      // {
+      //   title: '我的收藏',
+      //   img: require('@/assets/personalCenter/collect.png'),
+      //   imgActive: require('@/assets/personalCenter/collectactive.png'),
+      //   key: 'collect',
+      // },
+      {
+        title: '我的浏览',
+        img: require('@/assets/personalCenter/recent.png'),
+        imgActive: require('@/assets/personalCenter/recentactive.png'),
+        key: 'recent',
+      },
+      {
+        title: '我的需求',
+        img: require('@/assets/personalCenter/demand.png'),
+        imgActive: require('@/assets/personalCenter/demandactive.png'),
+        key: 'demand',
+      },
+      {
+        title: '我的评论',
+        img: require('@/assets/personalCenter/remark.png'),
+        imgActive: require('@/assets/personalCenter/remarkactive.png'),
+        key: 'remark',
+      },
+    ]
+    // 西海岸
+    // if() {
 
-    setup() {
-      const menuList = [
-        {
-          title: '申购车',
-          img: require('@/assets/personalCenter/demand.png'),
-          imgActive: require('@/assets/personalCenter/demandactive.png'),
-          key: 'PurchaseVehicle',
-        },
-        // {
-        //   title: '我的发布',
-        //   img: require('@/assets/personalCenter/push.png'),
-        //   imgActive: require('@/assets/personalCenter/pushactive.png'),
-        //   key: 'push',
-        // },
-        // {
-        //   title: '我的申请',
-        //   img: require('@/assets/personalCenter/apply.png'),
-        //   imgActive: require('@/assets/personalCenter/applyactive.png'),
-        //   key: 'apply',
-        // },
-        // {
-        //   title: '我的收藏',
-        //   img: require('@/assets/personalCenter/collect.png'),
-        //   imgActive: require('@/assets/personalCenter/collectactive.png'),
-        //   key: 'collect',
-        // },
-        // {
-        //   title: '我的浏览',
-        //   img: require('@/assets/personalCenter/recent.png'),
-        //   imgActive: require('@/assets/personalCenter/recentactive.png'),
-        //   key: 'recent',
-        // },
-        // {
-        //   title: '我的需求',
-        //   img: require('@/assets/personalCenter/demand.png'),
-        //   imgActive: require('@/assets/personalCenter/demandactive.png'),
-        //   key: 'demand',
-        // },
-        // {
-        //   title: '我的评论',
-        //   img: require('@/assets/personalCenter/remark.png'),
-        //   imgActive: require('@/assets/personalCenter/remarkactive.png'),
-        //   key: 'remark',
-        // },
-      ]
-      const selectedKeys = ref(['PurchaseVehicle'])
-      const type = JSON.parse(window.sessionStorage.getItem('type'))
-      if (type) {
-        selectedKeys.value = [type]
-      }
-      const handleClick = (item) => {
-        console.log('click', item)
-        mybus.emit('tabsChange', item)
-      }
+    // }
+    const selectedKeys = ref(['apply'])
 
-      return {
-        menuList,
-        selectedKeys,
-        handleClick,
-      }
-    },
-  })
+    const type = JSON.parse(window.sessionStorage.getItem('type'))
+    if (type) {
+      selectedKeys.value = [type]
+    }
+    const handleClick = (item) => {
+      console.log('click', item)
+      mybus.emit('tabsChange', item)
+    }
+
+    onMounted(() => {
+      handleClick(menuList[1])
+    })
+
+    return {
+      menuList,
+      selectedKeys,
+      handleClick,
+    }
+  },
+})
 </script>
 <style lang="less" scoped>
-  #aside-menu-container {
-    margin-top: 20px;
-    height: 790px;
-    overflow-y: scroll;
-    overflow-x: hidden;
+#aside-menu-container {
+  margin-top: 20px;
+  height: 790px;
+  overflow-y: scroll;
+  overflow-x: hidden;
 
-    :deep(.ant-menu-item) {
-      height: 60px;
-      font-size: 16px;
-      color: #333;
-      &:hover {
-        color: #0087ff;
-        background-color: #edf4fc;
-      }
-    }
-    :deep(.ant-menu-title-content) {
-      display: flex;
-      align-items: center;
-      .icon {
-        display: block;
-        width: 24px;
-        height: 24px;
-        background: no-repeat center;
-        margin-right: 30px;
-      }
-    }
-    :deep(.ant-menu-item-selected) {
-      background-color: #edf4fc;
+  :deep(.ant-menu-item) {
+    height: 60px;
+    font-size: 16px;
+    color: #333;
+
+    &:hover {
       color: #0087ff;
-      &::after {
-        display: none;
-      }
+      background-color: #edf4fc;
     }
   }
-  #aside-menu-container::-webkit-scrollbar {
-    width: 0 !important;
+
+  :deep(.ant-menu-title-content) {
+    display: flex;
+    align-items: center;
+
+    .icon {
+      display: block;
+      width: 24px;
+      height: 24px;
+      background: no-repeat center;
+      margin-right: 30px;
+    }
   }
+
+  :deep(.ant-menu-item-selected) {
+    background-color: #edf4fc;
+    color: #0087ff;
+
+    &::after {
+      display: none;
+    }
+  }
+}
+
+#aside-menu-container::-webkit-scrollbar {
+  width: 0 !important;
+}
 </style>