From c6fa97899831db5b5a47a681d8c42af3ce4129f5 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Tue, 3 Jan 2023 16:50:12 +0800
Subject: [PATCH] =?UTF-8?q?UI=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/assets/newHome/add-grey.png       |  Bin 0 -> 1574 bytes
 front/src/assets/newHome/biaoti.png         |  Bin 0 -> 303 bytes
 front/src/views/home/AbilityToApplyFor.vue  |    7 +-
 front/src/views/home/algorithmCompare.vue   |   36 +-
 front/src/views/home/apply.vue              | 1826 +++++++++----------
 front/src/views/home/infrastructurePage.vue |   15 +-
 6 files changed, 905 insertions(+), 979 deletions(-)
 create mode 100644 front/src/assets/newHome/add-grey.png
 create mode 100644 front/src/assets/newHome/biaoti.png

diff --git a/front/src/assets/newHome/add-grey.png b/front/src/assets/newHome/add-grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..61d40dbc81f00c38a15d76127fe7613f4428124f
GIT binary patch
literal 1574
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m=!ZaB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T
z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?T<fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v>
zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26e~9uV^=d1H#av!BQrxoS7%ET16M}_V^ddG
zH%nt9V`G?Jm;B_?+|;}hnBEkaUQ+`DoO(eiA-4c%vrB4GW?5>ATTy<l0@%k^nYi8J
zg3~;x-V|JJF>!OnsaGH97=2K@BE>UI2$*<4On9mVa^UGcH4m8Bi-4)R^wp~h1_q|t
zo-U3d6}QgJwDt*c6lr_zC+1UO5~tIl<Km$p7Uqz9V^%^Br`wh$r<!ZW!lbKvGkT^r
zgsG_=>k8Mt!ObZUw{RlY)`&^5|LZNq%~Rx!txxa$tRC+)ZTIs(pLeudI&ZKrU!FCA
ztvP{%ry;ID(B$;{{|&Yq*uoAlMX*`kcF{cj-1-1>f%Fn>n{vK6?BNG^f9A0JG>0c#
zPgC;|@p@4DVM*7{BCpfs*HyzJ^qUtyP~X8XHFdX?s#x;962lWu>v`=O%|h!9pSho$
zxXJVei(Rv4>9<)^VtkjeS<Z?ySo7%eh9^EVC2Ba`LjFiiyd%n6bopNB$<CemQ;j92
zNjWktYUf_c^|g5V_OC(Z+r7%m<iel4&E2|lV_>$1*pKv!+)`&1l>K+`Sl_+6lxZ!u
zi<_*8-aJ2^d(6Cgg3Ss){%^jvj!pVV@Ii&0i~k7QzI+jK>ES}hDybz0dp?Cbo7{N6
z@gSqro6k2A<X<Q3_MK~7>%2bA>;0S>z4T!9+cVc*U3PBgsZD;{vYzhD_;BIL!MSVK
z9{RLHYyNrhX*UAe?==5b`^)&<XK8J5)p^~s=dUL-eYb30Ew}!I7Vp0gHy(6NTXrj4
z_rinn*=|;D7cXy`_PT>#PHM^Wm=N}xFVkaByMK)5c27Ne`DEkN%RkSlCWWZ$zK*fn
z+rKR~pk%kG*GW#{xLeGY2V~~Fd-da>Gyk`Hk59y`+&80KHDAc&yV#kK-H{JC_NgTF
zS<26hsZCkB`@h)Yo$DtVXD3bg#l7z6mOEz(V~ezco3BhP`7U#Fy|KZu8Of6#ueemX
zVb+gFF>Jx>j_%3e_VqjyIhlF&%Z!^Zzc+}#`oVTTtoqYkxz5xrTHCh&S@UiWN4*wr
zz1yv8ahY49pX|K<>CG&e=M`0JU)~q^&mzIFuVem`D=z)JKqa@QtDnm{r-UW|T1j8|

literal 0
HcmV?d00001

diff --git a/front/src/assets/newHome/biaoti.png b/front/src/assets/newHome/biaoti.png
new file mode 100644
index 0000000000000000000000000000000000000000..cae79049e6d86efb7c0cf3e269ef89d46b12a123
GIT binary patch
literal 303
zcmeAS@N?(olHy`uVBq!ia0vp@K+MCz3?%z9kG}>|Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBC}AAn6XMDc@$mo56d(y<
z;Aewm85s6hz6F`fR}$nG%)p>^RqJYfLw&;)?JL?&*3*ENGB752ySoTX-NdT{<gk}`
z`ns||<6-Aj=NI$YtpF5q^mK6y;kX`p>ZD+UfdKPC*_>kKr}K56wa<&a8XDStWx?&_
zMPZrEckS%vUSi$;*F{B1u+!tnN;O@BH+En9fn5EtpDf(IQSa6P4P)?h^>bP0l+XkK
D0uf~_

literal 0
HcmV?d00001

diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue
index e7b50be7..4d787b23 100644
--- a/front/src/views/home/AbilityToApplyFor.vue
+++ b/front/src/views/home/AbilityToApplyFor.vue
@@ -289,6 +289,9 @@
       margin-bottom: 0.2rem;
       display: flex;
       justify-content: space-between;
+      background: url("~@/assets/newHome/biaoti.png") no-repeat;
+    background-position-y: 7px;
+    padding-left: 17px;
     }
 
     .ability-to-apply-for-content {
@@ -297,7 +300,7 @@
 
       .dep-name {
         color: #0558e1;
-        font-size: 0.22rem;
+        font-size: 0.18rem;
         display: flex;
         align-items: center;
         line-height: 0.22rem;
@@ -346,7 +349,7 @@
 
       .description {
         width: 8.8rem;
-        color: rgba(0, 0, 0, 0.45);
+        color: rgba(0, 0, 0, 0.70);
       }
 
       .remove {
diff --git a/front/src/views/home/algorithmCompare.vue b/front/src/views/home/algorithmCompare.vue
index f872ad40..6fffa394 100644
--- a/front/src/views/home/algorithmCompare.vue
+++ b/front/src/views/home/algorithmCompare.vue
@@ -678,11 +678,21 @@
     height: 100vh;
     width: 100%;
   }
-
-  // @font-face {
-  //     font-family: 'num-typeface';
-  //     src: url('~@/assets/newHome/font/num-typeface.otf');
-  // }
+  :deep .ant-anchor-link{
+    height: 50px !important;
+    line-height: 50px;
+    margin:0px !important;
+  }
+:deep .ant-anchor-link-active > .ant-anchor-link-title {
+    color: #fff;
+    width: 100%;
+    height: 100%;
+    background: #0058e1;
+}
+:deep .ant-anchor-link-title:only-child {
+   
+    padding-left: 14px;
+}
 
   .border {
     border: 1px solid #dddee1;
@@ -768,22 +778,22 @@
 
       .top {
         width: 100%;
-        height: 100px;
+        height: 137px;
         margin-bottom: 20px;
         display: flex;
         align-items: center;
-        justify-content: flex-start;
+        justify-content: flex-end;
 
         .td-name {
-          height: 100px;
+          height: 137px;
           display: flex;
           align-items: center;
           justify-content: center;
         }
 
         .td {
-          height: 100px;
-          line-height: 100px;
+          height: 137px;
+          line-height: 137px;
           position: relative;
           display: flex;
           justify-content: center;
@@ -877,9 +887,9 @@
   }
 
   .add-img {
-    height: 60px;
-    width: 60px;
-    background: url('~@/assets/newHome/add-on.png');
+    height: 40px;
+    width: 40px;
+    background: url('~@/assets/newHome/add-grey.png');
     background-size: 100% 100%;
     cursor: pointer;
   }
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 6eda1c7c..fcf0c6e0 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -8,222 +8,116 @@
         </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"
-            >
-              <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>
-                <!-- 西海岸-摄像头-增加过期时间 -->
-                <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>
-                <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"
-                    :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-                    show-search
-                    :filterOption="true"
-                    @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">
-                <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>
+            <div style="    background: #f6f7f9;
+                padding: 24px 14px 14px 20px;
+                margin-bottom: 10px;
+                margin-top: 10px;
+                margin-bottom: 20px">
+              <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>
+                  <!-- 西海岸-摄像头-增加过期时间 -->
+                  <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>
-                  <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>
-              </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>
-              </div>
-
-              <!-- 西海岸--附件上传  -->
-              <div v-if="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-button>
-                          <upload-outlined>选择上传附件</upload-outlined>
-                        </a-button>
-                        <span>
-                          支持doc、docx、PDF等格式支撑材料上传，文件大小不超过100M
-                        </span>
-                      </a-upload>
+                <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>
+                  <a-form-item style="margin: 0 0px" 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"
+                      :getPopupContainer="(triggerNode) => triggerNode.parentNode" show-search :filterOption="true"
+                      @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">
+                  <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>
-                  </a-col>
-                </a-row>
-                <a-row>
-                  <a-col :span="24" style="margin-left: 106px">
-                    <a
-                      href="/static/download/感知资源申请表.doc"
-                      download="感知资源申请表"
-                    >
-                      感知资源申请表模板下载
-                    </a>
-                  </a-col>
-                </a-row>
-              </div>
+                    <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>
+                </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>
+                </div>
 
-              <div class="bottom-btn">
-                <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>
-              </div>
-            </a-form>
+                <!-- 西海岸--附件上传  -->
+                <div v-if="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-button>
+                            <upload-outlined>选择上传附件</upload-outlined>
+                          </a-button>
+                          <span>
+                            支持doc、docx、PDF等格式支撑材料上传，文件大小不超过100M
+                          </span>
+                        </a-upload>
+                      </a-form-item>
+                    </a-col>
+                  </a-row>
+                  <a-row>
+                    <a-col :span="24" style="margin-left: 106px">
+                      <a href="/static/download/感知资源申请表.doc" download="感知资源申请表">
+                        感知资源申请表模板下载
+                      </a>
+                    </a-col>
+                  </a-row>
+                </div>
+
+
+              </a-form>
+            </div>
+            <div class="bottom-btn">
+
+              <a-button class="confirm-apply" type="primary" html-type="submit" @click="processStartHandle()">
+                申请
+              </a-button>
+              <a-button class="cancel-apply" type="primary" html-type="cancle" @click="resetFields()">
+                取消
+              </a-button>
+            </div>
           </div>
           <div class="success" v-else>
             <div>
@@ -237,342 +131,277 @@
   </div>
 </template>
 <script>
-  import { willApplyCameraBatchDelete } from '@/api/home'
-  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,
-    getAppListByDept,
-  } 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'
+import { willApplyCameraBatchDelete } from '@/api/home'
+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,
+  getAppListByDept,
+} 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 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(7, 'days').format('YYYY-MM-DD HH:mm:ss'),
-          label: '7天',
-        },
-        {
-          value: moment().add(30, 'days').format('YYYY-MM-DD HH:mm:ss'),
-          label: '1个月',
-        },
-        {
-          value: moment().add(180, 'days').format('YYYY-MM-DD HH:mm:ss'),
-          label: '6个月',
-        },
-        {
-          value: moment().add(365, 'days').format('YYYY-MM-DD HH:mm:ss'),
-          label: '1年',
-        },
-        {
-          value: moment().add(730, 'days').format('YYYY-MM-DD HH:mm:ss'),
-          label: '2年',
-        },
-        {
-          value: moment().add(1095, 'days').format('YYYY-MM-DD HH:mm:ss'),
-          label: '3年',
-        },
-      ]
-      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(7, 'days').format('YYYY-MM-DD HH:mm:ss'),
+        label: '7天',
+      },
+      {
+        value: moment().add(30, 'days').format('YYYY-MM-DD HH:mm:ss'),
+        label: '1个月',
+      },
+      {
+        value: moment().add(180, 'days').format('YYYY-MM-DD HH:mm:ss'),
+        label: '6个月',
+      },
+      {
+        value: moment().add(365, 'days').format('YYYY-MM-DD HH:mm:ss'),
+        label: '1年',
+      },
+      {
+        value: moment().add(730, 'days').format('YYYY-MM-DD HH:mm:ss'),
+        label: '2年',
+      },
+      {
+        value: moment().add(1095, 'days').format('YYYY-MM-DD HH:mm:ss'),
+        label: '3年',
+      },
+    ]
+    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)
           }
         })
-      }
-      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) ||
-          '[]'
+        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 == '开发区公安分局'
       )
-      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
         )
-      )
-      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)
+    }
 
-      // 提交申请
-      let submitFlag = true
-      const processStartHandle = () => {
-        formRef.value.validate().then(() => {
-          if (submitFlag) {
-            submitFlag = false
-            if (!formUrl) {
-              return message.error('请设置保存表单的URL')
-            }
-            if (!formName) {
-              return message.error('请设置表单名称')
-            }
+    // 提交申请
+    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) {
+          if (id) {
+            endProcess({ instanceId: taskId }).then((end) => {
+              if (end.data.code == 0) {
                 let ids = []
                 let falgNum = 0
                 let sxt = true
@@ -602,20 +431,10 @@
                     }
                   })
                 })
-                console.log('formName--ids-提交数据--------->', formName, ids)
                 if (formName.system.length !== 0) {
-                  if (
-                    formName.applicationSystem &&
-                    formName.applicationSystem.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)
@@ -643,464 +462,555 @@
                     }
                   })
                 }
-              } 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 &&
+                  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)
-        }
-        let delArr = []
-        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.resourceId = jcss.channelId
-              _itemData.managementUnitName = jcss.managementUnitName
-              _itemData.cameraPointTypeName = jcss.cameraPointTypeName
-              delArr.push(jcss.id)
-            }
-            obj.system.push(_itemData)
-          })
-        submitApply(obj).then((res) => {
-          // applySuccess.value = false
-          console.log('摄像头申请================>', res)
-          if (res.data.msg == 'success') {
-            if (delArr.length > 0) {
-              willApplyCameraBatchDelete(delArr).then((res) => {
-                jumpToDetailsPageconetent()
-              })
-            } else 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
-              }
+            }
+          }
+        }
+      })
+    }
+
+    // 基础设施--数据下发
+    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)
+      }
+      let delArr = []
+      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.resourceId = jcss.channelId
+            _itemData.managementUnitName = jcss.managementUnitName
+            _itemData.cameraPointTypeName = jcss.cameraPointTypeName
+            delArr.push(jcss.id)
+          }
+          obj.system.push(_itemData)
+        })
+      submitApply(obj).then((res) => {
+        // applySuccess.value = false
+        console.log('摄像头申请================>', res)
+        if (res.data.msg == 'success') {
+          if (delArr.length > 0) {
+            willApplyCameraBatchDelete(delArr).then((res) => {
               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)
+            })
+          } else if (item.id) {
+            sgcDel({ ids: [item.id] }).then((res1) => {
+              if (res1.data.msg === 'success') {
+                if (falgNum == 0 && sxt) {
+                  message.success('申请提交成功，请到消息中心查看！')
+                  sxt = false
                 }
-              },
-            })
-            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,
-          })
-        }
-      }
-      getAppListByDept().then((res) => {
-        console.log('res=====>', res.data.data)
-        if (res.data.code == 0) {
-          if (res.data.data.length == 0) {
-            // message.warning('该关键词，暂无应用资源！')
-          } else {
-            // 过滤本单位的应用系统
-            res.data.data.map((val) => {
-              systemOptions2.value.push({
-                value: val.NAME,
-                label: val.NAME,
-              })
-            })
-            // console.log('第一次获取===================>', systemOptions2.value)
-          }
-        } else {
-          message.error('应用系统获取数据失败!')
-        }
-      })
-      const handleBlur = () => {
-        console.log('blur')
-      }
-      const arrId = []
-      const handleFocus = () => {
-        console.log('focus', systemOptions2.value, systemOptions.value)
-        for (let 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)
+                mybus.emit('getSgcNum')
+                jumpToDetailsPageconetent()
               }
-              integrationServicesItemInfo.value = res.data.data || {}
-            },
-            (err) => {
-              reject(err)
-              message.error(err)
+            })
+          } 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,
         })
       }
-
-      // 西海岸：单兵设备、无人机提交申请
-      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, // 需求依据
+    }
+    getAppListByDept().then((res) => {
+      console.log('res=====>', res.data.data)
+      if (res.data.code == 0) {
+        if (res.data.data.length == 0) {
+          // message.warning('该关键词，暂无应用资源！')
+        } else {
+          // 过滤本单位的应用系统
+          res.data.data.map((val) => {
+            systemOptions2.value.push({
+              value: val.NAME,
+              label: val.NAME,
+            })
+          })
+          // console.log('第一次获取===================>', systemOptions2.value)
         }
-        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('申请失败！')
+      } else {
+        message.error('应用系统获取数据失败!')
+      }
+    })
+    const handleBlur = () => {
+      console.log('blur')
+    }
+    const arrId = []
+    const handleFocus = () => {
+      console.log('focus', systemOptions2.value, systemOptions.value)
+      for (let 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)
             }
-          })
-          .catch((err) => {
+            integrationServicesItemInfo.value = res.data.data || {}
+          },
+          (err) => {
+            reject(err)
             message.error(err)
-          })
-      }
+          }
+        )
+      })
+    }
 
-      //文件上传成功回调
-      const roomUpload = (response) => {
-        if (response.file.response !== undefined) {
-          fileList.value = response.fileList
-          formName.attachment = response.file.response.data
-        }
+    // 西海岸：单兵设备、无人机提交申请
+    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)
+        })
+    }
 
-      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 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;
+:deep .ant-form-item-label-left {
+  text-align: right;
+}
+
+#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;
+    overflow: hidden;
+    margin-top: 15px;
+
+    // background: #f6f7f9;
+    .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;
-      overflow: hidden;
-      .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;
-  }
-
-  .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;
+  :deep(.ant-input) {
+    border: 1px solid #e0e0e0;
     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;
+  .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;
+}
+
+.cancel-apply {
+  width: 80px;
+  height: 32px;
+  text-align: center;
+  background: #fff;
+  color: #0558e1;
+  border: 1px solid #0558e1;
+  border-radius: 2px;
+  font-size: 14px;
+}
+
+.cancel-apply:hover {
+  background: #fff;
+  color: #0558e1;
+  opacity: 0.8;
+}
+
+.confirm-apply {
+  margin-right: 20px;
+  width: 80px;
+  height: 32px;
+  text-align: center;
+  background: #0558e1;
+  color: #fff;
+  border: 1px solid #0558e1;
+  border-radius: 2px;
+  font-size: 14px;
+}
+
+.confirm-apply :hover {
+  background: #0558e1;
+  color: #fff;
+  opacity: 0.8;
+}
 </style>
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 3cbf33ee..f648304b 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -117,11 +117,14 @@
           </div>
           <a-button
             style="
-              margin-left: 0.8rem;
-              background: #e1edfa;
-              color: #0087ff;
-              border: none;
-              border-radius: 0.06rem;
+               width: 80px; 
+               height: 32px;
+               text-align: center;
+               background: #0558e1;
+                color: #fff;
+                border: 1px solid #0558e1;
+                border-radius: 2px;
+                font-size: 14px;
             "
             @click="appointment(item)"
           >
@@ -2830,7 +2833,7 @@
       .rightContent {
         height: 1.75rem;
         width: 5.8rem;
-
+        margin-right:72px;
         .topContent {
           font-size: 0.2rem;
           color: #000;