From a320b46ade16609f2f9c1c1a88fb4d094834d3d7 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 15 Nov 2022 14:25:42 +0800
Subject: [PATCH 01/25] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../abilityStatistics/components/abilityDetails.vue   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/components/abilityDetails.vue b/back/src/views/modules/abilityStatistics/components/abilityDetails.vue
index 0f72bccc..ba72488c 100644
--- a/back/src/views/modules/abilityStatistics/components/abilityDetails.vue
+++ b/back/src/views/modules/abilityStatistics/components/abilityDetails.vue
@@ -53,13 +53,13 @@
             <span class="img"></span>
             <span>{{ item.name }}</span>
           </div>
-          <div
+          <!-- <div
             style="
               display: flex;
               justify-content: space-between;
               align-items: center;
             "
-          ></div>
+          ></div> -->
           <div class="ability" v-for="val in item.list" :key="val.id">
             <div class="box" v-if="item.list.length > 0">
               <div class="right">
@@ -280,7 +280,7 @@ export default {
   }
 }
 </script>
-<style scoped>
+<style lang="scss" scoped>
 .title {
   font-size: 22px;
   color: #000;
@@ -324,7 +324,7 @@ export default {
       font-size: 16px;
 
       span {
-        width: 50px;
+        width: 300px;
       }
     }
   }
@@ -334,7 +334,8 @@ export default {
   .main {
     .item {
       border-top: 1px #eee solid;
-
+      line-height: 30px;
+      margin-bottom: 10px;
       .deptName {
         color: #0058e1;
         font-size: 16px;

From e03c1455ec531f61ac54d417c67dd4160a529e74 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 15 Nov 2022 14:36:22 +0800
Subject: [PATCH 02/25] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=9C=9F=E6=9C=9B?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/abilityStatistics/components/abilityDetails.vue   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/components/abilityDetails.vue b/back/src/views/modules/abilityStatistics/components/abilityDetails.vue
index ba72488c..64eccc20 100644
--- a/back/src/views/modules/abilityStatistics/components/abilityDetails.vue
+++ b/back/src/views/modules/abilityStatistics/components/abilityDetails.vue
@@ -34,9 +34,9 @@
           <p>
             <span>应用背景：{{ detailParams.applicationBackground }}</span>
           </p>
-          <p>
+          <!-- <p>
             <span>期望效果：{{ detailParams.effectWish }}</span>
-          </p>
+          </p> -->
         </div>
       </div>
     </div>

From 3eab1e693f54fd68022826a1987b11ec3d1a563c Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Tue, 15 Nov 2022 14:57:22 +0800
Subject: [PATCH 03/25] =?UTF-8?q?UI=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/demo/abilitydemandapply.vue      |   27 +-
 .../views/capacityOnTheShelf/Algorithm.vue    | 1416 ++++++------
 .../views/capacityOnTheShelf/Application.vue  |  223 +-
 .../capacityOnTheShelf/BusinessComponent.vue  |  230 +-
 .../DevelopmentComponents.vue                 |  228 +-
 .../capacityOnTheShelf/LayerServices.vue      |  222 +-
 .../components/PutOnTheShelf.vue              | 2041 +++++++++--------
 .../src/views/demandCenter/demandDetails.vue  |    2 +-
 8 files changed, 2501 insertions(+), 1888 deletions(-)

diff --git a/back/src/views/modules/activiti/demo/abilitydemandapply.vue b/back/src/views/modules/activiti/demo/abilitydemandapply.vue
index f1b96feb..e6572223 100644
--- a/back/src/views/modules/activiti/demo/abilitydemandapply.vue
+++ b/back/src/views/modules/activiti/demo/abilitydemandapply.vue
@@ -57,10 +57,28 @@
           :disabled="fieldDisabled"
           placeholder="需求描述"
         ></el-input>
-         </el-tooltip>
+         </el-tooltip>   
       </el-form-item>
       <el-form-item v-if="dataForm.enclosure" label="申请附件" prop="enclosure">
-          <el-button @click="downloadFile(dataForm.enclosure, '申请附件')">附件下载</el-button>
+        <button
+                style="
+                  width: 100px;
+                  height: 30px;
+                  margin-right: 10px;
+                  background: rgb(237, 244, 252);
+                  color: rgb(0, 135, 255);
+                  font-size: 14px;
+                  border-radius: 6px;
+                  border: 1px solid rgb(187, 211, 239);
+                  padding: 0px;
+                  text-align: center;
+                  cursor: pointer;
+                "
+              @click="downloadFile(dataForm.enclosure, '申请附件')"
+              >
+              附件下载
+              </button>
+          <!-- <el-button     class="DownloadAttachment" @click="downloadFile(dataForm.enclosure, '申请附件')">附件下载</el-button> -->
       </el-form-item>
     </el-form>
     <!--  流程综合组件   -->
@@ -334,6 +352,11 @@ export default {
 }
 </script>
 <style lang="scss">
+  .DownloadAttachment {
+              position: absolute;
+              right: 10px;
+              top: -150px;
+            }
 .agreeOr {
   & > div {
     // text-align: right;
diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue
index ff61e001..1dc59bbb 100644
--- a/front/src/views/capacityOnTheShelf/Algorithm.vue
+++ b/front/src/views/capacityOnTheShelf/Algorithm.vue
@@ -7,18 +7,19 @@
 -->
 <template>
   <div class="box">
-    <div class="header">能力上架申请</div>
-    
+    <!-- <div class="header">能力上架申请</div> -->
     <div class="top">
       <div
         v-for="(nav, index) in navList"
         :key="nav"
-        :class="[index <= navList2.indexOf(showView) ? 'finish' : '']"
+        :class="[index <= navList2.indexOf(showView) ? 'finish' : 'ff']"
       >
-        <span class="bg-box">
-          <span>{{ index + 1 }}</span>
-        </span>
-        <span>{{ nav.name }}</span>
+        <div class="wai">
+          <span class="bg-box">
+            <span>{{ index + 1 }}</span>
+          </span>
+          <span class="bg-name">{{ nav.name }}</span>
+        </div>
         <div class="line" v-if="index !== navList.length - 1"></div>
       </div>
     </div>
@@ -80,37 +81,10 @@
         :required="required"
         :notFilled="notFilled"
       ></put-on-the-shelf>
-      <!-- <algorithm-essential-information
-        v-if="showView === '基本信息' && refData.name"
-        :refData="refData"
-        :dataFrom="dataFrom"
-        :videoList="videoList"
-      ></algorithm-essential-information>
-      <algorithm-advantage
-        v-else-if="showView === '算法优势'"
-        :refData="refData"
-        :dataFrom="dataFrom"
-      ></algorithm-advantage>
-      <algorithm-scenarios
-        v-else-if="showView === '应用场景'"
-        :refData="refData"
-        :dataFrom="dataFrom"
-      ></algorithm-scenarios> -->
-      <!-- <algorithm-scenarios
-        v-else-if="showView === '应用场景'"
-        :refData="refData"
-        :dataFrom="dataFrom"
-      ></algorithm-scenarios> -->
-      <!-- <algorithm-deployment-use
-        v-else-if="showView === '部署与使用'"
-        :refData="refData"
-        :dataFrom="dataFrom"
-        :fileList="fileList"
-        :imgList="imgList"
-      ></algorithm-deployment-use> -->
+   
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
-      <button @click="close()">取消</button>
+     
       <a-popconfirm
         v-if="
           showView == '算法优势' &&
@@ -124,7 +98,7 @@
         @confirm="changeSfys('上一步')"
         @cancel="cancel"
       >
-        <button>上一步</button>
+        <button  class="buzhou">上一步</button>
       </a-popconfirm>
       <button
         v-else-if="
@@ -133,6 +107,7 @@
             sfys[0].list.length
         "
         @click="changeSfys('上一步')"
+        class="buzhou"
       >
         上一步
       </button>
@@ -149,7 +124,7 @@
         @confirm="changeYycj('上一步')"
         @cancel="cancel"
       >
-        <button>上一步</button>
+        <button class="buzhou">上一步</button>
       </a-popconfirm>
       <button
         v-else-if="
@@ -158,10 +133,11 @@
             yycj[0].list.length
         "
         @click="changeYycj('上一步')"
+        class="buzhou"
       >
         上一步
       </button>
-      <button v-else-if="showView !== '基本信息'" @click="back()">
+      <button class="buzhou" v-else-if="showView !== '基本信息'" @click="back()">
         上一步
       </button>
       <a-popconfirm
@@ -178,9 +154,9 @@
         @confirm="changeBs('预览')"
         @cancel="cancel"
       >
-        <button>预览</button>
+        <button class="buzhou">预览</button>
       </a-popconfirm>
-      <button v-else-if="showView === '部署与使用'" @click="preview()">
+      <button v-else-if="showView === '部署与使用'" @click="preview()" class="buzhou">
         预览
       </button>
       <a-popconfirm
@@ -196,7 +172,7 @@
         @confirm="changeSfys('下一步')"
         @cancel="cancel"
       >
-        <button>下一步</button>
+        <button class="buzhou">下一步</button>
       </a-popconfirm>
       <button
         v-else-if="
@@ -205,6 +181,7 @@
             sfys[0].list.length
         "
         @click="changeSfys('下一步')"
+        class="buzhou"
       >
         下一步
       </button>
@@ -221,7 +198,7 @@
         @confirm="changeYycj('下一步')"
         @cancel="cancel"
       >
-        <button>下一步</button>
+        <button class="buzhou">下一步</button>
       </a-popconfirm>
       <button
         v-else-if="
@@ -230,10 +207,11 @@
             yycj[0].list.length
         "
         @click="changeYycj('下一步')"
+        class="buzhou"
       >
         下一步
       </button>
-      <button v-else-if="showView !== '部署与使用'" @click="next()">
+      <button class="buzhou" v-else-if="showView !== '部署与使用'" @click="next()">
         下一步
       </button>
       <a-popconfirm
@@ -250,704 +228,697 @@
         @confirm="changeBs('提交')"
         @cancel="cancel"
       >
-        <button>提交</button>
+        <button class="buzhou">提交</button>
       </a-popconfirm>
-      <button v-else-if="showView === '部署与使用'" @click="submit()">
+      <button class="buzhou" v-else-if="服务商联系电话 === '部署与使用'" @click="submit()">
         提交
       </button>
+       <button class="quxiao" @click="close()">取消</button>
     </div>
   </div>
 </template>
 <script setup>
-  // import AlgorithmEssentialInformation from '@/views/capacityOnTheShelf/components/AlgorithmEssentialInformation.vue'
-  // import AlgorithmAdvantage from '@/views/capacityOnTheShelf/components/AlgorithmAdvantage.vue'
-  // import AlgorithmScenarios from '@/views/capacityOnTheShelf/components/AlgorithmScenarios.vue'
-  import PutOnTheShelf from '@/views/capacityOnTheShelf/components/PutOnTheShelf.vue'
-  // import AlgorithmDeploymentUse from '@/views/capacityOnTheShelf/components/AlgorithmDeploymentUse.vue'
-  import { ref, onBeforeUnmount } from 'vue'
-  import { useRouter } from 'vue-router'
-  import { getCategoryTree } from '@/api/personalCenter'
-  import { shangjiainsert, shangjiaapply } from '@/api/personalCenter'
-  import {
-    getUser,
-    getUserInfo,
-    selectOne,
-    updateRes,
-    relaunch,
-  } from '@/api/home'
-  import { message } from 'ant-design-vue'
-  import mybus from '@/myplugins/mybus'
-  const router = useRouter()
-  const showView = ref('基本信息')
-  const sfys = ref([
-    {
-      name: '算法优势',
-      list: [
-        {
-          name: '算法优势名称',
-          field: 'name',
-          type: 'input',
-          note1: '',
-        },
-        {
-          name: '算法优势描述',
-          field: 'desc',
-          type: 'textArea',
-          note1: '',
-        },
-      ],
-    },
-  ])
-  const yycj = ref([
-    {
-      name: '应用场景',
-      list: [
-        {
-          name: '应用场景名称',
-          field: 'name',
-          type: 'input',
-          note1: '',
-        },
-        {
-          name: '应用场景描述',
-          field: 'desc',
-          type: 'textArea',
-          note1: '',
-        },
-        {
-          name: '应用场景图片',
-          field: 'img',
-          type: 'image',
-          note1: '',
-        },
-      ],
-    },
-  ])
-  const bs = ref([
-    {
-      name: '计费标准信息',
-      list: [
-        {
-          name: '计费方式',
-          field: 'type',
-          type: 'radio',
-          options: ['一次性买断', '按调用次数', '按并发路数', '按年计费'],
-          note1: '一次性买断',
-        },
-        {
-          name: '计费标准',
-          field: 'price',
-          type: 'input2',
-          // company: '元',
-          note1: '',
-        },
-        {
-          name: '计费标准描述',
-          field: 'desc',
-          type: 'textArea',
-          note1: '',
-        },
-      ],
-    },
-    {
-      name: '常见问题',
-      list: [
-        {
-          name: '问题',
-          field: 'question',
-          type: 'textArea',
-          note1: '',
-        },
-        {
-          name: '答复',
-          field: 'answer',
-          type: 'textArea',
-          note1: '',
-        },
-      ],
-    },
-  ])
-  let shiyongshouce = ref({})
-  const navList = ref([])
-  const navList2 = ref([])
-  const fileList = ref({})
-  const packageList = ref({})
-  const accessoryList = ref({})
-  const imgList = ref({})
-  const videoList = ref({})
-  const data = ref({})
-  const refData = ref({})
-  const submitFlag = ref(true)
-  const dataFrom = ref({
-    infoList: [
+// import AlgorithmEssentialInformation from '@/views/capacityOnTheShelf/components/AlgorithmEssentialInformation.vue'
+// import AlgorithmAdvantage from '@/views/capacityOnTheShelf/components/AlgorithmAdvantage.vue'
+// import AlgorithmScenarios from '@/views/capacityOnTheShelf/components/AlgorithmScenarios.vue'
+import PutOnTheShelf from '@/views/capacityOnTheShelf/components/PutOnTheShelf.vue'
+// import AlgorithmDeploymentUse from '@/views/capacityOnTheShelf/components/AlgorithmDeploymentUse.vue'
+import { ref, onBeforeUnmount } from 'vue'
+import { useRouter } from 'vue-router'
+import { getCategoryTree } from '@/api/personalCenter'
+import { shangjiainsert, shangjiaapply } from '@/api/personalCenter'
+import {
+  getUser,
+  getUserInfo,
+  selectOne,
+  updateRes,
+  relaunch,
+} from '@/api/home'
+import { message } from 'ant-design-vue'
+import mybus from '@/myplugins/mybus'
+const router = useRouter()
+const showView = ref('基本信息')
+const sfys = ref([
+  {
+    name: '算法优势',
+    list: [
       {
-        attrType: '组件类型',
-        attrValue: '智能算法',
-        delFlag: 0,
+        name: '算法优势名称',
+        field: 'name',
+        type: 'input',
+        note1: '',
+      },
+      {
+        name: '算法优势描述',
+        field: 'desc',
+        type: 'textArea',
+        note1: '',
       },
     ],
-    delFlag: 0,
-    type: '组件服务',
-    deptId: '',
-  })
-  const required = ref([
-    '归属部门',
-    '部门联系人',
-    '部门联系人电话',
-    '应用领域',
-    '共享条件',
-    '算法名称',
-    '算法描述',
-    '图层名称',
-    '图层描述',
-    '组件名称',
-    '组件描述',
-    '组件地址',
-    '服务地址',
-    '服务接口',
-    '接口请求方式',
-    '算法类别',
-  ])
-  const notFilled = ref([])
-  getUser().then((res) => {
-    dataFrom.value.deptId = res.data.data.deptId
-  })
-  const close = () => {
-    window.close()
-  }
-  const back = () => {
-    navList.value.forEach((val, index) => {
-      if (val.key === showView.value && index > 0) {
-        showView.value = navList2.value[index - 1]
-        refData.value = data.value.filter(
-          (item) => item.name === showView.value
-        )[0]
-        console.log('表单数据=============>', dataFrom.value)
-      }
-    })
-  }
-  const next = () => {
-    notFilled.value = []
-    console.log(dataFrom.value, 'dataFrom.value.name')
-    if (!dataFrom.value.name) {
-      notFilled.value.push('算法名称')
-    }
-    if (!dataFrom.value.description) {
-      notFilled.value.push('算法描述')
-    }
-    if (!dataFrom.value.shareCondition) {
-      notFilled.value.push('共享条件')
-    }
-    if (!dataFrom.value.deptId) {
-      notFilled.value.push('归属部门')
-    }
-    if (!dataFrom.value.deptContacts) {
-      notFilled.value.push('部门联系人')
-    }
-    if (!dataFrom.value.deptPhone) {
-      notFilled.value.push('部门联系人电话')
-    }
-    if (
-      !dataFrom.value.infoList.filter(
-        (val) => val.attrType === '算法类别'
-      )[0] ||
-      !dataFrom.value.infoList.filter((val) => val.attrType === '算法类别')[0]
-        .attrValue
-    ) {
-      notFilled.value.push('算法类别')
-    }
-    if (
-      !dataFrom.value.infoList.filter(
-        (val) => val.attrType === '应用领域'
-      )[0] ||
-      !dataFrom.value.infoList.filter((val) => val.attrType === '应用领域')[0]
-        .attrValue
-    ) {
-      console.log('应用领域==========>', dataFrom.value.infoList)
-      notFilled.value.push('应用领域')
-    }
-    if (notFilled.value.length > 0) {
-      message.warning('请填写必填字段')
-      console.log(notFilled.value)
-    } else {
-      let i = -1
-      navList.value.forEach((val, index) => {
-        if (val.key === showView.value && index < navList.value.length - 1) {
-          i = index + 1
-        }
-      })
-      if (i !== -1) {
-        showView.value = navList2.value[i]
-        refData.value = data.value.filter(
-          (item) => item.name === showView.value
-        )[0]
-        console.log('表单数据=============>', dataFrom.value, refData.value)
-      }
-    }
-  }
-  // 预览
-  const preview = () => {
-    notFilled.value = []
-    console.log(dataFrom.value, 'dataFrom.value.name')
-    if (
-      dataFrom.value.infoList.filter((val) => val.attrType === '使用方式')[0] &&
-      dataFrom.value.infoList.filter((val) => val.attrType === '使用方式')[0]
-        .attrValue == '调用接口'
-    ) {
-      if (
-        !dataFrom.value.infoList.filter(
-          (val) => val.attrType === '服务接口'
-        )[0] ||
-        !dataFrom.value.infoList.filter((val) => val.attrType === '服务接口')[0]
-          .attrValue
-      ) {
-        notFilled.value.push('服务接口')
-      }
-      if (!dataFrom.value.apiMethodType) {
-        notFilled.value.push('接口请求方式')
-      }
-    }
-    if (notFilled.value.length > 0) {
-      message.warning('请填写必填字段')
-      console.log(notFilled.value)
-    } else {
-      dataFrom.value.infoList = dataFrom.value.infoList.filter(
-        (item) => item.attrValue !== ''
-      )
-      console.log('预览==============>', dataFrom.value)
-      window.sessionStorage.setItem('preview', JSON.stringify(dataFrom.value))
-      const newpage = router.resolve({
-        path: '/details',
-      })
-      window.open(newpage.href, '_blank')
-    }
-  }
-  const submit = () => {
-    notFilled.value = []
-    console.log(dataFrom.value, 'dataFrom.value.name')
-    if (
-      dataFrom.value.infoList.filter((val) => val.attrType === '使用方式')[0] &&
-      dataFrom.value.infoList.filter((val) => val.attrType === '使用方式')[0]
-        .attrValue == '调用接口'
-    ) {
-      if (
-        !dataFrom.value.infoList.filter(
-          (val) => val.attrType === '服务接口'
-        )[0] ||
-        !dataFrom.value.infoList.filter((val) => val.attrType === '服务接口')[0]
-          .attrValue
-      ) {
-        notFilled.value.push('服务接口')
-      }
-      if (!dataFrom.value.apiMethodType) {
-        notFilled.value.push('接口请求方式')
-      }
-    }
-    if (notFilled.value.length > 0) {
-      message.warning('请填写必填字段')
-      console.log(notFilled.value)
-    } else {
-      console.log('提交数据=============>', dataFrom.value)
-      if (submitFlag.value) {
-        submitFlag.value = false
-        dataFrom.value.infoList = dataFrom.value.infoList.filter(
-          (item) => item.attrValue !== ''
-        )
-        if (resourceId) {
-          delete dataFrom.value.createDate
-          delete dataFrom.value.updateDate
-          dataFrom.value.infoList.map((del) => {
-            delete del.createDate
-            delete del.updateDate
-          })
-          updateRes(dataFrom.value).then((upres) => {
-            if (upres.data.code == 0) {
-              relaunch({ data: dataFrom.value, taskId: taskId }).then((res) => {
-                console.log('驳回================>', res)
-                if (res.data.code == 0) {
-                  message.success('重新发起流程成功！')
-                  submitFlag.value = true
-                  window.setTimeout(() => {
-                    window.close()
-                  }, 1000)
-                } else {
-                  message.error('重新发起流程失败！')
-                  submitFlag.value = true
-                }
-              })
-            } else {
-              message.error('数据更新失败！')
-              submitFlag.value = true
-            }
-          })
-        } else {
-          shangjiainsert(dataFrom.value).then((res) => {
-            const instanceId = res.data.data
-            dataFrom.value.id = res.data.data
-            getUser().then((res6) => {
-              getUserInfo(res6.data.data.id).then((res2) => {
-                const deptId = dataFrom.value.deptId
-                const userId = res2.data.data.id
-                const userName = res2.data.data.realName
-                const params = {
-                  instanceId: instanceId,
-                  deptId: deptId,
-                  userId: userId,
-                  userName: userName,
-                  resourceDTO: [dataFrom.value],
-                }
-                shangjiaapply(params).then((res3) => {
-                  console.log('res3', res3)
-                  if (res3.data.code == 0) {
-                    message.success('上架申请提交成功，请注意查看消息通知！')
-                    window.setTimeout(() => {
-                      window.close()
-                      submitFlag.value = true
-                    }, 1000)
-                  }
-                })
-              })
-            })
-          })
-        }
-      }
-    }
-  }
-  const init = () => {
-    getCategoryTree().then((res) => {
-      // console.clear()
-      res.data.data = res.data.data
-        .filter((item) => item.name === '组件服务一')[0]
-        .children.filter((item) => item.name === '智能算法')[0]
-      navList.value = []
-      navList2.value = []
-      res.data.data.children.forEach((val) => {
-        // console.log('val================>', val, echoData.value)
-        navList.value.push({
-          name: val.name,
-          key: val.name,
-        })
-        navList2.value.push(val.name)
-        if (val.name === '部署与使用') {
-          console.log(val, '部署与使用')
-          val.children.forEach((valChild) => {
-            if (valChild.name === '使用方式') {
-              valChild.children.forEach((valChilds) => {
-                if (valChilds.name === '使用方式') {
-                  valChilds.note1 = '调用接口'
-                }
-              })
-            }
-          })
-        }
-        // 回填数据
-        if (resourceId) {
-          val.children.map((item) => {
-            if (item.children.length > 0) {
-              item.children.map((child) => {
-                switch (child.name) {
-                  case '算法名称':
-                    child.note1 = echoData.value.name
-                    break
-                  case '算法描述':
-                    child.note1 = echoData.value.description
-                    break
-                  case '共享条件':
-                    child.note1 = echoData.value.shareCondition
-                    break
-                  case '归属部门':
-                    child.note1 = echoData.value.deptId
-                    break
-                  case '部门联系人':
-                    child.note1 = echoData.value.deptContacts
-                    break
-                  case '部门联系人电话':
-                    child.note1 = echoData.value.deptPhone
-                    break
-                  case '接口请求方式':
-                    child.note1 = echoData.value.apiMethodType
-                    break
-                  case '应用领域':
-                    if (
-                      echoData.value.infoList &&
-                      echoData.value.infoList.filter(
-                        (fil) => fil.attrType == child.name
-                      )[0]
-                    ) {
-                      child.note1 = echoData.value.infoList.filter(
-                        (fil) => fil.attrType == child.name
-                      )[0].attrValue
-                      child.note2 = echoData.value.infoList
-                        .filter((fil) => fil.attrType == child.name)[0]
-                        .attrValue.split(';')
-                    }
-                    break
-                  case '算法介绍视频':
-                    if (
-                      echoData.value.infoList &&
-                      echoData.value.infoList.filter(
-                        (fil) => fil.attrType == child.name
-                      )[0]
-                    ) {
-                      videoList.value = [
-                        {
-                          uid: echoData.value.infoList.filter(
-                            (fil) => fil.attrType == child.name
-                          )[0].id,
-                          name:
-                            echoData.value.infoList.filter(
-                              (fil) => fil.attrType == child.name
-                            )[0].note3 || '--',
-                          status: 'done',
-                          url: echoData.value.infoList.filter(
-                            (fil) => fil.attrType == child.name
-                          )[0].attrValue,
-                          thumbUrl: echoData.value.infoList.filter(
-                            (fil) => fil.attrType == child.name
-                          )[0].attrValue,
-                        },
-                      ]
-                    }
-                    break
-                  default:
-                    if (
-                      echoData.value.infoList &&
-                      echoData.value.infoList.filter(
-                        (fil) => fil.attrType == child.name
-                      )[0]
-                    ) {
-                      child.note1 = echoData.value.infoList.filter(
-                        (fil) => fil.attrType == child.name
-                      )[0].attrValue
-                    }
-                    break
-                }
-              })
-            }
-            console.log('item================>', item, echoData.value)
-          })
-        }
-      })
-      data.value = res.data.data.children
+  },
+])
+const yycj = ref([
+  {
+    name: '应用场景',
+    list: [
+      {
+        name: '应用场景名称',
+        field: 'name',
+        type: 'input',
+        note1: '',
+      },
+      {
+        name: '应用场景描述',
+        field: 'desc',
+        type: 'textArea',
+        note1: '',
+      },
+      {
+        name: '应用场景图片',
+        field: 'img',
+        type: 'image',
+        note1: '',
+      },
+    ],
+  },
+])
+const bs = ref([
+  {
+    name: '计费标准信息',
+    list: [
+      {
+        name: '计费方式',
+        field: 'type',
+        type: 'radio',
+        options: ['一次性买断', '按调用次数', '按并发路数', '按年计费'],
+        note1: '一次性买断',
+      },
+      {
+        name: '计费标准',
+        field: 'price',
+        type: 'input2',
+        // company: '元',
+        note1: '',
+      },
+      {
+        name: '计费标准描述',
+        field: 'desc',
+        type: 'textArea',
+        note1: '',
+      },
+    ],
+  },
+  {
+    name: '常见问题',
+    list: [
+      {
+        name: '问题',
+        field: 'question',
+        type: 'textArea',
+        note1: '',
+      },
+      {
+        name: '答复',
+        field: 'answer',
+        type: 'textArea',
+        note1: '',
+      },
+    ],
+  },
+])
+let shiyongshouce = ref({})
+const navList = ref([])
+const navList2 = ref([])
+const fileList = ref({})
+const packageList = ref({})
+const accessoryList = ref({})
+const imgList = ref({})
+const videoList = ref({})
+const data = ref({})
+const refData = ref({})
+const submitFlag = ref(true)
+const dataFrom = ref({
+  infoList: [
+    {
+      attrType: '组件类型',
+      attrValue: '智能算法',
+      delFlag: 0,
+    },
+  ],
+  delFlag: 0,
+  type: '组件服务',
+  deptId: '',
+})
+const required = ref([
+  '归属部门',
+  '部门联系人',
+  '部门联系人电话',
+  '应用领域',
+  '共享条件',
+  '算法名称',
+  '算法描述',
+  '图层名称',
+  '图层描述',
+  '组件名称',
+  '组件描述',
+  '组件地址',
+  '服务地址',
+  '服务接口',
+  '接口请求方式',
+  '算法类别',
+])
+const notFilled = ref([])
+getUser().then((res) => {
+  dataFrom.value.deptId = res.data.data.deptId
+})
+const close = () => {
+  window.close()
+}
+const back = () => {
+  navList.value.forEach((val, index) => {
+    if (val.key === showView.value && index > 0) {
+      showView.value = navList2.value[index - 1]
       refData.value = data.value.filter(
         (item) => item.name === showView.value
       )[0]
-      console.log('所有编目结构==============>', data.value)
-    })
+      console.log('表单数据=============>', dataFrom.value)
+    }
+  })
+}
+const next = () => {
+  notFilled.value = []
+  console.log(dataFrom.value, 'dataFrom.value.name')
+  if (!dataFrom.value.name) {
+    notFilled.value.push('算法名称')
   }
-  const resourceId = router.currentRoute.value.query.id
-  const taskId = router.currentRoute.value.query.taskId
-  const echoData = ref({})
-  if (resourceId) {
-    // 回显数据
-    selectOne(resourceId).then((res) => {
-      echoData.value = res.data.data
-      dataFrom.value = echoData.value
-      init()
-      // console.log('驳回修改===================>', echoData.value)
-    })
+  if (!dataFrom.value.description) {
+    notFilled.value.push('算法描述')
+  }
+  if (!dataFrom.value.shareCondition) {
+    notFilled.value.push('共享条件')
+  }
+  if (!dataFrom.value.deptId) {
+    notFilled.value.push('归属部门')
+  }
+  if (!dataFrom.value.deptContacts) {
+    notFilled.value.push('部门联系人')
+  }
+  if (!dataFrom.value.deptPhone) {
+    notFilled.value.push('部门联系人电话')
+  }
+  if (
+    !dataFrom.value.infoList.filter((val) => val.attrType === '算法类别')[0] ||
+    !dataFrom.value.infoList.filter((val) => val.attrType === '算法类别')[0]
+      .attrValue
+  ) {
+    notFilled.value.push('算法类别')
+  }
+  if (
+    !dataFrom.value.infoList.filter((val) => val.attrType === '应用领域')[0] ||
+    !dataFrom.value.infoList.filter((val) => val.attrType === '应用领域')[0]
+      .attrValue
+  ) {
+    console.log('应用领域==========>', dataFrom.value.infoList)
+    notFilled.value.push('应用领域')
+  }
+  if (notFilled.value.length > 0) {
+    message.warning('请填写必填字段')
+    console.log(notFilled.value)
   } else {
-    init()
-  }
-  // 特殊字段处理
-  const refPutOnTheShelf = ref(null)
-  const changeSfys = (type) => {
-    console.log(refPutOnTheShelf, sfys.value)
-    refPutOnTheShelf.value.add('算法优势', true, type)
-  }
-  const changeYycj = (type) => {
-    console.log(refPutOnTheShelf)
-    refPutOnTheShelf.value.add('应用场景', true, type)
-  }
-  const changeBs = (type) => {
-    console.log(refPutOnTheShelf)
-    refPutOnTheShelf.value.add('计费标准信息', true)
-    refPutOnTheShelf.value.add('常见问题', true, type)
-  }
-  mybus.on('chageDataFrom', (obj) => {
-    if (obj.attrType == '技术文档' && obj.attrValue != null) {
-      shiyongshouce.value = obj
+    let i = -1
+    navList.value.forEach((val, index) => {
+      if (val.key === showView.value && index < navList.value.length - 1) {
+        i = index + 1
+      }
+    })
+    if (i !== -1) {
+      showView.value = navList2.value[i]
+      refData.value = data.value.filter(
+        (item) => item.name === showView.value
+      )[0]
+      console.log('表单数据=============>', dataFrom.value, refData.value)
     }
+  }
+}
+// 预览
+const preview = () => {
+  notFilled.value = []
+  console.log(dataFrom.value, 'dataFrom.value.name')
+  if (
+    dataFrom.value.infoList.filter((val) => val.attrType === '使用方式')[0] &&
+    dataFrom.value.infoList.filter((val) => val.attrType === '使用方式')[0]
+      .attrValue == '调用接口'
+  ) {
+    if (
+      !dataFrom.value.infoList.filter(
+        (val) => val.attrType === '服务接口'
+      )[0] ||
+      !dataFrom.value.infoList.filter((val) => val.attrType === '服务接口')[0]
+        .attrValue
+    ) {
+      notFilled.value.push('服务接口')
+    }
+    if (!dataFrom.value.apiMethodType) {
+      notFilled.value.push('接口请求方式')
+    }
+  }
+  if (notFilled.value.length > 0) {
+    message.warning('请填写必填字段')
+    console.log(notFilled.value)
+  } else {
     dataFrom.value.infoList = dataFrom.value.infoList.filter(
-      (item) => item.attrType !== obj.attrType
+      (item) => item.attrValue !== ''
     )
-    if (obj.attrValue == [] || obj.attrValue == '[]' || obj.attrValue == null) {
-      obj.attrValue = ''
+    console.log('预览==============>', dataFrom.value)
+    window.sessionStorage.setItem('preview', JSON.stringify(dataFrom.value))
+    const newpage = router.resolve({
+      path: '/details',
+    })
+    window.open(newpage.href, '_blank')
+  }
+}
+const submit = () => {
+  notFilled.value = []
+  console.log(dataFrom.value, 'dataFrom.value.name')
+  if (
+    dataFrom.value.infoList.filter((val) => val.attrType === '使用方式')[0] &&
+    dataFrom.value.infoList.filter((val) => val.attrType === '使用方式')[0]
+      .attrValue == '调用接口'
+  ) {
+    if (
+      !dataFrom.value.infoList.filter(
+        (val) => val.attrType === '服务接口'
+      )[0] ||
+      !dataFrom.value.infoList.filter((val) => val.attrType === '服务接口')[0]
+        .attrValue
+    ) {
+      notFilled.value.push('服务接口')
     }
-    dataFrom.value.infoList.push(obj)
-    if (shiyongshouce.value.attrValue) {
-      dataFrom.value.infoList.map((syscitem, syscindex) => {
-        if (syscitem.attrType == '技术文档') {
-          dataFrom.value.infoList[syscindex] = shiyongshouce.value
-        }
+    if (!dataFrom.value.apiMethodType) {
+      notFilled.value.push('接口请求方式')
+    }
+  }
+  if (notFilled.value.length > 0) {
+    message.warning('请填写必填字段')
+    console.log(notFilled.value)
+  } else {
+    console.log('提交数据=============>', dataFrom.value)
+    if (submitFlag.value) {
+      submitFlag.value = false
+      dataFrom.value.infoList = dataFrom.value.infoList.filter(
+        (item) => item.attrValue !== ''
+      )
+      if (resourceId) {
+        delete dataFrom.value.createDate
+        delete dataFrom.value.updateDate
+        dataFrom.value.infoList.map((del) => {
+          delete del.createDate
+          delete del.updateDate
+        })
+        updateRes(dataFrom.value).then((upres) => {
+          if (upres.data.code == 0) {
+            relaunch({ data: dataFrom.value, taskId: taskId }).then((res) => {
+              console.log('驳回================>', res)
+              if (res.data.code == 0) {
+                message.success('重新发起流程成功！')
+                submitFlag.value = true
+                window.setTimeout(() => {
+                  window.close()
+                }, 1000)
+              } else {
+                message.error('重新发起流程失败！')
+                submitFlag.value = true
+              }
+            })
+          } else {
+            message.error('数据更新失败！')
+            submitFlag.value = true
+          }
+        })
+      } else {
+        shangjiainsert(dataFrom.value).then((res) => {
+          const instanceId = res.data.data
+          dataFrom.value.id = res.data.data
+          getUser().then((res6) => {
+            getUserInfo(res6.data.data.id).then((res2) => {
+              const deptId = dataFrom.value.deptId
+              const userId = res2.data.data.id
+              const userName = res2.data.data.realName
+              const params = {
+                instanceId: instanceId,
+                deptId: deptId,
+                userId: userId,
+                userName: userName,
+                resourceDTO: [dataFrom.value],
+              }
+              shangjiaapply(params).then((res3) => {
+                console.log('res3', res3)
+                if (res3.data.code == 0) {
+                  message.success('上架申请提交成功，请注意查看消息通知！')
+                  window.setTimeout(() => {
+                    window.close()
+                    submitFlag.value = true
+                  }, 1000)
+                }
+              })
+            })
+          })
+        })
+      }
+    }
+  }
+}
+const init = () => {
+  getCategoryTree().then((res) => {
+    // console.clear()
+    res.data.data = res.data.data
+      .filter((item) => item.name === '组件服务一')[0]
+      .children.filter((item) => item.name === '智能算法')[0]
+    navList.value = []
+    navList2.value = []
+    res.data.data.children.forEach((val) => {
+      // console.log('val================>', val, echoData.value)
+      navList.value.push({
+        name: val.name,
+        key: val.name,
       })
-    }
-    console.log('数据变更=================》', obj, dataFrom.value.infoList)
+      navList2.value.push(val.name)
+      if (val.name === '部署与使用') {
+        console.log(val, '部署与使用')
+        val.children.forEach((valChild) => {
+          if (valChild.name === '使用方式') {
+            valChild.children.forEach((valChilds) => {
+              if (valChilds.name === '使用方式') {
+                valChilds.note1 = '调用接口'
+              }
+            })
+          }
+        })
+      }
+      // 回填数据
+      if (resourceId) {
+        val.children.map((item) => {
+          if (item.children.length > 0) {
+            item.children.map((child) => {
+              switch (child.name) {
+                case '算法名称':
+                  child.note1 = echoData.value.name
+                  break
+                case '算法描述':
+                  child.note1 = echoData.value.description
+                  break
+                case '共享条件':
+                  child.note1 = echoData.value.shareCondition
+                  break
+                case '归属部门':
+                  child.note1 = echoData.value.deptId
+                  break
+                case '部门联系人':
+                  child.note1 = echoData.value.deptContacts
+                  break
+                case '部门联系人电话':
+                  child.note1 = echoData.value.deptPhone
+                  break
+                case '接口请求方式':
+                  child.note1 = echoData.value.apiMethodType
+                  break
+                case '应用领域':
+                  if (
+                    echoData.value.infoList &&
+                    echoData.value.infoList.filter(
+                      (fil) => fil.attrType == child.name
+                    )[0]
+                  ) {
+                    child.note1 = echoData.value.infoList.filter(
+                      (fil) => fil.attrType == child.name
+                    )[0].attrValue
+                    child.note2 = echoData.value.infoList
+                      .filter((fil) => fil.attrType == child.name)[0]
+                      .attrValue.split(';')
+                  }
+                  break
+                case '算法介绍视频':
+                  if (
+                    echoData.value.infoList &&
+                    echoData.value.infoList.filter(
+                      (fil) => fil.attrType == child.name
+                    )[0]
+                  ) {
+                    videoList.value = [
+                      {
+                        uid: echoData.value.infoList.filter(
+                          (fil) => fil.attrType == child.name
+                        )[0].id,
+                        name:
+                          echoData.value.infoList.filter(
+                            (fil) => fil.attrType == child.name
+                          )[0].note3 || '--',
+                        status: 'done',
+                        url: echoData.value.infoList.filter(
+                          (fil) => fil.attrType == child.name
+                        )[0].attrValue,
+                        thumbUrl: echoData.value.infoList.filter(
+                          (fil) => fil.attrType == child.name
+                        )[0].attrValue,
+                      },
+                    ]
+                  }
+                  break
+                default:
+                  if (
+                    echoData.value.infoList &&
+                    echoData.value.infoList.filter(
+                      (fil) => fil.attrType == child.name
+                    )[0]
+                  ) {
+                    child.note1 = echoData.value.infoList.filter(
+                      (fil) => fil.attrType == child.name
+                    )[0].attrValue
+                  }
+                  break
+              }
+            })
+          }
+          console.log('item================>', item, echoData.value)
+        })
+      }
+    })
+    data.value = res.data.data.children
+    refData.value = data.value.filter((item) => item.name === showView.value)[0]
+    console.log('所有编目结构==============>', data.value)
   })
-  mybus.on('chageFileList', (obj) => {
-    fileList.value = obj
-  })
-  mybus.on('chagePackageList', (obj) => {
-    packageList.value = obj
-  })
-  mybus.on('chageAccessory', (obj) => {
-    accessoryList.value = obj
-  })
-  mybus.on('chageImgList', (obj) => {
-    imgList.value = obj
-  })
-  mybus.on('chageVideoList', (obj) => {
-    videoList.value = obj
-  })
-  //datafrom外面数据
-  mybus.on('chageDataFromDwon', (obj) => {
-    switch (obj.attrType) {
-      case '算法名称':
-        dataFrom.value.name = obj.attrValue
-        break
-      case '算法描述':
-        dataFrom.value.description = obj.attrValue
-        break
-      case '共享条件':
-        dataFrom.value.shareCondition = obj.attrValue
-        break
-      case '共享类型':
-        dataFrom.value.shareType = obj.attrValue
-        break
-      case '服务接口':
-        dataFrom.value.apiUrl = obj.attrValue
-        break
-      case '接口请求方式':
-        dataFrom.value.apiMethodType = obj.attrValue
-        break
-      case '归属部门':
-        dataFrom.value.deptId = obj.attrValue
-        if (obj.attrValueTwo) {
-          dataFrom.value.deptName = obj.attrValueTwo.label
-        }
-        break
-      case '部门联系人':
-        dataFrom.value.deptContacts = obj.attrValue
-        break
-      case '部门联系人电话':
-        dataFrom.value.deptPhone = obj.attrValue
-        break
-    }
-    // console.log('dataFrom.value', dataFrom.value)
-  })
-  onBeforeUnmount(() => {
-    mybus.off('chageDataFrom')
-    mybus.off('chageFileList')
-    mybus.off('chageImgList')
-    mybus.off('chageDataFromDwon')
-    mybus.off('chageVideoList')
-    mybus.off('chagePackageList')
-    mybus.off('chageAccessory')
+}
+const resourceId = router.currentRoute.value.query.id
+const taskId = router.currentRoute.value.query.taskId
+const echoData = ref({})
+if (resourceId) {
+  // 回显数据
+  selectOne(resourceId).then((res) => {
+    echoData.value = res.data.data
+    dataFrom.value = echoData.value
+    init()
+    // console.log('驳回修改===================>', echoData.value)
   })
+} else {
+  init()
+}
+// 特殊字段处理
+const refPutOnTheShelf = ref(null)
+const changeSfys = (type) => {
+  console.log(refPutOnTheShelf, sfys.value)
+  refPutOnTheShelf.value.add('算法优势', true, type)
+}
+const changeYycj = (type) => {
+  console.log(refPutOnTheShelf)
+  refPutOnTheShelf.value.add('应用场景', true, type)
+}
+const changeBs = (type) => {
+  console.log(refPutOnTheShelf)
+  refPutOnTheShelf.value.add('计费标准信息', true)
+  refPutOnTheShelf.value.add('常见问题', true, type)
+}
+mybus.on('chageDataFrom', (obj) => {
+  if (obj.attrType == '技术文档' && obj.attrValue != null) {
+    shiyongshouce.value = obj
+  }
+  dataFrom.value.infoList = dataFrom.value.infoList.filter(
+    (item) => item.attrType !== obj.attrType
+  )
+  if (obj.attrValue == [] || obj.attrValue == '[]' || obj.attrValue == null) {
+    obj.attrValue = ''
+  }
+  dataFrom.value.infoList.push(obj)
+  if (shiyongshouce.value.attrValue) {
+    dataFrom.value.infoList.map((syscitem, syscindex) => {
+      if (syscitem.attrType == '技术文档') {
+        dataFrom.value.infoList[syscindex] = shiyongshouce.value
+      }
+    })
+  }
+  console.log('数据变更=================》', obj, dataFrom.value.infoList)
+})
+mybus.on('chageFileList', (obj) => {
+  fileList.value = obj
+})
+mybus.on('chagePackageList', (obj) => {
+  packageList.value = obj
+})
+mybus.on('chageAccessory', (obj) => {
+  accessoryList.value = obj
+})
+mybus.on('chageImgList', (obj) => {
+  imgList.value = obj
+})
+mybus.on('chageVideoList', (obj) => {
+  videoList.value = obj
+})
+//datafrom外面数据
+mybus.on('chageDataFromDwon', (obj) => {
+  switch (obj.attrType) {
+    case '算法名称':
+      dataFrom.value.name = obj.attrValue
+      break
+    case '算法描述':
+      dataFrom.value.description = obj.attrValue
+      break
+    case '共享条件':
+      dataFrom.value.shareCondition = obj.attrValue
+      break
+    case '共享类型':
+      dataFrom.value.shareType = obj.attrValue
+      break
+    case '服务接口':
+      dataFrom.value.apiUrl = obj.attrValue
+      break
+    case '接口请求方式':
+      dataFrom.value.apiMethodType = obj.attrValue
+      break
+    case '归属部门':
+      dataFrom.value.deptId = obj.attrValue
+      if (obj.attrValueTwo) {
+        dataFrom.value.deptName = obj.attrValueTwo.label
+      }
+      break
+    case '部门联系人':
+      dataFrom.value.deptContacts = obj.attrValue
+      break
+    case '部门联系人电话':
+      dataFrom.value.deptPhone = obj.attrValue
+      break
+  }
+  // console.log('dataFrom.value', dataFrom.value)
+})
+onBeforeUnmount(() => {
+  mybus.off('chageDataFrom')
+  mybus.off('chageFileList')
+  mybus.off('chageImgList')
+  mybus.off('chageDataFromDwon')
+  mybus.off('chageVideoList')
+  mybus.off('chagePackageList')
+  mybus.off('chageAccessory')
+})
 </script>
 <style lang="less" scoped>
-  .box {
-    position: relative;
-    top: 0.64rem;
-    margin: 0.15rem 4rem;
-    padding: 0.1rem;
-    background: #fff;
-    .header {
-      font-size: 0.28rem;
-      font-weight: 600;
-    }
-    .vue-box {
-      padding: 0 1rem;
-    }
-    .top {
-      margin: 0.1rem 0.2rem 0;
-      padding: 0.15rem 0.3rem;
-      background: #edf4fc;
-      display: flex;
-      justify-content: space-between;
-      div {
-        font-size: 0.18rem;
-        color: #999;
-        display: flex;
-        justify-content: center;
-        align-items: center;
+.box {
+  position: relative;
+  top: 0.64rem;
+  // margin: 0.15rem 3rem;
+  padding: 0.1rem;
+  background: #fff;
+  .header {
+    font-size: 0.28rem;
+    font-weight: 600;
+  }
+  .vue-box {
+    padding: 0 1rem;
+  }
+  .top {
+    font-size: 16px;
+    margin: 0.32px 0.4px 0;
+    padding: 24px 24pxs;
+    display: flex;
+    justify-content: center;
+    .ff {
+      color: #b3b3b3;
+      display: inline-flex;
+      justify-content: center;
+      align-items: center;
+      .wai {
+        margin-top: 14px;
         .bg-box {
           display: flex;
           justify-content: center;
           align-items: center;
-          width: 0.45rem;
-          height: 0.45rem;
+          width: 32px;
+          height: 32px;
           border-radius: 50%;
-          border: 0.01rem solid rgb(214, 214, 214);
-          margin-right: 0.1rem;
+          // border: 0.01rem solid rgb(214, 214, 214);
+          margin: 0px 16px;
           transition: all 0.3s ease;
           span {
             display: flex;
             justify-content: center;
             align-items: center;
-            width: 0.3rem;
-            height: 0.3rem;
+            width: 32px;
+            height: 32px;
             border-radius: 50%;
-            border: 0.01rem solid #999;
+            border: 1px solid #d9d9d9;
           }
         }
-        .line {
-          margin-left: 0.1rem;
-          width: 1.3rem;
-          height: 0.01rem;
-          background: #999;
+        .bg-name {
+          color: #b3b3b3;
         }
       }
-      .finish {
-        color: #0087ff;
+      .line {
+        // margin-left: 16px;
+        width: 326px;
+        height: 2px;
+        background: #d9d9d9;
+      }
+    }
+    .finish {
+      color: #fff;
+      display: inline-flex;
+      justify-content: center;
+      align-items: center;
+      .wai {
+        margin-top: 14px;
         .bg-box {
-          background: #9ccefa;
-          color: #fff;
-          border: 0.01rem solid #9ccefa;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          width: 32px;
+          height: 32px;
+          border-radius: 50%;
+          // border: 0.01rem solid rgb(214, 214, 214);
+          margin: 0px 16px;
+          transition: all 0.3s ease;
           span {
-            background: #0087ff;
-            border: 0.01rem solid #0087ff;
+            background: #0058e1;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            width: 32px;
+            height: 32px;
+            border-radius: 50%;
+            border: 1px solid solid #0058e1;
           }
         }
-        .line {
-          background: #0087ff;
+        .bg-name {
+          color: #212121;
+          font-weight: bold;
         }
       }
-      .btn {
-        display: flex;
-        justify-content: space-around;
-        padding: 0.1rem 3.5rem 0;
-        button {
-          cursor: pointer;
-          font-size: 0.14rem;
-          width: 0.8rem;
-          height: 0.35rem;
-          text-align: center;
-          color: #fff;
-          border: 0.01rem solid #9ccefa;
-          span {
-            background: #0087ff;
-            border: 0.01rem solid #0087ff;
-          }
-        }
-        .line {
-          background: #0087ff;
-        }
-        button:nth-of-type(1) {
-          color: #0087ff;
-          background: #e1edfa;
-        }
-        button:nth-of-type(2) {
-          background: #01c5dc;
-        }
-      }
-      .first {
-        justify-content: space-around;
+      .line {
+        // margin-left: 16px;
+        width: 326px;
+        height: 2px;
+        background: #0058e1;
       }
     }
     .btn {
       display: flex;
-      justify-content: space-between;
+      justify-content: space-around;
       padding: 0.1rem 3.5rem 0;
       button {
         cursor: pointer;
@@ -956,8 +927,13 @@
         height: 0.35rem;
         text-align: center;
         color: #fff;
-        border: none;
-        border-radius: 0.06rem;
+        border: 0.01rem solid #9ccefa;
+        span {
+          background: #0087ff;
+          border: 0.01rem solid #0087ff;
+        }
+      }
+      .line {
         background: #0087ff;
       }
       button:nth-of-type(1) {
@@ -969,7 +945,55 @@
       }
     }
     .first {
-      justify-content: space-around;
+      justify-content: center;
     }
   }
+  .btn {
+    display: flex;
+    justify-content: center;
+    padding: 0.1rem 3.5rem 0;
+   //  button {
+      // cursor: pointer;
+      // font-size: 14px;
+      // text-align: center;
+      // color: #fff;
+      // border: none;
+      // border-radius: 0.06rem;
+      // background: #0087ff;
+      // margin-right:12px;
+    //  margin-right:12px;
+    .quxiao{
+      margin-right:12px;
+      cursor: pointer;
+      width: 90px;
+      height: 32px;
+      background: #ffffff;
+      color:#0058e1;
+      border-radius: 2px;
+      border: 1px #0058e1 solid;
+    }
+    // .quxiao:hover{
+    //   background: #0058e1;
+    //   color:#ffffff;   
+    // }
+    .buzhou{
+      margin-right:12px;
+      cursor: pointer;
+      background: #0058e1;
+      color:#ffffff;
+      width: 90px;
+      height: 32px;
+      border-radius: 2px;
+      border: 1px #0058e1 solid;
+  }
+  // .buzhou:hover{  
+  //     background: #ffffff;
+  //     color:#0058e1;  
+  // }
+    
+  }
+  .first {
+    justify-content: center;
+  }
+}
 </style>
diff --git a/front/src/views/capacityOnTheShelf/Application.vue b/front/src/views/capacityOnTheShelf/Application.vue
index 168072fc..4d13325a 100644
--- a/front/src/views/capacityOnTheShelf/Application.vue
+++ b/front/src/views/capacityOnTheShelf/Application.vue
@@ -7,17 +7,19 @@
 -->
 <template>
   <div class="box">
-    <div class="header">能力上架申请</div>
+    <!-- <div class="header">能力上架申请</div> -->
     <div class="top">
       <div
         v-for="(nav, index) in navList"
         :key="nav"
-        :class="[index <= navList2.indexOf(showView) ? 'finish' : '']"
+        :class="[index <= navList2.indexOf(showView) ? 'finish' : 'ff']"
       >
-        <span class="bg-box">
-          <span>{{ index + 1 }}</span>
-        </span>
-        <span>{{ nav.name }}</span>
+        <div class="wai">
+          <span class="bg-box">
+            <span>{{ index + 1 }}</span>
+          </span>
+          <span class="bg-name">{{ nav.name }}</span>
+        </div>
         <div class="line" v-if="index !== navList.length - 1"></div>
       </div>
     </div>
@@ -101,7 +103,7 @@
       ></application-deployment-use> -->
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
-      <button @click="close()">取消</button>
+     
 
       <a-popconfirm
         v-if="
@@ -116,13 +118,14 @@
         @confirm="changeGnjs('上一步')"
         @cancel="cancel"
       >
-        <button>上一步</button>
+        <button class="buzhou">上一步</button>
       </a-popconfirm>
-      <button v-else-if="showView == '功能介绍'" @click="changeGnjs('上一步')">
+      <button class="buzhou" v-else-if="showView == '功能介绍'" @click="changeGnjs('上一步')">
         上一步
       </button>
       <!-- 分割线 -->
       <button
+      class="buzhou"
         v-show="showView !== '基本信息' && showView === '部署与应用'"
         @click="back()"
       >
@@ -141,12 +144,12 @@
         @confirm="changeBs('预览')"
         @cancel="cancel"
       >
-        <button>预览</button>
+        <button class="buzhou">预览</button>
       </a-popconfirm>
-      <button v-else-if="showView === '部署与应用'" @click="preview()">
+      <button class="buzhou" v-else-if="showView === '部署与应用'" @click="preview()">
         预览
       </button>
-      <button v-show="showView === '基本信息'" @click="next()">下一步</button>
+      <button class="buzhou" v-show="showView === '基本信息'" @click="next()">下一步</button>
       <a-popconfirm
         v-if="
           showView == '功能介绍' &&
@@ -160,9 +163,9 @@
         @confirm="changeGnjs('下一步')"
         @cancel="cancel"
       >
-        <button>下一步</button>
+        <button class="buzhou">下一步</button>
       </a-popconfirm>
-      <button v-else-if="showView == '功能介绍'" @click="changeGnjs('下一步')">
+      <button  class="buzhou" v-else-if="showView == '功能介绍'" @click="changeGnjs('下一步')">
         下一步
       </button>
       <a-popconfirm
@@ -178,11 +181,12 @@
         @confirm="changeBs('提交')"
         @cancel="cancel"
       >
-        <button>提交</button>
+        <button class="buzhou">提交</button>
       </a-popconfirm>
-      <button v-else-if="showView === '部署与应用'" @click="submit()">
+      <button class="buzhou" v-else-if="showView === '部署与应用'" @click="submit()">
         提交
       </button>
+      <button class="quxiao" @click="close()">取消</button>
     </div>
   </div>
 </template>
@@ -715,85 +719,120 @@
 </script>
 <style lang="less" scoped>
   .box {
-    position: relative;
-    top: 64px;
-    margin: 15px 400px;
-    padding: 10px;
-    background: #fff;
-    .header {
-      font-size: 28px;
-      font-weight: 600;
-    }
-    .vue-box {
-      padding: 0 100px;
-    }
-    .top {
-      margin: 10px 20px 0;
-      padding: 15px 30px;
-      background: #edf4fc;
-      display: flex;
-      justify-content: space-between;
-      div {
-        font-size: 18px;
-        color: #999;
-        display: flex;
-        justify-content: center;
-        align-items: center;
+  position: relative;
+  top: 0.64rem;
+  // margin: 0.15rem 3rem;
+  padding: 0.1rem;
+  background: #fff;
+  .header {
+    font-size: 0.28rem;
+    font-weight: 600;
+  }
+  .vue-box {
+    padding: 0 1rem;
+  }
+  .top {
+    font-size: 16px;
+    margin: 0.32px 0.4px 0;
+    padding: 24px 24pxs;
+    display: flex;
+    justify-content: center;
+    .ff {
+      color: #b3b3b3;
+      display: inline-flex;
+      justify-content: center;
+      align-items: center;
+      .wai {
+        margin-top: 14px;
         .bg-box {
           display: flex;
           justify-content: center;
           align-items: center;
-          width: 45px;
-          height: 45px;
+          width: 32px;
+          height: 32px;
           border-radius: 50%;
-          border: 1px solid rgb(214, 214, 214);
-          margin-right: 10px;
+          // border: 0.01rem solid rgb(214, 214, 214);
+          margin: 0px 16px;
           transition: all 0.3s ease;
           span {
             display: flex;
             justify-content: center;
             align-items: center;
-            width: 30px;
-            height: 30px;
+            width: 32px;
+            height: 32px;
             border-radius: 50%;
-            border: 1px solid #999;
+            border: 1px solid #d9d9d9;
           }
         }
-        .line {
-          margin-left: 10px;
-          width: 280px;
-          height: 1px;
-          background: #999;
+        .bg-name {
+          color: #b3b3b3;
         }
       }
-      .finish {
-        color: #0087ff;
+      .line {
+        // margin-left: 16px;
+        width: 326px;
+        height: 2px;
+        background: #d9d9d9;
+      }
+    }
+    .finish {
+      color: #fff;
+      display: inline-flex;
+      justify-content: center;
+      align-items: center;
+      .wai {
+        margin-top: 14px;
         .bg-box {
-          background: #9ccefa;
-          color: #fff;
-          border: 1px solid #9ccefa;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          width: 32px;
+          height: 32px;
+          border-radius: 50%;
+          // border: 0.01rem solid rgb(214, 214, 214);
+          margin: 0px 16px;
+          transition: all 0.3s ease;
           span {
-            background: #0087ff;
-            border: 1px solid #0087ff;
+            background: #0058e1;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            width: 32px;
+            height: 32px;
+            border-radius: 50%;
+            border: 1px solid solid #0058e1;
           }
         }
-        .line {
-          background: #0087ff;
+        .bg-name {
+          color: #212121;
+          font-weight: bold;
         }
       }
+      .line {
+        // margin-left: 16px;
+        width: 326px;
+        height: 2px;
+        background: #0058e1;
+      }
     }
     .btn {
       display: flex;
-      justify-content: space-between;
-      padding: 10px 350px 0;
+      justify-content: space-around;
+      padding: 0.1rem 3.5rem 0;
       button {
         cursor: pointer;
-        width: 80px;
-        height: 35px;
+        font-size: 0.14rem;
+        width: 0.8rem;
+        height: 0.35rem;
         text-align: center;
         color: #fff;
-        border: none;
-        border-radius: 6px;
+        border: 0.01rem solid #9ccefa;
+        span {
+          background: #0087ff;
+          border: 0.01rem solid #0087ff;
+        }
+      }
+      .line {
         background: #0087ff;
       }
       button:nth-of-type(1) {
@@ -805,7 +844,55 @@
       }
     }
     .first {
-      justify-content: space-around;
+      justify-content: center;
     }
   }
+  .btn {
+    display: flex;
+    justify-content: center;
+    padding: 0.1rem 3.5rem 0;
+   //  button {
+      // cursor: pointer;
+      // font-size: 14px;
+      // text-align: center;
+      // color: #fff;
+      // border: none;
+      // border-radius: 0.06rem;
+      // background: #0087ff;
+      // margin-right:12px;
+    //  margin-right:12px;
+    .quxiao{
+      margin-right:12px;
+      cursor: pointer;
+      width: 90px;
+      height: 32px;
+      background: #ffffff;
+      color:#0058e1;
+      border-radius: 2px;
+      border: 1px #0058e1 solid;
+    }
+    // .quxiao:hover{
+    //   background: #0058e1;
+    //   color:#ffffff;   
+    // }
+    .buzhou{
+      margin-right:12px;
+      cursor: pointer;
+      background: #0058e1;
+      color:#ffffff;
+      width: 90px;
+      height: 32px;
+      border-radius: 2px;
+      border: 1px #0058e1 solid;
+  }
+  // .buzhou:hover{  
+  //     background: #ffffff;
+  //     color:#0058e1;  
+  // }
+    
+  }
+  .first {
+    justify-content: center;
+  }
+}
 </style>
diff --git a/front/src/views/capacityOnTheShelf/BusinessComponent.vue b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
index 9434c895..118ff20b 100644
--- a/front/src/views/capacityOnTheShelf/BusinessComponent.vue
+++ b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
@@ -7,17 +7,19 @@
 -->
 <template>
   <div class="box">
-    <div class="header">能力上架申请</div>
+    <!-- <div class="header">能力上架申请</div> -->
     <div class="top">
       <div
         v-for="(nav, index) in navList"
         :key="nav"
-        :class="[index <= navList2.indexOf(showView) ? 'finish' : '']"
+        :class="[index <= navList2.indexOf(showView) ? 'finish' : 'ff']"
       >
-        <span class="bg-box">
-          <span>{{ index + 1 }}</span>
-        </span>
-        <span>{{ nav.name }}</span>
+        <div class="wai">
+          <span class="bg-box">
+            <span>{{ index + 1 }}</span>
+          </span>
+          <span class="bg-name">{{ nav.name }}</span>
+        </div>
         <div class="line" v-if="index !== navList.length - 1"></div>
       </div>
     </div>
@@ -80,7 +82,7 @@
       ></put-on-the-shelf>
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
-      <button @click="close()">取消</button>
+    
       <a-popconfirm
         v-if="
           showView == '功能介绍' &&
@@ -94,9 +96,10 @@
         @confirm="changeGnjs('上一步')"
         @cancel="cancel"
       >
-        <button>上一步</button>
+        <button  class="buzhou" >上一步</button>
       </a-popconfirm>
       <button
+      class="buzhou" 
         v-else-if="
           showView == '功能介绍' &&
           gnjs[0].list.filter((val) => val.note1 !== '').length ==
@@ -119,9 +122,10 @@
         @confirm="changeYycj('上一步')"
         @cancel="cancel"
       >
-        <button>上一步</button>
+        <button  class="buzhou" >上一步</button>
       </a-popconfirm>
       <button
+      class="buzhou" 
         v-else-if="
           showView == '应用场景' &&
           yycj[0].list.filter((val) => val.note1 !== '').length ==
@@ -131,7 +135,7 @@
       >
         上一步
       </button>
-      <button v-else-if="showView !== '基本信息'" @click="back()">
+      <button  class="buzhou"  v-else-if="showView !== '基本信息'" @click="back()">
         上一步
       </button>
       <a-popconfirm
@@ -146,9 +150,9 @@
         @confirm="changeBs('预览')"
         @cancel="cancel"
       >
-        <button>预览</button>
+        <button  class="buzhou" >预览</button>
       </a-popconfirm>
-      <button v-else-if="showView === '部署与使用'" @click="preview()">
+      <button  class="buzhou" v-else-if="showView === '部署与使用'" @click="preview()">
         预览
       </button>
       <a-popconfirm
@@ -164,9 +168,10 @@
         @confirm="changeGnjs('下一步')"
         @cancel="cancel"
       >
-        <button>下一步</button>
+        <button  class="buzhou"  >下一步</button>
       </a-popconfirm>
       <button
+      class="buzhou" 
         v-else-if="
           showView == '功能介绍' &&
           gnjs[0].list.filter((val) => val.note1 !== '').length ==
@@ -189,9 +194,10 @@
         @confirm="changeYycj('下一步')"
         @cancel="cancel"
       >
-        <button>下一步</button>
+        <button  class="buzhou" >下一步</button>
       </a-popconfirm>
       <button
+      class="buzhou" 
         v-else-if="
           showView == '应用场景' &&
           yycj[0].list.filter((val) => val.note1 !== '').length ==
@@ -201,7 +207,7 @@
       >
         下一步
       </button>
-      <button v-else-if="showView !== '部署与使用'" @click="next()">
+      <button  class="buzhou"  v-else-if="showView !== '部署与使用'" @click="next()">
         下一步
       </button>
       <a-popconfirm
@@ -216,11 +222,12 @@
         @confirm="changeBs('提交')"
         @cancel="cancel"
       >
-        <button>提交</button>
+        <button  class="buzhou" >提交</button>
       </a-popconfirm>
-      <button v-else-if="showView === '部署与使用'" @click="submit()">
+      <button class="buzhou" v-else-if="showView === '部署与使用'" @click="submit()">
         提交
       </button>
+      <button class="quxiao" @click="close()">取消</button>
     </div>
   </div>
 </template>
@@ -802,86 +809,121 @@
   })
 </script>
 <style lang="less" scoped>
-  .box {
-    position: relative;
-    top: 64px;
-    margin: 15px 400px;
-    padding: 10px;
-    background: #fff;
-    .header {
-      font-size: 28px;
-      font-weight: 600;
-    }
-    .vue-box {
-      padding: 0 100px;
-    }
-    .top {
-      margin: 10px 20px 0;
-      padding: 15px 30px;
-      background: #edf4fc;
-      display: flex;
-      justify-content: space-between;
-      div {
-        font-size: 18px;
-        color: #999;
-        display: flex;
-        justify-content: center;
-        align-items: center;
+.box {
+  position: relative;
+  top: 0.64rem;
+  // margin: 0.15rem 3rem;
+  padding: 0.1rem;
+  background: #fff;
+  .header {
+    font-size: 0.28rem;
+    font-weight: 600;
+  }
+  .vue-box {
+    padding: 0 1rem;
+  }
+  .top {
+    font-size: 16px;
+    margin: 0.32px 0.4px 0;
+    padding: 24px 24pxs;
+    display: flex;
+    justify-content: center;
+    .ff {
+      color: #b3b3b3;
+      display: inline-flex;
+      justify-content: center;
+      align-items: center;
+      .wai {
+        margin-top: 14px;
         .bg-box {
           display: flex;
           justify-content: center;
           align-items: center;
-          width: 45px;
-          height: 45px;
+          width: 32px;
+          height: 32px;
           border-radius: 50%;
-          border: 1px solid rgb(214, 214, 214);
-          margin-right: 10px;
+          // border: 0.01rem solid rgb(214, 214, 214);
+          margin: 0px 16px;
           transition: all 0.3s ease;
           span {
             display: flex;
             justify-content: center;
             align-items: center;
-            width: 30px;
-            height: 30px;
+            width: 32px;
+            height: 32px;
             border-radius: 50%;
-            border: 1px solid #999;
+            border: 1px solid #d9d9d9;
           }
         }
-        .line {
-          margin-left: 10px;
-          width: 130px;
-          height: 1px;
-          background: #999;
+        .bg-name {
+          color: #b3b3b3;
         }
       }
-      .finish {
-        color: #0087ff;
+      .line {
+        // margin-left: 16px;
+        width: 326px;
+        height: 2px;
+        background: #d9d9d9;
+      }
+    }
+    .finish {
+      color: #fff;
+      display: inline-flex;
+      justify-content: center;
+      align-items: center;
+      .wai {
+        margin-top: 14px;
         .bg-box {
-          background: #9ccefa;
-          color: #fff;
-          border: 1px solid #9ccefa;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          width: 32px;
+          height: 32px;
+          border-radius: 50%;
+          // border: 0.01rem solid rgb(214, 214, 214);
+          margin: 0px 16px;
+          transition: all 0.3s ease;
           span {
-            background: #0087ff;
-            border: 1px solid #0087ff;
+            background: #0058e1;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            width: 32px;
+            height: 32px;
+            border-radius: 50%;
+            border: 1px solid solid #0058e1;
           }
         }
-        .line {
-          background: #0087ff;
+        .bg-name {
+          color: #212121;
+          font-weight: bold;
         }
       }
+      .line {
+        // margin-left: 16px;
+        width: 326px;
+        height: 2px;
+        background: #0058e1;
+      }
     }
     .btn {
       display: flex;
-      justify-content: space-between;
-      padding: 10px 350px 0;
+      justify-content: space-around;
+      padding: 0.1rem 3.5rem 0;
       button {
         cursor: pointer;
-        width: 80px;
-        height: 35px;
+        font-size: 0.14rem;
+        width: 0.8rem;
+        height: 0.35rem;
         text-align: center;
         color: #fff;
-        border: none;
-        border-radius: 6px;
+        border: 0.01rem solid #9ccefa;
+        span {
+          background: #0087ff;
+          border: 0.01rem solid #0087ff;
+        }
+      }
+      .line {
         background: #0087ff;
       }
       button:nth-of-type(1) {
@@ -893,7 +935,55 @@
       }
     }
     .first {
-      justify-content: space-around;
+      justify-content: center;
     }
   }
+  .btn {
+    display: flex;
+    justify-content: center;
+    padding: 0.1rem 3.5rem 0;
+   //  button {
+      // cursor: pointer;
+      // font-size: 14px;
+      // text-align: center;
+      // color: #fff;
+      // border: none;
+      // border-radius: 0.06rem;
+      // background: #0087ff;
+      // margin-right:12px;
+    //  margin-right:12px;
+    .quxiao{
+      margin-right:12px;
+      cursor: pointer;
+      width: 90px;
+      height: 32px;
+      background: #ffffff;
+      color:#0058e1;
+      border-radius: 2px;
+      border: 1px #0058e1 solid;
+    }
+    // .quxiao:hover{
+    //   background: #0058e1;
+    //   color:#ffffff;   
+    // }
+    .buzhou{
+      margin-right:12px;
+      cursor: pointer;
+      background: #0058e1;
+      color:#ffffff;
+      width: 90px;
+      height: 32px;
+      border-radius: 2px;
+      border: 1px #0058e1 solid;
+  }
+  // .buzhou:hover{  
+  //     background: #ffffff;
+  //     color:#0058e1;  
+  // }
+    
+  }
+  .first {
+    justify-content: center;
+  }
+}
 </style>
diff --git a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
index 88669d0a..bf3a3ef8 100644
--- a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
+++ b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
@@ -7,17 +7,19 @@
 -->
 <template>
   <div class="box">
-    <div class="header">能力上架申请</div>
+    <!-- <div class="header">能力上架申请</div> -->
     <div class="top">
       <div
         v-for="(nav, index) in navList"
         :key="nav"
-        :class="[index <= navList2.indexOf(showView) ? 'finish' : '']"
+        :class="[index <= navList2.indexOf(showView) ? 'finish' : 'ff']"
       >
-        <span class="bg-box">
-          <span>{{ index + 1 }}</span>
-        </span>
-        <span>{{ nav.name }}</span>
+        <div class="wai">
+          <span class="bg-box">
+            <span>{{ index + 1 }}</span>
+          </span>
+          <span class="bg-name">{{ nav.name }}</span>
+        </div>
         <div class="line" v-if="index !== navList.length - 1"></div>
       </div>
     </div>
@@ -79,7 +81,7 @@
       ></put-on-the-shelf>
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
-      <button @click="close()">取消</button>
+    
       <a-popconfirm
         v-if="
           showView == '功能介绍' &&
@@ -93,9 +95,10 @@
         @confirm="changeGnjs('上一步')"
         @cancel="cancel"
       >
-        <button>上一步</button>
+        <button  class="buzhou">上一步</button>
       </a-popconfirm>
       <button
+      class="buzhou"
         v-else-if="
           showView == '功能介绍' &&
           gnjs[0].list.filter((val) => val.note1 !== '').length ==
@@ -118,9 +121,10 @@
         @confirm="changeYycj('上一步')"
         @cancel="cancel"
       >
-        <button>上一步</button>
+        <button  class="buzhou">上一步</button>
       </a-popconfirm>
       <button
+      class="buzhou"
         v-else-if="
           showView == '应用场景' &&
           yycj[0].list.filter((val) => val.note1 !== '').length ==
@@ -130,7 +134,7 @@
       >
         上一步
       </button>
-      <button v-else-if="showView !== '基本信息'" @click="back()">
+      <button  class="buzhou" v-else-if="showView !== '基本信息'" @click="back()">
         上一步
       </button>
       <a-popconfirm
@@ -145,9 +149,9 @@
         @confirm="changeBs('预览')"
         @cancel="cancel"
       >
-        <button>预览</button>
+        <button  class="buzhou">预览</button>
       </a-popconfirm>
-      <button v-else-if="showView === '部署与使用'" @click="preview()">
+      <button  class="buzhou" v-else-if="showView === '部署与使用'" @click="preview()">
         预览
       </button>
       <a-popconfirm
@@ -163,9 +167,10 @@
         @confirm="changeGnjs('下一步')"
         @cancel="cancel"
       >
-        <button>下一步</button>
+        <button  class="buzhou">下一步</button>
       </a-popconfirm>
       <button
+      class="buzhou"
         v-else-if="
           showView == '功能介绍' &&
           gnjs[0].list.filter((val) => val.note1 !== '').length ==
@@ -188,9 +193,10 @@
         @confirm="changeYycj('下一步')"
         @cancel="cancel"
       >
-        <button>下一步</button>
+        <button  class="buzhou">下一步</button>
       </a-popconfirm>
       <button
+      class="buzhou"
         v-else-if="
           showView == '应用场景' &&
           yycj[0].list.filter((val) => val.note1 !== '').length ==
@@ -200,7 +206,7 @@
       >
         下一步
       </button>
-      <button v-else-if="showView !== '部署与使用'" @click="next()">
+      <button  class="buzhou" v-else-if="showView !== '部署与使用'" @click="next()">
         下一步
       </button>
       <a-popconfirm
@@ -215,11 +221,12 @@
         @confirm="changeBs('提交')"
         @cancel="cancel"
       >
-        <button>提交</button>
+        <button  class="buzhou">提交</button>
       </a-popconfirm>
-      <button v-else-if="showView === '部署与使用'" @click="submit()">
+      <button  class="buzhou" v-else-if="showView === '部署与使用'" @click="submit()">
         提交
       </button>
+      <button class="quxiao" @click="close()">取消</button>
     </div>
   </div>
 </template>
@@ -800,85 +807,120 @@
 </script>
 <style lang="less" scoped>
   .box {
-    position: relative;
-    top: 64px;
-    margin: 15px 400px;
-    padding: 10px;
-    background: #fff;
-    .header {
-      font-size: 28px;
-      font-weight: 600;
-    }
-    .vue-box {
-      padding: 0 100px;
-    }
-    .top {
-      margin: 10px 20px 0;
-      padding: 15px 30px;
-      background: #edf4fc;
-      display: flex;
-      justify-content: space-between;
-      div {
-        font-size: 18px;
-        color: #999;
-        display: flex;
-        justify-content: center;
-        align-items: center;
+  position: relative;
+  top: 0.64rem;
+  // margin: 0.15rem 3rem;
+  padding: 0.1rem;
+  background: #fff;
+  .header {
+    font-size: 0.28rem;
+    font-weight: 600;
+  }
+  .vue-box {
+    padding: 0 1rem;
+  }
+  .top {
+    font-size: 16px;
+    margin: 0.32px 0.4px 0;
+    padding: 24px 24pxs;
+    display: flex;
+    justify-content: center;
+    .ff {
+      color: #b3b3b3;
+      display: inline-flex;
+      justify-content: center;
+      align-items: center;
+      .wai {
+        margin-top: 14px;
         .bg-box {
           display: flex;
           justify-content: center;
           align-items: center;
-          width: 45px;
-          height: 45px;
+          width: 32px;
+          height: 32px;
           border-radius: 50%;
-          border: 1px solid rgb(214, 214, 214);
-          margin-right: 10px;
+          // border: 0.01rem solid rgb(214, 214, 214);
+          margin: 0px 16px;
           transition: all 0.3s ease;
           span {
             display: flex;
             justify-content: center;
             align-items: center;
-            width: 30px;
-            height: 30px;
+            width: 32px;
+            height: 32px;
             border-radius: 50%;
-            border: 1px solid #999;
+            border: 1px solid #d9d9d9;
           }
         }
-        .line {
-          margin-left: 10px;
-          width: 130px;
-          height: 1px;
-          background: #999;
+        .bg-name {
+          color: #b3b3b3;
         }
       }
-      .finish {
-        color: #0087ff;
+      .line {
+        // margin-left: 16px;
+        width: 326px;
+        height: 2px;
+        background: #d9d9d9;
+      }
+    }
+    .finish {
+      color: #fff;
+      display: inline-flex;
+      justify-content: center;
+      align-items: center;
+      .wai {
+        margin-top: 14px;
         .bg-box {
-          background: #9ccefa;
-          color: #fff;
-          border: 1px solid #9ccefa;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          width: 32px;
+          height: 32px;
+          border-radius: 50%;
+          // border: 0.01rem solid rgb(214, 214, 214);
+          margin: 0px 16px;
+          transition: all 0.3s ease;
           span {
-            background: #0087ff;
-            border: 1px solid #0087ff;
+            background: #0058e1;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            width: 32px;
+            height: 32px;
+            border-radius: 50%;
+            border: 1px solid solid #0058e1;
           }
         }
-        .line {
-          background: #0087ff;
+        .bg-name {
+          color: #212121;
+          font-weight: bold;
         }
       }
+      .line {
+        // margin-left: 16px;
+        width: 326px;
+        height: 2px;
+        background: #0058e1;
+      }
     }
     .btn {
       display: flex;
-      justify-content: space-between;
-      padding: 10px 350px 0;
+      justify-content: space-around;
+      padding: 0.1rem 3.5rem 0;
       button {
         cursor: pointer;
-        width: 80px;
-        height: 35px;
+        font-size: 0.14rem;
+        width: 0.8rem;
+        height: 0.35rem;
         text-align: center;
         color: #fff;
-        border: none;
-        border-radius: 6px;
+        border: 0.01rem solid #9ccefa;
+        span {
+          background: #0087ff;
+          border: 0.01rem solid #0087ff;
+        }
+      }
+      .line {
         background: #0087ff;
       }
       button:nth-of-type(1) {
@@ -890,7 +932,55 @@
       }
     }
     .first {
-      justify-content: space-around;
+      justify-content: center;
     }
   }
+  .btn {
+    display: flex;
+    justify-content: center;
+    padding: 0.1rem 3.5rem 0;
+   //  button {
+      // cursor: pointer;
+      // font-size: 14px;
+      // text-align: center;
+      // color: #fff;
+      // border: none;
+      // border-radius: 0.06rem;
+      // background: #0087ff;
+      // margin-right:12px;
+    //  margin-right:12px;
+    .quxiao{
+      margin-right:12px;
+      cursor: pointer;
+      width: 90px;
+      height: 32px;
+      background: #ffffff;
+      color:#0058e1;
+      border-radius: 2px;
+      border: 1px #0058e1 solid;
+    }
+    // .quxiao:hover{
+    //   background: #0058e1;
+    //   color:#ffffff;   
+    // }
+    .buzhou{
+      margin-right:12px;
+      cursor: pointer;
+      background: #0058e1;
+      color:#ffffff;
+      width: 90px;
+      height: 32px;
+      border-radius: 2px;
+      border: 1px #0058e1 solid;
+  }
+  // .buzhou:hover{  
+  //     background: #ffffff;
+  //     color:#0058e1;  
+  // }
+    
+  }
+  .first {
+    justify-content: center;
+  }
+}
 </style>
diff --git a/front/src/views/capacityOnTheShelf/LayerServices.vue b/front/src/views/capacityOnTheShelf/LayerServices.vue
index ea073a23..faab70cb 100644
--- a/front/src/views/capacityOnTheShelf/LayerServices.vue
+++ b/front/src/views/capacityOnTheShelf/LayerServices.vue
@@ -7,17 +7,19 @@
 -->
 <template>
   <div class="box">
-    <div class="header">能力上架申请</div>
+    <!-- <div class="header">能力上架申请</div> -->
     <div class="top">
       <div
         v-for="(nav, index) in navList"
         :key="nav"
-        :class="[index <= navList2.indexOf(showView) ? 'finish' : '']"
+        :class="[index <= navList2.indexOf(showView) ? 'finish' : 'ff']"
       >
-        <span class="bg-box">
-          <span>{{ index + 1 }}</span>
-        </span>
-        <span>{{ nav.name }}</span>
+        <div class="wai">
+          <span class="bg-box">
+            <span>{{ index + 1 }}</span>
+          </span>
+          <span class="bg-name">{{ nav.name }}</span>
+        </div>
         <div class="line" v-if="index !== navList.length - 1"></div>
       </div>
     </div>
@@ -76,7 +78,7 @@
       ></put-on-the-shelf>
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
-      <button @click="close()">取消</button>
+    
       <a-popconfirm
         v-if="
           showView == '应用场景' &&
@@ -90,9 +92,10 @@
         @confirm="changeYycj('上一步')"
         @cancel="cancel"
       >
-        <button>上一步</button>
+        <button class="buzhou">上一步</button>
       </a-popconfirm>
       <button
+      class="buzhou"
         v-else-if="
           showView == '应用场景' &&
           yycj[0].list.filter((val) => val.note1 !== '').length ==
@@ -102,7 +105,7 @@
       >
         上一步
       </button>
-      <button v-else-if="showView !== '基本信息'" @click="back()">
+      <button class="buzhou" v-else-if="showView !== '基本信息'" @click="back()">
         上一步
       </button>
       <a-popconfirm
@@ -118,9 +121,9 @@
         @confirm="changeBs('预览')"
         @cancel="cancel"
       >
-        <button>预览</button>
+        <button class="buzhou">预览</button>
       </a-popconfirm>
-      <button v-else-if="showView === '部署与使用'" @click="preview()">
+      <button class="buzhou" v-else-if="showView === '部署与使用'" @click="preview()">
         预览
       </button>
       <a-popconfirm
@@ -136,9 +139,10 @@
         @confirm="changeYycj('下一步')"
         @cancel="cancel"
       >
-        <button>下一步</button>
+        <button class="buzhou">下一步</button>
       </a-popconfirm>
       <button
+      class="buzhou"
         v-else-if="
           showView == '应用场景' &&
           yycj[0].list.filter((val) => val.note1 !== '').length ==
@@ -148,7 +152,7 @@
       >
         下一步
       </button>
-      <button v-else-if="showView !== '部署与使用'" @click="next()">
+      <button class="buzhou" v-else-if="showView !== '部署与使用'" @click="next()">
         下一步
       </button>
       <a-popconfirm
@@ -164,11 +168,12 @@
         @confirm="changeBs('提交')"
         @cancel="cancel"
       >
-        <button>提交</button>
+        <button class="buzhou">提交</button>
       </a-popconfirm>
-      <button v-else-if="showView === '部署与使用'" @click="submit()">
+      <button class="buzhou" v-else-if="showView === '部署与使用'" @click="submit()">
         提交
       </button>
+      <button class="quxiao" @click="close()">取消</button>
     </div>
   </div>
 </template>
@@ -670,85 +675,120 @@
 </script>
 <style lang="less" scoped>
   .box {
-    position: relative;
-    top: 64px;
-    margin: 15px 400px;
-    padding: 10px;
-    background: #fff;
-    .header {
-      font-size: 28px;
-      font-weight: 600;
-    }
-    .vue-box {
-      padding: 0 100px;
-    }
-    .top {
-      margin: 10px 20px 0;
-      padding: 15px 30px;
-      background: #edf4fc;
-      display: flex;
-      justify-content: space-between;
-      div {
-        font-size: 18px;
-        color: #999;
-        display: flex;
-        justify-content: center;
-        align-items: center;
+  position: relative;
+  top: 0.64rem;
+  // margin: 0.15rem 3rem;
+  padding: 0.1rem;
+  background: #fff;
+  .header {
+    font-size: 0.28rem;
+    font-weight: 600;
+  }
+  .vue-box {
+    padding: 0 1rem;
+  }
+  .top {
+    font-size: 16px;
+    margin: 0.32px 0.4px 0;
+    padding: 24px 24pxs;
+    display: flex;
+    justify-content: center;
+    .ff {
+      color: #b3b3b3;
+      display: inline-flex;
+      justify-content: center;
+      align-items: center;
+      .wai {
+        margin-top: 14px;
         .bg-box {
           display: flex;
           justify-content: center;
           align-items: center;
-          width: 45px;
-          height: 45px;
+          width: 32px;
+          height: 32px;
           border-radius: 50%;
-          border: 1px solid rgb(214, 214, 214);
-          margin-right: 10px;
+          // border: 0.01rem solid rgb(214, 214, 214);
+          margin: 0px 16px;
           transition: all 0.3s ease;
           span {
             display: flex;
             justify-content: center;
             align-items: center;
-            width: 30px;
-            height: 30px;
+            width: 32px;
+            height: 32px;
             border-radius: 50%;
-            border: 1px solid #999;
+            border: 1px solid #d9d9d9;
           }
         }
-        .line {
-          margin-left: 10px;
-          width: 130px;
-          height: 1px;
-          background: #999;
+        .bg-name {
+          color: #b3b3b3;
         }
       }
-      .finish {
-        color: #0087ff;
+      .line {
+        // margin-left: 16px;
+        width: 326px;
+        height: 2px;
+        background: #d9d9d9;
+      }
+    }
+    .finish {
+      color: #fff;
+      display: inline-flex;
+      justify-content: center;
+      align-items: center;
+      .wai {
+        margin-top: 14px;
         .bg-box {
-          background: #9ccefa;
-          color: #fff;
-          border: 1px solid #9ccefa;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          width: 32px;
+          height: 32px;
+          border-radius: 50%;
+          // border: 0.01rem solid rgb(214, 214, 214);
+          margin: 0px 16px;
+          transition: all 0.3s ease;
           span {
-            background: #0087ff;
-            border: 1px solid #0087ff;
+            background: #0058e1;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            width: 32px;
+            height: 32px;
+            border-radius: 50%;
+            border: 1px solid solid #0058e1;
           }
         }
-        .line {
-          background: #0087ff;
+        .bg-name {
+          color: #212121;
+          font-weight: bold;
         }
       }
+      .line {
+        // margin-left: 16px;
+        width: 326px;
+        height: 2px;
+        background: #0058e1;
+      }
     }
     .btn {
       display: flex;
-      justify-content: space-between;
-      padding: 10px 350px 0;
+      justify-content: space-around;
+      padding: 0.1rem 3.5rem 0;
       button {
         cursor: pointer;
-        width: 80px;
-        height: 35px;
+        font-size: 0.14rem;
+        width: 0.8rem;
+        height: 0.35rem;
         text-align: center;
         color: #fff;
-        border: none;
-        border-radius: 6px;
+        border: 0.01rem solid #9ccefa;
+        span {
+          background: #0087ff;
+          border: 0.01rem solid #0087ff;
+        }
+      }
+      .line {
         background: #0087ff;
       }
       button:nth-of-type(1) {
@@ -760,7 +800,55 @@
       }
     }
     .first {
-      justify-content: space-around;
+      justify-content: center;
     }
   }
+  .btn {
+    display: flex;
+    justify-content: center;
+    padding: 0.1rem 3.5rem 0;
+   //  button {
+      // cursor: pointer;
+      // font-size: 14px;
+      // text-align: center;
+      // color: #fff;
+      // border: none;
+      // border-radius: 0.06rem;
+      // background: #0087ff;
+      // margin-right:12px;
+    //  margin-right:12px;
+    .quxiao{
+      margin-right:12px;
+      cursor: pointer;
+      width: 90px;
+      height: 32px;
+      background: #ffffff;
+      color:#0058e1;
+      border-radius: 2px;
+      border: 1px #0058e1 solid;
+    }
+    // .quxiao:hover{
+    //   background: #0058e1;
+    //   color:#ffffff;   
+    // }
+    .buzhou{
+      margin-right:12px;
+      cursor: pointer;
+      background: #0058e1;
+      color:#ffffff;
+      width: 90px;
+      height: 32px;
+      border-radius: 2px;
+      border: 1px #0058e1 solid;
+  }
+  // .buzhou:hover{  
+  //     background: #ffffff;
+  //     color:#0058e1;  
+  // }
+    
+  }
+  .first {
+    justify-content: center;
+  }
+}
 </style>
diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index 4559593f..89c8972f 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -10,44 +10,16 @@
     <div v-for="title in props.refData.children" :key="title.id">
       <div class="top">
         <div></div>
-        <div>{{ title.name }}</div>
+        <div    >{{ title.name }}</div>
         <div></div>
       </div>
       <template v-if="title.isConfigure">
         <div class="bottom">
-          <!-- <div class="items" v-if="data[title.name].length > 0">
-            <div
-              class="item"
-              v-for="(val, index) in data[title.name]"
-              :key="'key1' + val.name + index"
-            >
-              <p>
-                <span>{{ title.name }}-{{ index + 1 }}</span>
-                <span></span>
-              </p>
-              <p
-                v-for="attr in props.configure.filter(
-                  (item, index2) => item.name === title.name
-                )[0].list"
-                :key="'key2' + attr.name + index2"
-              >
-                <span>{{ attr.name }}</span>
-                <span v-if="attr.type === 'image'">
-                  <a-image :width="85" :height="60" :src="val.img" />
-                </span>
-                <span v-else>{{ val[attr.field] + (attr.company || '') }}</span>
-              </p>
-              <div class="del">
-                <i class="delImg" @click="del(title.name, index)"></i>
-                <div @click="del(title.name, index)">删除</div>
-              </div>
-            </div>
-          </div> -->
           <div
             v-for="(val, index) in data[title.name]"
             :key="'key1' + val.name + index"
           >
-            <div
+            <!-- <div
               style="
                 font-size: 0.18rem;
                 font-weight: 600;
@@ -67,6 +39,28 @@
                   <div>删除</div>
                 </div>
               </a-popconfirm>
+            </div> -->
+            <div
+              style="
+                  font-size: 16px;
+                 display: flex;
+                float: right;
+                top:0px;
+                margin-right: 28px;
+              "
+            >
+              <!-- <span>{{ title.name }}-{{ index + 1 }}</span> -->
+              <a-popconfirm
+                :title="'是否删除该条' + title.name + '?'"
+                ok-text="是"
+                cancel-text="否"
+                @confirm="del(title.name, index)"
+              >
+                <div class="del">
+                  <i class="delImg"></i>
+                  <div>删除</div>
+                </div>
+              </a-popconfirm>
             </div>
             <div
               class="form"
@@ -75,8 +69,10 @@
               )[0].list"
               :key="'key2' + attr.name + index2"
             >
-              <span>{{ attr.name }}</span>
+            
+            <span >{{ attr.name }}:</span>
               <a-input
+              style="width:280px"
                 disabled
                 v-model:value="val[attr.field]"
                 :maxlength="24"
@@ -85,25 +81,30 @@
               />
               <template v-if="attr.type == 'input2'">
                 <a-input
-                  disabled
+                style="width:280px"
+                   disabled
                   :maxLength="1000"
                   v-model:value="val[attr.field]"
                   :placeholder="'请填写' + attr.name"
                 />
               </template>
-              <a-textarea
+              <template v-else-if="attr.type == 'textArea'">
+              <a-input
+                style="width:1120px"
                 disabled
+                v-model:value="val[attr.field]"
+                :maxlength="1000"
+                :placeholder="'请填写' + attr.name + ',不超过1000个字符'"
+               
+              />
+            </template>
+              <!-- <a-textarea
+              disabled
                 v-model:value="val[attr.field]"
                 :showCount="true"
                 :maxlength="1000"
                 :placeholder="'请填写' + attr.name"
                 v-else-if="attr.type == 'textArea'"
-              />
-              <!-- <a-radio-group
-                v-model:value="val[attr.field]"
-                :options="val.options"
-                @change="radioChange"
-                v-else-if="attr.type == 'radio'"
               /> -->
               <div v-else-if="attr.type == 'radio'">
                 {{ val[attr.field] + (attr.company || '') }}
@@ -111,24 +112,13 @@
               <span v-else-if="attr.type === 'image'">
                 <a-image :width="85" :height="60" :src="val.img" />
               </span>
-              <!-- <upload
-                :key="showKey"
-                type="图片"
-                btnName="上传图片"
-                :maxCount="1"
-                :data="val"
-                :list="[]"
-                tip="支持图片类型，大小不超过100M"
-                v-else-if="val.type == 'image'"
-              ></upload> -->
             </div>
+            <div style="margin-top:24px;height:1px;border-top: 1px dashed #dddee1; width: 1240px;font-size: 18px;"></div>
           </div>
-          <!-- <div class="add" @click="add(title.name)">
-            添加更多{{ title.name }}
-          </div> -->
-          <div style="font-size: 0.18rem; font-weight: 600">
+      
+          <!-- <div style="font-size: 0.18rem; font-weight: 600border-top: 1px dashed grey; width: 1240px;font-size: 18px;">
             <span>{{ title.name }}-{{ data[title.name].length + 1 }}</span>
-          </div>
+          </div> -->
           <div
             class="form"
             v-for="(val, index) in props.configure.filter(
@@ -136,8 +126,9 @@
             )[0].list"
             :key="'key3' + val.name + index"
           >
-            <span>{{ val.name }}</span>
+          <span >{{ val.name }}:</span>
             <a-input
+            style="width:280px"
               v-model:value="val.note1"
               :maxlength="24"
               :placeholder="'请填写' + val.name + ',不超过24个字符'"
@@ -145,6 +136,7 @@
             />
             <template v-if="val.type == 'input2'">
               <a-input
+                style="width:280px"
                 :maxLength="1000"
                 v-model:value="val.note1"
                 :placeholder="'请填写' + val.name"
@@ -163,13 +155,23 @@
                 }}
               </span>
             </template>
-            <a-textarea
+            <template  v-else-if="val.type == 'textArea'">
+              <a-input
+                style="width:1120px"
+                :showCount="true"
+                v-model:value="val.note1"
+                :maxlength="1000"
+                :placeholder="'请填写' + val.name + ',不超过1000个字符'"
+           
+              />
+            </template>
+            <!-- <a-textarea
               v-model:value="val.note1"
               :showCount="true"
               :maxlength="1000"
               :placeholder="'请填写' + val.name"
               v-else-if="val.type == 'textArea'"
-            />
+            /> -->
             <a-input-number
               v-model:value="val.note1"
               :min="0"
@@ -179,12 +181,31 @@
               :placeholder="'请填写' + val.name"
               v-else-if="val.type == 'number'"
             />
-            <a-radio-group
+            <!-- <a-radio-group
               v-model:value="val.note1"
               :options="val.options"
               @change="radioChange"
               v-else-if="val.type == 'radio'"
-            />
+            /> -->
+            <div
+            v-else-if="val.type == 'radio'"
+                class="danxuan-Area"
+                id="danxuan-Area"
+              >
+                <div
+                  v-for="itemSelect in val.options"
+                  :key="itemSelect"
+                  class="danxuan-Area-son"
+                  @click="radioChangeNew(val, itemSelect)"
+                  :class="
+                    val.note1 && val.note1=== itemSelect
+                      ? 'danxuan-Area-down'
+                      : ''
+                  "
+                >
+                  {{ itemSelect }}
+                </div>
+              </div>
             <upload
               :key="showKey"
               type="图片"
@@ -192,13 +213,19 @@
               :maxCount="1"
               :data="val"
               :list="[]"
-              tip="支持图片类型，大小不超过100M"
+              tip="支持图片类型，大小不超过100M; 注：上传截图如涉及敏感数据请将其模糊化或打码"
               v-else-if="val.type == 'image'"
             ></upload>
           </div>
+          <div style="margin-top:24px;height:1px;border-top: 1px dashed #dddee1; width: 1240px;font-size: 18px;"></div>
           <div class="submit">
             <a-button type="primary" @click="add(title.name)">
-              添加更多{{ title.name }}
+              <img
+                style="height: 12px; width: 12px;margin-top: -2px;"
+                src="../../../assets/home/zhengjia.png"
+                alt=""
+              />
+              <span style="margin-left: 4px">添加多个{{ title.name }}</span>
             </a-button>
           </div>
         </div>
@@ -228,7 +255,7 @@
                 <b class="required" v-if="required.indexOf(item.name) > -1">
                   *
                 </b>
-                {{ item.name }}
+                {{ item.name }} :
               </div>
               <a-input
                 :maxLength="1000"
@@ -246,26 +273,59 @@
                 :placeholder="'请输入' + item.name + '，不超过50个字符'"
                 @change="changeIiem(item.name, item.note1)"
               />
-              <a-radio-group
+              <!-- <a-radio-group
                 v-else-if="item.type == 'radio'"
                 v-model:value="item.note1"
                 :options="item.options"
                 @change="changeIiem(item.name, item.note1)"
-              />
-              <a-input
+              /> -->  
+              <!-- 接口请求方式  单选框样式改变 -->
+              <!-- <div  v-else-if="item.type == 'radio'">ddd </div> -->
+              <div
+              v-else-if="item.type == 'radio'"
+                class="danxuan-Area"
+                id="danxuan-Area"
+              >
+                <div
+                  v-for="itemSelect in item.options"
+                  :key="itemSelect"
+                  class="danxuan-Area-son"
+                  @click="danxuanRadio(item, itemSelect)"
+                  :class="
+                    item.note1 && item.note1 === itemSelect
+                      ? 'danxuan-Area-down'
+                      : ''
+                  "
+                >
+                  {{ itemSelect }}
+                </div>
+              </div>
+              <!-- <a-input
                 v-else-if="item.type == 'AbilityType'"
                 :maxLength="1000"
                 v-model:value="item.note1"
                 :placeholder="'请输入' + item.name"
                 :disabled="true"
-              />
-              <a-input
+              /> -->
+              <span
+                v-else-if="item.type == 'AbilityType'"
+                style="font-weight: bold; color: #212121"
+              >
+                {{ item.note1 }}
+              </span>
+              <span
+                v-else-if="item.type == 'ComponentType'"
+                style="font-weight:bold;color:#212121}"
+              >
+                {{ item.note1 }}
+              </span>
+              <!-- <a-input
                 v-else-if="item.type == 'ComponentType'"
                 v-model:value="item.note1"
                 :maxLength="1000"
                 :placeholder="'请输入' + item.name"
                 :disabled="true"
-              />
+              /> -->
               <a-textarea
                 v-else-if="item.type == 'textArea'"
                 v-model:value="item.note1"
@@ -274,6 +334,7 @@
                 :placeholder="'请输入' + item.name"
                 @change="changeIiem(item.name, item.note1)"
               />
+              
               <upload
                 v-else-if="item.type == 'image'"
                 type="图片"
@@ -281,7 +342,7 @@
                 :maxCount="1"
                 :data="item"
                 :list="props.imgList"
-                tip="支持图片类型，大小不超过100M"
+                tip="支持图片类型，大小不超过100M； 注：上传截图如涉及敏感数据请将其模糊化或打码"
               ></upload>
               <upload
                 v-else-if="item.type == 'file' && item.name !== '使用手册'"
@@ -345,15 +406,18 @@
                   <VueTemplateDemo :dataFrom="props.dataFrom"></VueTemplateDemo>
                 </div>
               </div>
+
+
               <upload
                 v-else-if="item.type == 'video'"
                 type="视频"
-                btnName="上传视频"
+                btnName="请上传视频"
                 :maxCount="1"
                 :data="item"
                 :list="props.videoList"
                 tip="支持视频类型，大小不超过100M"
               ></upload>
+
               <!-- <a-button
               v-else-if="item.type == 'AssociatedApplication'"
               @click="sourceClick"
@@ -393,11 +457,11 @@
                   {{ itemSelect.dictLabel }}
                 </a-select-option>
               </a-select>
-              <a-select
+              <!-- <a-select
                 v-else-if="item.type == 'select' && item.name !== '归属部门'"
                 style="width: 2.4rem"
                 v-model:value="item.note1"
-                :placeholder="'请选择' + item.name"
+                :placeholder="'请选择11' + item.name"
                 @change="changeIiem(item.name, item.note1)"
               >
                 <a-select-option
@@ -407,7 +471,27 @@
                 >
                   {{ itemSelect.dictLabel }}
                 </a-select-option>
-              </a-select>
+              </a-select> -->
+              <div
+                v-else-if="item.type == 'select' && item.name !== '归属部门'"
+                class="danxuan-Area"
+                id="danxuan-Area"
+              >
+                <div
+                  v-for="(itemSelect, indexSelect) in item.options"
+                  :key="indexSelect"
+                  :value="itemSelect.dictLabel"
+                  class="danxuan-Area-son"
+                  @click="danxuanArea(item, item.name, itemSelect.dictLabel)"
+                  :class="
+                    item.note1 && item.note1 === itemSelect.dictLabel
+                      ? 'danxuan-Area-down'
+                      : ''
+                  "
+                >
+                  {{ itemSelect.dictLabel }}
+                </div>
+              </div>
               <a-select
                 v-else-if="item.name === '归属部门'"
                 style="width: 2.4rem"
@@ -438,6 +522,7 @@
                   "
                 >
                   {{ itemson.dictLabel }}
+                  <div class="application-Area-son-son"></div>
                 </div>
               </div>
             </div>
@@ -516,905 +601,1031 @@
   </div>
 </template>
 <script setup>
-  import VueTemplateDemo from '@/views/personalCenter/VueTemplateDemo'
-  import { placeHolderWords } from '@/utils/placeHolder'
-  import {
-    ref,
-    defineProps,
-    watch,
-    onMounted,
-    defineExpose,
-    defineEmits,
-  } from 'vue'
-  import mybus from '@/myplugins/mybus'
-  import upload from '@/views/components/upload'
-  import { message } from 'ant-design-vue'
-  import { getUserInfo, getDeptAll } from '@/api/user'
-  import {
-    getCategoryTreePage,
-    queryApplicationRelByResourceId,
-    queryResourceRelByKeyId,
-    filesUpload,
-  } from '@/api/personalCenter'
-  import { useRouter } from 'vue-router'
-  const router = useRouter()
-  const abilityToType = router.currentRoute.value.query.abilityToType
-  const componentTypeValue = router.currentRoute.value.query.componentTypeValue
-  const changeField = ref([])
-  const props = defineProps({
-    // 展示数据
-    refData: { type: Object, default: null },
-    // 表单数据
-    dataFrom: { type: Array, default: null },
-    // 文件回显
-    fileList: { type: Array, default: null },
-    fileList2: { type: Array, default: null },
-    // 压缩包回显
-    packageList: { type: Array, default: null },
-    // 图片回显
-    imgList: { type: Array, default: null },
-    // 视频回显
-    videoList: { type: Array, default: null },
-    // 外部字段
-    externalField: { type: Array, default: null },
-    // 多条的配置
-    configure: { type: Array, default: null },
-    required: { type: Array, default: null },
-    notFilled: { type: Array, default: null },
-    // [{
-    //   name:'计费标准信息',
-    //   list:[
-    //     {
-    //       name:'计费方式',
-    //       type:'radio',
-    //       field:'type',
-    //       options:
-    //         {
-    //           name:'一次性买断',
-    //           value:'1'
-    //         },
-    //         {
-    //           name:'按调用次数',
-    //           value:'2'
-    //         },
-    //         {
-    //           name:'按并发路数',
-    //           value:'3'
-    //         },
-    //         {
-    //           name:'按年计费',
-    //           value:'4'
-    //         }
-    //       ],
-    //       note1:''
-    //     },
-    //     {
-    //       name:'计费标准',
-    //       field:'price',
-    //       type:'number',
-    //       company:'元',
-    //       note1: ''
-    //     },
-    //     {
-    //       name:'计费标准描述',
-    //       field:'desc',
-    //       type:'textArea',
-    //       note1:''
-    //     }
-    //   ]
-    // }]
-  })
-  const emit = defineEmits(['next', 'back', 'submit', 'preview'])
-  // console.log('props==========>', props)
-  const changeAdd = () => {
-    console.log('子组件方法触发~')
-  }
-  const data = ref({
-    list: [],
-  })
-  const showKey = ref(0)
-  const numType = ref('一次性买断')
-  const radioChange = (e) => {
-    numType.value = e.target.value
-  }
-  const changeIiem = (name, value) => {
-    if (value && value !== '' && changeField.value.indexOf(name) == -1) {
-      changeField.value.push(name)
-    } else if (!value || value == '') {
-      if (changeField.value.indexOf(name) > -1) {
-        changeField.value.splice(changeField.value.indexOf(name), 1)
-      }
-    }
-  }
-  props.refData.children.map((item) => {
-    if (item.name == '基本信息') {
-      item.children.map((val) => {
-        if (val.name == '能力类型') {
-          val.note1 = abilityToType
-        }
-        if (val.name == '组件类型') {
-          val.note1 = componentTypeValue
-        }
-      })
-    }
-    if (
-      props.configure &&
-      props.configure.filter((val) => val.name === item.name).length > 0
-    ) {
-      item.isConfigure = true
-      data.value[item.name] = []
+import VueTemplateDemo from '@/views/personalCenter/VueTemplateDemo'
+import { placeHolderWords } from '@/utils/placeHolder'
+import {
+  ref,
+  defineProps,
+  watch,
+  onMounted,
+  defineExpose,
+  defineEmits,
+} from 'vue'
+import mybus from '@/myplugins/mybus'
+import upload from '@/views/components/upload'
+import { message } from 'ant-design-vue'
+import { getUserInfo, getDeptAll } from '@/api/user'
+import {
+  getCategoryTreePage,
+  queryApplicationRelByResourceId,
+  queryResourceRelByKeyId,
+  filesUpload,
+} from '@/api/personalCenter'
+import { useRouter } from 'vue-router'
+const router = useRouter()
+const abilityToType = router.currentRoute.value.query.abilityToType
+const componentTypeValue = router.currentRoute.value.query.componentTypeValue
+const changeField = ref([])
+//选取的数据
+const chooseField = ref([])
+const props = defineProps({
+  // 展示数据
+  refData: { type: Object, default: null },
+  // 表单数据
+  dataFrom: { type: Array, default: null },
+  // 文件回显
+  fileList: { type: Array, default: null },
+  fileList2: { type: Array, default: null },
+  // 压缩包回显
+  packageList: { type: Array, default: null },
+  // 图片回显
+  imgList: { type: Array, default: null },
+  // 视频回显
+  videoList: { type: Array, default: null },
+  // 外部字段
+  externalField: { type: Array, default: null },
+  // 多条的配置
+  configure: { type: Array, default: null },
+  required: { type: Array, default: null },
+  notFilled: { type: Array, default: null },
+  // [{
+  //   name:'计费标准信息',
+  //   list:[
+  //     {
+  //       name:'计费方式',
+  //       type:'radio',
+  //       field:'type',
+  //       options:
+  //         {
+  //           name:'一次性买断',
+  //           value:'1'
+  //         },
+  //         {
+  //           name:'按调用次数',
+  //           value:'2'
+  //         },
+  //         {
+  //           name:'按并发路数',
+  //           value:'3'
+  //         },
+  //         {
+  //           name:'按年计费',
+  //           value:'4'
+  //         }
+  //       ],
+  //       note1:''
+  //     },
+  //     {
+  //       name:'计费标准',
+  //       field:'price',
+  //       type:'number',
+  //       company:'元',
+  //       note1: ''
+  //     },
+  //     {
+  //       name:'计费标准描述',
+  //       field:'desc',
+  //       type:'textArea',
+  //       note1:''
+  //     }
+  //   ]
+  // }]
+})
+const emit = defineEmits(['next', 'back', 'submit', 'preview'])
+
+const changeAdd = () => {}
+const data = ref({
+  list: [],
+})
+const showKey = ref(0)
+const numType = ref('一次性买断')
+const radioChange = (e) => {
+  numType.value = e.target.value
+}
+const radioChangeNew = (item,itemSelect) => {
+  if (item.note1) {
+    if (item.note1 === itemSelect) {
+      item.note1 = null
     } else {
-      item.isConfigure = false
+      item.note1 = itemSelect
     }
-  })
-  let arr = props.refData.children.filter((item) => {
-    if (props.configure) {
-      if (!item.isConfigure) {
-        return item
+  } else {
+    item.note1 = itemSelect
+  }
+
+  numType.value =itemSelect
+}
+const changeIiem = (name, value) => {
+  if (value && value !== '' && changeField.value.indexOf(name) == -1) {
+    changeField.value.push(name)
+  } else if (!value || value == '') {
+    if (changeField.value.indexOf(name) > -1) {
+      changeField.value.splice(changeField.value.indexOf(name), 1)
+    }
+  }
+}
+
+props.refData.children.map((item) => {
+  if (item.name == '基本信息') {
+    item.children.map((val) => {
+      if (val.name == '能力类型') {
+        val.note1 = abilityToType
       }
-    } else {
+      if (val.name == '组件类型') {
+        val.note1 = componentTypeValue
+      }
+    })
+  }
+  if (
+    props.configure &&
+    props.configure.filter((val) => val.name === item.name).length > 0
+  ) {
+    item.isConfigure = true
+    data.value[item.name] = []
+  } else {
+    item.isConfigure = false
+  }
+})
+let arr = props.refData.children.filter((item) => {
+  if (props.configure) {
+    if (!item.isConfigure) {
       return item
     }
-  })
-  data.value.list = []
-  // 获取字典数据
-  arr.forEach((val) => {
-    val.children.forEach((item) => {
-      if (item.isLinkToDic === 'true' && item.linkValue) {
-        getCategoryTreePage({
-          page: 1,
-          limit: 20,
-          dictTypeId: item.linkValue,
-          deFlage: 0,
-        }).then((res) => {
-          if (item.type === 'radio') {
-            item.options = res.data.data.list.map((radio) => radio.dictLabel)
-          } else if (item.type === 'select' || item.type === 'checkBox') {
-            if (item.type === 'checkBox') {
-              if (!item.note2) {
-                item.note2 = []
-              }
+  } else {
+    return item
+  }
+})
+data.value.list = []
+// 获取字典数据
+arr.forEach((val) => {
+  val.children.forEach((item) => {
+    if (item.isLinkToDic === 'true' && item.linkValue) {
+      getCategoryTreePage({
+        page: 1,
+        limit: 20,
+        dictTypeId: item.linkValue,
+        deFlage: 0,
+      }).then((res) => {
+        if (item.type === 'radio') {
+          item.options = res.data.data.list.map((radio) => radio.dictLabel)
+        } else if (item.type === 'select' || item.type === 'checkBox') {
+          if (item.type === 'checkBox') {
+            if (!item.note2) {
+              item.note2 = []
             }
-            item.options = res.data.data.list
           }
-          data.value.list.push(item)
-        })
-      } else if (item.name === '归属部门') {
-        getDeptAll().then((res) => {
-          const dataList = []
-          res.data.data.forEach((element) => {
-            dataList.push({
-              value: element.id,
-              label: element.name,
-            })
-          })
-          item.options = dataList
-          if (!item.note1) {
-            getUserInfo().then(({ data: res1 }) => {
-              console.log(res1.data)
-              item.note1 = res1.data.deptId
-              item.note2 = item.options.filter(
-                (val) => val.value == item.note1
-              )[0]
-              console.log('默认部门=========>', item, res1.data)
-              data.value.list.push(item)
-            })
-          } else {
-            data.value.list.push(item)
-          }
-        })
-      }
-      // else if (item.name === '部门联系人') {
-      //   if (!item.note1) {
-      //     getUserInfo().then(({ data: res1 }) => {
-      //       console.log(res1.data)
-      //       item.note1 = res1.data.realName || ''
-      //     })
-      //     data.value.list.push(item)
-      //   } else {
-      //     data.value.list.push(item)
-      //   }
-      // } else if (item.name === '部门联系人电话') {
-      //   if (!item.note1) {
-      //     getUserInfo().then(({ data: res1 }) => {
-      //       console.log(res1.data)
-      //       item.note1 = res1.data.mobile || ''
-      //     })
-      //     data.value.list.push(item)
-      //   } else {
-      //     data.value.list.push(item)
-      //   }
-      // }
-      else if (item.name === '来源应用') {
-        queryApplicationRelByResourceId({
-          referenceId: 0,
-        }).then((res) => {
-          const dataList = []
-          res.data.data.notLinked.forEach((element) => {
-            dataList.push({
-              value: element.id,
-              label: element.name,
-            })
-          })
-          item.options = dataList
-          data.value.list.push(item)
-        })
-      } else {
+          item.options = res.data.data.list
+        }
         data.value.list.push(item)
-      }
-    })
-    console.log('props.dataFrom', data.value.list)
-  })
-  if (props.dataFrom) {
-    // console.log(props.dataFrom, data.value.list)
-    props.dataFrom.infoList.forEach((item) => {
-      if (
-        props.configure &&
-        props.configure.filter((val) => val.name === item.attrType).length > 0
-      ) {
-        data.value[item.attrType] = JSON.parse(item.attrValue)
-      } else if (item.attrType === '应用领域') {
-        props.refData.children.forEach((val) => {
-          val.children.forEach((child) => {
-            if (child.name === item.attrType) {
-              // 通过;分割成数组
-              child.note2 = item.attrValue.split(';')
-              showKey.value++
-              // console.log('应用领域', item, item.attrValue.split(';'), child)
-            }
+      })
+    } else if (item.name === '归属部门') {
+      getDeptAll().then((res) => {
+        const dataList = []
+        res.data.data.forEach((element) => {
+          dataList.push({
+            value: element.id,
+            label: element.name,
           })
         })
-        //  item.note1 = item.attrValue.split(';')
-      }
-    })
-  }
-  //显示富文本
-  let showText = ref(false)
-  const showTextFunction = () => {
-    console.log('点击富文本=========================>')
-    showText.value = true
-  }
-  mybus.on('showTextFunctionEmit', (show) => {
-    console.log('ssdcsd')
-    showText.value = show
-  })
-  mybus.off('func')
-  const add = (title, addFlag, type) => {
-    console.log(title, 'title')
-    let list = props.configure.filter((item) => item.name === title)[0].list
-    let flag = true
-    list.forEach((item) => {
-      // console.log(item)
-      if (item.type !== 'number' && !item.note1.length > 0) {
-        flag = false
-      } else if (item.type === 'number' && !item.note1 > 0) {
-        flag = false
-      }
-    })
-    if (flag) {
-      let obj = {}
-      let sfFlag = false
-      list.forEach((item) => {
-        if (item.type === 'input2') {
-          sfFlag = data.value[title].filter(
-            (val) => val.type === numType.value
-          )[0]
-          if (sfFlag) {
-            message.warning('已添加过该类型！')
-            return
-          }
-          obj[item.field] =
-            item.note1 +
-            (numType.value == '一次性买断'
-              ? '元'
-              : numType.value == '按调用次数'
-              ? '元/次'
-              : numType.value == '按并发路数'
-              ? '元/路'
-              : numType.value == '按年计费'
-              ? '元/年'
-              : '')
+        item.options = dataList
+        if (!item.note1) {
+          getUserInfo().then(({ data: res1 }) => {
+            item.note1 = res1.data.deptId
+            item.note2 = item.options.filter(
+              (val) => val.value == item.note1
+            )[0]
+
+            data.value.list.push(item)
+          })
         } else {
-          obj[item.field] = item.note1
+          data.value.list.push(item)
         }
       })
-      if (!sfFlag) {
-        data.value[title].push(obj)
-      }
-      // console.log(data.value[title])
-      mybus.emit('chageDataFrom', {
-        attrType: title,
-        attrValue: JSON.stringify(data.value[title]),
-        delFlag: 0,
-      })
-      list.forEach((item) => {
-        item.note1 = ''
-        showKey.value++
-      })
-      if (addFlag) {
-        if (type == '上一步') {
-          emit('back')
-        } else if (type == '下一步') {
-          emit('next')
-        } else if (type == '提交') {
-          emit('submit')
-        } else if (type == '预览') {
-          emit('preview')
-        }
-      }
-    } else {
-      if (!addFlag) {
-        message.warning('请填写完整')
-      } else {
-        list.forEach((item) => {
-          item.note1 = ''
-          showKey.value++
-        })
-        if (type == '上一步') {
-          emit('back')
-        } else if (type == '下一步') {
-          emit('next')
-        } else if (type == '提交') {
-          emit('submit')
-        } else if (type == '预览') {
-          emit('preview')
-        }
-      }
     }
-  }
-  const del = (title, index) => {
-    data.value[title].splice(index, 1)
+    // else if (item.name === '部门联系人') {
+    //   if (!item.note1) {
+    //     getUserInfo().then(({ data: res1 }) => {
+    //       console.log(res1.data)
+    //       item.note1 = res1.data.realName || ''
+    //     })
+    //     data.value.list.push(item)
+    //   } else {
+    //     data.value.list.push(item)
+    //   }
+    // } else if (item.name === '部门联系人电话') {
+    //   if (!item.note1) {
+    //     getUserInfo().then(({ data: res1 }) => {
+    //       console.log(res1.data)
+    //       item.note1 = res1.data.mobile || ''
+    //     })
+    //     data.value.list.push(item)
+    //   } else {
+    //     data.value.list.push(item)
+    //   }
+    // }
+    else if (item.name === '来源应用') {
+      queryApplicationRelByResourceId({
+        referenceId: 0,
+      }).then((res) => {
+        const dataList = []
+        res.data.data.notLinked.forEach((element) => {
+          dataList.push({
+            value: element.id,
+            label: element.name,
+          })
+        })
+        item.options = dataList
+        data.value.list.push(item)
+      })
+    } else {
+      data.value.list.push(item)
+    }
+  })
+})
+if (props.dataFrom) {
+  props.dataFrom.infoList.forEach((item) => {
+    if (
+      props.configure &&
+      props.configure.filter((val) => val.name === item.attrType).length > 0
+    ) {
+      data.value[item.attrType] = JSON.parse(item.attrValue)
+    } else if (item.attrType === '应用领域') {
+      props.refData.children.forEach((val) => {
+        val.children.forEach((child) => {
+          if (child.name === item.attrType) {
+            // 通过;分割成数组
+            child.note2 = item.attrValue.split(';')
+            showKey.value++
+          }
+        })
+      })
+      //  item.note1 = item.attrValue.split(';')
+    }
+  })
+}
+//显示富文本
+let showText = ref(false)
+const showTextFunction = () => {
+  showText.value = true
+}
+mybus.on('showTextFunctionEmit', (show) => {
+  showText.value = show
+})
+mybus.off('func')
+const add = (title, addFlag, type) => {
+  let list = props.configure.filter((item) => item.name === title)[0].list
+  let flag = true
+  list.forEach((item) => {
+    if (item.type !== 'number' && !item.note1.length > 0) {
+      flag = false
+    } else if (item.type === 'number' && !item.note1 > 0) {
+      flag = false
+    }
+  })
+  if (flag) {
+    let obj = {}
+    let sfFlag = false
+    list.forEach((item) => {
+      if (item.type === 'input2') {
+        sfFlag = data.value[title].filter(
+          (val) => val.type === numType.value
+        )[0]
+        if (sfFlag) {
+          message.warning('已添加过该类型！')
+          return
+        }
+        obj[item.field] =
+          item.note1 +
+          (numType.value == '一次性买断'
+            ? '元'
+            : numType.value == '按调用次数'
+            ? '元/次'
+            : numType.value == '按并发路数'
+            ? '元/路'
+            : numType.value == '按年计费'
+            ? '元/年'
+            : '')
+      } else {
+        obj[item.field] = item.note1
+      }
+    })
+    if (!sfFlag) {
+      data.value[title].push(obj)
+    }
+
     mybus.emit('chageDataFrom', {
       attrType: title,
       attrValue: JSON.stringify(data.value[title]),
       delFlag: 0,
     })
-  }
-  const ApplicationArea = (item, itemson) => {
-    // console.log('点击=========》', item, itemson)
-    // console.log(item, itemson)
-    if (item.note2.indexOf(itemson.dictLabel) === -1) {
-      item.note2.push(itemson.dictLabel)
+    list.forEach((item) => {
+      item.note1 = ''
+      showKey.value++
+    })
+    if (addFlag) {
+      if (type == '上一步') {
+        emit('back')
+      } else if (type == '下一步') {
+        emit('next')
+      } else if (type == '提交') {
+        emit('submit')
+      } else if (type == '预览') {
+        emit('preview')
+      }
+    }
+  } else {
+    if (!addFlag) {
+      message.warning('请填写完整')
     } else {
-      item.note2.splice(item.note2.indexOf(itemson.dictLabel), 1)
+      list.forEach((item) => {
+        item.note1 = ''
+        showKey.value++
+      })
+      if (type == '上一步') {
+        emit('back')
+      } else if (type == '下一步') {
+        emit('next')
+      } else if (type == '提交') {
+        emit('submit')
+      } else if (type == '预览') {
+        emit('preview')
+      }
     }
-    // 多选判断是否为空
+  }
+}
+const del = (title, index) => {
+  data.value[title].splice(index, 1)
+  mybus.emit('chageDataFrom', {
+    attrType: title,
+    attrValue: JSON.stringify(data.value[title]),
+    delFlag: 0,
+  })
+}
+const ApplicationArea = (item, itemson) => {
+  if (item.note2.indexOf(itemson.dictLabel) === -1) {
+    item.note2.push(itemson.dictLabel)
+  } else {
+    item.note2.splice(item.note2.indexOf(itemson.dictLabel), 1)
+  }
+  // 多选判断是否为空
+  if (item.note2.length !== 0 && changeField.value.indexOf('应用领域') == -1) {
+    changeField.value.push('应用领域')
+  } else if (item.note2.length == 0) {
+    if (changeField.value.indexOf('应用领域') > -1) {
+      changeField.value.splice(changeField.value.indexOf('应用领域'), 1)
+    }
+  }
+  mybus.emit('chageDataFrom', {
+    attrType: item.name,
+    attrValue: item.note2.join(';'),
+    delFlag: 0,
+  })
+}
+const danxuanArea = (item, itemSelect, indexSelect) => {
+  if (item.note1) {
+    if (item.note1 === indexSelect) {
+      item.note1 = null
+    } else {
+      item.note1 = indexSelect
+    }
+  } else {
+    item.note1 = indexSelect
+  }
+
+  changeIiem(itemSelect, indexSelect)
+}
+const danxuanRadio= (item, itemSelect) => {
+  if (item.note1) {
+    if (item.note1 === itemSelect) {
+      item.note1 = null
+    } else {
+      item.note1 = itemSelect
+    }
+  } else {
+    item.note1 = itemSelect
+  }
+
+  changeIiem(item.name, item.note1)
+}
+// 来源应用
+const visibleAssociatedApplication = ref(false)
+const visibleAssociatedApplicationOther = ref(false)
+const mockData = ref([])
+const mockDataOther = ref([])
+const titles = ref(['未关联的应用名称', '已关联的应用名称'])
+const titleName = ref('来源应用')
+const targetKeys = ref([])
+const targetKeysOther = ref([])
+// 上一步关联数据
+// const targetKeysBack = ref([])
+// 来源应用-back
+const sourceClick = () => {
+  mockData.value = []
+  visibleAssociatedApplication.value = true
+  props.dataFrom.infoList.forEach((val) => {
+    if (val.attrType === '来源应用' && val.attrValue != '') {
+      queryApplicationRelByResourceId({
+        referenceId: 0,
+      }).then((res) => {
+        res.data.data.notLinked.forEach((val, index) => {
+          mockData.value.push({
+            key: val.id,
+            title: val.name,
+            description: val.id,
+          })
+        })
+      })
+      targetKeys.value = []
+      val.attrValue.split(',').forEach((item) => {
+        targetKeys.value.push(item)
+      })
+    } else if (val.attrType === '来源应用' && val.attrValue == '') {
+      queryApplicationRelByResourceId({
+        referenceId: 0,
+      }).then((res) => {
+        res.data.data.notLinked.forEach((val, index) => {
+          mockData.value.push({
+            key: val.id,
+            title: val.name,
+            description: val.id,
+          })
+        })
+      })
+    }
+  })
+}
+// 关联组件
+const componentsClick = () => {
+  titles.value = ['未关联的组件名称', '已关联的组件名称']
+  titleName.value = '关联组件'
+  visibleAssociatedApplicationOther.value = true
+  mockDataOther.value = []
+  props.dataFrom.infoList.forEach((val) => {
+    if (val.attrType === '关联组件信息' && val.attrValue != '') {
+      queryResourceRelByKeyId({
+        keyId: 0,
+        type: '组件服务',
+        referenceName: '',
+      }).then((res) => {
+        res.data.data.notLinked.forEach((val, index) => {
+          mockDataOther.value.push({
+            key: val.id,
+            title: val.name,
+            description: val.name,
+          })
+        })
+      })
+      targetKeysOther.value = []
+      val.attrValue.split(',').forEach((item) => {
+        targetKeysOther.value.push(item)
+      })
+    } else if (val.attrType === '关联组件信息' && val.attrValue == '') {
+      queryResourceRelByKeyId({
+        keyId: 0,
+        type: '组件服务',
+        referenceName: '',
+      }).then((res) => {
+        res.data.data.notLinked.forEach((val, index) => {
+          mockDataOther.value.push({
+            key: val.id,
+            title: val.name,
+            description: val.name,
+          })
+        })
+      })
+    }
+  })
+}
+const selectedKeys = ref([])
+const selectedKeysOther = ref([])
+
+const handleChange = (nextTargetKeys, direction, moveKeys) => {
+  if (direction === 'right') {
+    targetKeys.value = moveKeys.filter((item, index) => index === 0)
+  }
+}
+const handleSelectChange = (sourceSelectedKeys, targetSelectedKeys) => {}
+const handleChangeOther = (nextTargetKeys, direction, moveKeys) => {}
+const handleSelectChangeOther = (sourceSelectedKeys, targetSelectedKeys) => {}
+
+const filterOptionTransfer = (inputValue, option) => {
+  return option.description.indexOf(inputValue) > -1
+}
+
+const handleOk = (e) => {
+  visibleAssociatedApplicationOther.value = false
+  visibleAssociatedApplication.value = false
+
+  data.value.list.map((item) => {
+    if (item.name === '来源应用') {
+      item.note1 = targetKeys.value + ''
+    } else if (item.name === '关联组件信息') {
+      item.note1 = targetKeysOther.value + ''
+    }
+  })
+}
+const handleCancel = (e) => {
+  visibleAssociatedApplicationOther.value = false
+  visibleAssociatedApplication.value = false
+}
+
+const showType = ref('')
+const showTypeClick = (e) => {
+  showType.value = e
+}
+showTypeClick('调用接口')
+
+watch(data.value.list, (newProps, oldProps) => {
+  newProps.forEach((val) => {
     if (
-      item.note2.length !== 0 &&
-      changeField.value.indexOf('应用领域') == -1
+      props.configure &&
+      props.configure.filter((item) => item.name === val.name).length > 0
     ) {
-      changeField.value.push('应用领域')
-      console.log('点击=========》1', changeField.value, item.note2)
-    } else if (item.note2.length == 0) {
-      if (changeField.value.indexOf('应用领域') > -1) {
-        changeField.value.splice(changeField.value.indexOf('应用领域'), 1)
-        console.log('点击=========》2', changeField.value, item.note2)
+      mybus.emit('chageDataFrom', {
+        attrType: val.name,
+        attrValue: val.note1,
+        delFlag: 0,
+      })
+    } else if (
+      props.externalField &&
+      props.externalField.indexOf(val.name) > -1
+    ) {
+      let note2 = {} //储存归属部门的名字
+      if (val.options) {
+        note2 = val.options.filter((item) => item.value == val.note1)[0]
       }
-    }
-    mybus.emit('chageDataFrom', {
-      attrType: item.name,
-      attrValue: item.note2.join(';'),
-      delFlag: 0,
-    })
-  }
-  // 来源应用
-  const visibleAssociatedApplication = ref(false)
-  const visibleAssociatedApplicationOther = ref(false)
-  const mockData = ref([])
-  const mockDataOther = ref([])
-  const titles = ref(['未关联的应用名称', '已关联的应用名称'])
-  const titleName = ref('来源应用')
-  const targetKeys = ref([])
-  const targetKeysOther = ref([])
-  // 上一步关联数据
-  // const targetKeysBack = ref([])
-  // 来源应用-back
-  const sourceClick = () => {
-    mockData.value = []
-    visibleAssociatedApplication.value = true
-    props.dataFrom.infoList.forEach((val) => {
-      if (val.attrType === '来源应用' && val.attrValue != '') {
-        queryApplicationRelByResourceId({
-          referenceId: 0,
-        }).then((res) => {
-          // console.log(res.data.data.notLinked)
-          res.data.data.notLinked.forEach((val, index) => {
-            mockData.value.push({
-              key: val.id,
-              title: val.name,
-              description: val.id,
-            })
+
+      mybus.emit('chageDataFromDwon', {
+        attrType: val.name,
+        attrValue: val.note1,
+        delFlag: 0,
+        attrValueTwo: note2,
+      })
+    } else {
+      if (val.name !== '应用领域' && val.name !== '发布端') {
+        if (val.name == '算法介绍视频') {
+          mybus.emit('chageDataFrom', {
+            attrType: val.name,
+            attrValue: val.note1,
+            delFlag: 0,
+            note3: val.note3,
           })
-        })
-        targetKeys.value = []
-        val.attrValue.split(',').forEach((item) => {
-          targetKeys.value.push(item)
-        })
-        console.log(targetKeys.value)
-        // console.log('wowowo')
-      } else if (val.attrType === '来源应用' && val.attrValue == '') {
-        queryApplicationRelByResourceId({
-          referenceId: 0,
-        }).then((res) => {
-          // console.log(res.data.data.notLinked)
-          res.data.data.notLinked.forEach((val, index) => {
-            mockData.value.push({
-              key: val.id,
-              title: val.name,
-              description: val.id,
-            })
+        } else {
+          mybus.emit('chageDataFrom', {
+            attrType: val.name,
+            attrValue: val.note1,
+            delFlag: 0,
           })
-        })
-      }
-    })
-  }
-  // 关联组件
-  const componentsClick = () => {
-    titles.value = ['未关联的组件名称', '已关联的组件名称']
-    titleName.value = '关联组件'
-    visibleAssociatedApplicationOther.value = true
-    mockDataOther.value = []
-    props.dataFrom.infoList.forEach((val) => {
-      if (val.attrType === '关联组件信息' && val.attrValue != '') {
-        queryResourceRelByKeyId({
-          keyId: 0,
-          type: '组件服务',
-          referenceName: '',
-        }).then((res) => {
-          // console.log(res.data.data.notLinked)
-          res.data.data.notLinked.forEach((val, index) => {
-            mockDataOther.value.push({
-              key: val.id,
-              title: val.name,
-              description: val.name,
-            })
-          })
-        })
-        targetKeysOther.value = []
-        val.attrValue.split(',').forEach((item) => {
-          targetKeysOther.value.push(item)
-        })
-        console.log(targetKeysOther.value)
-        // console.log('wowowo')
-      } else if (val.attrType === '关联组件信息' && val.attrValue == '') {
-        queryResourceRelByKeyId({
-          keyId: 0,
-          type: '组件服务',
-          referenceName: '',
-        }).then((res) => {
-          // console.log(res.data.data.notLinked)
-          res.data.data.notLinked.forEach((val, index) => {
-            mockDataOther.value.push({
-              key: val.id,
-              title: val.name,
-              description: val.name,
-            })
-          })
-        })
-      }
-    })
-  }
-  const selectedKeys = ref([])
-  const selectedKeysOther = ref([])
-
-  const handleChange = (nextTargetKeys, direction, moveKeys) => {
-    console.log('targetKeys: ', nextTargetKeys)
-    console.log('direction: ', direction)
-    console.log('moveKeys: ', moveKeys)
-    if (direction === 'right') {
-      targetKeys.value = moveKeys.filter((item, index) => index === 0)
-    }
-  }
-  const handleSelectChange = (sourceSelectedKeys, targetSelectedKeys) => {
-    console.log('targetSelectedKeys: ', targetSelectedKeys, sourceSelectedKeys)
-  }
-  const handleChangeOther = (nextTargetKeys, direction, moveKeys) => {
-    console.log('targetKeys: ', nextTargetKeys)
-    console.log('direction: ', direction)
-    console.log('moveKeys: ', moveKeys)
-  }
-  const handleSelectChangeOther = (sourceSelectedKeys, targetSelectedKeys) => {
-    console.log('targetSelectedKeys: ', targetSelectedKeys, sourceSelectedKeys)
-  }
-
-  const filterOptionTransfer = (inputValue, option) => {
-    console.log(option, 'option')
-    return option.description.indexOf(inputValue) > -1
-  }
-
-  const handleOk = (e) => {
-    console.log(e)
-    visibleAssociatedApplicationOther.value = false
-    visibleAssociatedApplication.value = false
-    // console.log('2222222222222', props.refData)
-    data.value.list.map((item) => {
-      if (item.name === '来源应用') {
-        item.note1 = targetKeys.value + ''
-      } else if (item.name === '关联组件信息') {
-        item.note1 = targetKeysOther.value + ''
-      }
-    })
-  }
-  const handleCancel = (e) => {
-    console.log(e)
-    visibleAssociatedApplicationOther.value = false
-    visibleAssociatedApplication.value = false
-  }
-
-  const showType = ref('')
-  const showTypeClick = (e) => {
-    showType.value = e
-    console.log(e, 'showType', showType.value)
-  }
-  showTypeClick('调用接口')
-
-  watch(data.value.list, (newProps, oldProps) => {
-    console.log('数据发生改变==========>', newProps, oldProps)
-    newProps.forEach((val) => {
-      // console.log('数据发生改变==========>', val)
-      if (
-        props.configure &&
-        props.configure.filter((item) => item.name === val.name).length > 0
-      ) {
-        mybus.emit('chageDataFrom', {
-          attrType: val.name,
-          attrValue: val.note1,
-          delFlag: 0,
-        })
-      } else if (
-        props.externalField &&
-        props.externalField.indexOf(val.name) > -1
-      ) {
-        let note2 = {} //储存归属部门的名字
-        if (val.options) {
-          note2 = val.options.filter((item) => item.value == val.note1)[0]
-        }
-        console.log('chageDataFromDwon===================>', val)
-        mybus.emit('chageDataFromDwon', {
-          attrType: val.name,
-          attrValue: val.note1,
-          delFlag: 0,
-          attrValueTwo: note2,
-        })
-      } else {
-        if (val.name !== '应用领域' && val.name !== '发布端') {
-          if (val.name == '算法介绍视频') {
-            console.log('变更视频==================>', val)
-            mybus.emit('chageDataFrom', {
-              attrType: val.name,
-              attrValue: val.note1,
-              delFlag: 0,
-              note3: val.note3,
-            })
-          } else {
-            mybus.emit('chageDataFrom', {
-              attrType: val.name,
-              attrValue: val.note1,
-              delFlag: 0,
-            })
-          }
         }
       }
-    })
+    }
   })
-  const applicationsChange = (value) => {
-    data.value.list.map((item) => {
-      if (item.name === '来源应用') {
-        item.note1 = value
-      }
-    })
-    console.log(`selected ${value}`)
-  }
-
-  const handleBlur = () => {
-    console.log('blur')
-  }
-  const applicationsBlur = () => {
-    console.log('blur')
-  }
-
-  const handleFocus = () => {
-    console.log('focus')
-  }
-  const applicationsFocus = () => {
-    console.log('focus')
-  }
-
-  const filterOption = (input, option) => {
-    return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-  }
-  defineExpose({
-    add,
+})
+const applicationsChange = (value) => {
+  data.value.list.map((item) => {
+    if (item.name === '来源应用') {
+      item.note1 = value
+    }
   })
-  const applicationsOption = (input, option) => {
-    return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-  }
+}
+
+const handleBlur = () => {}
+const applicationsBlur = () => {}
+
+const handleFocus = () => {}
+const applicationsFocus = () => {}
+
+const filterOption = (input, option) => {
+  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+}
+defineExpose({
+  add,
+})
+const applicationsOption = (input, option) => {
+  return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+}
 </script>
 <style></style>
 <style lang="less" scoped>
-  .put-on-the-shelf {
-    height: 6.8rem;
-    overflow: scroll;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 0.5rem 1rem 0.25rem;
-    .Technical-text {
-      height: 0.3rem;
-      width: 1rem;
-      border: 0.01rem solid #bbd3ef;
-      border-radius: 0.06rem;
-      background: #edf4fc;
-      color: #0087ff;
-      font-size: 0.14rem;
-      text-align: center;
-      line-height: 0.3rem;
-    }
-    .Technical-text:hover {
-      cursor: pointer;
-    }
+:deep(.upload-list-inline .ant-upload .ant-btn) {
+  height: 150px;
+  width: 218px;
+  border: 1px solid rgba(198, 198, 198, 0.5);
+  border-radius: 2px;
+  background: rgba(0, 88, 225, 0.05);
+  color: #0087ff;
+  font-size: 14px;
+}
 
-    & > div {
-      width: 100%;
-      margin-top: 0.6rem;
+:deep(.upload-list-inline .ant-upload .ant-btn > span) {
+  background: url('~@/assets/home/yuanjia.png') no-repeat;
+  color: #666666;
+  background-position: center;
+  text-align: center;
+  line-height: 120px;
+  height: 50px;
+}
+// 箭头大小以及位置
+:deep(.ant-select-arrow) {
+  background: url('~@/assets/home/huixia.png') no-repeat;
+  cursor: pointer;
+  margin-top: -4px;
+  margin-right: -4px;
+}
 
-      .top {
-        color: #333333;
-        font-size: 0.22rem;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin-bottom: 0.25rem;
+// 隐藏三角
+:deep(.ant-select-arrow .anticon) {
+  vertical-align: top;
+  transition: transform 0.3s;
+  display: none;
+}
+// :deep(.ant-select-arrow :focus) {
+//   background:url('~@/assets/home/huishang.png') no-repeat ;
+// cursor: pointer;
+//   margin-top: -4px;
+//   margin-right: -4px;
+// }
 
-        div:first-child,
-        div:last-child {
-          width: 2.45rem;
-          height: 0.01rem;
-          background: #f0f0f0;
-        }
+.put-on-the-shelf {
+  margin: 0.15rem 2rem;
+  background: rgb(246, 247, 249, 0.8);
+  height: 846px;
+  overflow: scroll;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  .Technical-text {
+    height: 0.3rem;
+    width: 1rem;
+    border: 0.01rem solid #bbd3ef;
+    border-radius: 0.06rem;
+    background: #edf4fc;
+    color: #0087ff;
+    font-size: 0.14rem;
+    text-align: center;
+    line-height: 0.3rem;
+  }
+  .Technical-text:hover {
+    cursor: pointer;
+  }
 
-        div:nth-child(2) {
-          margin: 0 0.3rem;
-        }
+  & > div {
+    padding: 0px 0px 24px 24px;
+    width: 100%;
+    font-size: 14px;
+
+    .top {
+      color: #333333;
+      font-size: 24px;
+    font-weight: bold;
+    margin-top: 22px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin-bottom: 0.25rem;
+
+      div:first-child,
+      div:last-child {
+        width: 2.45rem;
+        height: 0.02rem;
+        background: #f0f0f0;
       }
 
-      .bottom {
-        margin-top: 0.25rem;
+      div:nth-child(2) {
+        margin: 0 0.3rem;
+      }
+    }
 
-        .items {
-          background: #fafafa;
-          padding: 0.1rem;
+    .bottom {
+      // margin-top: 0.25rem;
 
-          p {
-            display: flex;
-            justify-content: space-between;
+      .items {
+        background: #fafafa;
+        padding: 0.1rem;
 
-            span:nth-of-type(1) {
-              width: 2rem;
-            }
+        p {
+          display: flex;
+          justify-content: space-between;
 
-            span:nth-of-type(2) {
-              width: 100%;
-              font-weight: 600;
-            }
+          span:nth-of-type(1) {
+            width: 2rem;
           }
 
-          p:nth-of-type(1) > span:nth-of-type(1) {
-            font-size: 0.18rem;
+          span:nth-of-type(2) {
+            width: 100%;
             font-weight: 600;
           }
         }
 
-        .add {
-          cursor: pointer;
-          margin-top: 0.1rem;
-          font-size: 0.16rem;
-          color: #007efb;
-        }
-
-        .form {
-          margin-top: 0.2rem;
-          display: flex;
-          justify-content: flex-start;
-          align-items: center;
-
-          span:first-child {
-            width: 1.2rem;
-          }
-
-          :deep(.ant-input-textarea) {
-            width: 5.2rem;
-          }
-
-          :deep(.ant-radio-group) {
-            width: 5.2rem;
-          }
-
-          :deep(.ant-input-number) {
-            width: 2rem;
-          }
-
-          :deep(.ant-input) {
-            resize: none;
-            width: 5.2rem;
-          }
-
-          .ant-btn {
-            width: 1.6rem;
-            height: 0.32rem;
-            text-align: center;
-            background: #edf4fc;
-            color: #0087ff;
-            border: 0.01rem solid #bbd3ef;
-            border-radius: 0.06rem;
-          }
-        }
-
-        .submit {
-          margin-top: 0.4rem;
-          font-size: 0.14rem;
-          display: flex;
-          justify-content: flex-end;
-
-          .ant-btn {
-            width: 1.8rem;
-            height: 0.3rem;
-            text-align: center;
-            background: #d9ebff;
-            color: #0087ff;
-            border: 0.01rem solid #0087ff;
-            border-radius: 0.06rem;
-          }
+        p:nth-of-type(1) > span:nth-of-type(1) {
+          font-size: 0.18rem;
+          font-weight: 600;
         }
       }
-    }
 
-    & > div:nth-of-type(1) {
-      margin-top: 0;
-    }
-  }
+      .add {
+        cursor: pointer;
+        margin-top: 0.1rem;
+        font-size: 0.16rem;
+        color: #007efb;
+      }
 
-  .application-Area {
-    width: 5.2rem;
-    display: grid;
-    margin-top: -0.05rem;
-    grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
-
-    .application-Area-son {
-      cursor: pointer;
-      font-size: 0.14rem;
-      width: 0.9rem;
-      height: 0.26rem;
-      border-radius: 0.13rem;
-      color: #333333;
-      background: #f5f5f5;
-      border: 0.01rem #cccccc solid;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      margin-top: 0.1rem;
-      font-weight: 500;
-    }
-
-    .application-Area-down {
-      background: #0087ff;
-      color: #fff;
-    }
-  }
-
-  :deep(.ant-image-img) {
-    width: 100%;
-    height: 100%;
-    object-fit: contain;
-  }
-
-  :deep(.ant-modal) {
-    width: 9.6rem;
-  }
-
-  :deep(.ant-transfer-list) {
-    width: 39.5%;
-    height: 5.2rem;
-  }
-
-  :deep(.ant-transfer-operation) {
-    flex-direction: row-reverse;
-    margin: 0 0.3rem;
-  }
-
-  :deep(.ant-btn) {
-    width: 0.56rem;
-    height: 0.4rem;
-    border-radius: 0.04rem;
-  }
-
-  :deep(.ant-btn:first-child) {
-    margin-left: 0.04rem;
-  }
-
-  :deep(.ant-modal-footer) {
-    border: 0;
-  }
-
-  :deep(.ant-modal-header) {
-    border: 0;
-  }
-
-  :deep(.ant-modal-title) {
-    line-height: 0.24rem;
-    font-size: 0.18rem;
-    color: #303133;
-  }
-
-  :deep(.ant-transfer-list-header) {
-    background: #f5f7fa;
-  }
-
-  :deep(.ant-transfer-list-header-selected) {
-    display: flex;
-    width: 90%;
-    flex-direction: row-reverse;
-    justify-content: space-between;
-    align-items: center;
-  }
-
-  :deep(.ant-transfer-list-header-title) {
-    font-size: 0.16rem;
-    color: #303133;
-    font-weight: 400;
-    text-align: left;
-  }
-  :deep(.ant-transfer-list-header .ant-checkbox-wrapper) {
-    display: none !important;
-  }
-  :deep(.ant-upload-list-item-name) {
-    width: 1rem;
-  }
-
-  .del {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-    font-size: 0.14rem;
-    margin-left: 0.2rem;
-
-    .delImg {
-      cursor: pointer;
-      display: inline-block;
-      width: 0.16rem;
-      height: 0.18rem;
-      background: url(~@/assets/home/sf_del.png) no-repeat;
-      margin-right: 0.05rem;
-    }
-    div {
-      cursor: pointer;
-    }
-  }
-  .item {
-    position: relative;
-    span:first-child {
-      width: unset;
-    }
-    .box {
-      display: flex;
-      align-items: center;
-      // margin: 15px 0;
-      & > div:nth-of-type(1) {
-        width: 105px;
+      .form {
+        min-height: 32px;
+        margin-top: 24px;
         display: flex;
+        justify-content: flex-start;
         align-items: center;
+
+        span:first-child {
+          width: 1.0rem;
+        }
+
+        :deep(.ant-input-textarea) {
+          width: 1000px;
+        }
+
+        :deep(.ant-radio-group) {
+          width: 5.2rem;
+        }
+
+        :deep(.ant-input-number) {
+          width: 2rem;
+        }
+
+        :deep(.ant-input) {
+          resize: none;
+          width: 5.2rem;
+        }
+
+        .ant-btn {
+          width: 1.6rem;
+          height: 0.32rem;
+          text-align: center;
+          background: #edf4fc;
+          color: #0087ff;
+          border: 0.01rem solid #bbd3ef;
+          border-radius: 0.06rem;
+        }
       }
-      .required {
-        color: #f56c6c;
-        margin-right: 3px;
+
+      .submit {
+        margin-top: 0.4rem;
+        font-size: 0.14rem;
+        display: flex;
+        justify-content: center;
+
+        .ant-btn {
+          width: 260px;
+          height: 32px;
+          text-align: center;
+          background: #fff;
+          color: #0558e1;
+          border: 1px solid #0558e1;
+          border-radius: 2px;
+          font-size: 14px;
+        }
+        .ant-btn:hover{
+          background: #fff;
+          color: #0558e1;
+          opacity: 0.8;
+        }
+        .ant-btn:active{
+          background: #fff;
+          color: #0558e1;
+          opacity: 0.8
+        }
       }
     }
-    .requiredTips {
-      font-size: 14px;
-      color: #f56c6c;
-      position: absolute;
-      bottom: -20px;
-      left: 110px;
-    }
   }
+
+  & > div:nth-of-type(1) {
+    margin-top: 0;
+  }
+}
+.danxuan-Area {
+  display: grid;
+  margin-top: -0.05rem;
+  grid-template-columns: auto auto auto auto auto auto auto auto ;
+  border-left: 1px #0558e1 solid;
+  .danxuan-Area-son {
+    cursor: pointer;
+    min-width: 82px;
+    height: 32px;
+    border-radius: 2px;
+    color: #0558e1;
+    background: #fff;
+    border-right: 1px #0558e1 solid;
+    border-bottom: 1px #0558e1 solid;
+    border-top: 1px #0558e1 solid;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .danxuan-Area-son:hover {
+    color: #fff;
+    background: #0558e1;
+  }
+
+  .danxuan-Area-down {
+    background: #0058e1;
+    color: #fff;
+    // border: 1px #0558e1 solid;
+  }
+}
+
+.application-Area {
+  display: grid;
+  margin-top: -0.05rem;
+  grid-template-columns: auto auto auto auto auto auto;
+
+  .application-Area-son {
+    cursor: pointer;
+    width: 162px;
+    height: 32px;
+    border-radius: 2px;
+    color: #212121;
+    background: rgba(96, 99, 104, 0.1);
+    border: 0.01rem rgba(96, 99, 104, 0.1) solid;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 8px;
+    margin-right: 8px;
+    position: relative;
+    .application-Area-son-son {
+      position: absolute;
+      right: 0px;
+      top: 0px;
+      z-index: 100;
+      width: 16px;
+      height: 16px;
+      background: url('~@/assets/home/kong.png') no-repeat;
+    }
+  }
+  .application-Area-son:hover {
+    opacity: 0.9;
+    color: #0058e1;
+    border: 1px #0558e1 solid;
+  }
+
+  .application-Area-down {
+    opacity: 0.9;
+    color: #0058e1;
+    border: 1px #0558e1 solid;
+    .application-Area-son-son {
+      position: absolute;
+      right: 0px;
+      top: 0px;
+      z-index: 100;
+      width: 16px;
+      height: 16px;
+      background: url('~@/assets/home/duihao.png') no-repeat;
+    }
+  }
+}
+
+:deep(.ant-image-img) {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}
+
+:deep(.ant-modal) {
+  width: 9.6rem;
+}
+
+:deep(.ant-transfer-list) {
+  width: 39.5%;
+  height: 5.2rem;
+}
+
+:deep(.ant-transfer-operation) {
+  flex-direction: row-reverse;
+  margin: 0 0.3rem;
+}
+
+:deep(.ant-btn) {
+  width: 0.56rem;
+  height: 0.4rem;
+  border-radius: 0.04rem;
+}
+
+:deep(.ant-btn:first-child) {
+  margin-left: 0.04rem;
+}
+
+:deep(.ant-modal-footer) {
+  border: 0;
+}
+
+:deep(.ant-modal-header) {
+  border: 0;
+}
+
+:deep(.ant-modal-title) {
+  line-height: 0.24rem;
+  font-size: 0.18rem;
+  color: #303133;
+}
+
+:deep(.ant-transfer-list-header) {
+  background: #f5f7fa;
+}
+
+:deep(.ant-transfer-list-header-selected) {
+  display: flex;
+  width: 90%;
+  flex-direction: row-reverse;
+  justify-content: space-between;
+  align-items: center;
+}
+
+:deep(.ant-transfer-list-header-title) {
+  font-size: 0.16rem;
+  color: #303133;
+  font-weight: 400;
+  text-align: left;
+}
+:deep(.ant-transfer-list-header .ant-checkbox-wrapper) {
+  display: none !important;
+}
+:deep(.ant-upload-list-item-name) {
+  width: 1rem;
+}
+
+.del {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  font-size: 0.14rem;
+  margin-left: 0.2rem;
+
+  .delImg {
+    cursor: pointer;
+    display: inline-block;
+    width: 0.16rem;
+    height: 0.18rem;
+    background: url(~@/assets/home/sf_del.png) no-repeat;
+    margin-right: 0.05rem;
+  }
+
+  div {
+    cursor: pointer;
+  }
+}
+.item {
+  position: relative;
+  span:first-child {
+    width: unset;
+  }
+  .box {
+    display: flex;
+    align-items: center;
+    min-height: 32px;
+    // margin: 15px 0;
+    & > div:nth-of-type(1) {
+      text-align: right;
+      width: 110px;
+      margin-right: 16px;
+      // display: flex;
+      align-items: center;
+    }
+    .required {
+      color: #e83e48;
+      margin-left: -6px;
+    }
+  }
+
+  :deep(.the-new-release .box .first) {
+    justify-content: center !important;
+
+    padding: 10px 350px 0;
+    button {
+      cursor: pointer;
+      width: 80px;
+      height: 35px;
+      text-align: center;
+      color: #fff;
+      border: none;
+      border-radius: 6px;
+      background: yellow;
+    }
+    button:nth-of-type(1) {
+      color: red;
+      background: #e1edfa;
+    }
+    button:nth-of-type(2) {
+      background: yellow;
+    }
+  }
+
+  .requiredTips {
+    font-size: 14px;
+    color: #e83e48;
+    position: absolute;
+    bottom: -20px;
+    left: 110px;
+  }
+}
 </style>
diff --git a/front/src/views/demandCenter/demandDetails.vue b/front/src/views/demandCenter/demandDetails.vue
index ca9e50fa..15125495 100644
--- a/front/src/views/demandCenter/demandDetails.vue
+++ b/front/src/views/demandCenter/demandDetails.vue
@@ -147,7 +147,7 @@
               <button
                 style="
                   width: 100px;
-                  height: 30px;
+                  height: 35px;
                   margin-right: 10px;
                   background: rgb(237, 244, 252);
                   color: rgb(0, 135, 255);

From dbdaa313ff90cfa2e8a34baee07c0b7f3e4c16d0 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 15 Nov 2022 15:23:13 +0800
Subject: [PATCH 04/25] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/abilityStatistics/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index a911413b..4fb52a09 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -71,8 +71,9 @@
         <!--资源名称 仅明细添加-->
 
         <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
+          <span>名称：</span>
           <!-- <span v-if="this.departmentId === 2 || this.departmentId === 4">资源名称：</span> -->
-          <el-input  v-model="resourceName" placeholder="请输入资源名称" clearable></el-input>
+          <el-input style="width:80%;"  v-model="resourceName" placeholder="请输入资源名称" clearable></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" style="display: flex;justify-content: end;margin-right: 40px;">
@@ -1188,7 +1189,7 @@ input::placeholder {
   background: #fff;
   border: 1px solid #dcdfe6;
   color: #000;
-  color: #FFF;
+  color: #fff;
   background-color: #0058e1;
   border-color: #0058e1;
   text-decoration: none;
@@ -1197,7 +1198,6 @@ input::placeholder {
 .export:hover {
   background: #65a5f9;
   border-color: #65a5f9;
-  color: #FFF;
+  color: #fff;
 }
-
 </style>

From f094da8cd5f7170cdca421cd12aba8da9d4238ae Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 15 Nov 2022 16:13:56 +0800
Subject: [PATCH 05/25] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E5=B1=8F?=
 =?UTF-8?q?=E8=94=BD=E6=88=91=E7=9A=84=E7=94=B3=E8=AF=B7=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=9A=84=E4=B8=89=E4=B8=AA=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../personalCenter/components/MyApply.vue     | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index 26ab9c86..22e3b146 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -306,20 +306,24 @@
   getUserInfo().then((res) => {
     userName.value = res.data.data.username
   })
-  let typeList = ref([
-    '能力申请',
-    '能力上架',
-    '能力下架',
-    '能力需求',
-    '需求评论',
-    '数据资源申请',
-    '云资源申请',
-    '云视频申请',
-    // '能力评价',
-  ])
   const formState = ref({ name: '' })
   // 西海岸-设备申请
   let isXiHaiAn = whoShow.itShowXiHaiAn
+  let typeList = ref(
+    isXiHaiAn
+      ? ['能力申请', '能力上架', '能力下架', '能力需求', '需求评论']
+      : [
+          '能力申请',
+          '能力上架',
+          '能力下架',
+          '能力需求',
+          '需求评论',
+          '数据资源申请',
+          '云资源申请',
+          '云视频申请',
+          // '能力评价',
+        ]
+  )
   const itShowXiHaiAn = ref(isXiHaiAn)
   const phoneSate = ref([2, 3])
   if (isXiHaiAn) {

From e60f6973253a74065a71f9668624e428a159ec2b Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 15 Nov 2022 16:17:25 +0800
Subject: [PATCH 06/25] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/personalCenter/components/MyApply.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index 22e3b146..bde52726 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -773,8 +773,9 @@
         contentList.data = res.data.data.list
         total.value = res.data.data.total
         initNum()
+        console.log('typeIndex', typeIndex.value)
         switch (typeIndex.value) {
-          case 2:
+          case 1:
             contentList.data.map((val) => {
               nengliziyuanshangjiaapply(val.businessKey).then((res1) => {
                 console.log('上架===========>', res1.data.data)
@@ -784,7 +785,7 @@
               })
             })
             break
-          case 3:
+          case 2:
             contentList.data.map((val) => {
               selectOneDel(val.businessKey).then((res1) => {
                 console.log('下架===========>', res1.data.data)
@@ -794,7 +795,7 @@
               })
             })
             break
-          case 4:
+          case 3:
             contentList.data.map((val) => {
               getDemandForm(val.businessKey).then((res1) => {
                 console.log('需求===========>', res1.data.data)
@@ -805,7 +806,7 @@
               })
             })
             break
-          case 5:
+          case 4:
             contentList.data.map((val) => {
               demandComment(val.businessKey).then((res1) => {
                 console.log('评论===========>', res1.data.data)

From db469bd53dc2787ce5434226934032ffef565ada Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Tue, 15 Nov 2022 17:06:32 +0800
Subject: [PATCH 07/25] =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82=EF=BC=8C?=
 =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7=E6=96=B0UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/demo/abilitydemandapply.vue      | 115 +++++++++++++++-
 .../views/modules/activiti/demo/comments.vue  | 115 +++++++++++++++-
 .../modules/activiti/my-work-dynamics.vue     |   7 +-
 .../myAgent/demo/ability-resource-shelf.vue   | 115 +++++++++++++++-
 .../myAgent/demo/competency-application.vue   | 123 ++++++++++++++++--
 back/src/views/modules/sys/menu.vue           |  22 +++-
 back/src/views/modules/sys/role.vue           |   2 +-
 7 files changed, 463 insertions(+), 36 deletions(-)

diff --git a/back/src/views/modules/activiti/demo/abilitydemandapply.vue b/back/src/views/modules/activiti/demo/abilitydemandapply.vue
index f1b96feb..87e5ba5a 100644
--- a/back/src/views/modules/activiti/demo/abilitydemandapply.vue
+++ b/back/src/views/modules/activiti/demo/abilitydemandapply.vue
@@ -73,11 +73,16 @@
     ></ren-process-multiple> -->
      <!-- 审批 -->
     <div class="agreeOr" v-if="taskId">
-      <div>
-        <el-button type="primary" @click="showDialog('同意')">同意</el-button>
+      <div class="approvalOperation">
+        <!-- <el-button type="primary" @click="showDialog('同意')">同意</el-button>
         <el-button type="danger" plain @click="showDialog('拒绝')"
           >驳回</el-button
-        >
+        > -->
+       <div class="contentOperation">
+          <el-input v-model="input" placeholder="请输入审批意见"></el-input>
+          <el-button class="agreeButton" @click="agreeOrNot($store.state.contentTabsActiveName,'同意')">同意</el-button>
+          <el-button class="rejectButton"  @click="agreeOrNot($store.state.contentTabsActiveName,'驳回')">驳回</el-button>
+        </div> 
       </div>
     </div>
     <!-- 审批弹窗 -->
@@ -221,9 +226,9 @@ export default {
     },
     // 同意与退回
     agreeOrNot: debounce(
-      function (data) {
+      function (data,type) {
         this.dataForm.taskId = this.$route.params.taskId
-        if (this.dialogType === '同意') {
+        if (type === '同意') {
           if (this.input !== '') {
             console.log('this.dataForm', this.dataForm)
             const params = qs.stringify({
@@ -260,7 +265,7 @@ export default {
           } else {
             this.$message.error('请输入审批意见！')
           }
-        } else if (this.dialogType === '拒绝') {
+        } else if (type === '驳回') {
           if (this.input !== '') {
             const params = qs.stringify({
               taskId: this.dataForm.taskId,
@@ -341,4 +346,102 @@ export default {
     margin: 20px 0;
   }
 }
+.approvalOperation{
+  display: flex;
+  flex-direction: column;
+  .contentOperation{
+    display: flex;
+  flex-direction: row;
+  margin-bottom: 10px;
+  .el-input{
+    margin-left: 0px;
+    width: 500px;
+    height: 32px;
+    line-height: 32px;
+    .el-input__inner{
+         height: 32px;
+         width: 500px;
+          line-height: 32px;
+    }
+  }
+  .agreeButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #ffffff;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin-left: 10px;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    background-color: #0058e1;
+  }
+  .agreeButton:hover{
+    background: #65a5f9;
+    border-color: #65a5f9;
+    color: #FFF;
+  }
+  .rejectButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #F56C6C;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #F56C6C;
+    margin-left: 12px;
+  }
+ .rejectButton:hover{
+    background-color: #F56C6C;
+    border-color: #F56C6C;
+    color: #ffffff;
+  }
+  .transferButton{
+     display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #0058e1;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #0058e1;
+    margin-left: 12px;
+  }
+  }
+}
 </style>
diff --git a/back/src/views/modules/activiti/demo/comments.vue b/back/src/views/modules/activiti/demo/comments.vue
index 4f2a6d5c..cdb82ce9 100644
--- a/back/src/views/modules/activiti/demo/comments.vue
+++ b/back/src/views/modules/activiti/demo/comments.vue
@@ -32,11 +32,16 @@
     ></ren-process-multiple> -->
     <!-- 审批 -->
     <div class="agreeOr" v-if="taskId">
-      <div>
-        <el-button type="primary" @click="showDialog('同意')">同意</el-button>
+      <div class="approvalOperation">
+        <!-- <el-button type="primary" @click="showDialog('同意')">同意</el-button>
         <el-button type="danger" plain @click="showDialog('拒绝')"
           >驳回</el-button
-        >
+        > -->
+         <div class="contentOperation">
+          <el-input v-model="input" placeholder="请输入审批意见"></el-input>
+          <el-button class="agreeButton" @click="agreeOrNot($store.state.contentTabsActiveName,'同意')">同意</el-button>
+          <el-button class="rejectButton"  @click="agreeOrNot($store.state.contentTabsActiveName,'拒绝')">驳回</el-button>
+        </div> 
       </div>
     </div>
     <!-- 审批弹窗 -->
@@ -149,9 +154,9 @@ export default {
     },
     // 同意与退回
     agreeOrNot: debounce(
-      function (data) {
+      function (data,type) {
         this.dataForm.taskId = this.$route.params.taskId
-        if (this.dialogType === '同意') {
+        if (type === '同意') {
           if (this.input !== '') {
             console.log('this.dataForm', this.dataForm)
             const params = qs.stringify({
@@ -188,7 +193,7 @@ export default {
           } else {
             this.$message.error('请输入审批意见！')
           }
-        } else if (this.dialogType === '拒绝') {
+        } else if (type === '拒绝') {
           if (this.input !== '') {
             const params = qs.stringify({
               taskId: this.dataForm.taskId,
@@ -291,4 +296,102 @@ export default {
   height: 100px;
   resize: none;
 }
+.approvalOperation{
+  display: flex;
+  flex-direction: column;
+  .contentOperation{
+    display: flex;
+  flex-direction: row;
+  margin-bottom: 10px;
+  .el-input{
+    margin-left: 0px;
+    width: 500px;
+    height: 32px;
+    line-height: 32px;
+    .el-input__inner{
+         height: 32px;
+         width: 500px;
+          line-height: 32px;
+    }
+  }
+  .agreeButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #ffffff;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin-left: 10px;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    background-color: #0058e1;
+  }
+  .agreeButton:hover{
+    background: #65a5f9;
+    border-color: #65a5f9;
+    color: #FFF;
+  }
+  .rejectButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #F56C6C;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #F56C6C;
+    margin-left: 12px;
+  }
+ .rejectButton:hover{
+    background-color: #F56C6C;
+    border-color: #F56C6C;
+    color: #ffffff;
+  }
+  .transferButton{
+     display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #0058e1;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #0058e1;
+    margin-left: 12px;
+  }
+  }
+}
 </style>
diff --git a/back/src/views/modules/activiti/my-work-dynamics.vue b/back/src/views/modules/activiti/my-work-dynamics.vue
index 7e1bbb0a..8df6d5fe 100644
--- a/back/src/views/modules/activiti/my-work-dynamics.vue
+++ b/back/src/views/modules/activiti/my-work-dynamics.vue
@@ -521,12 +521,11 @@ export default {
       })
         .then(async () => {
           let ids = []
-          if (this.deleteDataArr.length > 1) {
+          if(row.id && this.deleteDataArr.length==0){
+             ids = [row.id]
+          }else{
             ids = this.deleteDataArr
-          } else {
-            ids = [row.id]
           }
-          console.log(ids)
           this.$http
             .delete('/workdynamics/delete', {
               data: ids
diff --git a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
index 663d940a..98a53e6d 100644
--- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@@ -35,12 +35,18 @@
     <!-- 审批 -->
     <div class="agreeOr" v-if="taskId">
       <h3>审批</h3>
-      <div>
-        <el-button type="info" @click="entrustTask()" v-if='taskEntrustFlag && taskEntrustFlag2'>转办</el-button>
+      <div class="approvalOperation">
+          <div class="contentOperation">
+          <el-input v-model="input" placeholder="请输入审批意见"></el-input>
+          <el-button class="agreeButton" @click="agreeOrNot($store.state.contentTabsActiveName,'同意')">同意</el-button>
+          <el-button class="rejectButton"  @click="agreeOrNot($store.state.contentTabsActiveName,'驳回')">驳回</el-button>
+          <el-button class="transferButton" @click="entrustTask()" v-if='taskEntrustFlag && taskEntrustFlag2'>转办</el-button>
+        </div>
+        <!-- <el-button type="info" @click="entrustTask()" v-if='taskEntrustFlag && taskEntrustFlag2'>转办</el-button>
         <el-button type="primary" @click="showDialog('同意')">同意</el-button>
         <el-button type="danger" plain @click="showDialog('驳回')"
           >驳回</el-button
-        >
+        > -->
         <!-- <el-radio-group v-model="agreeOrList" style="width: 230px">
           <el-radio-button label="同意" class="blueAll">同意</el-radio-button>
           <el-radio-button label="退回" class="redAll">退回</el-radio-button>
@@ -243,8 +249,8 @@ export default {
     },
     // 同意与退回
     agreeOrNot: debounce(
-      function (data) {
-        if (this.dialogType === '同意') {
+      function (data,type) {
+        if (type === '同意') {
           if (this.input !== '') {
             console.log('this.dataForm', this.dataForm)
             const params = qs.stringify({
@@ -282,7 +288,7 @@ export default {
           } else {
             this.$message.error('请输入审批意见！')
           }
-        } else if (this.dialogType === '驳回') {
+        } else if (type === '驳回') {
           if (this.input !== '') {
             const params = qs.stringify({
               taskId: this.taskId,
@@ -358,7 +364,7 @@ export default {
 }
 ::v-deep .agreeOr > div {
   display: flex;
-  align-items: center;
+  //align-items: center;
   .el-input {
     margin-right: 10px;
     margin-left: 32px;
@@ -416,4 +422,99 @@ export default {
 .blueInput {
   width: 55px;
 }
+.approvalOperation{
+  display: flex;
+  flex-direction: column;
+  .contentOperation{
+    display: flex;
+  flex-direction: row;
+  margin-bottom: 10px;
+  .el-input{
+    margin-left: 0px;
+    width: 500px;
+    height: 32px;
+    ::v-deep.el-input__inner{
+        height: 32px;
+    }
+  }
+  .agreeButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #ffffff;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    background-color: #0058e1;
+  }
+  .agreeButton:hover{
+    background: #65a5f9;
+    border-color: #65a5f9;
+    color: #FFF;
+  }
+  .rejectButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #F56C6C;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #F56C6C;
+    margin-left: 12px;
+  }
+ .rejectButton:hover{
+    background-color: #F56C6C;
+    border-color: #F56C6C;
+    color: #ffffff;
+  }
+  .transferButton{
+     display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #0058e1;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #0058e1;
+    margin-left: 12px;
+  }
+  }
+}
 </style>
diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index 5bce2930..0b863954 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -89,15 +89,18 @@
     <!-- 审批 -->
     <div class="agreeOr" v-if="dataForm.taskId">
       <h3>审批</h3>
-      <div>
+      <div class="approvalOperation">
         <!-- <el-radio-group v-model="agreeOrList" style="width:230px;">
           <el-radio-button label="同意" class="blueAll" @click="showDialog('同意')">同意</el-radio-button>
           <el-radio-button label="退回" class="redAll" @click="showDialog('退回')">退回</el-radio-button>
         </el-radio-group> -->
         <!-- 委托 -->
-        <el-button type="info" @click="entrustTask()" v-if='taskEntrustFlag && taskEntrustFlag2'>转办</el-button>
-        <el-button type="primary" @click="showDialog('同意')">同意</el-button>
-        <el-button type="danger" plain @click="showDialog('驳回')">驳回</el-button>
+        <div class="contentOperation">
+          <el-input v-model="input" placeholder="请输入审批意见"></el-input>
+          <el-button class="agreeButton" @click="agreeOrNot($store.state.contentTabsActiveName,'同意')">同意</el-button>
+          <el-button class="rejectButton"  @click="agreeOrNot($store.state.contentTabsActiveName,'驳回')">驳回</el-button>
+          <el-button class="transferButton" @click="entrustTask()" v-if='taskEntrustFlag && taskEntrustFlag2'>转办</el-button>
+        </div>
         <!-- <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
         <el-input v-if="agreeOrList ==='退回'" v-model="inputNo" placeholder="请输入退回意见"></el-input>
          <el-button class="inputBule" @click="agreeOrNot">提交</el-button> -->
@@ -107,14 +110,14 @@
         <ren-task-entrust v-if="renTaskEntrustVisible" ref="renTaskEntrust"></ren-task-entrust>
     <!--  流程详情   -->
     <ren-process-detail ref="renProcessMultiple"></ren-process-detail>
-    <el-dialog title="审批意见" :close-on-click-modal="false" :visible.sync="dialogVisible" width="30%"
+    <!-- <el-dialog title="审批意见" :close-on-click-modal="false" :visible.sync="dialogVisible" width="30%"
       :before-close="handleClose">
       <el-input v-model="input" placeholder="请输入审批意见"></el-input>
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleClose2">取 消</el-button>
         <el-button type="primary" @click.native="agreeOrNot($store.state.contentTabsActiveName)">确 定</el-button>
       </span>
-    </el-dialog>
+    </el-dialog> -->
   </el-card>
 </template>
 
@@ -169,6 +172,7 @@ export default {
     this.$http.get('/sys/user/info').then(({ data: res }) => {
       res.data.roleIdList.map(val => {
         this.$http.get('/sys/role/' + val).then(role => {
+          console.log('role',role);
           if (role.data.data.name === '流程管理员') {
             this.taskEntrustFlag = true
           }
@@ -190,7 +194,7 @@ export default {
       formSaveErrorCallback: null
     }
     // 初始化综合组件
-    this.initProcessMultiple(callbacks)
+    this.initProcessMultiple(callbacks);
   },
   computed: {
     // dataRule () {
@@ -410,8 +414,10 @@ export default {
     },
     // 同意与退回
     agreeOrNot: debounce(
-      function (data) {
-        if (this.dialogType === '同意') {
+      function (data,type) {
+          //console.log('datadata',data);
+          //console.log('tttttt',type);
+        if (type === '同意') {
           if (this.input !== '') {
             console.log('this.dataForm', this.dataForm)
             const params = qs.stringify({
@@ -448,7 +454,7 @@ export default {
           } else {
             this.$message.error('请输入审批意见！')
           }
-        } else if (this.dialogType === '驳回') {
+        } else if (type === '驳回') {
           if (this.input !== '') {
             const params = qs.stringify({
               taskId: this.dataForm.taskId,
@@ -670,7 +676,7 @@ export default {
 
 ::v-deep .agreeOr > div {
   display: flex;
-  align-items: center;
+  //align-items: center;
 
   .el-input {
     margin-right: 10px;
@@ -737,4 +743,99 @@ export default {
 .blueInput {
   width: 55px;
 }
+.approvalOperation{
+  display: flex;
+  flex-direction: column;
+  .contentOperation{
+    display: flex;
+  flex-direction: row;
+  margin-bottom: 10px;
+  .el-input{
+    margin-left: 0px;
+    width: 500px;
+    height: 32px;
+    ::v-deep.el-input__inner{
+        height: 32px;
+    }
+  }
+  .agreeButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #ffffff;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    background-color: #0058e1;
+  }
+  .agreeButton:hover{
+    background: #65a5f9;
+    border-color: #65a5f9;
+    color: #FFF;
+  }
+  .rejectButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #F56C6C;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #F56C6C;
+    margin-left: 12px;
+  }
+ .rejectButton:hover{
+    background-color: #F56C6C;
+    border-color: #F56C6C;
+    color: #ffffff;
+  }
+  .transferButton{
+     display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #0058e1;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #0058e1;
+    margin-left: 12px;
+  }
+  }
+}
 </style>
diff --git a/back/src/views/modules/sys/menu.vue b/back/src/views/modules/sys/menu.vue
index bbc70ae3..005b6f9e 100644
--- a/back/src/views/modules/sys/menu.vue
+++ b/back/src/views/modules/sys/menu.vue
@@ -9,6 +9,15 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__menu">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+         <el-form-item>
+          <el-input v-model="dataForm.name" :placeholder="$t('process.name')" clearable></el-input>
+        </el-form-item>
+          <el-form-item>
+          <el-button  type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+           <el-button  type="primary" @click="resetHandle()">{{ $t('reset') }}</el-button>
+        </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('sys:menu:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
@@ -52,11 +61,22 @@ export default {
       mixinViewModuleOptions: {
         getDataListURL: '/sys/menu/list',
         deleteURL: '/sys/menu'
-      }
+      },
+       dataForm: {
+           name: null
+       },
     }
   },
   components: {
     AddOrUpdate
+  },
+    methods: {
+    resetHandle() {
+      this.dataForm.name = '';
+      this.$nextTick(() => {
+        this.getDataList()
+      })
+    },
   }
 }
 </script>
diff --git a/back/src/views/modules/sys/role.vue b/back/src/views/modules/sys/role.vue
index e6f4c2ab..4f549b1f 100644
--- a/back/src/views/modules/sys/role.vue
+++ b/back/src/views/modules/sys/role.vue
@@ -6,7 +6,7 @@
           <el-input v-model="dataForm.name" :placeholder="$t('role.name')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataList()" type="primary">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('sys:role:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>

From 6d806547efbd241e184e85672ea44d0804ed9c5a Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Tue, 15 Nov 2022 18:23:26 +0800
Subject: [PATCH 08/25] =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2ui?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/assets/home/searchInner.png        | Bin 0 -> 398 bytes
 front/src/views/home/DetailsPageconetent.vue |  66 +++++++++++--------
 front/src/views/home/integrationServices.vue |  33 ++++++----
 3 files changed, 62 insertions(+), 37 deletions(-)
 create mode 100644 front/src/assets/home/searchInner.png

diff --git a/front/src/assets/home/searchInner.png b/front/src/assets/home/searchInner.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ee46d37a64e8757bdd2e73272592e9410ff576b
GIT binary patch
literal 398
zcmeAS@N?(olHy`uVBq!ia0vp^f*{Pn0wgD<^cMmtmUKs7M+SzC{oH>NS%G|oWRD<U
z28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Sk<d+1mv-o
zc>21sKjY@$<d-_#HuX19=!d6^V~EE2+6%V&&5R;#4_9+6Q=4>5NibPh=;*m6v-Q@t
z+F$56_JUo4x5ZJ%?9poPY$0!7A1%RD6|vqWsX~(%#x0GjJvQ0;x#jmxk;WOS#*cOc
zZ+LjL+{(etH6+Z(Cv1LKiSSFOTf3I5UVpNc+q&z7Iorgf{nDPP`zIG<xoi!bviUdr
zf}Hb71>UC`H@xv?b$!3c&S`?&`l{J(4?9_0zaMjMG@QzyIfL8vnP{Dt|L#0Sx4Dvh
zOIC}`@z_$cG-Wg61<T`W)!W&wTrHWsA?NC>Io|xfi<JxWx7n<|8796xDePX#<7xkw
qE|>AP&i_7rQqP`+Wzh*29;?UH+P}8sw6X_=0fVQjpUXO@geCxMHIvK$

literal 0
HcmV?d00001

diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index fbf52dd8..986fda7c 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -21,21 +21,21 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-          <button class="button-reset" @click="chongzhi()">重置</button>
-          <button
+           <i  class="searchImg" aria-hidden="true"></i>
+           <button
             class="button-reset"
-            style="margin-left: 0.1rem"
             @click="globalSearch()"
           >
             全局搜索
           </button>
+          <button class="button-reset" style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
           <button
             v-if="Cardsname == '应用资源'"
             class="button-reset"
             @click="applyAll()"
-            style="margin-left: 0.1rem"
+            style="margin-left: 0.1rem;width:135px"
           >
-            全部申请
+            申请全部应用资源
           </button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
@@ -168,14 +168,14 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-          <button class="button-reset" @click="chongzhi()">重置</button>
+            <i  class="searchImg" aria-hidden="true"></i>
           <button
             class="button-reset"
-            style="margin-left: 0.1rem"
             @click="globalSearch()"
           >
             全局搜索
           </button>
+          <button class="button-reset" style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
       </div>
@@ -228,14 +228,14 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-          <button class="button-reset" @click="chongzhi()">重置</button>
-          <button
+            <i  class="searchImg" aria-hidden="true"></i>
+           <button
             class="button-reset"
-            style="margin-left: 0.1rem"
             @click="globalSearch()"
           >
             全局搜索
           </button>
+          <button class="button-reset" style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
       </div>
@@ -334,7 +334,8 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-          <button class="button-reset" @click="chongzhi()">重置</button>
+            <i  class="searchImg" aria-hidden="true"></i>
+          <button class="button-reset" style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
@@ -481,7 +482,8 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-          <button class="button-reset" @click="chongzhi()">重置</button>
+          <i  class="searchImg" aria-hidden="true"></i>
+          <button class="button-reset" style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
         </div>
       </div>
       <KnowledgeBase
@@ -538,7 +540,8 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-          <button class="button-reset" @click="chongzhi()">重置</button>
+            <i  class="searchImg" aria-hidden="true"></i>
+          <button class="button-reset" style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
@@ -703,7 +706,8 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-          <button class="button-reset" @click="chongzhi()">重置</button>
+            <i  class="searchImg" aria-hidden="true"></i>
+          <button class="button-reset"  style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
         </div>
       </div>
       <KnowledgeBase
@@ -1930,13 +1934,21 @@
     .resultListSearchInput-son {
       background: #fff;
       padding: 0.2rem 0.2rem 0rem 0.3rem;
-
+      position: relative;
       .hengxian {
         width: 100%;
         height: 0.01rem;
         background: rgba(150, 144, 144, 0.3);
         margin-top: 0.2rem;
       }
+     .searchImg{
+      width: 17px;
+      height: 17px;
+     background: url('~@/assets/home/searchInner.png');
+      position: absolute;
+      top: 29px;
+      left: 480px;
+      }
     }
   }
 
@@ -1945,20 +1957,20 @@
 
     :deep(.ant-input) {
       width: 4rem;
-      height: 0.36rem;
+      height: 0.32rem;
       background: #fff;
-      border-radius: 0.04rem;
+      border-radius: 0.02rem;
     }
 
     :deep(.ant-input-search-button) {
       width: 0.8rem;
-      height: 0.36rem;
-      background: #0087ff;
-      border-radius: 0.04rem !important;
+      height: 0.32rem;
+      background: #0558e1;
+      border-radius: 0.02rem !important;
       font-size: 0.14rem;
       font-weight: 400;
       color: #fff;
-      line-height: 0.34rem;
+      line-height: 0.32rem;
       margin-left: 0.1rem;
     }
 
@@ -1971,13 +1983,15 @@
     border: 0;
     outline: none;
     width: 0.8rem;
-    height: 0.36rem;
-    background: #e1edfa;
-    border-radius: 0.04rem;
+    height: 0.32rem;
+    color: #fff;
+    //background: #e1edfa;
+    background: #0558e1;
+    border-radius: 0.02rem;
     font-size: 0.14rem;
     font-weight: 400;
-    color: #0087ff;
-    line-height: 0.34rem;
+    //color: #0087ff;
+    line-height: 0.32rem;
     margin-left: 2.5rem;
     cursor: pointer;
   }
diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue
index 89313d69..32535ead 100644
--- a/front/src/views/home/integrationServices.vue
+++ b/front/src/views/home/integrationServices.vue
@@ -29,6 +29,7 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
+            <i  class="searchImg" aria-hidden="true"></i>
           <button class="button-reset" @click="resetAction()">重置</button>
           <div class="hengxian"></div>
         </div>
@@ -342,6 +343,14 @@
         background: rgba(150, 144, 144, 0.3);
         margin-top: 0.2rem;
       }
+      .searchImg{
+      width: 17px;
+      height: 17px;
+     background: url('~@/assets/home/searchInner.png');
+      position: absolute;
+      top: 139px;
+    left: 500px;
+      }
     }
   }
 
@@ -350,20 +359,20 @@
 
     :deep(.ant-input) {
       width: 4rem;
-      height: 0.36rem;
+      height: 0.32rem;
       background: #fff;
-      border-radius: 0.04rem;
+      border-radius: 0.02rem;
     }
 
     :deep(.ant-input-search-button) {
       width: 0.8rem;
-      height: 0.36rem;
-      background: #0087ff;
-      border-radius: 0.04rem !important;
+      height: 0.32rem;
+     background: #0558e1;
+      border-radius: 0.02rem !important;
       font-size: 0.14rem;
       font-weight: 400;
       color: #fff;
-      line-height: 0.34rem;
+      line-height: 0.32rem;
       margin-left: 0.1rem;
     }
 
@@ -376,13 +385,15 @@
     border: 0;
     outline: none;
     width: 0.8rem;
-    height: 0.36rem;
-    background: #e1edfa;
-    border-radius: 0.04rem;
+    height: 0.32rem;
+    //background: #e1edfa;
+     background: #0558e1;
+    border-radius: 0.02rem;
     font-size: 0.14rem;
     font-weight: 400;
-    color: #0087ff;
-    line-height: 0.34rem;
+    //color: #0087ff;
+     color: #fff;
+    line-height: 0.32rem;
     margin-left: 2.5rem;
     cursor: pointer;
   }

From 1ee871886f44771f50c4fbedaa367527f71b9a9a Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 15 Nov 2022 19:27:22 +0800
Subject: [PATCH 09/25] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/utils/request.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/back/src/utils/request.js b/back/src/utils/request.js
index 23b7fd03..790dc0dc 100644
--- a/back/src/utils/request.js
+++ b/back/src/utils/request.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-05-11 20:03:41
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-11-11 11:07:09
+ * @LastEditTime: 2022-11-15 19:26:30
  * @Description: 告诉大家这是什么
  */
 import axios from 'axios'
@@ -102,7 +102,7 @@ http.interceptors.response.use(
     response['Access-Control-Expose-Headers'] = 'redirect'
     const { code, message } = response.data
     if (response.headers.token) {
-      Cookies.set('ucsToken', response.headers.token, { expires: 'session' })
+      Cookies.set('ucsToken', response.headers.token)
     }
     if (response.headers.redirect) {
       window.location.href = response.headers.redirect

From 2f55fca3910824383c7c299a9862954b17ad6841 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Wed, 16 Nov 2022 15:10:45 +0800
Subject: [PATCH 10/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/assets/abilityStatistics/four.png   | Bin 4423 -> 4409 bytes
 front/src/assets/abilityStatistics/fours.png  | Bin 4298 -> 3840 bytes
 front/src/assets/abilityStatistics/three.png  | Bin 4409 -> 4473 bytes
 front/src/assets/abilityStatistics/threes.png | Bin 3840 -> 3891 bytes
 front/src/assets/abilityStatistics/two.png    | Bin 4473 -> 4423 bytes
 front/src/assets/abilityStatistics/twos.png   | Bin 3891 -> 4298 bytes
 .../views/newHome/components/WorkDynamics.vue |   1 +
 7 files changed, 1 insertion(+)

diff --git a/front/src/assets/abilityStatistics/four.png b/front/src/assets/abilityStatistics/four.png
index d42b1fd026e0568bf176a5f25e8cffdfcaf47424..70c100090ac51061de3d8cfc88310680b5bc6a85 100644
GIT binary patch
delta 3736
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
aK}k`Uydyg0oz6h<*GvrVLF*x|G5-L?;|GiY

delta 3750
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
Tqz?W9`s?5@L+Be#$LRk97_%M)

diff --git a/front/src/assets/abilityStatistics/fours.png b/front/src/assets/abilityStatistics/fours.png
index 227cb98a8e919df9a107340419d97f23ccb1b7da..8a7d08849d6879ca074c18f6562edd15db84caf2 100644
GIT binary patch
delta 3163
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

delta 3624
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

diff --git a/front/src/assets/abilityStatistics/three.png b/front/src/assets/abilityStatistics/three.png
index 70c100090ac51061de3d8cfc88310680b5bc6a85..d33192ec54c35f54224b3756d112c87668853f59 100644
GIT binary patch
delta 3801
zcmZ{nS2!Guwubd6QKBXYq7yROFvG75CVCycCR+4PlwpGCy+@BedX!N^M3jW+Ejptc
zMr1?_v2*@&_IdWj{@2BOv7T?Ob-UgU&P&dBPy!2}2vk{ASwcivQ3NU~3RMD$NI{gu
zp~_GoL=p@X5#{6vaP!pCl2-Px^>ed#_f=Dt<^0omV&`Nh{eQEf|1_IkOd!JXzo9=H
z|KULT2?6WBLr?!PBuuD?0N^S4;^9$Z)s!Iy0gHzgmY=Ou?iI#5Ir)?_9O#hJI%@vl
znQi41lzgi-i)=A-aw>z8$8nN|8!WwI0C1zBfcJWh4D>S;9_o&d`ORkZAE&iK6rEw5
zDA8PJ3Vr=p`5OoL820e+u&1FLUOHs?BlN{MwosN2m!DJcp}7`OEisHhEQqLzykfS;
z1OAO+JZC)MA7tRq{0)9WB>v1F=#l9DjncbsNp$~>rw<e;-~K_O*sEOoh4$gRkn`WR
z9eo#7?9MEvN{5alkvNc?Ru;>BLrcjhj7WL?2TjZRa-Q)fyZU5{=3qnx>wvIVKL5z8
zeKK45r2b~<Xtk02<$GO2s2ruP-TknwY{xt<-RX1EX%(`|Peh};+aMH0QpsvoLt|(o
z=F5Qr2JJIVl`kIy9wXmZa{QJ$#2?F;;`-Z{y-R*u8>KcSJJLN6I=8cFH(1i3E1&Lw
zjtCk%dDG7sV{Y|aMHumZhS}<eg*<z7@MM$hXss{LB6c9(qxYof@Vx%zmLlAx`023o
z$hz5(CRFvsm|j>!#cl2VA<|6A;B*Q>GjQX(M5I?t(e!B-+3wP`g}ruuskcu@WrmA*
z%Gk=-_Fz-w$gmGmmd`1JK%7LKBU_o^MTcst!T8%4y1^jtyf6emRiWLhDc>gi?xM#n
z6{?OrEf|tU@aG+_uH^VRJjEWp`go#V{SRf5x#GI^TAw{yUrT|{d8h1|9YnYZ^}$nk
z8Y-A{<w@#wv}NSm*!IiBH-inu#}Q)#W>z%b^#<m6IFt=*4nFRuUIJHnj{=T(n9(6_
z_@gql=p-lF!vk>-W*1`9Ump5V$D*Q*?|VX%S-bXK_!MDiqQObdf!rOiLXLTSJ00C8
zLwrsc+@VI(4l9ECNSRy0<Eftvb~LURi+@9qI%HSH1uY8Y(_R~VPH9K3ZpwDec->7t
zRK$?^s@Xr~<DMJA=#81ZBpFL?0QP!q0!&yAiLG&FVM3stRMyEfV@qH%n^IoAM;*zQ
z8W?N;(X7L;y9NPSbDh=BJis^yDdp@nJ1d3DqQTA?D~OTvtoLquB=ng4dW9+2FK6V@
z_$8ac>gzRIighAw?{lJa{u6K8fFuPi3@P79xoN)_s$8&uJauM;=0S{OFj%OKp;DKo
zTCQTz9$^tcWl=6=giT)_^4IDY@?`zhEcDG?92k&Z+x8PFG=@#xc<0Dsiel~~<`yj}
z4q=Ib6E+)AlQ8XkG#SHEsLiWcnX5Jo#kgG*d^TGpO0yfNxFDdgsvRpZwI5HazE1PQ
zRxEgBbfcDQ4Y!^;VB%{AD}78bHC+rLEDx935$>K7!yw1_^sEtImV+YC^QcBn4PSN#
zV9!royL!JDUux(1zZguqi&~w2jPi@aEgfQXLUGpd=U0ro<mVeaMtGAb+%;ocpiQLt
z_j3*8ZP=$p`tFO8ZZ;F>;~e7%#~m|k&bpLHo`WgC(_E*-v=X^4A0tZ;dM(hgi-Hh<
zaLptp1TH{G!o29RZ6#lg57iy_?fZd#sWe<RdUK@#@#NHqcB~%em+nzCR4*B@vH$QZ
zleWeLdCA2f$mXKk!k-ll0*#eLv*#1gEVYnIA=-gVvTCK(crY8}rwd3XVKd$FFWBro
zLO--N(+4kYpu(=JiqmPPOO0%m)m=fvp|V?aB)`A*ZoB*Ag&+gNUri=ks0Lc?i2JTW
z)-bl^g<yf0+r;%|naIJ-`#!9GtUt*T0%@n^+`LkGqfiGA%Z#u&o_d3w4~T9>lCsh5
zB%H1)n8&t45vBHJqN|m>;MsYG<i{OUIVeqgcURu@B+~>j6~AB#=C<|2gB>}9;tTva
zFAHDR&19S9^NHUQ(+Oa8^?rcY-5c_mj+io<>h~vxnGGIpt=;_JlqUlVHg%Y1;Eg;Z
zi>7%OhI&HI$nc1<FAxf?bPHr(_U4wi(L(ajjZp4d5_WCO1mnYVZIrTJ;=GGgv1YQ_
zgO+X{M7V68(UY>Z^xCng0ZR~@@U*4ok8TlPmJNR^(({xN)9p4W{KV5S+g+BWgV7uP
zg<tZj|LJ`yF>R)qny(xd*YFu$efskL8E-?|LMS^|Ub<oU+Pf<@mv2SVU1M|Ib<!@C
zwHbcO$?M}X)jH!}pI6KsGdAlI7(04wJ6mp-jvzhr+HxFnpnQOK!UzV0@$rHkv?JvF
zTkWh5HG$wmBFcJvwN{=yJ_jN_0~*&O8*&b0$4l=qrEyAHgELTa!}BM@{gCHL6(%Dg
zhA+Mh-`SDHcfS%FUrO?x-}kvd91q<7gv_)(rP{MN*ul9N3zLQR6-Ed?4-^$@;#bW}
ziHbIra7MGT?^Myx>jz~a8~|4)>ZG>b8;1jk`_Cq`4qn^qh!3-oxaHq5`-_T%!{=08
zbG71)<xK1ddc`q3E7Lrq+E}S{SI$_+=Byi;FQ~Ec9%@bF!O;hMyKl(x72w%wDl=rx
zX>mN8q`kZa2iA!ao!KaaS5b!>oEU#U0uJr*w;Fz@AJjUVJvR10929EERFB%rr6y_?
z_6B7xfqV8m>A0rkYO-1;Wv*ym$3LOwWJtZQPr#@dM*9J+_Ej!ow}bhJ@1S}A{ia@_
zX2~q(+2A3aV=xmb4v+bX|55GM(+laDPLFTbL9-jqybVu3yrh(te11z~^1R%C^zp|1
zsTY;mq|_I7Ui3Ad?-1)dU-c-goW%8Vk`y6p(TjxXqP07{_EL%AxAl`qRQ%yQh|zed
zO^-DVgqiO~=I%!Adg7^`224Itv~XDsQ>rs#M-6BE@_%N%FBel-^oj$(N3mpV)6@X@
zZ6!4)V9aUO&efS*9sP)7M5`0_0B0<r31(EuOC~d`#Hx?PAz-<)P4+(FWdXnQzg=GW
zhML&j+<*%8@@q0$cAdTksY1p!{VaQuamJgh&OO&4RQz}_Up<2I$~yT9&<qQZT^>)`
zXT$I`90w*WL^rB%!?`)m;DswS(ms>MO}#Ch4u9F#J6lti`r|TAt;0jTX36fI3f$Sm
z8@sjf=nIuVtR|jGp>u;huisl<y=YmB9nKt8!PoBqh-;uPF?zC^^fnfdnd;<%Zn5IT
zu-twYKS6IJZtSO`=!q7-IH9>W11V2}*biPV-5oDI8LarwghRy#!e=T^Hwv#6(wWpl
zOp1_d_;2c9t<8p0E~CWnY`zEWUC-mW>8#^Vf6g;OOc{$}b@pzGD|1nyr`a3l#Mg3*
zDQ$Z5H%%(MC!cw8N8EC)yF^A;#qZ^dnI#(PJTmfoqBKH$(#4(RRmI$~^7_H?r~K%5
zX>gWo`M58IIke9dwq@5>$33YweyNZHcML<cN#=Ny<?gf!3I_h9#=M`!owhn_rM7Sc
zsgB3t|M@?fVY$A-R3(6*4O%#R$u-60XMX_7ZiM!davu+xzi{oM{0L4vq^C8!bsMh>
zm#_knqspI5ql{A2G(gU?Sh*7+60Q}eZLGJGzLl_({foO@{o|BOk*mwo11-%5D6JBT
zvZ#mUc`kd8;A1`C^;*ENj=Y8oT-nJ|5PvCx0kQAOQZG+Egvi9?iu4Gc3`eelB?4G<
z6h8ZLysWKUwPc-3&PUpuGSsi@eqJcOk6-^xjR}+X<Hns*EStrHh<>TD;$a@P7@}k^
zRbl_rJ$BY5gc<Hi*I4!|rNfkIt{U?fkqHVnPMp}dRnTS9%=AckCvhG9)~LwsL1h<W
zBE+==l!UE%P_tVmx=thOIoact8K_k?YD=p9;|)Ts4h54Ja9j)#bdsCem%shUg-tkj
zYD(|ScAs-GsFBWK<)|tt@9A*i+0x!{Njf9UM`lJU*q8)4LWmn1WcZPo4RKHbC@{8q
zf<V$IVqU)1U#Yo00~Eo)fLF4D4n$BGTA=Qk*HIZ|4a$$;6S${c&psy?wVqc$5$W<1
zbu^j{nR~M?=`;R1u-g2%b+7>-RlMmJxn&ccR5e2PBY7guWV;!;7LiWZZgb~gzBn{Y
zQV|#>w=7-rvgoW@b@i?#Kp}1Wol4u(*CT#6(iKGAz1LqeUiK6x@_qlYVkm~#;1vwL
zGYhckgJIKbh`*gOT%YNr5*)R2lh1vpr+a6PKXJ@?E9_n(u_+SG_dQw*#Q$2j1uNUA
z5dt71zd6!=95_vLC2-&|cx>B?F<9~9NtBOW)SA2X`2j|*Bnuoa+uXPu-JqM*+CwW8
z227HoZdlAX%de8!<287mL{cKk_fEd}P%Ry<faK9?IqH8FI$_9U!{uSQ^QdV*k`h^+
z_bMG94!<hI#CLQ8b-(E3i|T5{H68Um>M2#{N|Pi<Da^4Kkbu}#w#80=BWbjca4Z7P
zfE*biSzDp`mQj$RJ~wS9+fG+){ZGtS=Mq+ZRJP2S*|Q#`O=w~Na0F67p<TB85rL+>
z0xoE^9jbmz0b=X-l40(Ntg+?}#t0nlDbhm#L|M5B0#}^%7o85}8yqD0buvBNy|+<4
zN?yUBgSJ?iI|u#Xr3Qd2<BoIi#IMkZE6P1kY`XY9Y~nra+rz!!M_7rudcT?OOZvsl
zRrvmcia@Nw5v@cBf^JB@WLMAEA`uI7SH+~QEf+L}IDJ67;dH&>u~fjzAo`xtpnbKf
zTdUxO^GV55396#QOfb*Y_(p;c&Ca@^3!wB`2f6!Sbcp$Xoaq0h>L1LC_dnIj$l$kd
ZFP<j2*EPF&6NmSw)S%kR^@`8J{{`(gMcV)X

delta 3736
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
aK}k`Uydyg0oz6h<*GvrVLF*x|G5-Lczz4nn

diff --git a/front/src/assets/abilityStatistics/threes.png b/front/src/assets/abilityStatistics/threes.png
index 8a7d08849d6879ca074c18f6562edd15db84caf2..b892248f2c4d1dd235b9e5e12fc8168dc90a4df3 100644
GIT binary patch
delta 3214
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

delta 3163
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

diff --git a/front/src/assets/abilityStatistics/two.png b/front/src/assets/abilityStatistics/two.png
index d33192ec54c35f54224b3756d112c87668853f59..d42b1fd026e0568bf176a5f25e8cffdfcaf47424 100644
GIT binary patch
delta 3750
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
VQ#wx<^ab?SA>c-^*IJHI{|CZg9z_5E

delta 3801
zcmZ{nS2!Guwubd6QKBXYq7yROFvG75CVCycCR+4PlwpGCy+@BedX!N^M3jW+Ejptc
zMr1?_v2*@&_IdWj{@2BOv7T?Ob-Ugn&P&dBPy!2}2vk{ASwcivQ3NU~3RMD$NI{gu
zp~_GoL=p@X5#{6vaP!pCl2-Px^>ed#_f=Dt<^0omV&`Nh{eQEf|1_IkOd!JXzo9=H
z|KULT2?6WBLr?!PBuuD?0N^S4;^9$Z)s!Iy0gHzgmY=Ou?iI#5Ir)?_9O#hJI%@vl
znQi41lzgi-i)=A-aw>z8$8nN|8!WwI0C1zBfcJWh4D>S;9_o&d`ORkZAE&iK6rEw5
zDA8PJ3Vr=p`5OoL820e+u&1FLUOHs?BlN{MwosN2m!DJcp}7`OEisHhEQqLzykfS;
z1OAO+JZC)MA7tRq{0)9WB>v1F=#l9DjncbsNp$~>rw<e;-~K_O*sEOoh4$gRkn`WR
z9eo#7?9MEvN{5alkvNc?Ru;>BLrcjhj7WL?2TjZRa-Q)fyZU5{=3qnx>wvIVKL5z8
zeKK45r2b~<Xtk02<$GO2s2ruP-TknwY{xt<-RX1EX%(`|Peh};+aMH0QpsvoLt|(o
z=F5Qr2JJIVl`kIy9wXmZa{QJ$#2?F;;`-Z{y-R*u8>KcSJJLN6I=8cFH(1i3E1&Lw
zjtCk%dDG7sV{Y|aMHumZhS}<eg*<z7@MM$hXss{LB6c9(qxYof@Vx%zmLlAx`023o
z$hz5(CRFvsm|j>!#cl2VA<|6A;B*Q>GjQX(M5I?t(e!B-+3wP`g}ruuskcu@WrmA*
z%Gk=-_Fz-w$gmGmmd`1JK%7LKBU_o^MTcst!T8%4y1^jtyf6emRiWLhDc>gi?xM#n
z6{?OrEf|tU@aG+_uH^VRJjEWp`go#V{SRf5x#GI^TAw{yUrT|{d8h1|9YnYZ^}$nk
z8Y-A{<w@#wv}NSm*!IiBH-inu#}Q)#W>z%b^#<m6IFt=*4nFRuUIJHnj{=T(n9(6_
z_@gql=p-lF!vk>-W*1`9Ump5V$D*Q*?|VX%S-bXK_!MDiqQObdf!rOiLXLTSJ00C8
zLwrsc+@VI(4l9ECNSRy0<Eftvb~LURi+@9qI%HSH1uY8Y(_R~VPH9K3ZpwDec->7t
zRK$?^s@Xr~<DMJA=#81ZBpFL?0QP!q0!&yAiLG&FVM3stRMyEfV@qH%n^IoAM;*zQ
z8W?N;(X7L;y9NPSbDh=BJis^yDdp@nJ1d3DqQTA?D~OTvtoLquB=ng4dW9+2FK6V@
z_$8ac>gzRIighAw?{lJa{u6K8fFuPi3@P79xoN)_s$8&uJauM;=0S{OFj%OKp;DKo
zTCQTz9$^tcWl=6=giT)_^4IDY@?`zhEcDG?92k&Z+x8PFG=@#xc<0Dsiel~~<`yj}
z4q=Ib6E+)AlQ8XkG#SHEsLiWcnX5Jo#kgG*d^TGpO0yfNxFDdgsvRpZwI5HazE1PQ
zRxEgBbfcDQ4Y!^;VB%{AD}78bHC+rLEDx935$>K7!yw1_^sEtImV+YC^QcBn4PSN#
zV9!royL!JDUux(1zZguqi&~w2jPi@aEgfQXLUGpd=U0ro<mVeaMtGAb+%;ocpiQLt
z_j3*8ZP=$p`tFO8ZZ;F>;~e7%#~m|k&bpLHo`WgC(_E*-v=X^4A0tZ;dM(hgi-Hh<
zaLptp1TH{G!o29RZ6#lg57iy_?fZd#sWe<RdUK@#@#NHqcB~%em+nzCR4*B@vH$QZ
zleWeLdCA2f$mXKk!k-ll0*#eLv*#1gEVYnIA=-gVvTCK(crY8}rwd3XVKd$FFWBro
zLO--N(+4kYpu(=JiqmPPOO0%m)m=fvp|V?aB)`A*ZoB*Ag&+gNUri=ks0Lc?i2JTW
z)-bl^g<yf0+r;%|naIJ-`#!9GtUt*T0%@n^+`LkGqfiGA%Z#u&o_d3w4~T9>lCsh5
zB%H1)n8&t45vBHJqN|m>;MsYG<i{OUIVeqgcURu@B+~>j6~AB#=C<|2gB>}9;tTva
zFAHDR&19S9^NHUQ(+Oa8^?rcY-5c_mj+io<>h~vxnGGIpt=;_JlqUlVHg%Y1;Eg;Z
zi>7%OhI&HI$nc1<FAxf?bPHr(_U4wi(L(ajjZp4d5_WCO1mnYVZIrTJ;=GGgv1YQ_
zgO+X{M7V68(UY>Z^xCng0ZR~@@U*4ok8TlPmJNR^(({xN)9p4W{KV5S+g+BWgV7uP
zg<tZj|LJ`yF>R)qny(xd*YFu$efskL8E-?|LMS^|Ub<oU+Pf<@mv2SVU1M|Ib<!@C
zwHbcO$?M}X)jH!}pI6KsGdAlI7(04wJ6mp-jvzhr+HxFnpnQOK!UzV0@$rHkv?JvF
zTkWh5HG$wmBFcJvwN{=yJ_jN_0~*&O8*&b0$4l=qrEyAHgELTa!}BM@{gCHL6(%Dg
zhA+Mh-`SDHcfS%FUrO?x-}kvd91q<7gv_)(rP{MN*ul9N3zLQR6-Ed?4-^$@;#bW}
ziHbIra7MGT?^Myx>jz~a8~|4)>ZG>b8;1jk`_Cq`4qn^qh!3-oxaHq5`-_T%!{=08
zbG71)<xK1ddc`q3E7Lrq+E}S{SI$_+=Byi;FQ~Ec9%@bF!O;hMyKl(x72w%wDl=rx
zX>mN8q`kZa2iA!ao!KaaS5b!>oEU#U0uJr*w;Fz@AJjUVJvR10929EERFB%rr6y_?
z_6B7xfqV8m>A0rkYO-1;Wv*ym$3LOwWJtZQPr#@dM*9J+_Ej!ow}bhJ@1S}A{ia@_
zX2~q(+2A3aV=xmb4v+bX|55GM(+laDPLFTbL9-jqybVu3yrh(te11z~^1R%C^zp|1
zsTY;mq|_I7Ui3Ad?-1)dU-c-goW%8Vk`y6p(TjxXqP07{_EL%AxAl`qRQ%yQh|zed
zO^-DVgqiO~=I%!Adg7^`224Itv~XDsQ>rs#M-6BE@_%N%FBel-^oj$(N3mpV)6@X@
zZ6!4)V9aUO&efS*9sP)7M5`0_0B0<r31(EuOC~d`#Hx?PAz-<)P4+(FWdXnQzg=GW
zhML&j+<*%8@@q0$cAdTksY1p!{VaQuamJgh&OO&4RQz}_Up<2I$~yT9&<qQZT^>)`
zXT$I`90w*WL^rB%!?`)m;DswS(ms>MO}#Ch4u9F#J6lti`r|TAt;0jTX36fI3f$Sm
z8@sjf=nIuVtR|jGp>u;huisl<y=YmB9nKt8!PoBqh-;uPF?zC^^fnfdnd;<%Zn5IT
zu-twYKS6IJZtSO`=!q7-IH9>W11V2}*biPV-5oDI8LarwghRy#!e=T^Hwv#6(wWpl
zOp1_d_;2c9t<8p0E~CWnY`zEWUC-mW>8#^Vf6g;OOc{$}b@pzGD|1nyr`a3l#Mg3*
zDQ$Z5H%%(MC!cw8N8EC)yF^A;#qZ^dnI#(PJTmfoqBKH$(#4(RRmI$~^7_H?r~K%5
zX>gWo`M58IIke9dwq@5>$33YweyNZHcML<cN#=Ny<?gf!3I_h9#=M`!owhn_rM7Sc
zsgB3t|M@?fVY$A-R3(6*4O%#R$u-60XMX_7ZiM!davu+xzi{oM{0L4vq^C8!bsMh>
zm#_knqspI5ql{A2G(gU?Sh*7+60Q}eZLGJGzLl_({foO@{o|BOk*mwo11-%5D6JBT
zvZ#mUc`kd8;A1`C^;*ENj=Y8oT-nJ|5PvCx0kQAOQZG+Egvi9?iu4Gc3`eelB?4G<
z6h8ZLysWKUwPc-3&PUpuGSsi@eqJcOk6-^xjR}+X<Hns*EStrHh<>TD;$a@P7@}k^
zRbl_rJ$BY5gc<Hi*I4!|rNfkIt{U?fkqHVnPMp}dRnTS9%=AckCvhG9)~LwsL1h<W
zBE+==l!UE%P_tVmx=thOIoact8K_k?YD=p9;|)Ts4h54Ja9j)#bdsCem%shUg-tkj
zYD(|ScAs-GsFBWK<)|tt@9A*i+0x!{Njf9UM`lJU*q8)4LWmn1WcZPo4RKHbC@{8q
zf<V$IVqU)1U#Yo00~Eo)fLF4D4n$BGTA=Qk*HIZ|4a$$;6S${c&psy?wVqc$5$W<1
zbu^j{nR~M?=`;R1u-g2%b+7>-RlMmJxn&ccR5e2PBY7guWV;!;7LiWZZgb~gzBn{Y
zQV|#>w=7-rvgoW@b@i?#Kp}1Wol4u(*CT#6(iKGAz1LqeUiK6x@_qlYVkm~#;1vwL
zGYhckgJIKbh`*gOT%YNr5*)R2lh1vpr+a6PKXJ@?E9_n(u_+SG_dQw*#Q$2j1uNUA
z5dt71zd6!=95_vLC2-&|cx>B?F<9~9NtBOW)SA2X`2j|*Bnuoa+uXPu-JqM*+CwW8
z227HoZdlAX%de8!<287mL{cKk_fEd}P%Ry<faK9?IqH8FI$_9U!{uSQ^QdV*k`h^+
z_bMG94!<hI#CLQ8b-(E3i|T5{H68Um>M2#{N|Pi<Da^4Kkbu}#w#80=BWbjca4Z7P
zfE*biSzDp`mQj$RJ~wS9+fG+){ZGtS=Mq+ZRJP2S*|Q#`O=w~Na0F67p<TB85rL+>
z0xoE^9jbmz0b=X-l40(Ntg+?}#t0nlDbhm#L|M5B0#}^%7o85}8yqD0buvBNy|+<4
zN?yUBgSJ?iI|u#Xr3Qd2<BoIi#IMkZE6P1kY`XY9Y~nra+rz!!M_7rudcT?OOZvsl
zRrvmcia@Nw5v@cBf^JB@WLMAEA`uI7SH+~QEf+L}IDJ67;dH&>u~fjzAo`xtpnbKf
zTdUxO^GV55396#QOfb*Y_(p;c&Ca@^3!wB`2f6!Sbcp$Xoaq0h>L1LC_dnIj$l$kd
ZFP<j2*EPF&6NmSw)S%kR^@`8J{{_7yMd<(l

diff --git a/front/src/assets/abilityStatistics/twos.png b/front/src/assets/abilityStatistics/twos.png
index b892248f2c4d1dd235b9e5e12fc8168dc90a4df3..227cb98a8e919df9a107340419d97f23ccb1b7da 100644
GIT binary patch
delta 3621
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

delta 3211
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

diff --git a/front/src/views/newHome/components/WorkDynamics.vue b/front/src/views/newHome/components/WorkDynamics.vue
index b3151918..d4abfc0a 100644
--- a/front/src/views/newHome/components/WorkDynamics.vue
+++ b/front/src/views/newHome/components/WorkDynamics.vue
@@ -83,6 +83,7 @@
   function handlecancel() {
     abilityToTypeFunctionData.value = '组件服务'
     componentTypeValue.value = ''
+    visible.value = false
   }
   let abilityToTypeFunctionData = ref('组件服务')
   function abilityToTypeFunction(item) {

From 2c69d3829bf775aa4b43062417e0a04b8125f147 Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Wed, 16 Nov 2022 16:20:41 +0800
Subject: [PATCH 11/25] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/static/config/location.js        | 960 +++++++++---------
 front/src/views/home/algorithmCompare.vue     |  19 +-
 front/src/views/home/components/header.vue    | 111 +-
 .../home/components/searchResultList.vue      |  16 +-
 4 files changed, 590 insertions(+), 516 deletions(-)

diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index bb935c74..a590821b 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -7,527 +7,485 @@
  */
 // eslint-disable-next-line no-undef
 const newLocation = CONFIGITEM.version
-// const newLocation = 'baotou'
-// const newLocation = 'xihaian'
+    // const newLocation = 'baotou'
+    // const newLocation = 'xihaian'
 
 // 数据资源数据
 const whoShow = {}
 const launchedDataNumObject = {}
-// 导航数据
+    // 导航数据
 const navListManagement = {}
-// 无人机单兵数据
+    // 无人机单兵数据
 const uavAndIndividualSoldier = {}
-// 基础设施
+    // 基础设施
 const infrastructure = {}
-// 区市站点数据
+    // 区市站点数据
 const mapTestNum = {}
-// 底部数据
+    // 底部数据
 const footerDataList = {}
-// 西海岸--特殊用户
+    // 西海岸--特殊用户
 const xhaHasPermissionUser = {}
-// qingdao
+    // qingdao
 if (newLocation !== 'baotou' && newLocation !== 'xihaian') {
-  whoShow.itShowQingDao = true
-  infrastructure.deptName = '青岛市大数据发展管理局'
-  infrastructure.deptId = '1067246875800000066'
-  navListManagement.navList = [
-    { name: '共享门户', key: 'home' },
-    { name: '能力集市', key: 'DetailsPageconetent' },
-    // { name: '能力云图', key: 'capabilityCloud' },
-    { name: '能力统计', key: 'abilityStatistics' },
-    // { name: '开发指南', key: 'developmentGuide' },
-    { name: '新手指南', key: 'instructionManual' },
-    { name: '需求中心', key: 'demandCenter' },
-    // { name: '个人中心', key: 'personalCenter' },
-    // { name: '区市站点', key: 'mapTest' },
-    // { name: '后台管理', key: 'houtaiguanli' },
-    //  { name: '典型赋能案例', key: 'assignCase' },
-    { name: '融合服务', key: 'integrationServices' },
-    { name: 'CIM专区', key: 'cimSpecialArea' },
-  ]
-  footerDataList.footerList = {
-    company: {
-      left: '青岛市大数据发展管理局',
-      right: '政府标识码3702000106',
-    },
-    address: [
-      {
-        name: '邮编: 266071',
-        value: 'Email: QDDSJJ@qingdao.shandong.cn',
-      },
-      {
-        name: '版权所有：青岛市大数据发展管理局',
-        value: '地址：山东省青岛市香港中路17号市级机关三号办公楼',
-      },
-      {
-        name: '电话：0532-85912587',
-        value: '传真：0532-85912181',
-      },
-    ],
-  }
-  mapTestNum.lsNum = [
-    {
-      name: '基础设施',
-      key: 'lsjcss',
-      num: '20135个',
-    },
-    {
-      name: '数据资源',
-      key: 'lsjcss',
-      num: '857项',
-    },
-    {
-      name: '应用资源',
-      key: 'lsjcss',
-      num: '28个',
-    },
-  ]
-  mapTestNum.xhaNum = [
-    {
-      name: '基础设施',
-      key: 'xhajcss',
-      num: '35282个',
-    },
-    {
-      name: '数据资源',
-      key: 'xhajcss',
-      num: '11项',
-    },
-    {
-      name: '应用资源',
-      key: 'xhajcss',
-      num: '23个',
-    },
-    {
-      name: '组件服务',
-      key: 'xhazjfw',
-      num: '8个',
-    },
-  ]
+    whoShow.itShowQingDao = true
+    infrastructure.deptName = '青岛市大数据发展管理局'
+    infrastructure.deptId = '1067246875800000066'
+    navListManagement.navList = [
+        { name: '共享门户', key: 'home' },
+        { name: '能力集市', key: 'DetailsPageconetent', innerKey: 'algorithmCompare' },
+        // { name: '能力云图', key: 'capabilityCloud' },
+        { name: '能力统计', key: 'abilityStatistics' },
+        // { name: '开发指南', key: 'developmentGuide' },
+        { name: '新手指南', key: 'instructionManual' },
+        { name: '需求中心', key: 'demandCenter' },
+        // { name: '个人中心', key: 'personalCenter' },
+        // { name: '区市站点', key: 'mapTest' },
+        // { name: '后台管理', key: 'houtaiguanli' },
+        //  { name: '典型赋能案例', key: 'assignCase' },
+        { name: '融合服务', key: 'integrationServices' },
+        { name: 'CIM专区', key: 'cimSpecialArea' },
+    ]
+    footerDataList.footerList = {
+        company: {
+            left: '青岛市大数据发展管理局',
+            right: '政府标识码3702000106',
+        },
+        address: [{
+                name: '邮编: 266071',
+                value: 'Email: QDDSJJ@qingdao.shandong.cn',
+            },
+            {
+                name: '版权所有：青岛市大数据发展管理局',
+                value: '地址：山东省青岛市香港中路17号市级机关三号办公楼',
+            },
+            {
+                name: '电话：0532-85912587',
+                value: '传真：0532-85912181',
+            },
+        ],
+    }
+    mapTestNum.lsNum = [{
+            name: '基础设施',
+            key: 'lsjcss',
+            num: '20135个',
+        },
+        {
+            name: '数据资源',
+            key: 'lsjcss',
+            num: '857项',
+        },
+        {
+            name: '应用资源',
+            key: 'lsjcss',
+            num: '28个',
+        },
+    ]
+    mapTestNum.xhaNum = [{
+            name: '基础设施',
+            key: 'xhajcss',
+            num: '35282个',
+        },
+        {
+            name: '数据资源',
+            key: 'xhajcss',
+            num: '11项',
+        },
+        {
+            name: '应用资源',
+            key: 'xhajcss',
+            num: '23个',
+        },
+        {
+            name: '组件服务',
+            key: 'xhazjfw',
+            num: '8个',
+        },
+    ]
 }
 // baotou
 else if (newLocation === 'baotou') {
-  whoShow.itShowBaoTou = true
-  launchedDataNumObject.launchedDataNum = [
-    {
-      num: 10372,
-    },
-    {
-      num: 1080,
-    },
-    {
-      num: 976,
-    },
-  ]
-  navListManagement.navList = [
-    { name: '共享门户', key: 'home' },
-    { name: '能力集市', key: 'DetailsPageconetent' },
-    { name: '能力云图', key: 'capabilityCloud' },
-    { name: '能力统计', key: 'abilityStatistics' },
-    // { name: '开发指南', key: 'developmentGuide' },
-    { name: '需求中心', key: 'demandCenter' },
-    // { name: '个人中心', key: 'personalCenter' },
-    // { name: '区市站点', key: 'mapTest' },
-    // { name: '后台管理', key: 'houtaiguanli' },
-    { name: '赋能案例', key: 'assignCase' },
-  ]
-  footerDataList.footerList = {
-    company: {
-      left: '包头市工业和信息化局大数据中心建设',
-      right: '海信网络科技股份有限公司',
-    },
-    address: [
-      {
-        name: '蒙ICP备05003330-1号',
-        value: '政府标识码1502000040',
-      },
-      {
-        name: '版权所有：包头市工业和信息化局大数据中心',
-        value: '地址：内蒙古自治区包头市九原区开元大街1号',
-      },
-      {
-        name: '电话：0472-5618235',
-        value: '传真：0472-5618235',
-      },
-    ],
-  }
+    whoShow.itShowBaoTou = true
+    launchedDataNumObject.launchedDataNum = [{
+            num: 10372,
+        },
+        {
+            num: 1080,
+        },
+        {
+            num: 976,
+        },
+    ]
+    navListManagement.navList = [
+        { name: '共享门户', key: 'home' },
+        { name: '能力集市', key: 'DetailsPageconetent' },
+        { name: '能力云图', key: 'capabilityCloud' },
+        { name: '能力统计', key: 'abilityStatistics' },
+        // { name: '开发指南', key: 'developmentGuide' },
+        { name: '需求中心', key: 'demandCenter' },
+        // { name: '个人中心', key: 'personalCenter' },
+        // { name: '区市站点', key: 'mapTest' },
+        // { name: '后台管理', key: 'houtaiguanli' },
+        { name: '赋能案例', key: 'assignCase' },
+    ]
+    footerDataList.footerList = {
+        company: {
+            left: '包头市工业和信息化局大数据中心建设',
+            right: '海信网络科技股份有限公司',
+        },
+        address: [{
+                name: '蒙ICP备05003330-1号',
+                value: '政府标识码1502000040',
+            },
+            {
+                name: '版权所有：包头市工业和信息化局大数据中心',
+                value: '地址：内蒙古自治区包头市九原区开元大街1号',
+            },
+            {
+                name: '电话：0472-5618235',
+                value: '传真：0472-5618235',
+            },
+        ],
+    }
 }
 // xihaian
 else if (newLocation === 'xihaian') {
-  whoShow.itShowXiHaiAn = true
-  infrastructure.deptName = '西海岸新区大数据发展'
-  // infrastructure.deptId = '1067246875800000066'
-  uavAndIndividualSoldier.num = 4
-  uavAndIndividualSoldier.uavList = [
-    {
-      name: '经纬 M300 RTK-1',
-      url: '',
-      details: [
-        {
-          name: '飞行器',
-          attribute: {
-            尺寸: '尺寸（展开，不包含桨叶）：810×670×430 mm（长×宽×高）；尺寸（折叠，包含桨叶）：430×420×430 mm（长×宽×高）',
-            对称电机轴距: '895 mm',
-            '重量（含下置单云台支架）:空机重量（不含电池）':
-              '3.6 kg；空机重量（含双电池）：6.3 kg',
-            单云台减震球最大负重: '930g',
-            最大起飞重量: '9 kg',
-            工作频率: '2.4000-2.4835 GHz；5.725-5.850 GHz',
-            '发射功率（EIRP）':
-              '2.4000-2.4835 GHz：29.5 dBm（FCC）、18.5dBm（CE）、18.5 dBm（SRRC）、18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）、12.5dBm（CE）、28.5 dBm（SRRC）',
-            '悬停精度（P-GPS）':
-              '垂直：±0.1 m（视觉定位正常工作时）、±0.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）；水平：±0.3 m（视觉定位正常工作时）、±1.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）',
-            'RTK 位置精度':
-              '在 RTK FIX 时：1 cm+1 ppm（水平）、1.5 cm + 1 ppm（垂直）',
-            最大旋转角速度: '俯仰轴：300°/s、航向轴：100°/s',
-            最大俯仰角度: '30° （P模式且前视视觉系统启用：25°）',
-            最大上升速度: 'S 模式：6 m/s、P 模式：5 m/s',
-            '最大下降速度（垂直）': 'S 模式：5 m/s、P 模式：4 m/s',
-            最大倾斜下降速度: 'S 模式：7 m/s',
-            最大水平飞行速度: 'S 模式：23 m/s、P 模式：17 m/s',
-            最大飞行海拔高度:
-              '5000 m（2110 桨叶，起飞重量≤7 kg）/ 7000 m（2195 高原静音桨叶，起飞重量≤7 kg）',
-            最大可承受风速: '15m/s（起飞及降落阶段为12m/s）',
-            最大飞行时间: '55 min',
-            '适配 DJI 云台':
-              '禅思 XT2、禅思 XT S、禅思 Z30、禅思 H20、禅思 H20T、DJI P1、DJI L1',
-            支持云台安装方式:
-              '下置单云台、上置单云台、下置双云台、下置单云台+上置单云台、下置双云台+上置单云台',
-            'IP 防护等级': 'IP45',
-            GNSS: 'GPS+GLONASS+BeiDou+Galileo',
-            工作环境温度: '-20°C 至 50°C',
-          },
+    whoShow.itShowXiHaiAn = true
+    infrastructure.deptName = '西海岸新区大数据发展'
+        // infrastructure.deptId = '1067246875800000066'
+    uavAndIndividualSoldier.num = 4
+    uavAndIndividualSoldier.uavList = [{
+            name: '经纬 M300 RTK-1',
+            url: '',
+            details: [{
+                    name: '飞行器',
+                    attribute: {
+                        尺寸: '尺寸（展开，不包含桨叶）：810×670×430 mm（长×宽×高）；尺寸（折叠，包含桨叶）：430×420×430 mm（长×宽×高）',
+                        对称电机轴距: '895 mm',
+                        '重量（含下置单云台支架）:空机重量（不含电池）': '3.6 kg；空机重量（含双电池）：6.3 kg',
+                        单云台减震球最大负重: '930g',
+                        最大起飞重量: '9 kg',
+                        工作频率: '2.4000-2.4835 GHz；5.725-5.850 GHz',
+                        '发射功率（EIRP）': '2.4000-2.4835 GHz：29.5 dBm（FCC）、18.5dBm（CE）、18.5 dBm（SRRC）、18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）、12.5dBm（CE）、28.5 dBm（SRRC）',
+                        '悬停精度（P-GPS）': '垂直：±0.1 m（视觉定位正常工作时）、±0.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）；水平：±0.3 m（视觉定位正常工作时）、±1.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）',
+                        'RTK 位置精度': '在 RTK FIX 时：1 cm+1 ppm（水平）、1.5 cm + 1 ppm（垂直）',
+                        最大旋转角速度: '俯仰轴：300°/s、航向轴：100°/s',
+                        最大俯仰角度: '30° （P模式且前视视觉系统启用：25°）',
+                        最大上升速度: 'S 模式：6 m/s、P 模式：5 m/s',
+                        '最大下降速度（垂直）': 'S 模式：5 m/s、P 模式：4 m/s',
+                        最大倾斜下降速度: 'S 模式：7 m/s',
+                        最大水平飞行速度: 'S 模式：23 m/s、P 模式：17 m/s',
+                        最大飞行海拔高度: '5000 m（2110 桨叶，起飞重量≤7 kg）/ 7000 m（2195 高原静音桨叶，起飞重量≤7 kg）',
+                        最大可承受风速: '15m/s（起飞及降落阶段为12m/s）',
+                        最大飞行时间: '55 min',
+                        '适配 DJI 云台': '禅思 XT2、禅思 XT S、禅思 Z30、禅思 H20、禅思 H20T、DJI P1、DJI L1',
+                        支持云台安装方式: '下置单云台、上置单云台、下置双云台、下置单云台+上置单云台、下置双云台+上置单云台',
+                        'IP 防护等级': 'IP45',
+                        GNSS: 'GPS+GLONASS+BeiDou+Galileo',
+                        工作环境温度: '-20°C 至 50°C',
+                    },
+                },
+                {
+                    name: '遥控器',
+                    attribute: {
+                        工作频率: '2.4000-2.4835 GHz、5.725-5.850 GHz',
+                        '最大信号有效距离（无干扰、无遮挡）': 'NCC/FCC：15 km、CE/MIC：8 km、SRRC：8 km',
+                        '等效全向辐射功率（EIRP）': '2.4000-2.4835 GHz：29.5 dBm（FCC）；18.5dBm（CE）、18.5 dBm（SRRC）；18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）；12.5dBm（CE）、20.5 dBm（SRRC）',
+                        外置电池: '名称：WB37 智能电池；容量：4920 mAh；电压：7.6 V；电池类型：LiPo；能量：37.39 Wh；充电时间（使用 BS60 智能电池箱）：70 分钟（15°C 至 45°C）；130 分钟（0°C 至 15°C）',
+                        内置电池: '类型：18650 锂离子电池 （5000 mAh @ 7.2 V）；充电方式：使用规格为 12V/2A 的 USB 充电器；额定功率：17 W；充电时间：2 小时 15 分钟（使用规格为12V/2A 的 USB 充电器）',
+                        续航时间: '内置电池：约 2.5 小时内置电池+外置电池：约 4.5 小时',
+                        'USB-A 接口供电电压/电流': '5 V / 1.5 A',
+                        工作环境温度: '-20° 至 40° C',
+                    },
+                },
+                {
+                    name: '视觉系统',
+                    attribute: {
+                        障碍物感知范围: '前后左右：0.7-40 m、上下：0.6-30 m',
+                        FOV: '前后下：65°（H），50°（V）、左右上：75°（H），60°（V）',
+                        使用环境: '表面有丰富纹理，光照条件充足（>15 lux，室内日光灯正常照射环境）',
+                    },
+                },
+                {
+                    name: '红外感知系统',
+                    attribute: {
+                        障碍物感知范围: '0.1-8 m',
+                        FOV: '30°（±15°）',
+                        使用环境: '漫反射，大尺寸，高反射率（反射率>10%）障碍物',
+                    },
+                },
+                {
+                    name: '上下补光灯',
+                    attribute: {
+                        有效照明距离: '5 m',
+                    },
+                },
+                {
+                    name: 'FPV摄像头',
+                    attribute: {
+                        分辨率: '960p',
+                        FOV: '145°',
+                        帧率: '30 fps',
+                    },
+                },
+                {
+                    name: '智能飞行电池',
+                    attribute: {
+                        型号: 'TB60',
+                        容量: '5935 mAh',
+                        电压: '52.8 V',
+                        电池类型: 'LiPo 12S',
+                        能量: '274 Wh',
+                        电池整体重量: '约 1.35 kg',
+                        工作环境温度: '-20℃ 至 50℃',
+                        理想存放环境温度: '22℃ 至 30℃',
+                        充电环境温度: '-20°C 至 40°C（当环境温度低于 5°C时，电池会启动自加热功能，在低温环境下充电有可能会降低电池使用寿命）',
+                        充电时间: '使用 BS60 智能电池箱时，使用 220 V 电源：完全充满两块 TB60 智能飞行电池约需 60 分钟，从 20% 充到 90% 约需 30 分钟；使用 110 V 电源：完全充满两块 TB60 智能飞行电池约需 70 分钟，从 20% 充到 90% 约需 40 分钟',
+                    },
+                },
+                {
+                    name: 'BS60智能电池箱',
+                    attribute: {
+                        外形尺寸: '501×403×252 mm',
+                        空箱重量: '8.37 kg',
+                        可放置物品: 'TB60 智能飞行电池 8 块、WB37 智能电池 4 块',
+                        输入电压: '100-120 VAC，50-60 Hz / 220-240 VAC，50-60 Hz',
+                        最大输入功率: '1070 W',
+                        输出功率: '100-120 V：750 W、220-240 V：992 W',
+                        工作环境温度: '-20℃ 至 40℃',
+                    },
+                },
+            ],
         },
         {
-          name: '遥控器',
-          attribute: {
-            工作频率: '2.4000-2.4835 GHz、5.725-5.850 GHz',
-            '最大信号有效距离（无干扰、无遮挡）':
-              'NCC/FCC：15 km、CE/MIC：8 km、SRRC：8 km',
-            '等效全向辐射功率（EIRP）':
-              '2.4000-2.4835 GHz：29.5 dBm（FCC）；18.5dBm（CE）、18.5 dBm（SRRC）；18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）；12.5dBm（CE）、20.5 dBm（SRRC）',
-            外置电池:
-              '名称：WB37 智能电池；容量：4920 mAh；电压：7.6 V；电池类型：LiPo；能量：37.39 Wh；充电时间（使用 BS60 智能电池箱）：70 分钟（15°C 至 45°C）；130 分钟（0°C 至 15°C）',
-            内置电池:
-              '类型：18650 锂离子电池 （5000 mAh @ 7.2 V）；充电方式：使用规格为 12V/2A 的 USB 充电器；额定功率：17 W；充电时间：2 小时 15 分钟（使用规格为12V/2A 的 USB 充电器）',
-            续航时间: '内置电池：约 2.5 小时内置电池+外置电池：约 4.5 小时',
-            'USB-A 接口供电电压/电流': '5 V / 1.5 A',
-            工作环境温度: '-20° 至 40° C',
-          },
+            name: '经纬 M300 RTK-2',
+            url: '',
+            details: [{
+                    name: '飞行器',
+                    attribute: {
+                        尺寸: '尺寸（展开，不包含桨叶）：810×670×430 mm（长×宽×高）；尺寸（折叠，包含桨叶）：430×420×430 mm（长×宽×高）',
+                        对称电机轴距: '895 mm',
+                        '重量（含下置单云台支架）:空机重量（不含电池）': '3.6 kg；空机重量（含双电池）：6.3 kg',
+                        单云台减震球最大负重: '930g',
+                        最大起飞重量: '9 kg',
+                        工作频率: '2.4000-2.4835 GHz；5.725-5.850 GHz',
+                        '发射功率（EIRP）': '2.4000-2.4835 GHz：29.5 dBm（FCC）、18.5dBm（CE）、18.5 dBm（SRRC）、18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）、12.5dBm（CE）、28.5 dBm（SRRC）',
+                        '悬停精度（P-GPS）': '垂直：±0.1 m（视觉定位正常工作时）、±0.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）；水平：±0.3 m（视觉定位正常工作时）、±1.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）',
+                        'RTK 位置精度': '在 RTK FIX 时：1 cm+1 ppm（水平）、1.5 cm + 1 ppm（垂直）',
+                        最大旋转角速度: '俯仰轴：300°/s、航向轴：100°/s',
+                        最大俯仰角度: '30° （P模式且前视视觉系统启用：25°）',
+                        最大上升速度: 'S 模式：6 m/s、P 模式：5 m/s',
+                        '最大下降速度（垂直）': 'S 模式：5 m/s、P 模式：4 m/s',
+                        最大倾斜下降速度: 'S 模式：7 m/s',
+                        最大水平飞行速度: 'S 模式：23 m/s、P 模式：17 m/s',
+                        最大飞行海拔高度: '5000 m（2110 桨叶，起飞重量≤7 kg）/ 7000 m（2195 高原静音桨叶，起飞重量≤7 kg）',
+                        最大可承受风速: '15m/s（起飞及降落阶段为12m/s）',
+                        最大飞行时间: '55 min',
+                        '适配 DJI 云台': '禅思 XT2、禅思 XT S、禅思 Z30、禅思 H20、禅思 H20T、DJI P1、DJI L1',
+                        支持云台安装方式: '下置单云台、上置单云台、下置双云台、下置单云台+上置单云台、下置双云台+上置单云台',
+                        'IP 防护等级': 'IP45',
+                        GNSS: 'GPS+GLONASS+BeiDou+Galileo',
+                        工作环境温度: '-20°C 至 50°C',
+                    },
+                },
+                {
+                    name: '遥控器',
+                    attribute: {
+                        工作频率: '2.4000-2.4835 GHz、5.725-5.850 GHz',
+                        '最大信号有效距离（无干扰、无遮挡）': 'NCC/FCC：15 km、CE/MIC：8 km、SRRC：8 km',
+                        '等效全向辐射功率（EIRP）': '2.4000-2.4835 GHz：29.5 dBm（FCC）；18.5dBm（CE）、18.5 dBm（SRRC）；18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）；12.5dBm（CE）、20.5 dBm（SRRC）',
+                        外置电池: '名称：WB37 智能电池；容量：4920 mAh；电压：7.6 V；电池类型：LiPo；能量：37.39 Wh；充电时间（使用 BS60 智能电池箱）：70 分钟（15°C 至 45°C）；130 分钟（0°C 至 15°C）',
+                        内置电池: '类型：18650 锂离子电池 （5000 mAh @ 7.2 V）；充电方式：使用规格为 12V/2A 的 USB 充电器；额定功率：17 W；充电时间：2 小时 15 分钟（使用规格为12V/2A 的 USB 充电器）',
+                        续航时间: '内置电池：约 2.5 小时内置电池+外置电池：约 4.5 小时',
+                        'USB-A 接口供电电压/电流': '5 V / 1.5 A',
+                        工作环境温度: '-20° 至 40° C',
+                    },
+                },
+                {
+                    name: '视觉系统',
+                    attribute: {
+                        障碍物感知范围: '前后左右：0.7-40 m、上下：0.6-30 m',
+                        FOV: '前后下：65°（H），50°（V）、左右上：75°（H），60°（V）',
+                        使用环境: '表面有丰富纹理，光照条件充足（>15 lux，室内日光灯正常照射环境）',
+                    },
+                },
+                {
+                    name: '红外感知系统',
+                    attribute: {
+                        障碍物感知范围: '0.1-8 m',
+                        FOV: '30°（±15°）',
+                        使用环境: '漫反射，大尺寸，高反射率（反射率>10%）障碍物',
+                    },
+                },
+                {
+                    name: '上下补光灯',
+                    attribute: {
+                        有效照明距离: '5 m',
+                    },
+                },
+                {
+                    name: 'FPV摄像头',
+                    attribute: {
+                        分辨率: '960p',
+                        FOV: '145°',
+                        帧率: '30 fps',
+                    },
+                },
+                {
+                    name: '智能飞行电池',
+                    attribute: {
+                        型号: 'TB60',
+                        容量: '5935 mAh',
+                        电压: '52.8 V',
+                        电池类型: 'LiPo 12S',
+                        能量: '274 Wh',
+                        电池整体重量: '约 1.35 kg',
+                        工作环境温度: '-20℃ 至 50℃',
+                        理想存放环境温度: '22℃ 至 30℃',
+                        充电环境温度: '-20°C 至 40°C（当环境温度低于 5°C时，电池会启动自加热功能，在低温环境下充电有可能会降低电池使用寿命）',
+                        充电时间: '使用 BS60 智能电池箱时，使用 220 V 电源：完全充满两块 TB60 智能飞行电池约需 60 分钟，从 20% 充到 90% 约需 30 分钟；使用 110 V 电源：完全充满两块 TB60 智能飞行电池约需 70 分钟，从 20% 充到 90% 约需 40 分钟',
+                    },
+                },
+                {
+                    name: 'BS60智能电池箱',
+                    attribute: {
+                        外形尺寸: '501×403×252 mm',
+                        空箱重量: '8.37 kg',
+                        可放置物品: 'TB60 智能飞行电池 8 块、WB37 智能电池 4 块',
+                        输入电压: '100-120 VAC，50-60 Hz / 220-240 VAC，50-60 Hz',
+                        最大输入功率: '1070 W',
+                        输出功率: '100-120 V：750 W、220-240 V：992 W',
+                        工作环境温度: '-20℃ 至 40℃',
+                    },
+                },
+            ],
+        },
+    ]
+    uavAndIndividualSoldier.individualSoldier = [{
+            name: 'T950天通-1',
+            type: '单兵设备',
+            details: {
+                基本信息: {
+                    外观设计: '172X81X15.7(不含天线)，336g',
+                    操作系统: 'Android P',
+                    CPU: '展锐 Makalu T7510;虎贲T710+春藤IVY510',
+                    存储: '标配:6GB ROM +128G RAM',
+                    显示屏: '6.52吋水滴屏;HD+，1600*720(20:9)',
+                    后置摄像头: '后置为4800万主摄+200万微距+200万红外三摄组合，支持闪光灯',
+                    前置摄像头: '1600万',
+                    传感器相关: '指纹|光线传感器|距离传感器|加速度传感器|地磁传感器|陀螺仪|气压传感器',
+                    WLAN: '802.11a/b/g/n/AC 支持MIMO',
+                    电池: '6000mAh@3.8V，内置不可拆卸，支持18W快充',
+                    工作时间: '待机时长180h，卫星通话时长16h',
+                },
+                制式频段: {
+                    卫星频段: '天通一号卫星',
+                    频段: '2G:GSM 850/900/1800/1900;3G:WCDMA850/900/1900/2100;4G:TD-LTE B38/39/40/41;4G:FDD-LTE B1/3/5/7/8;5G: N1，N28，N41, N78，N79',
+                    双卡: '双nano卡(卫星卡+运营商全网通卡)',
+                    CA: 'B1+B3 下行 2CA(电信);B40/41带内上下行 2CA',
+                    VOLTE: '支持',
+                },
+                IO接口: {
+                    USB接口类型: 'TYPE-C USB3.0，支持OTG功能',
+                    耳机接口: '3.5mm，美标',
+                    存储卡: '支持TF卡扩展',
+                },
+                其它功能: {
+                    蓝牙: 'V5.0',
+                    定位: 'GPS、北斗混合定位、单北斗模式',
+                    NFC: '支持',
+                    充电方式: '三种充电方式(线充、座充、磁吸充电)',
+                    按键: '开机键、音量+/-、 SOS(侧面)、PTT按键',
+                },
+                环境适应性: {
+                    工作温度: '-20°~ 60°',
+                    存储温度: '-40°~ 80°',
+                    高温高湿: '(95±3)%(≧40°)，24小时',
+                    防护等级: 'IP68',
+                },
+            },
         },
         {
-          name: '视觉系统',
-          attribute: {
-            障碍物感知范围: '前后左右：0.7-40 m、上下：0.6-30 m',
-            FOV: '前后下：65°（H），50°（V）、左右上：75°（H），60°（V）',
-            使用环境:
-              '表面有丰富纹理，光照条件充足（>15 lux，室内日光灯正常照射环境）',
-          },
+            name: 'T950天通-2',
+            type: '单兵设备',
+            details: {
+                基本信息: {
+                    外观设计: '172X81X15.7(不含天线)，336g',
+                    操作系统: 'Android P',
+                    CPU: '展锐 Makalu T7510;虎贲T710+春藤IVY510',
+                    存储: '标配:6GB ROM +128G RAM',
+                    显示屏: '6.52吋水滴屏;HD+，1600*720(20:9)',
+                    后置摄像头: '后置为4800万主摄+200万微距+200万红外三摄组合，支持闪光灯',
+                    前置摄像头: '1600万',
+                    传感器相关: '指纹|光线传感器|距离传感器|加速度传感器|地磁传感器|陀螺仪|气压传感器',
+                    WLAN: '802.11a/b/g/n/AC 支持MIMO',
+                    电池: '6000mAh@3.8V，内置不可拆卸，支持18W快充',
+                    工作时间: '待机时长180h，卫星通话时长16h',
+                },
+                制式频段: {
+                    卫星频段: '天通一号卫星',
+                    频段: '2G:GSM 850/900/1800/1900;3G:WCDMA850/900/1900/2100;4G:TD-LTE B38/39/40/41;4G:FDD-LTE B1/3/5/7/8;5G: N1，N28，N41, N78，N79',
+                    双卡: '双nano卡(卫星卡+运营商全网通卡)',
+                    CA: 'B1+B3 下行 2CA(电信);B40/41带内上下行 2CA',
+                    VOLTE: '支持',
+                },
+                IO接口: {
+                    USB接口类型: 'TYPE-C USB3.0，支持OTG功能',
+                    耳机接口: '3.5mm，美标',
+                    存储卡: '支持TF卡扩展',
+                },
+                其它功能: {
+                    蓝牙: 'V5.0',
+                    定位: 'GPS、北斗混合定位、单北斗模式',
+                    NFC: '支持',
+                    充电方式: '三种充电方式(线充、座充、磁吸充电)',
+                    按键: '开机键、音量+/-、 SOS(侧面)、PTT按键',
+                },
+                环境适应性: {
+                    工作温度: '-20°~ 60°',
+                    存储温度: '-40°~ 80°',
+                    高温高湿: '(95±3)%(≧40°)，24小时',
+                    防护等级: 'IP68',
+                },
+            },
         },
-        {
-          name: '红外感知系统',
-          attribute: {
-            障碍物感知范围: '0.1-8 m',
-            FOV: '30°（±15°）',
-            使用环境: '漫反射，大尺寸，高反射率（反射率>10%）障碍物',
-          },
+    ]
+    navListManagement.navList = [
+        { name: '共享门户', key: 'home' },
+        { name: '能力集市', key: 'DetailsPageconetent' },
+        { name: '能力云图', key: 'capabilityCloud' },
+        { name: '能力统计', key: 'abilityStatistics' },
+        // { name: '开发指南', key: 'developmentGuide' },
+        { name: '需求中心', key: 'demandCenter' },
+        // { name: '个人中心', key: 'personalCenter' },
+        // { name: '区市站点', key: 'mapTest' },
+        // { name: '后台管理', key: 'houtaiguanli' },
+        { name: '赋能案例', key: 'assignCase' },
+    ]
+    footerDataList.footerList = {
+        company: {
+            left: '青岛西海岸新区大数据发展促进局建设',
+            // eslint-disable-next-line no-undef
+            right: CONFIGITEM.vNum,
         },
-        {
-          name: '上下补光灯',
-          attribute: {
-            有效照明距离: '5 m',
-          },
-        },
-        {
-          name: 'FPV摄像头',
-          attribute: {
-            分辨率: '960p',
-            FOV: '145°',
-            帧率: '30 fps',
-          },
-        },
-        {
-          name: '智能飞行电池',
-          attribute: {
-            型号: 'TB60',
-            容量: '5935 mAh',
-            电压: '52.8 V',
-            电池类型: 'LiPo 12S',
-            能量: '274 Wh',
-            电池整体重量: '约 1.35 kg',
-            工作环境温度: '-20℃ 至 50℃',
-            理想存放环境温度: '22℃ 至 30℃',
-            充电环境温度:
-              '-20°C 至 40°C（当环境温度低于 5°C时，电池会启动自加热功能，在低温环境下充电有可能会降低电池使用寿命）',
-            充电时间:
-              '使用 BS60 智能电池箱时，使用 220 V 电源：完全充满两块 TB60 智能飞行电池约需 60 分钟，从 20% 充到 90% 约需 30 分钟；使用 110 V 电源：完全充满两块 TB60 智能飞行电池约需 70 分钟，从 20% 充到 90% 约需 40 分钟',
-          },
-        },
-        {
-          name: 'BS60智能电池箱',
-          attribute: {
-            外形尺寸: '501×403×252 mm',
-            空箱重量: '8.37 kg',
-            可放置物品: 'TB60 智能飞行电池 8 块、WB37 智能电池 4 块',
-            输入电压: '100-120 VAC，50-60 Hz / 220-240 VAC，50-60 Hz',
-            最大输入功率: '1070 W',
-            输出功率: '100-120 V：750 W、220-240 V：992 W',
-            工作环境温度: '-20℃ 至 40℃',
-          },
-        },
-      ],
-    },
-    {
-      name: '经纬 M300 RTK-2',
-      url: '',
-      details: [
-        {
-          name: '飞行器',
-          attribute: {
-            尺寸: '尺寸（展开，不包含桨叶）：810×670×430 mm（长×宽×高）；尺寸（折叠，包含桨叶）：430×420×430 mm（长×宽×高）',
-            对称电机轴距: '895 mm',
-            '重量（含下置单云台支架）:空机重量（不含电池）':
-              '3.6 kg；空机重量（含双电池）：6.3 kg',
-            单云台减震球最大负重: '930g',
-            最大起飞重量: '9 kg',
-            工作频率: '2.4000-2.4835 GHz；5.725-5.850 GHz',
-            '发射功率（EIRP）':
-              '2.4000-2.4835 GHz：29.5 dBm（FCC）、18.5dBm（CE）、18.5 dBm（SRRC）、18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）、12.5dBm（CE）、28.5 dBm（SRRC）',
-            '悬停精度（P-GPS）':
-              '垂直：±0.1 m（视觉定位正常工作时）、±0.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）；水平：±0.3 m（视觉定位正常工作时）、±1.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）',
-            'RTK 位置精度':
-              '在 RTK FIX 时：1 cm+1 ppm（水平）、1.5 cm + 1 ppm（垂直）',
-            最大旋转角速度: '俯仰轴：300°/s、航向轴：100°/s',
-            最大俯仰角度: '30° （P模式且前视视觉系统启用：25°）',
-            最大上升速度: 'S 模式：6 m/s、P 模式：5 m/s',
-            '最大下降速度（垂直）': 'S 模式：5 m/s、P 模式：4 m/s',
-            最大倾斜下降速度: 'S 模式：7 m/s',
-            最大水平飞行速度: 'S 模式：23 m/s、P 模式：17 m/s',
-            最大飞行海拔高度:
-              '5000 m（2110 桨叶，起飞重量≤7 kg）/ 7000 m（2195 高原静音桨叶，起飞重量≤7 kg）',
-            最大可承受风速: '15m/s（起飞及降落阶段为12m/s）',
-            最大飞行时间: '55 min',
-            '适配 DJI 云台':
-              '禅思 XT2、禅思 XT S、禅思 Z30、禅思 H20、禅思 H20T、DJI P1、DJI L1',
-            支持云台安装方式:
-              '下置单云台、上置单云台、下置双云台、下置单云台+上置单云台、下置双云台+上置单云台',
-            'IP 防护等级': 'IP45',
-            GNSS: 'GPS+GLONASS+BeiDou+Galileo',
-            工作环境温度: '-20°C 至 50°C',
-          },
-        },
-        {
-          name: '遥控器',
-          attribute: {
-            工作频率: '2.4000-2.4835 GHz、5.725-5.850 GHz',
-            '最大信号有效距离（无干扰、无遮挡）':
-              'NCC/FCC：15 km、CE/MIC：8 km、SRRC：8 km',
-            '等效全向辐射功率（EIRP）':
-              '2.4000-2.4835 GHz：29.5 dBm（FCC）；18.5dBm（CE）、18.5 dBm（SRRC）；18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）；12.5dBm（CE）、20.5 dBm（SRRC）',
-            外置电池:
-              '名称：WB37 智能电池；容量：4920 mAh；电压：7.6 V；电池类型：LiPo；能量：37.39 Wh；充电时间（使用 BS60 智能电池箱）：70 分钟（15°C 至 45°C）；130 分钟（0°C 至 15°C）',
-            内置电池:
-              '类型：18650 锂离子电池 （5000 mAh @ 7.2 V）；充电方式：使用规格为 12V/2A 的 USB 充电器；额定功率：17 W；充电时间：2 小时 15 分钟（使用规格为12V/2A 的 USB 充电器）',
-            续航时间: '内置电池：约 2.5 小时内置电池+外置电池：约 4.5 小时',
-            'USB-A 接口供电电压/电流': '5 V / 1.5 A',
-            工作环境温度: '-20° 至 40° C',
-          },
-        },
-        {
-          name: '视觉系统',
-          attribute: {
-            障碍物感知范围: '前后左右：0.7-40 m、上下：0.6-30 m',
-            FOV: '前后下：65°（H），50°（V）、左右上：75°（H），60°（V）',
-            使用环境:
-              '表面有丰富纹理，光照条件充足（>15 lux，室内日光灯正常照射环境）',
-          },
-        },
-        {
-          name: '红外感知系统',
-          attribute: {
-            障碍物感知范围: '0.1-8 m',
-            FOV: '30°（±15°）',
-            使用环境: '漫反射，大尺寸，高反射率（反射率>10%）障碍物',
-          },
-        },
-        {
-          name: '上下补光灯',
-          attribute: {
-            有效照明距离: '5 m',
-          },
-        },
-        {
-          name: 'FPV摄像头',
-          attribute: {
-            分辨率: '960p',
-            FOV: '145°',
-            帧率: '30 fps',
-          },
-        },
-        {
-          name: '智能飞行电池',
-          attribute: {
-            型号: 'TB60',
-            容量: '5935 mAh',
-            电压: '52.8 V',
-            电池类型: 'LiPo 12S',
-            能量: '274 Wh',
-            电池整体重量: '约 1.35 kg',
-            工作环境温度: '-20℃ 至 50℃',
-            理想存放环境温度: '22℃ 至 30℃',
-            充电环境温度:
-              '-20°C 至 40°C（当环境温度低于 5°C时，电池会启动自加热功能，在低温环境下充电有可能会降低电池使用寿命）',
-            充电时间:
-              '使用 BS60 智能电池箱时，使用 220 V 电源：完全充满两块 TB60 智能飞行电池约需 60 分钟，从 20% 充到 90% 约需 30 分钟；使用 110 V 电源：完全充满两块 TB60 智能飞行电池约需 70 分钟，从 20% 充到 90% 约需 40 分钟',
-          },
-        },
-        {
-          name: 'BS60智能电池箱',
-          attribute: {
-            外形尺寸: '501×403×252 mm',
-            空箱重量: '8.37 kg',
-            可放置物品: 'TB60 智能飞行电池 8 块、WB37 智能电池 4 块',
-            输入电压: '100-120 VAC，50-60 Hz / 220-240 VAC，50-60 Hz',
-            最大输入功率: '1070 W',
-            输出功率: '100-120 V：750 W、220-240 V：992 W',
-            工作环境温度: '-20℃ 至 40℃',
-          },
-        },
-      ],
-    },
-  ]
-  uavAndIndividualSoldier.individualSoldier = [
-    {
-      name: 'T950天通-1',
-      type: '单兵设备',
-      details: {
-        基本信息: {
-          外观设计: '172X81X15.7(不含天线)，336g',
-          操作系统: 'Android P',
-          CPU: '展锐 Makalu T7510;虎贲T710+春藤IVY510',
-          存储: '标配:6GB ROM +128G RAM',
-          显示屏: '6.52吋水滴屏;HD+，1600*720(20:9)',
-          后置摄像头:
-            '后置为4800万主摄+200万微距+200万红外三摄组合，支持闪光灯',
-          前置摄像头: '1600万',
-          传感器相关:
-            '指纹|光线传感器|距离传感器|加速度传感器|地磁传感器|陀螺仪|气压传感器',
-          WLAN: '802.11a/b/g/n/AC 支持MIMO',
-          电池: '6000mAh@3.8V，内置不可拆卸，支持18W快充',
-          工作时间: '待机时长180h，卫星通话时长16h',
-        },
-        制式频段: {
-          卫星频段: '天通一号卫星',
-          频段: '2G:GSM 850/900/1800/1900;3G:WCDMA850/900/1900/2100;4G:TD-LTE B38/39/40/41;4G:FDD-LTE B1/3/5/7/8;5G: N1，N28，N41, N78，N79',
-          双卡: '双nano卡(卫星卡+运营商全网通卡)',
-          CA: 'B1+B3 下行 2CA(电信);B40/41带内上下行 2CA',
-          VOLTE: '支持',
-        },
-        IO接口: {
-          USB接口类型: 'TYPE-C USB3.0，支持OTG功能',
-          耳机接口: '3.5mm，美标',
-          存储卡: '支持TF卡扩展',
-        },
-        其它功能: {
-          蓝牙: 'V5.0',
-          定位: 'GPS、北斗混合定位、单北斗模式',
-          NFC: '支持',
-          充电方式: '三种充电方式(线充、座充、磁吸充电)',
-          按键: '开机键、音量+/-、 SOS(侧面)、PTT按键',
-        },
-        环境适应性: {
-          工作温度: '-20°~ 60°',
-          存储温度: '-40°~ 80°',
-          高温高湿: '(95±3)%(≧40°)，24小时',
-          防护等级: 'IP68',
-        },
-      },
-    },
-    {
-      name: 'T950天通-2',
-      type: '单兵设备',
-      details: {
-        基本信息: {
-          外观设计: '172X81X15.7(不含天线)，336g',
-          操作系统: 'Android P',
-          CPU: '展锐 Makalu T7510;虎贲T710+春藤IVY510',
-          存储: '标配:6GB ROM +128G RAM',
-          显示屏: '6.52吋水滴屏;HD+，1600*720(20:9)',
-          后置摄像头:
-            '后置为4800万主摄+200万微距+200万红外三摄组合，支持闪光灯',
-          前置摄像头: '1600万',
-          传感器相关:
-            '指纹|光线传感器|距离传感器|加速度传感器|地磁传感器|陀螺仪|气压传感器',
-          WLAN: '802.11a/b/g/n/AC 支持MIMO',
-          电池: '6000mAh@3.8V，内置不可拆卸，支持18W快充',
-          工作时间: '待机时长180h，卫星通话时长16h',
-        },
-        制式频段: {
-          卫星频段: '天通一号卫星',
-          频段: '2G:GSM 850/900/1800/1900;3G:WCDMA850/900/1900/2100;4G:TD-LTE B38/39/40/41;4G:FDD-LTE B1/3/5/7/8;5G: N1，N28，N41, N78，N79',
-          双卡: '双nano卡(卫星卡+运营商全网通卡)',
-          CA: 'B1+B3 下行 2CA(电信);B40/41带内上下行 2CA',
-          VOLTE: '支持',
-        },
-        IO接口: {
-          USB接口类型: 'TYPE-C USB3.0，支持OTG功能',
-          耳机接口: '3.5mm，美标',
-          存储卡: '支持TF卡扩展',
-        },
-        其它功能: {
-          蓝牙: 'V5.0',
-          定位: 'GPS、北斗混合定位、单北斗模式',
-          NFC: '支持',
-          充电方式: '三种充电方式(线充、座充、磁吸充电)',
-          按键: '开机键、音量+/-、 SOS(侧面)、PTT按键',
-        },
-        环境适应性: {
-          工作温度: '-20°~ 60°',
-          存储温度: '-40°~ 80°',
-          高温高湿: '(95±3)%(≧40°)，24小时',
-          防护等级: 'IP68',
-        },
-      },
-    },
-  ]
-  navListManagement.navList = [
-    { name: '共享门户', key: 'home' },
-    { name: '能力集市', key: 'DetailsPageconetent' },
-    { name: '能力云图', key: 'capabilityCloud' },
-    { name: '能力统计', key: 'abilityStatistics' },
-    // { name: '开发指南', key: 'developmentGuide' },
-    { name: '需求中心', key: 'demandCenter' },
-    // { name: '个人中心', key: 'personalCenter' },
-    // { name: '区市站点', key: 'mapTest' },
-    // { name: '后台管理', key: 'houtaiguanli' },
-    { name: '赋能案例', key: 'assignCase' },
-  ]
-  footerDataList.footerList = {
-    company: {
-      left: '青岛西海岸新区大数据发展促进局建设',
-      // eslint-disable-next-line no-undef
-      right: CONFIGITEM.vNum,
-    },
-    address: [
-      {
-        name: '鲁IC备00000000号',
-        value: '政府标识码3702000106',
-      },
-      {
-        name: '版权所有：青岛西海岸新区大数据发展促进局',
-        value: '地址：青岛市西海岸新区长江中路369号',
-      },
-      {
-        name: '电话：0532-86986596',
-        value: '传真：0532-86986596',
-      },
-    ],
-  }
-  xhaHasPermissionUser.list = [
-    'xihaian01',
-    'xihaian02',
-    'xihaian03',
-    'xihaian04',
-    'admin',
-  ]
-}
+        address: [{
+                name: '鲁IC备00000000号',
+                value: '政府标识码3702000106',
+            },
+            {
+                name: '版权所有：青岛西海岸新区大数据发展促进局',
+                value: '地址：青岛市西海岸新区长江中路369号',
+            },
+            {
+                name: '电话：0532-86986596',
+                value: '传真：0532-86986596',
+            },
+        ],
+    }
+    xhaHasPermissionUser.list = [
+        'xihaian01',
+        'xihaian02',
+        'xihaian03',
+        'xihaian04',
+        'admin',
+    ]
+}
\ No newline at end of file
diff --git a/front/src/views/home/algorithmCompare.vue b/front/src/views/home/algorithmCompare.vue
index 6b155b17..5ab4b261 100644
--- a/front/src/views/home/algorithmCompare.vue
+++ b/front/src/views/home/algorithmCompare.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="bg">
-    <home-header></home-header>
+    <home-header :target-flag = "targetFlag"></home-header>
     <div class="box-container">
       <a-spin
         size="large"
@@ -10,7 +10,7 @@
       />
       <div class="nav-box">
         <a-breadcrumb>
-          <a-breadcrumb-item>能力集市</a-breadcrumb-item>
+          <a-breadcrumb-item @click="goToDetailsPageconetent" class="bread-crumb-span">能力集市</a-breadcrumb-item>
           <a-breadcrumb-item>算法对比</a-breadcrumb-item>
         </a-breadcrumb>
       </div>
@@ -194,11 +194,11 @@
   import { selectOne } from '@/api/home'
   import { message, Tooltip, Table, Spin } from 'ant-design-vue'
   import { useRouter } from 'vue-router'
-
+  import mybus from '@/myplugins/mybus'
   const router = useRouter()
   let queryId = router.currentRoute.value.query.id
   const ctx = getCurrentInstance()
-
+  const targetFlag= ref(true)
   // 最大4列
   const pagination = ref([])
   // 表格列名
@@ -653,6 +653,14 @@
     let _obj = Object.assign({}, obj, _newObj)
     return _obj
   }
+
+  //点击头部面包屑进入对应的页面goToDetailsPageconetent
+  const goToDetailsPageconetent = () => {
+    let pathData =  {
+          path: '/DetailsPageconetent',
+        };
+     mybus.emit('changeMenuStyle',pathData);
+  }
 </script>
 
 <style>
@@ -719,6 +727,9 @@
       align-items: center;
       background: rgba(244, 245, 248, 0.8);
       padding-left: 10px;
+      .bread-crumb-span{
+         cursor: pointer;
+      }
     }
 
     .left {
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index bac92f97..bd363784 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -17,9 +17,9 @@
     <div
       v-for="item in navList"
       :key="item.key"
-      @click="jumpPage(item)"
+      @click="jumpPage(item,'headerClick')"
       class="nav"
-      :class="item.key == select ? 'select' : ''"
+      :class="[{'select':item.key == select},{'select-inner':(item.key == 'DetailsPageconetent' && item.innerKey == 'algorithmCompare'&& props.targetFlag)}]"
     >
       {{ item.name }}
     </div>
@@ -90,14 +90,14 @@
         </template>
         <span
           class="name"
-          @click="jumpPage({ name: '个人中心', key: 'personalCenter' })"
+          @click="jumpPage({ name: '个人中心', key: 'personalCenter' },'headerClick')"
         >
           {{ user.realName }}
         </span>
       </a-tooltip>
       <span @click="logout" class="out">退出</span>
       <i
-        @click="jumpPage({ name: '后台管理', key: 'houtaiguanli' })"
+        @click="jumpPage({ name: '后台管理', key: 'houtaiguanli' },'headerClick')"
         class="iconTo"
         v-show="backFlag"
       ></i>
@@ -135,6 +135,7 @@
   const mynoticeFlag = ref(false)
   const mynoticeData = ref([])
   const navList = ref(navListManagement.navList)
+  const targetRouter= ref('')
   const backFlag = ref(false)
   getUserInfo().then((res) => {
     if(res.data.data.superAdmin =='1'){
@@ -153,6 +154,7 @@
 
   const props = defineProps({
     showView: { type: String, default: '' },
+    targetFlag: { type: Boolean, default: false },
   })
 
   // 退出登录
@@ -185,8 +187,9 @@
     window.open('http://15.72.177.175:18460/analystrunner/tonglan', '_blank')
   }
   // 跳转页面
-  const jumpPage = (item) => {
-    // 西海岸
+  const jumpPage = (item,type) => {
+    if(type == 'headerClick'){
+       // 西海岸
     if (itShowXiHaiAn.value) {
       let _arr = ['共享门户', '能力云图', '能力统计', '需求中心', '赋能案例']
       if (
@@ -271,6 +274,84 @@
         router.push('/home')
         break
     }
+    }else if(type == 'innerClick'){
+    //select.value = item.key
+    switch (item.name) {
+      case '个人中心':
+        window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
+        router.push({
+          path: '/personalCenter',
+        })
+        break
+      case '能力统计':
+        router.push({
+          path: '/abilityStatistics',
+        })
+        break
+      case '能力集市':
+         router.push({
+           path: '/algorithmCompare',
+           query: {
+             id: targetRouter.value.id,
+           },
+         });
+        break
+      case '能力云图':
+        router.push({
+          path: '/capabilityCloud',
+        })
+        break
+      // case '技术文档':
+      //   router.push({
+      //     path: '/developmentGuide',
+      //   })
+      //   break
+      case '新手指南':
+        router.push({
+          path: '/instructionManual',
+        })
+        break
+      case '需求中心':
+        router.push({
+          path: '/demandCenter',
+        })
+        break
+      case '区市站点':
+        router.push({
+          path: '/mapTest',
+        })
+        break
+      case '后台管理':
+        Cookies.remove('JSESSIONID')
+        window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
+        // window.reload('http://15.2.21.238:9797')
+        break
+      case '赋能案例':
+        router.push({
+          path: '/assignCase',
+        })
+        break
+      case '典型赋能案例':
+        router.push({
+          path: '/assignCase',
+        })
+        break
+      case '融合服务':
+        router.push({
+          path: '/integrationServices',
+        })
+        break
+      case 'CIM专区':
+        router.push({
+          path: '/cimSpecialArea',
+        })
+        break
+      default:
+        router.push('/home')
+        break
+    }
+    
+    }
   }
   const scrollTop = ref(0)
   window.onscroll = function () {
@@ -348,6 +429,20 @@
     mybus.on('getMynotice', () => {
       getMynotice()
     })
+
+    mybus.on('changeMenuStyle', (data) => {
+      if(data.path=='/algorithmCompare'){
+        targetRouter.value = data;
+        jumpPage({
+        "name": "能力集市",
+        "key": "DetailsPageconetent",
+        "innerKey":"algorithmCompare"
+       },'innerClick');
+      } else if(data.path =='/DetailsPageconetent'){
+        jumpPage({ name: '能力集市', key: 'DetailsPageconetent' },'headerClick')
+      }
+    })
+
   })
   onBeforeUnmount(() => {
     mybus.off('getSgcNum')
@@ -433,6 +528,10 @@
     .select {
       background: #0058e1;
       color: #fff !important;
+    }
+      .select-inner {
+      background: #0058e1;
+      color: #fff !important;
     }
     .info1 {
       margin-left: 0.1rem;
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 1fc314bb..08ce0a0e 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -805,12 +805,18 @@
       }
       // 算法对比跳转
       const goComparePk = (item) => {
-        router.push({
+        // router.push({
+        //   path: '/algorithmCompare',
+        //   query: {
+        //     id: item.id,
+        //   },
+        // });
+        //修改顶部菜单的样式
+        let pathData = {
           path: '/algorithmCompare',
-          query: {
-            id: item.id,
-          },
-        })
+          id: item.id,
+        };
+         mybus.emit('changeMenuStyle',pathData);
       }
       return {
         onSearch,

From 65894066b5f829c047c1be0f1fa3f42d12e595fe Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Wed, 16 Nov 2022 16:25:56 +0800
Subject: [PATCH 12/25] =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/App.vue            | 176 +++++++++++++++++++++++++----------
 front/src/utils/waterMark.js |  69 ++++++++++++++
 2 files changed, 198 insertions(+), 47 deletions(-)
 create mode 100644 front/src/utils/waterMark.js

diff --git a/front/src/App.vue b/front/src/App.vue
index 82c2265f..4926fa93 100644
--- a/front/src/App.vue
+++ b/front/src/App.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.wuhongjian
  * @Date: 2022-05-06 11:12:00
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-03 10:13:59
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-16 10:21:49
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -13,56 +13,138 @@
   </div>
 </template>
 <script setup>
-import zhCN from 'ant-design-vue/es/locale/zh_CN'
-import Cookies from 'js-cookie'
-import { onBeforeUnmount } from 'vue'
-import { useRouter } from 'vue-router'
-import mybus from '@/myplugins/mybus'
-const router = useRouter()
+  import onWholeWaterMark from '@/utils/waterMark'
+  import * as moment from 'moment'
+  import { getUser } from '@/api/home'
+  import { getCategoryTreePage } from '@/api/personalCenter'
+  import zhCN from 'ant-design-vue/es/locale/zh_CN'
+  import Cookies from 'js-cookie'
+  import { onBeforeUnmount, onMounted, watch, nextTick } from 'vue'
+  import { useRouter } from 'vue-router'
+  import mybus from '@/myplugins/mybus'
+  const router = useRouter()
 
-const locale = zhCN
-const token = Cookies.get('ucsToken')
-console.log('token=================>', token)
-let ws = new WebSocket(
-  `ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
-)
-// ws.send()给服务器发送信息
-// 服务器每次返回信息都会执行一次onmessage方法
-ws.onmessage = function (e) {
-  console.log('WebSocket服务器返回的信息: ' + e.data)
-  mybus.emit('getMynotice')
-  // 判断当前路由是否是消息中心
-  if (router.currentRoute.value.name === 'mynoticeView') {
-    mybus.emit('noticeListInit')
-  }
-}
-ws.onerror = function (e) {
-  console.log('WebSocket连接异常============================>', e)
-  ws = new WebSocket(
+  const locale = zhCN
+  const token = Cookies.get('ucsToken')
+  console.log('token=================>', token)
+  let ws = new WebSocket(
     `ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
   )
-}
-ws.onclose = function (e) {
-  console.log('WebSocket连接断开============================>', e)
-}
-onBeforeUnmount(() => {
-  // 4.卸载前, 关闭链接
-  ws.close()
-})
+  // ws.send()给服务器发送信息
+  // 服务器每次返回信息都会执行一次onmessage方法
+  ws.onmessage = function (e) {
+    console.log('WebSocket服务器返回的信息: ' + e.data)
+    mybus.emit('getMynotice')
+    // 判断当前路由是否是消息中心
+    if (router.currentRoute.value.name === 'mynoticeView') {
+      mybus.emit('noticeListInit')
+    }
+  }
+  ws.onerror = function (e) {
+    console.log('WebSocket连接异常============================>', e)
+    ws = new WebSocket(
+      `ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
+    )
+  }
+  ws.onclose = function (e) {
+    console.log('WebSocket连接断开============================>', e)
+  }
+  let realName = '默认水印'
+  const arr = []
+  const changeWaterMark = (newValue) => {
+    console.log('监听', newValue, arr)
+    if (document.getElementById(realName.charCodeAt())) {
+      if (arr.indexOf(newValue) > -1) {
+        document.getElementById(realName.charCodeAt()).style.opacity = 1
+        document.getElementById(
+          moment().format('YYYY-MM-DD').charCodeAt()
+        ).style.opacity = 1
+      } else {
+        document.getElementById(realName.charCodeAt()).style.opacity = 0
+        document.getElementById(
+          moment().format('YYYY-MM-DD').charCodeAt()
+        ).style.opacity = 0
+      }
+    } else if (document.getElementById('默认水印'.charCodeAt())) {
+      if (arr.indexOf(newValue) > -1) {
+        document.getElementById('默认水印'.charCodeAt()).style.opacity = 1
+        document.getElementById(
+          moment().format('YYYY-MM-DD').charCodeAt()
+        ).style.opacity = 1
+      } else {
+        document.getElementById('默认水印'.charCodeAt()).style.opacity = 0
+        document.getElementById(
+          moment().format('YYYY-MM-DD').charCodeAt()
+        ).style.opacity = 0
+      }
+    }
+  }
+  const waterMarkInit = (newValue) => {
+    getUser().then((res) => {
+      if (res.data.code == 0) {
+        realName = res.data.data.realName
+      }
+      onWholeWaterMark(
+        [realName, moment().format('YYYY-MM-DD')],
+        600,
+        300,
+        30,
+        50
+      )
+      getCategoryTreePage({
+        page: 1,
+        limit: 999,
+        dictTypeId: '1592357067014803457',
+      }).then((res) => {
+        arr.length = 0
+        res.data.data.list.map((val) => {
+          arr.push(val.dictValue)
+        })
+        if (newValue) {
+          changeWaterMark(newValue)
+        }
+      })
+    })
+  }
+  watch(
+    () => router.currentRoute.value.path,
+    (newValue, oldValue) => {
+      console.log(
+        '路由变化',
+        newValue,
+        oldValue,
+        realName,
+        realName.charCodeAt()
+      )
+      // 如果刚登陆  初始化水印
+      if (oldValue == '/login' || oldValue == '/') {
+        waterMarkInit(newValue)
+      }
+      changeWaterMark(newValue)
+    },
+    { immediate: true }
+  )
+  onMounted(() => {
+    waterMarkInit()
+  })
+  onBeforeUnmount(() => {
+    // 4.卸载前, 关闭链接
+    ws.close()
+  })
 </script>
 <style lang="less">
-@import '~@/vab/styles/vab.less';
+  @import '~@/vab/styles/vab.less';
 
-#vue-admin-beautiful {
-  max-width: 1920px;
-  // max-height: 1080px;
-  margin: auto;
-  height: 100%;
-  position: relative;
-  background-color: #fff;
-}
+  #vue-admin-beautiful {
+    max-width: 1920px;
+    // max-height: 1080px;
+    margin: auto;
+    height: 100%;
+    position: relative;
+    background-color: #fff;
+  }
 
-body {
-  font-size: 0.14rem;
-}
+  body {
+    font-size: 0.14rem;
+  }
 </style>
diff --git a/front/src/utils/waterMark.js b/front/src/utils/waterMark.js
new file mode 100644
index 00000000..edc0c21e
--- /dev/null
+++ b/front/src/utils/waterMark.js
@@ -0,0 +1,69 @@
+/*
+ * @Author: Light
+ * @Date: 2022-11-14 15:01:54
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-16 09:57:28
+ * @Description: 水印
+ */
+const watermark = {
+  timer: null,
+  set: () => {},
+}
+const setWatermark = (str, width, height, size, top, index) => {
+  console.log('生成水印')
+  const id = str.charCodeAt()
+  if (document.getElementById(id) !== null) {
+    document.body.removeChild(document.getElementById(id))
+  }
+  const can = document.createElement('canvas')
+  can.width = width
+  can.height = height
+
+  const cans = can.getContext('2d')
+  cans.rotate((-20 * Math.PI) / 180)
+  cans.font = size + 'px Microsoft YaHei'
+  cans.fillStyle = 'rgba(200, 200, 200, 0.4)'
+  cans.textAlign = 'left'
+  cans.textBaseline = 'middle'
+  cans.fillText(str, can.width / 3, can.height / 2)
+
+  const WATER_MARK = document.createElement('div')
+  const ALL_WIDTH = document.documentElement.clientWidth + 'px'
+  const ALL_HEIGHT = document.documentElement.clientHeight + 'px'
+
+  WATER_MARK.id = id
+  WATER_MARK.style.cssText = `
+    position: fixed;
+    top: ${index * top}px;
+    left: 0;
+    zIndex: 99999999;
+    pointer-events: none;
+    width: ${ALL_WIDTH};
+    height: ${ALL_HEIGHT};
+    background: url(${can.toDataURL('image/png')}) left top repeat;
+    opacity: 0;
+  `
+  document.body.appendChild(WATER_MARK)
+  return id
+}
+
+// 该方法只允许调用一次
+watermark.set = (str, width, height, size, top, index) => {
+  let id = setWatermark(str, width, height, size, top, index)
+  watermark.timer && clearTimeout(watermark.timer)
+  watermark.timer = setTimeout(() => {
+    if (document.getElementById(id) === null) {
+      id = setWatermark(str, width, height, size, top, index)
+    }
+  }, 300)
+  window.onresize = () => {
+    setWatermark(str, width, height, size, top, index)
+  }
+}
+
+const onWholeWaterMark = (arr, width, height, size, top) => {
+  arr.map((str, index) => {
+    watermark.set(str, width, height, size, top, index)
+  })
+}
+export default onWholeWaterMark

From f8bb9c9223edceaabad18f656a44fd827fec560f Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 17 Nov 2022 10:15:29 +0800
Subject: [PATCH 13/25] =?UTF-8?q?=E7=BC=96=E7=9B=AE=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=20=20=20=E7=BB=84=E4=BB=B6=E6=9C=8D=E5=8A=A1=20=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E8=B5=84=E6=BA=90=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modules/ability/bsabilityai.vue |  4 ++--
 .../modules/ability/bsabilityservice.vue      |  4 ++--
 .../views/capacityOnTheShelf/Algorithm.vue    | 14 ++++++-------
 .../views/capacityOnTheShelf/Application.vue  | 14 ++++++-------
 .../capacityOnTheShelf/BusinessComponent.vue  | 20 +++++++++----------
 .../DevelopmentComponents.vue                 | 12 +++++------
 .../capacityOnTheShelf/LayerServices.vue      | 12 +++++------
 7 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index bba3d0ea..6537a62f 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -636,7 +636,7 @@ export default {
       this.showPutOnTheShelfFlag = true
       this.$http.get('/category/getCategoryTree').then((res) => {
         this.insertList = res.data.data.filter(
-          (item) => item.name === '组件服务一'
+          (item) => item.name === '组件服务'
         )[0]
       })
     },
@@ -887,7 +887,7 @@ export default {
     UpdateData (item) {
       this.$http.get('/category/getCategoryTree').then((res) => {
         this.insertList = res.data.data.filter(
-          (item) => item.name === '组件服务一'
+          (item) => item.name === '组件服务'
         )[0]
         this.radio = item.infoList.filter(
           (val) => val.attrType === '组件类型'
diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index 32c17f0f..5a67302b 100644
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@@ -577,7 +577,7 @@ export default {
     showPutOnTheShelf () {
       this.showPutOnTheShelfFlag2 = true
       this.$http.get('/category/getCategoryTree').then(res => {
-        this.insertList = res.data.data.filter(item => item.name === '应用资源一')[0]
+        this.insertList = res.data.data.filter(item => item.name === '应用资源')[0]
         this.putOnTheShelfList = this.insertList.children
       })
     },
@@ -747,7 +747,7 @@ export default {
     // 新修改
     UpdateData (item) {
       this.$http.get('/category/getCategoryTree').then(res => {
-        this.insertList = res.data.data.filter(item => item.name === '应用资源一')[0]
+        this.insertList = res.data.data.filter(item => item.name === '应用资源')[0]
         this.radio = '应用资源'
         // this.radio = item.infoList.filter(val => val.attrType === '应用资源')[0].attrValue
         this.putOnTheShelfList = this.insertList.children
diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue
index 1dc59bbb..128e67b0 100644
--- a/front/src/views/capacityOnTheShelf/Algorithm.vue
+++ b/front/src/views/capacityOnTheShelf/Algorithm.vue
@@ -81,10 +81,10 @@
         :required="required"
         :notFilled="notFilled"
       ></put-on-the-shelf>
-   
+
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
-     
+
       <a-popconfirm
         v-if="
           showView == '算法优势' &&
@@ -592,7 +592,7 @@ const init = () => {
   getCategoryTree().then((res) => {
     // console.clear()
     res.data.data = res.data.data
-      .filter((item) => item.name === '组件服务一')[0]
+      .filter((item) => item.name === '组件服务')[0]
       .children.filter((item) => item.name === '智能算法')[0]
     navList.value = []
     navList2.value = []
@@ -974,7 +974,7 @@ onBeforeUnmount(() => {
     }
     // .quxiao:hover{
     //   background: #0058e1;
-    //   color:#ffffff;   
+    //   color:#ffffff;
     // }
     .buzhou{
       margin-right:12px;
@@ -986,11 +986,11 @@ onBeforeUnmount(() => {
       border-radius: 2px;
       border: 1px #0058e1 solid;
   }
-  // .buzhou:hover{  
+  // .buzhou:hover{
   //     background: #ffffff;
-  //     color:#0058e1;  
+  //     color:#0058e1;
   // }
-    
+
   }
   .first {
     justify-content: center;
diff --git a/front/src/views/capacityOnTheShelf/Application.vue b/front/src/views/capacityOnTheShelf/Application.vue
index 4d13325a..ac710a6c 100644
--- a/front/src/views/capacityOnTheShelf/Application.vue
+++ b/front/src/views/capacityOnTheShelf/Application.vue
@@ -103,7 +103,7 @@
       ></application-deployment-use> -->
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
-     
+
 
       <a-popconfirm
         v-if="
@@ -378,7 +378,7 @@
     // ) {
     //   notFilled.value.push('共享条件')
     // }
-   
+
     if (notFilled.value.length > 0) {
       message.warning('请填写必填字段')
       console.log(notFilled.value)
@@ -480,7 +480,7 @@
     getCategoryTree().then((res) => {
       // console.clear()
       res.data.data = res.data.data.filter(
-        (item) => item.name === '应用资源一'
+        (item) => item.name === '应用资源'
       )[0]
       navList.value = []
       navList2.value = []
@@ -873,7 +873,7 @@
     }
     // .quxiao:hover{
     //   background: #0058e1;
-    //   color:#ffffff;   
+    //   color:#ffffff;
     // }
     .buzhou{
       margin-right:12px;
@@ -885,11 +885,11 @@
       border-radius: 2px;
       border: 1px #0058e1 solid;
   }
-  // .buzhou:hover{  
+  // .buzhou:hover{
   //     background: #ffffff;
-  //     color:#0058e1;  
+  //     color:#0058e1;
   // }
-    
+
   }
   .first {
     justify-content: center;
diff --git a/front/src/views/capacityOnTheShelf/BusinessComponent.vue b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
index 118ff20b..ec6acddc 100644
--- a/front/src/views/capacityOnTheShelf/BusinessComponent.vue
+++ b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
@@ -82,7 +82,7 @@
       ></put-on-the-shelf>
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
-    
+
       <a-popconfirm
         v-if="
           showView == '功能介绍' &&
@@ -99,7 +99,7 @@
         <button  class="buzhou" >上一步</button>
       </a-popconfirm>
       <button
-      class="buzhou" 
+      class="buzhou"
         v-else-if="
           showView == '功能介绍' &&
           gnjs[0].list.filter((val) => val.note1 !== '').length ==
@@ -125,7 +125,7 @@
         <button  class="buzhou" >上一步</button>
       </a-popconfirm>
       <button
-      class="buzhou" 
+      class="buzhou"
         v-else-if="
           showView == '应用场景' &&
           yycj[0].list.filter((val) => val.note1 !== '').length ==
@@ -171,7 +171,7 @@
         <button  class="buzhou"  >下一步</button>
       </a-popconfirm>
       <button
-      class="buzhou" 
+      class="buzhou"
         v-else-if="
           showView == '功能介绍' &&
           gnjs[0].list.filter((val) => val.note1 !== '').length ==
@@ -197,7 +197,7 @@
         <button  class="buzhou" >下一步</button>
       </a-popconfirm>
       <button
-      class="buzhou" 
+      class="buzhou"
         v-else-if="
           showView == '应用场景' &&
           yycj[0].list.filter((val) => val.note1 !== '').length ==
@@ -579,7 +579,7 @@
     getCategoryTree().then((res) => {
       // console.clear()
       res.data.data = res.data.data
-        .filter((item) => item.name === '组件服务一')[0]
+        .filter((item) => item.name === '组件服务')[0]
         .children.filter((item) => item.name === '业务组件')[0]
       navList.value = []
       navList2.value = []
@@ -964,7 +964,7 @@
     }
     // .quxiao:hover{
     //   background: #0058e1;
-    //   color:#ffffff;   
+    //   color:#ffffff;
     // }
     .buzhou{
       margin-right:12px;
@@ -976,11 +976,11 @@
       border-radius: 2px;
       border: 1px #0058e1 solid;
   }
-  // .buzhou:hover{  
+  // .buzhou:hover{
   //     background: #ffffff;
-  //     color:#0058e1;  
+  //     color:#0058e1;
   // }
-    
+
   }
   .first {
     justify-content: center;
diff --git a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
index bf3a3ef8..20929efe 100644
--- a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
+++ b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
@@ -81,7 +81,7 @@
       ></put-on-the-shelf>
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
-    
+
       <a-popconfirm
         v-if="
           showView == '功能介绍' &&
@@ -577,7 +577,7 @@
     getCategoryTree().then((res) => {
       // console.clear()
       res.data.data = res.data.data
-        .filter((item) => item.name === '组件服务一')[0]
+        .filter((item) => item.name === '组件服务')[0]
         .children.filter((item) => item.name === '开发组件')[0]
       navList.value = []
       navList2.value = []
@@ -961,7 +961,7 @@
     }
     // .quxiao:hover{
     //   background: #0058e1;
-    //   color:#ffffff;   
+    //   color:#ffffff;
     // }
     .buzhou{
       margin-right:12px;
@@ -973,11 +973,11 @@
       border-radius: 2px;
       border: 1px #0058e1 solid;
   }
-  // .buzhou:hover{  
+  // .buzhou:hover{
   //     background: #ffffff;
-  //     color:#0058e1;  
+  //     color:#0058e1;
   // }
-    
+
   }
   .first {
     justify-content: center;
diff --git a/front/src/views/capacityOnTheShelf/LayerServices.vue b/front/src/views/capacityOnTheShelf/LayerServices.vue
index faab70cb..f0ba0d1c 100644
--- a/front/src/views/capacityOnTheShelf/LayerServices.vue
+++ b/front/src/views/capacityOnTheShelf/LayerServices.vue
@@ -78,7 +78,7 @@
       ></put-on-the-shelf>
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
-    
+
       <a-popconfirm
         v-if="
           showView == '应用场景' &&
@@ -472,7 +472,7 @@
     getCategoryTree().then((res) => {
       // console.clear()
       res.data.data = res.data.data
-        .filter((item) => item.name === '组件服务一')[0]
+        .filter((item) => item.name === '组件服务')[0]
         .children.filter((item) => item.name === '图层服务')[0]
       navList.value = []
       navList2.value = []
@@ -829,7 +829,7 @@
     }
     // .quxiao:hover{
     //   background: #0058e1;
-    //   color:#ffffff;   
+    //   color:#ffffff;
     // }
     .buzhou{
       margin-right:12px;
@@ -841,11 +841,11 @@
       border-radius: 2px;
       border: 1px #0058e1 solid;
   }
-  // .buzhou:hover{  
+  // .buzhou:hover{
   //     background: #ffffff;
-  //     color:#0058e1;  
+  //     color:#0058e1;
   // }
-    
+
   }
   .first {
     justify-content: center;

From b5f18ecedc107c398873acac13216a9c9a5c5a42 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 17 Nov 2022 15:13:30 +0800
Subject: [PATCH 14/25] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=BB=9F=E8=AE=A1echar?=
 =?UTF-8?q?ts=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ResourceAggregation.vue        |  4 +--
 .../components/SharingSituation.vue           | 33 ++++++++++++-------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
index 3d9d4741..9e586c8d 100644
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@@ -240,8 +240,8 @@
       },
       legend: {
         icon: 'emptyCircle',
-        height: 3,
-        itemGap: 40,
+        itemGap: 20,
+        padding: 20,
         // orient: 'horizontal',
         bottom: 0,
         formatter: function (name) {
diff --git a/front/src/views/abilityStatistics/components/SharingSituation.vue b/front/src/views/abilityStatistics/components/SharingSituation.vue
index 9bc27605..3ec8b807 100644
--- a/front/src/views/abilityStatistics/components/SharingSituation.vue
+++ b/front/src/views/abilityStatistics/components/SharingSituation.vue
@@ -97,6 +97,12 @@
     let myChart = echarts.init(chartDom)
     let option
     option = {
+      grid: {
+        top: '10%',
+        right: '5%',
+        bottom: '10%',
+        left: '5%',
+      },
       xAxis: {
         type: 'category',
         data: datas.time,
@@ -255,16 +261,21 @@
   }
 
   .situation {
-    font-weight: 600;
-    font-style: normal;
-    font-size: 24px;
+    font-size: 30px;
+    color: #000;
     text-align: center;
-  }
-  .line {
-    width: 34px;
-    height: 3px;
-    background-color: #0058e1;
-    margin-top: 8px;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+    justify-content: center;
+    align-items: center;
+    margin-bottom: 26px;
+    .line {
+      width: 34px;
+      height: 3px;
+      background-color: #0058e1;
+      margin-top: 8px;
+    }
   }
 
   .SharingSituation {
@@ -321,8 +332,8 @@
 
     .Chart {
       flex: 1;
-      width: 598px;
-      height: 286px;
+      width: 638px;
+      height: 296px;
       background: #f7f7f7;
       text-align: center;
       margin: auto;

From 904c7cbbb55abc21a16a2157e56eb4950b130c7e Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 17 Nov 2022 15:35:00 +0800
Subject: [PATCH 15/25] =?UTF-8?q?UI=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/abilityStatistics/components/AbilityRanking.vue | 2 +-
 .../abilityStatistics/components/ResourceAggregation.vue      | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/front/src/views/abilityStatistics/components/AbilityRanking.vue b/front/src/views/abilityStatistics/components/AbilityRanking.vue
index 12197f78..2ae1a5ab 100644
--- a/front/src/views/abilityStatistics/components/AbilityRanking.vue
+++ b/front/src/views/abilityStatistics/components/AbilityRanking.vue
@@ -259,7 +259,7 @@
     padding-bottom: 0;
     .main {
       width: 100%;
-      margin-top: 10px;
+      margin-top: 60px;
       display: flex;
       flex-direction: column;
       align-items: center;
diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
index 9e586c8d..5673f65f 100644
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@@ -261,8 +261,7 @@
         {
           center: ['50%', '40%'],
           type: 'pie',
-          selectedMode: 'single',
-          silent: true,
+          // selectedMode: 'single',
           radius: ['50%', '30%'],
           color: ['#fe845e', '#6cc95a', '#02d1b0', '#1772ff', '#FAC858'],
           top: '0',
@@ -290,7 +289,6 @@
           type: 'pie',
           center: ['50%', '40%'],
           radius: ['58%', '50%'],
-          silent: true,
           itemStyle: {
             normal: {
               color: '#c2c7d6',

From 8d15818d1bfb12e74e880969174f4ad944fe4cdc Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Thu, 17 Nov 2022 15:35:42 +0800
Subject: [PATCH 16/25] =?UTF-8?q?=E6=96=B0=E6=89=8B=E6=8C=87=E5=8D=97?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BA=95=E9=83=A8=E8=93=9D=E8=89=B2=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/instructionManual/components/menuBook.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/front/src/views/instructionManual/components/menuBook.vue b/front/src/views/instructionManual/components/menuBook.vue
index d27eb5fe..679e466b 100644
--- a/front/src/views/instructionManual/components/menuBook.vue
+++ b/front/src/views/instructionManual/components/menuBook.vue
@@ -47,8 +47,8 @@
         </div>
       </div>
       <!-- 联系我们 -->
-      <div class="img-bg callus-box">
-        <!-- <div class="title" style="margin-bottom: 20px">
+      <!--<div class="img-bg callus-box">
+         <div class="title" style="margin-bottom: 20px">
           <div class="text text-white">联系我们</div>
           <div class="line line-white"></div>
         </div>
@@ -61,8 +61,8 @@
             手机号：
             <span>0530-0000000</span>
           </p>
-        </div> -->
-      </div>
+        </div>
+      </div> -->
       <!-- 能力上架弹窗 -->
       <a-modal
         v-model:visible="visible"

From 11994b61205cc092cf907a6ff68eb39de07c5008 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Thu, 17 Nov 2022 15:37:09 +0800
Subject: [PATCH 17/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/App.vue                              | 23 +++++++++++-
 .../modules/ability/IntegratedServices.vue    |  4 +-
 .../modules/ability/assignedScene/index.vue   |  4 +-
 .../src/views/modules/ability/bsabilityai.vue |  6 +--
 .../modules/ability/bsabilityservice.vue      |  8 ++--
 .../modules/ability/bsinfrastructure.vue      |  2 +-
 .../views/modules/abilityStatistics/index.vue | 37 +++++--------------
 .../modules/activiti/demo/correction.vue      |  2 +-
 back/src/views/modules/activiti/model.vue     |  2 +-
 .../modules/activiti/my-work-dynamics.vue     |  2 +-
 .../modules/activiti/process-initiation.vue   |  2 +-
 back/src/views/modules/activiti/process.vue   |  4 +-
 back/src/views/modules/activiti/running.vue   |  2 +-
 .../views/modules/algorithm/alarm-display.vue |  4 +-
 .../algorithm/algorithm-management.vue        |  8 ++--
 .../modules/algorithm/task-monitoring.vue     |  4 +-
 .../src/views/modules/canassigncase/index.vue |  8 ++--
 back/src/views/modules/demo/excel.vue         |  8 ++--
 back/src/views/modules/demo/news.vue          |  4 +-
 back/src/views/modules/demo/product.vue       |  4 +-
 back/src/views/modules/devtools/baseclass.vue |  4 +-
 .../src/views/modules/devtools/datasource.vue |  4 +-
 back/src/views/modules/devtools/fieldtype.vue |  4 +-
 back/src/views/modules/devtools/generator.vue |  4 +-
 back/src/views/modules/devtools/template.vue  |  6 +--
 back/src/views/modules/job/schedule.vue       | 11 +++---
 back/src/views/modules/message/mail-log.vue   |  4 +-
 .../modules/message/mail-template-send.vue    |  2 +-
 .../views/modules/message/mail-template.vue   |  4 +-
 back/src/views/modules/message/sms-log.vue    |  4 +-
 back/src/views/modules/message/sms-send.vue   |  2 +-
 back/src/views/modules/message/sms.vue        |  4 +-
 back/src/views/modules/notice/notice-user.vue |  2 +-
 back/src/views/modules/notice/notice.vue      |  4 +-
 back/src/views/modules/oss/oss.vue            |  2 +-
 .../src/views/modules/pay/alipaynotifylog.vue |  2 +-
 back/src/views/modules/pay/order.vue          |  2 +-
 back/src/views/modules/project/contribute.vue |  2 +-
 back/src/views/modules/project/list.vue       |  2 +-
 back/src/views/modules/project/use.vue        |  2 +-
 back/src/views/modules/sys/dict-type.vue      |  6 +--
 .../modules/sys/log-data-modification-log.vue |  4 +-
 back/src/views/modules/sys/log-error.vue      |  2 +-
 back/src/views/modules/sys/log-login.vue      |  4 +-
 back/src/views/modules/sys/log-operation.vue  |  4 +-
 back/src/views/modules/sys/online.vue         |  2 +-
 back/src/views/modules/sys/params.vue         |  4 +-
 back/src/views/modules/sys/post.vue           |  6 +--
 back/src/views/modules/sys/role.vue           |  2 +-
 back/src/views/modules/sys/user.vue           |  8 ++--
 back/src/views/modules/ureport/ureport.vue    |  4 +-
 .../views/newHome/components/WorkDynamics.vue |  3 +-
 52 files changed, 130 insertions(+), 128 deletions(-)

diff --git a/back/src/App.vue b/back/src/App.vue
index 67fb81e4..90b247b5 100644
--- a/back/src/App.vue
+++ b/back/src/App.vue
@@ -13,7 +13,28 @@
 
 <style>
   .el-table th.gutter{
-    display: table-cell!important;
+    display: table-cell !important;
+  }
+
+  .el-button {
+    vertical-align: middle !important;
+    align-items: center !important;
+    display: inline-flex !important;
+    height:32px !important;
+    line-height: 32px !important;
+    justify-content: center !important;
+    min-width: 80px !important;
+    border-radius:2px !important;  
+  }
+  .el-button--primary {
+    vertical-align: middle !important;
+    align-items: center !important;
+    display: inline-flex !important;
+    height:32px !important;
+    line-height: 32px !important;
+    justify-content: center !important;
+    min-width: 80px !important;
+    border-radius:2px !important;  
   }
 </style>
 <script>
diff --git a/back/src/views/modules/ability/IntegratedServices.vue b/back/src/views/modules/ability/IntegratedServices.vue
index ecbceb7b..4d062da9 100644
--- a/back/src/views/modules/ability/IntegratedServices.vue
+++ b/back/src/views/modules/ability/IntegratedServices.vue
@@ -6,7 +6,7 @@
           <el-input v-model="dataForm.name" placeholder="名称" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="searchData">{{
+          <el-button type="primary" @click="searchData">{{
               $t("query")
           }}</el-button>
         </el-form-item>
@@ -16,7 +16,7 @@
         </el-form-item>
 
         <el-form-item>
-          <el-button @click="reset">重置</el-button>
+          <el-button type="primary" @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
diff --git a/back/src/views/modules/ability/assignedScene/index.vue b/back/src/views/modules/ability/assignedScene/index.vue
index 4008f7e7..f5de944a 100644
--- a/back/src/views/modules/ability/assignedScene/index.vue
+++ b/back/src/views/modules/ability/assignedScene/index.vue
@@ -6,7 +6,7 @@
           <el-input v-model="dataForm.name" placeholder="名称" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="searchData">{{
+          <el-button type="primary" @click="searchData">{{
               $t("query")
           }}</el-button>
         </el-form-item>
@@ -16,7 +16,7 @@
         </el-form-item>
 
         <el-form-item>
-          <el-button @click="reset">重置</el-button>
+          <el-button type="primary" @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index bba3d0ea..9d157c36 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -15,7 +15,7 @@
           }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="info" @click="exportHandle()">{{
+          <el-button type="primary" @click="exportHandle()">{{
             $t('export')
           }}</el-button>
         </el-form-item>
@@ -35,13 +35,13 @@
         <el-form-item>
           <el-button
             v-if="$hasPermission('ability:bsabilityai:delete')"
-            type="danger"
+            type="primary"
             @click="deleteHandle2()"
             >{{ $t('deleteBatch') }}</el-button
           >
         </el-form-item>
         <el-form-item>
-          <el-button @click="reset">重置</el-button>
+          <el-button  type="primary" @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
       <el-table
diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index 32c17f0f..48b7ee0d 100644
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@@ -10,12 +10,12 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList2(dataForm.name)">{{
+          <el-button type="primary" @click="getDataList2(dataForm.name)">{{
             $t("query")
           }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="info" @click="exportHandle()">{{
+          <el-button type="primary"  @click="exportHandle()">{{
             $t("export")
           }}</el-button>
         </el-form-item>
@@ -37,13 +37,13 @@
         <el-form-item>
           <el-button
             v-if="$hasPermission('ability:bsabilityai:delete')"
-            type="danger"
+            type="primary"
             @click="deleteHandle2()"
             >{{ $t("deleteBatch") }}</el-button
           >
         </el-form-item>
         <el-form-item>
-          <el-button @click="reset">重置</el-button>
+          <el-button type="primary" @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
       <el-table
diff --git a/back/src/views/modules/ability/bsinfrastructure.vue b/back/src/views/modules/ability/bsinfrastructure.vue
index 84572707..06ae48ce 100644
--- a/back/src/views/modules/ability/bsinfrastructure.vue
+++ b/back/src/views/modules/ability/bsinfrastructure.vue
@@ -10,7 +10,7 @@
           <el-input v-model="dataForm.orderId" :placeholder="$t('infrastructure.resourceName')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="resetDataList()">{{ $t('reset') }}</el-button>
diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index 4fb52a09..6825db1e 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -1,27 +1,8 @@
 <template>
   <div>
     <div class="container">
-      <!-- <div class='container-left'  v-if='homeIsShow'>
-        <div class='left-search'>
-            <div>
-                <input type="text" class='input-style' placeholder="请输入部门关键词" v-model="inputTxt">
-                <div class='input-search'  @click='searchBtn'>
-                    <img src="@/assets/img/搜索.png" style='margin-top:7px;margin-left:16px' >
-                </div>
-            </div>
-        </div>
-        <el-tree
-            class='tree-style'
-            :data="treeData"
-            :props="defaultProps"
-            accordion
-            @node-click="handleNodeClick">
-           <span slot-scope="{ node }" class='tree-text-style'>
-                <img  src="@/assets/img/一级图标.png" style="width: 16px; height: 16px" />
-                {{ node.label }}
-           </span>
-        </el-tree>
-         </div> -->
+
+      
       <el-form :inline="true">
         <!--起始日期 @keyup.enter.native="getDataList()"-->
         <el-form-item>
@@ -76,10 +57,9 @@
           <el-input style="width:80%;"  v-model="resourceName" placeholder="请输入资源名称" clearable></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" style="display: flex;justify-content: end;margin-right: 40px;">
+      <el-form :inline="true" style="margin-right: 40px;">
          <!--操作按钮查询-->
          <el-form-item>
-          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <!--操作按钮重置-->
         <el-form-item>
@@ -1180,14 +1160,15 @@ input::placeholder {
 }
 
 .export {
+  margin-top: 6px;
   display: inline-block;
-  width: 70px;
-  height: 40px;
-  line-height: 40px;
+  width: 80px;
+  height: 32px;
+  line-height: 32px;
   text-align: center;
-  border-radius: 5px;
+  border-radius: 2px;
   background: #fff;
-  border: 1px solid #dcdfe6;
+  border: 2px solid #dcdfe6;
   color: #000;
   color: #fff;
   background-color: #0058e1;
diff --git a/back/src/views/modules/activiti/demo/correction.vue b/back/src/views/modules/activiti/demo/correction.vue
index de970618..004efccf 100644
--- a/back/src/views/modules/activiti/demo/correction.vue
+++ b/back/src/views/modules/activiti/demo/correction.vue
@@ -6,7 +6,7 @@
           <el-button v-if="$hasPermission('sys:correction:all')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:correction:all')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('sys:correction:all')" type="primary" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
diff --git a/back/src/views/modules/activiti/model.vue b/back/src/views/modules/activiti/model.vue
index 7194b76e..3c92cc51 100644
--- a/back/src/views/modules/activiti/model.vue
+++ b/back/src/views/modules/activiti/model.vue
@@ -31,7 +31,7 @@
           }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="deleteHandle()">{{
+          <el-button type="primary" @click="deleteHandle()">{{
             $t("deleteBatch")
           }}</el-button>
         </el-form-item>
diff --git a/back/src/views/modules/activiti/my-work-dynamics.vue b/back/src/views/modules/activiti/my-work-dynamics.vue
index 8df6d5fe..6dfd5410 100644
--- a/back/src/views/modules/activiti/my-work-dynamics.vue
+++ b/back/src/views/modules/activiti/my-work-dynamics.vue
@@ -11,7 +11,7 @@
       <el-button type="primary" class="button-new" @click="flashTableData"
         >查询</el-button
       >
-      <el-button @click="restTableData">重置</el-button>
+      <el-button type="primary"  @click="restTableData">重置</el-button>
       <div style="float: right">
         <el-button
           size="mini"
diff --git a/back/src/views/modules/activiti/process-initiation.vue b/back/src/views/modules/activiti/process-initiation.vue
index baf72e70..29377574 100644
--- a/back/src/views/modules/activiti/process-initiation.vue
+++ b/back/src/views/modules/activiti/process-initiation.vue
@@ -9,7 +9,7 @@
           <el-input v-model="dataForm.key" :placeholder="$t('process.key')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table
diff --git a/back/src/views/modules/activiti/process.vue b/back/src/views/modules/activiti/process.vue
index 6b716798..2249e51a 100644
--- a/back/src/views/modules/activiti/process.vue
+++ b/back/src/views/modules/activiti/process.vue
@@ -9,13 +9,13 @@
           <el-input v-model="dataForm.key" :placeholder="$t('process.key')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary"  @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="deployHandle()">{{ $t('process.deployFile') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button type="primary" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table
diff --git a/back/src/views/modules/activiti/running.vue b/back/src/views/modules/activiti/running.vue
index 0a7bdb22..a039b0f3 100644
--- a/back/src/views/modules/activiti/running.vue
+++ b/back/src/views/modules/activiti/running.vue
@@ -9,7 +9,7 @@
           <el-input v-model="dataForm.definitionKey" :placeholder="$t('running.definitionKey')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table
diff --git a/back/src/views/modules/algorithm/alarm-display.vue b/back/src/views/modules/algorithm/alarm-display.vue
index 1461aab9..ba7c295f 100644
--- a/back/src/views/modules/algorithm/alarm-display.vue
+++ b/back/src/views/modules/algorithm/alarm-display.vue
@@ -20,8 +20,8 @@
                     end-placeholder="结束日期"
                     :picker-options="pickerOptions">
                 </el-date-picker>
-                <el-button @click="flashTableData">查询</el-button>
-             <el-button @click="resetTableData">重置</el-button>
+                <el-button type="primary" @click="flashTableData">查询</el-button>
+             <el-button type="primary"  @click="resetTableData">重置</el-button>
             </div>
         </el-row>
         <div style="display:flex;flex-wrap:wrap">
diff --git a/back/src/views/modules/algorithm/algorithm-management.vue b/back/src/views/modules/algorithm/algorithm-management.vue
index 3dba3e36..39f477cc 100644
--- a/back/src/views/modules/algorithm/algorithm-management.vue
+++ b/back/src/views/modules/algorithm/algorithm-management.vue
@@ -13,12 +13,12 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList2(dataForm.name)">{{
+          <el-button type="primary" @click="getDataList2(dataForm.name)">{{
             $t("query")
           }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="info" @click="exportHandle()">{{
+          <el-button type="primary"  @click="exportHandle()">{{
             $t("export")
           }}</el-button>
         </el-form-item>
@@ -33,13 +33,13 @@
         <el-form-item>
           <el-button
             v-if="$hasPermission('ability:bsabilityai:delete')"
-            type="danger"
+            type="primary" 
             @click="deleteHandle2()"
             >{{ $t("deleteBatch") }}</el-button
           >
         </el-form-item>
         <el-form-item>
-          <el-button @click="reset">重置</el-button>
+          <el-button type="primary"  @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
       <el-table
diff --git a/back/src/views/modules/algorithm/task-monitoring.vue b/back/src/views/modules/algorithm/task-monitoring.vue
index 0f3f95ac..8db8c814 100644
--- a/back/src/views/modules/algorithm/task-monitoring.vue
+++ b/back/src/views/modules/algorithm/task-monitoring.vue
@@ -11,8 +11,8 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="flashTableData">查询</el-button>
-          <el-button @click="resetTableData">重置</el-button>
+          <el-button type="primary" @click="flashTableData">查询</el-button>
+          <el-button type="primary" @click="resetTableData">重置</el-button>
           <el-button type="primary" @click="addTask">任务新增</el-button>
         </el-form-item>
       </el-form>
diff --git a/back/src/views/modules/canassigncase/index.vue b/back/src/views/modules/canassigncase/index.vue
index f62ece4d..06efb4f1 100644
--- a/back/src/views/modules/canassigncase/index.vue
+++ b/back/src/views/modules/canassigncase/index.vue
@@ -10,12 +10,12 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList2(dataForm.name)">{{
+          <el-button type="primary" @click="getDataList2(dataForm.name)">{{
             $t("query")
           }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="info" @click="exportHandle()">{{
+          <el-button type="primary" @click="exportHandle()">{{
             $t("export")
           }}</el-button>
         </el-form-item>
@@ -30,13 +30,13 @@
         <el-form-item>
           <el-button
             v-if="$hasPermission('ability:bsabilityai:delete')"
-            type="danger"
+            type="primary"
             @click="deleteHandle2()"
             >{{ $t("deleteBatch") }}</el-button
           >
         </el-form-item>
         <el-form-item>
-          <el-button @click="reset">重置</el-button>
+          <el-button type="primary" @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
       <el-table
diff --git a/back/src/views/modules/demo/excel.vue b/back/src/views/modules/demo/excel.vue
index 293a531c..33b7b2e3 100644
--- a/back/src/views/modules/demo/excel.vue
+++ b/back/src/views/modules/demo/excel.vue
@@ -9,19 +9,19 @@
           <el-input v-model="dataForm.identity" :placeholder="$t('excel.identity')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button type="primary" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="warning" @click="importHandle()">{{ $t('excel.import') }}</el-button>
+          <el-button type="primary" @click="importHandle()">{{ $t('excel.import') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
diff --git a/back/src/views/modules/demo/news.vue b/back/src/views/modules/demo/news.vue
index a3759159..fca811bf 100644
--- a/back/src/views/modules/demo/news.vue
+++ b/back/src/views/modules/demo/news.vue
@@ -16,13 +16,13 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary"  @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button type="primary" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table
diff --git a/back/src/views/modules/demo/product.vue b/back/src/views/modules/demo/product.vue
index 25443e94..97854b9d 100644
--- a/back/src/views/modules/demo/product.vue
+++ b/back/src/views/modules/demo/product.vue
@@ -6,13 +6,13 @@
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('demo:product:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('demo:product:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('demo:product:delete')" type="primary" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
diff --git a/back/src/views/modules/devtools/baseclass.vue b/back/src/views/modules/devtools/baseclass.vue
index 213ff599..297e737f 100644
--- a/back/src/views/modules/devtools/baseclass.vue
+++ b/back/src/views/modules/devtools/baseclass.vue
@@ -6,13 +6,13 @@
           <el-input v-model="dataForm.code" placeholder="基类编码" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">查询</el-button>
+          <el-button type="primary" @click="getDataList()">查询</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="deleteHandle()">删除</el-button>
+          <el-button type="primary" @click="deleteHandle()">删除</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
diff --git a/back/src/views/modules/devtools/datasource.vue b/back/src/views/modules/devtools/datasource.vue
index af004b5a..f3ba1d18 100644
--- a/back/src/views/modules/devtools/datasource.vue
+++ b/back/src/views/modules/devtools/datasource.vue
@@ -14,13 +14,13 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">查询</el-button>
+          <el-button type="primary" @click="getDataList()">查询</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="deleteHandle()">删除</el-button>
+          <el-button type="primary" @click="deleteHandle()">删除</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
diff --git a/back/src/views/modules/devtools/fieldtype.vue b/back/src/views/modules/devtools/fieldtype.vue
index 73aa706a..89a289d3 100644
--- a/back/src/views/modules/devtools/fieldtype.vue
+++ b/back/src/views/modules/devtools/fieldtype.vue
@@ -9,13 +9,13 @@
           <el-input v-model="dataForm.attrType" placeholder="属性类型" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">查询</el-button>
+          <el-button type="primary" @click="getDataList()">查询</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="deleteHandle()">删除</el-button>
+          <el-button type="primary" @click="deleteHandle()">删除</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
diff --git a/back/src/views/modules/devtools/generator.vue b/back/src/views/modules/devtools/generator.vue
index 4bb4aa33..e87af2a9 100644
--- a/back/src/views/modules/devtools/generator.vue
+++ b/back/src/views/modules/devtools/generator.vue
@@ -6,13 +6,13 @@
           <el-input v-model="dataForm.tableName" placeholder="表名"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">查询</el-button>
+          <el-button type="primary" @click="getDataList()">查询</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="importHandle()">导入数据库表</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="deleteHandle()">删除</el-button>
+          <el-button type="primary" @click="deleteHandle()">删除</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
diff --git a/back/src/views/modules/devtools/template.vue b/back/src/views/modules/devtools/template.vue
index 40c6e3ec..4c8a7b2b 100644
--- a/back/src/views/modules/devtools/template.vue
+++ b/back/src/views/modules/devtools/template.vue
@@ -12,13 +12,13 @@
           <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="success" @click="enabledHandle()">启用</el-button>
+          <el-button type="primary" @click="enabledHandle()">启用</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="warning" @click="disabledHandle()">禁用</el-button>
+          <el-button type="primary" @click="disabledHandle()">禁用</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="deleteHandle()">删除</el-button>
+          <el-button type="primary" @click="deleteHandle()">删除</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
diff --git a/back/src/views/modules/job/schedule.vue b/back/src/views/modules/job/schedule.vue
index d1af99b5..43731ce4 100644
--- a/back/src/views/modules/job/schedule.vue
+++ b/back/src/views/modules/job/schedule.vue
@@ -6,25 +6,24 @@
           <el-input v-model="dataForm.beanName" :placeholder="$t('schedule.beanName')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('sys:schedule:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:schedule:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('sys:schedule:delete')" type="primary" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:schedule:pause')" type="danger" @click="pauseHandle()">{{ $t('schedule.pauseBatch') }}</el-button>
+          <el-button v-if="$hasPermission('sys:schedule:pause')" type="primary" @click="pauseHandle()">{{ $t('schedule.pauseBatch') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:schedule:resume')" type="danger" @click="resumeHandle()">{{ $t('schedule.resumeBatch') }}</el-button>
+          <el-button v-if="$hasPermission('sys:schedule:resume')" type="primary" @click="resumeHandle()">{{ $t('schedule.resumeBatch') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:schedule:run')" type="danger" @click="runHandle()">{{ $t('schedule.runBatch') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:schedule:log')" type="success" @click="logHandle()">{{ $t('schedule.log') }}</el-button>
+          <el-button v-if="$hasPermission('sys:schedule:log')" type="primary" @click="logHandle()">{{ $t('schedule.log') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table
diff --git a/back/src/views/modules/message/mail-log.vue b/back/src/views/modules/message/mail-log.vue
index 1ab6a8aa..046d2e16 100644
--- a/back/src/views/modules/message/mail-log.vue
+++ b/back/src/views/modules/message/mail-log.vue
@@ -15,10 +15,10 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button type="primary" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table
diff --git a/back/src/views/modules/message/mail-template-send.vue b/back/src/views/modules/message/mail-template-send.vue
index ef92b681..a608fca5 100644
--- a/back/src/views/modules/message/mail-template-send.vue
+++ b/back/src/views/modules/message/mail-template-send.vue
@@ -12,7 +12,7 @@
       </el-form-item>
     </el-form>
     <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="visible = false">{{ $t('cancel') }}</el-button>
       <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
     </template>
   </el-dialog>
diff --git a/back/src/views/modules/message/mail-template.vue b/back/src/views/modules/message/mail-template.vue
index 33628dc9..2379d0d8 100644
--- a/back/src/views/modules/message/mail-template.vue
+++ b/back/src/views/modules/message/mail-template.vue
@@ -6,7 +6,7 @@
           <el-input v-model="dataForm.name" :placeholder="$t('mail.name')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
@@ -15,7 +15,7 @@
           <el-button type="primary" @click="configHandle()">{{ $t('mail.config') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button type="primary" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table
diff --git a/back/src/views/modules/message/sms-log.vue b/back/src/views/modules/message/sms-log.vue
index 6b419499..2029fad8 100644
--- a/back/src/views/modules/message/sms-log.vue
+++ b/back/src/views/modules/message/sms-log.vue
@@ -15,10 +15,10 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:smslog:all')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('sys:smslog:all')" type="primary" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
diff --git a/back/src/views/modules/message/sms-send.vue b/back/src/views/modules/message/sms-send.vue
index 1dc90111..a3173844 100644
--- a/back/src/views/modules/message/sms-send.vue
+++ b/back/src/views/modules/message/sms-send.vue
@@ -9,7 +9,7 @@
       </el-form-item>
     </el-form>
     <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="visible = false">{{ $t('cancel') }}</el-button>
       <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
     </template>
   </el-dialog>
diff --git a/back/src/views/modules/message/sms.vue b/back/src/views/modules/message/sms.vue
index 7deee55a..84320617 100644
--- a/back/src/views/modules/message/sms.vue
+++ b/back/src/views/modules/message/sms.vue
@@ -10,13 +10,13 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button type="primary" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table
diff --git a/back/src/views/modules/notice/notice-user.vue b/back/src/views/modules/notice/notice-user.vue
index 09aff9e0..765ee20e 100644
--- a/back/src/views/modules/notice/notice-user.vue
+++ b/back/src/views/modules/notice/notice-user.vue
@@ -6,7 +6,7 @@
           <ren-select v-model="dataForm.type" dict-type="notice_type" :placeholder="$t('notice.type')"></ren-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
diff --git a/back/src/views/modules/notice/notice.vue b/back/src/views/modules/notice/notice.vue
index a89c69f8..4e6d10ed 100644
--- a/back/src/views/modules/notice/notice.vue
+++ b/back/src/views/modules/notice/notice.vue
@@ -6,13 +6,13 @@
           <ren-select v-model="dataForm.type" dict-type="notice_type" :placeholder="$t('notice.type')"></ren-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button type="primary" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
diff --git a/back/src/views/modules/oss/oss.vue b/back/src/views/modules/oss/oss.vue
index 1a2c7ac5..47428559 100644
--- a/back/src/views/modules/oss/oss.vue
+++ b/back/src/views/modules/oss/oss.vue
@@ -9,7 +9,7 @@
           <el-button type="primary" @click="uploadHandle()">{{ $t('oss.upload') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button type="primary" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table
diff --git a/back/src/views/modules/pay/alipaynotifylog.vue b/back/src/views/modules/pay/alipaynotifylog.vue
index c8d98095..e3a9ad98 100644
--- a/back/src/views/modules/pay/alipaynotifylog.vue
+++ b/back/src/views/modules/pay/alipaynotifylog.vue
@@ -12,7 +12,7 @@
           <el-input v-model="dataForm.tradeStatus" :placeholder="$t('order.tradeStatus')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
diff --git a/back/src/views/modules/pay/order.vue b/back/src/views/modules/pay/order.vue
index 6f110498..47f1f396 100644
--- a/back/src/views/modules/pay/order.vue
+++ b/back/src/views/modules/pay/order.vue
@@ -12,7 +12,7 @@
           <ren-select v-model="dataForm.status" dict-type="order_status" :placeholder="$t('order.status')"></ren-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/back/src/views/modules/project/contribute.vue b/back/src/views/modules/project/contribute.vue
index 5afee272..644eaf59 100644
--- a/back/src/views/modules/project/contribute.vue
+++ b/back/src/views/modules/project/contribute.vue
@@ -9,7 +9,7 @@
           <el-input v-model="dataForm.resourceName" placeholder="应用名称" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="reset">重置</el-button>
diff --git a/back/src/views/modules/project/list.vue b/back/src/views/modules/project/list.vue
index ee292abe..2f0d2b23 100644
--- a/back/src/views/modules/project/list.vue
+++ b/back/src/views/modules/project/list.vue
@@ -15,7 +15,7 @@
            <el-date-picker v-model="dataForm.applyTime" value-format="yyyy-MM-dd" type="date" :placeholder="$t('projectList.applydate')" clearable></el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="resetDataList()">{{ $t('reset') }}</el-button>
diff --git a/back/src/views/modules/project/use.vue b/back/src/views/modules/project/use.vue
index 916d3290..90032d47 100644
--- a/back/src/views/modules/project/use.vue
+++ b/back/src/views/modules/project/use.vue
@@ -22,7 +22,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="getDataList()">查询</el-button>
-          <el-button @click="reset">重置</el-button>
+          <el-button type="primary" @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
       <el-table row-key="id" :data="dataList" border style="width: 100%">
diff --git a/back/src/views/modules/sys/dict-type.vue b/back/src/views/modules/sys/dict-type.vue
index 82249b3b..ee19b187 100644
--- a/back/src/views/modules/sys/dict-type.vue
+++ b/back/src/views/modules/sys/dict-type.vue
@@ -9,13 +9,13 @@
           <el-input v-model="dataForm.dictType" :placeholder="$t('dict.dictType')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:dict:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary"  v-if="$hasPermission('sys:dict:save')"  @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:dict:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button type="primary"  v-if="$hasPermission('sys:dict:delete')" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table
diff --git a/back/src/views/modules/sys/log-data-modification-log.vue b/back/src/views/modules/sys/log-data-modification-log.vue
index a482cea2..ac4ff49f 100644
--- a/back/src/views/modules/sys/log-data-modification-log.vue
+++ b/back/src/views/modules/sys/log-data-modification-log.vue
@@ -65,10 +65,10 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button @click="resetFunction()"> 重置 </el-button>
+          <el-button type="primary"  @click="resetFunction()"> 重置 </el-button>
         </el-form-item>
         <!-- <el-form-item>
           <el-button type="info" @click="exportHandle()">{{
diff --git a/back/src/views/modules/sys/log-error.vue b/back/src/views/modules/sys/log-error.vue
index d8089e3c..175b182e 100644
--- a/back/src/views/modules/sys/log-error.vue
+++ b/back/src/views/modules/sys/log-error.vue
@@ -3,7 +3,7 @@
     <div class="mod-sys__log-error">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @sort-change="dataListSortChangeHandle" style="width: 100%;">
diff --git a/back/src/views/modules/sys/log-login.vue b/back/src/views/modules/sys/log-login.vue
index dc769816..bc91502e 100644
--- a/back/src/views/modules/sys/log-login.vue
+++ b/back/src/views/modules/sys/log-login.vue
@@ -13,10 +13,10 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @sort-change="dataListSortChangeHandle" style="width: 100%;">
diff --git a/back/src/views/modules/sys/log-operation.vue b/back/src/views/modules/sys/log-operation.vue
index d1bf9fab..c46e69e2 100644
--- a/back/src/views/modules/sys/log-operation.vue
+++ b/back/src/views/modules/sys/log-operation.vue
@@ -45,10 +45,10 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button @click="resetFunction()"> 重置 </el-button>
+          <el-button type="primary" @click="resetFunction()"> 重置 </el-button>
         </el-form-item>
         <!-- <el-form-item>
           <el-button type="info" @click="exportHandle()">{{
diff --git a/back/src/views/modules/sys/online.vue b/back/src/views/modules/sys/online.vue
index 139ee204..89304b04 100644
--- a/back/src/views/modules/sys/online.vue
+++ b/back/src/views/modules/sys/online.vue
@@ -6,7 +6,7 @@
           <el-input v-model="dataForm.username" :placeholder="$t('online.username')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
diff --git a/back/src/views/modules/sys/params.vue b/back/src/views/modules/sys/params.vue
index 348db49f..a520c91b 100644
--- a/back/src/views/modules/sys/params.vue
+++ b/back/src/views/modules/sys/params.vue
@@ -6,13 +6,13 @@
           <el-input v-model="dataForm.paramCode" :placeholder="$t('params.paramCode')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary"  @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('sys:params:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:params:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('sys:params:delete')" type="primary"  @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
diff --git a/back/src/views/modules/sys/post.vue b/back/src/views/modules/sys/post.vue
index fd018ec1..363c79f3 100644
--- a/back/src/views/modules/sys/post.vue
+++ b/back/src/views/modules/sys/post.vue
@@ -12,14 +12,14 @@
           <ren-select v-model="dataForm.status" dict-type="post_status" :placeholder="$t('post.status')"></ren-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:post:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}
+          <el-button type="primary" v-if="$hasPermission('sys:post:save')"  @click="addOrUpdateHandle()">{{ $t('add') }}
           </el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:post:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch')
+          <el-button v-if="$hasPermission('sys:post:delete')" type="primary" @click="deleteHandle()">{{ $t('deleteBatch')
           }}</el-button>
         </el-form-item>
         <el-form-item>
diff --git a/back/src/views/modules/sys/role.vue b/back/src/views/modules/sys/role.vue
index 4f549b1f..72da927a 100644
--- a/back/src/views/modules/sys/role.vue
+++ b/back/src/views/modules/sys/role.vue
@@ -12,7 +12,7 @@
           <el-button v-if="$hasPermission('sys:role:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:role:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('sys:role:delete')" type="primary" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('sys:role:reset')" type="primary" @click="resetHandle()">{{ $t('reset') }}</el-button>
diff --git a/back/src/views/modules/sys/user.vue b/back/src/views/modules/sys/user.vue
index d891bf5f..a50edcd5 100644
--- a/back/src/views/modules/sys/user.vue
+++ b/back/src/views/modules/sys/user.vue
@@ -27,19 +27,19 @@
           }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:user:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}
+          <el-button type="primary" v-if="$hasPermission('sys:user:save')" @click="addOrUpdateHandle()">{{ $t('add') }}
           </el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:user:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch')
+          <el-button type="primary" v-if="$hasPermission('sys:user:delete')"  @click="deleteHandle()">{{ $t('deleteBatch')
           }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:user:export')" type="info" @click="exportHandle()">{{ $t('export') }}
+          <el-button type="primary" v-if="$hasPermission('sys:user:export')"  @click="exportHandle()">{{ $t('export') }}
           </el-button>
         </el-form-item>
         <el-form-item>
-          <el-button @click="reset()">重置</el-button>
+          <el-button type="primary"  @click="reset()">重置</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
diff --git a/back/src/views/modules/ureport/ureport.vue b/back/src/views/modules/ureport/ureport.vue
index a230af78..be775bbd 100644
--- a/back/src/views/modules/ureport/ureport.vue
+++ b/back/src/views/modules/ureport/ureport.vue
@@ -6,10 +6,10 @@
           <el-input v-model="dataForm.fileName" :placeholder="$t('fileName')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button type="primary" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table
diff --git a/front/src/views/newHome/components/WorkDynamics.vue b/front/src/views/newHome/components/WorkDynamics.vue
index d4abfc0a..eb5c33f2 100644
--- a/front/src/views/newHome/components/WorkDynamics.vue
+++ b/front/src/views/newHome/components/WorkDynamics.vue
@@ -125,6 +125,7 @@
     if (abilityToTypeFunctionData.value == '组件服务') {
       if (!componentTypeValue.value || componentTypeValue.value == '') {
         message.error('请选择组件类型！')
+        componentTypeValueOld.value=''
         return
       } else if (
         componentTypeValue.value === '智能算法' ||
@@ -153,7 +154,7 @@
     visible.value = false
     abilityToTypeFunctionData.value = '组件服务'
     componentTypeValue.value = ''
-    console.log(e)
+    visible.value = false
   }
   const getList = () => {
     const params = {

From 51271131b66fbcd9d96924c3291ab36a6f828ef8 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 17 Nov 2022 16:52:16 +0800
Subject: [PATCH 18/25] =?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

---
 .../components/AbilityRanking.vue             |  4 +-
 .../components/CapabilityRequirements.vue     |  7 ++-
 .../components/ResourceAggregation.vue        | 24 +++------
 .../components/SharingSituation.vue           | 49 ++++++++++++++-----
 4 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/front/src/views/abilityStatistics/components/AbilityRanking.vue b/front/src/views/abilityStatistics/components/AbilityRanking.vue
index 2ae1a5ab..33aaac78 100644
--- a/front/src/views/abilityStatistics/components/AbilityRanking.vue
+++ b/front/src/views/abilityStatistics/components/AbilityRanking.vue
@@ -273,7 +273,7 @@
         flex-wrap: wrap;
         justify-content: center;
         align-items: center;
-        margin-bottom: 26px;
+        margin-bottom: -10px;
         .line {
           width: 34px;
           height: 3px;
@@ -356,6 +356,8 @@
                 color: #734204;
               }
               .content-neirong {
+                font-size: 18px;
+                font-weight: 600;
                 width: 215px;
                 text-overflow: -o-ellipsis-lastline;
                 overflow: hidden;
diff --git a/front/src/views/abilityStatistics/components/CapabilityRequirements.vue b/front/src/views/abilityStatistics/components/CapabilityRequirements.vue
index b2d4c45c..a87451ea 100644
--- a/front/src/views/abilityStatistics/components/CapabilityRequirements.vue
+++ b/front/src/views/abilityStatistics/components/CapabilityRequirements.vue
@@ -31,7 +31,11 @@
         查看更多
         <span class="gengduo"></span>
       </div>
-      <a-empty v-else style="margin-top: 160px; margin-bottom: 60px" />
+      <a-empty
+        v-else
+        style="margin-top: 160px; margin-bottom: 60px"
+        :imageStyle="{ color: '#0058e1' }"
+      />
     </div>
   </div>
 </template>
@@ -92,6 +96,7 @@
             dataList.value[index].photo = photo.value[4]
             break
         }
+        dataList.value = []
       })
 
       console.log('123123123qwee', dataList.value)
diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
index 5673f65f..93158c84 100644
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@@ -475,7 +475,7 @@
           barGap: '-100%',
           itemStyle: {
             normal: {
-              color: '#C1232B',
+              color: '#ECB53F',
             },
           },
           //              data: [5, 20, 36, 10, 10, 20]
@@ -488,7 +488,7 @@
           barGap: '-100%',
           itemStyle: {
             normal: {
-              color: '#B5C334',
+              color: '#FE845E',
             },
           },
           //              data: [5, 20, 36, 10, 10, 20]
@@ -501,7 +501,7 @@
           barGap: '-100%',
           itemStyle: {
             normal: {
-              color: '#FCCE10',
+              color: '#6CC95A',
             },
           },
           //              data: [5, 20, 36, 10, 10, 20]
@@ -514,7 +514,7 @@
           barGap: '-100%',
           itemStyle: {
             normal: {
-              color: '#E87C25',
+              color: '#02D1B0',
             },
           },
           //              data: [5, 20, 36, 10, 10, 20]
@@ -527,20 +527,7 @@
           barGap: '-100%',
           itemStyle: {
             normal: {
-              color: '#27727B',
-            },
-          },
-          //              data: [5, 20, 36, 10, 10, 20]
-          data: [],
-        },
-        {
-          name: '',
-          type: 'bar',
-          barWidth: 35,
-          barGap: '-100%',
-          itemStyle: {
-            normal: {
-              color: '#FE8463',
+              color: '#1772FF',
             },
           },
           //              data: [5, 20, 36, 10, 10, 20]
@@ -558,6 +545,7 @@
       for (let i = 0; i < 5; i++) {
         if (i == index) {
           arr.push(val.value)
+          // arr.push(10) // 方便更改样式
         } else {
           arr.push(0)
         }
diff --git a/front/src/views/abilityStatistics/components/SharingSituation.vue b/front/src/views/abilityStatistics/components/SharingSituation.vue
index 3ec8b807..54fe719b 100644
--- a/front/src/views/abilityStatistics/components/SharingSituation.vue
+++ b/front/src/views/abilityStatistics/components/SharingSituation.vue
@@ -8,9 +8,17 @@
       <div class="SharingSituation-left">
         <div>
           <div class="left-title">
-            <div>日平均浏览量 {{ browseAvg }}次</div>
+            <div>
+              日平均浏览量
+              <span>{{ browseAvg }}</span>
+              次
+            </div>
             <div></div>
-            <div>日最大浏览量{{ browseMax }}次</div>
+            <div>
+              日最大浏览量
+              <span>{{ browseMax }}</span>
+              次
+            </div>
           </div>
           <div class="left-content-title">
             <div
@@ -34,7 +42,7 @@
             style="
               font-size: 14px;
               float: left;
-              margin-left: 420px;
+              margin-left: 505px;
               text-align: center;
               padding-top: 6px;
             "
@@ -42,6 +50,9 @@
             单位: 次
           </span>
           <p class="p">申请量</p>
+          <p class="p" style="position: absolute; top: 420px; left: -564px">
+            浏览量
+          </p>
         </div>
 
         <div class="volume_box">
@@ -61,12 +72,12 @@
                   backgroundImage: `url(${item.photo}) `,
                 }"
               ></div>
-              <div class="name">{{ item.type }}</div>
-              <div class-="type">{{ item.amount }}</div>
+              <div class="type">{{ item.type }}</div>
+              <div class="amount">{{ item.amount }}</div>
             </div>
             <div class="volume_box-son-bottom" v-else>
-              <div class="type">{{ item.amount }}</div>
-              <div class="name">{{ item.type }}</div>
+              <div class="amount">{{ item.amount }}</div>
+              <div class="type">{{ item.type }}</div>
               <div
                 class="photo"
                 :style="{
@@ -109,6 +120,8 @@
       },
       yAxis: {
         type: 'value',
+        name: '单位：次',
+        // minInterval: 1,
       },
       tooltip: {
         show: true,
@@ -285,6 +298,7 @@
     display: flex;
     justify-content: center;
     margin-top: 40px;
+    position: relative;
 
     .SharingSituation-left {
       width: 666px;
@@ -293,6 +307,7 @@
       z-index: 2;
       .left-title {
         height: 50px;
+        line-height: 50px;
         width: 100%;
         background: #0058e1;
         color: #ffffff;
@@ -301,6 +316,10 @@
         align-items: center;
         border-radius: 2px;
         padding: 0 80px;
+        span {
+          font-size: 26px;
+          font-weight: 600;
+        }
       }
       .left-content-title {
         display: flex;
@@ -344,15 +363,16 @@
       border-radius: 2px;
       margin-left: -40px;
       .p {
-        width: 96px;
-        height: 36px;
+        width: 95px;
+        height: 48px;
         color: #0058e1;
         font-size: 18px;
         background: url('../../../assets/abilityStatistics/gongxiangqingkuangliulanl.png')
           no-repeat;
+        background-size: 100%;
         text-align: center;
-        line-height: 36px;
-        margin-left: 500px;
+        line-height: 48px;
+        margin-left: 570px;
       }
       .volume_box {
         width: 666px;
@@ -384,6 +404,13 @@
               height: 46px;
               width: 46px;
             }
+            .amount {
+              font-size: 30px;
+              font-weight: 600;
+            }
+            .type {
+              font-size: 18px;
+            }
           }
           .volume_box-son-bottom {
             position: absolute;

From 8939f054dfa7d46f4464e7dc0e4c2bd9ed3c082b Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 17 Nov 2022 17:14:44 +0800
Subject: [PATCH 19/25] =?UTF-8?q?=E7=BC=96=E7=9B=AE=E9=97=AE=E9=A2=98BUG?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=20=E4=BB=A5=E5=8F=8A=E8=BD=AC=E5=8A=9E?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myAgent/demo/ResourcesAndServices.vue     | 20 +++++++++----------
 .../myAgent/demo/ability-resource-shelf.vue   |  4 ++--
 .../myAgent/demo/competency-application.vue   | 14 ++++++-------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
index c32b8653..d8236ecd 100644
--- a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
+++ b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
@@ -156,7 +156,7 @@ export default {
       type: Array
     }
   },
-  data() {
+  data () {
     return {
       dataList: [],
       dataView: [],
@@ -171,16 +171,16 @@ export default {
     }
   },
   watch: {
-    dataList(item) {
+    dataList (item) {
       if (item) {
         this.dataList = item
       }
     },
-    insertList(val) {
+    insertList (val) {
       if (val) {
         if (this.dataForm.type === '应用资源') {
           this.dataView = val.filter(
-            (item) => item.name === this.dataForm.type + '一'
+            (item) => item.name === this.dataForm.type
           )[0]
           this.dataForm.infoList.map((item, index) => {
             this.dataView.children.map((itemView, indexView) => {
@@ -253,7 +253,7 @@ export default {
             (item) => item.attrType === '组件类型'
           )
           this.dataView = val.filter(
-            (item) => item.name === this.dataForm.type + '一'
+            (item) => item.name === this.dataForm.type
           )[0]
           this.dataView = this.dataView.children.filter(
             (item) => item.name === componentType[0].attrValue
@@ -366,7 +366,7 @@ export default {
   },
   computed: {},
   methods: {
-    videoAndImg(link) {
+    videoAndImg (link) {
       if (link) {
         window.open(link)
       } else {
@@ -376,7 +376,7 @@ export default {
         })
       }
     },
-    deptName() {
+    deptName () {
       console.log(this.dataForm.deptId)
       this.$http
         .get(`/sys/dept/${this.dataForm.deptId}`)
@@ -385,7 +385,7 @@ export default {
           this.unit = res.data.name
         })
     },
-    queryPartAppByKeyIdFunction(index, indexSon, indexSonSon) {
+    queryPartAppByKeyIdFunction (index, indexSon, indexSonSon) {
       if (this.dataForm.type === '组件服务') {
         this.$http
           .get(
@@ -424,8 +424,8 @@ export default {
       }
     }
   },
-  created() { },
-  mounted() {
+  created () { },
+  mounted () {
     this.deptName()
   }
 }
diff --git a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
index 98a53e6d..0c6f5035 100644
--- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@@ -155,7 +155,7 @@ export default {
                 '/act/task/getTaskVariables?taskId=' + this.$route.params.taskId + '&variableName=allowEntrust'
               ).then(entrust => {
                 console.log('11111111111111', entrust, this.dataForm)
-                if (entrust.data.data.allowEntrust === true) {
+                if (entrust.data.data && entrust.data.data.allowEntrust === true) {
                   this.taskEntrustFlag2 = true
                   if (this.taskEntrustFlag && this.taskEntrustFlag2) {
                     this.$alert('当前审核部门为' + this.dataForm.deptName + '，该部门未配置审核人，请联系运维工程师配置完成后进行流程转办！', '流程提醒', {
@@ -249,7 +249,7 @@ export default {
     },
     // 同意与退回
     agreeOrNot: debounce(
-      function (data,type) {
+      function (data, type) {
         if (type === '同意') {
           if (this.input !== '') {
             console.log('this.dataForm', this.dataForm)
diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index 0b863954..83844d9a 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: Light
- * @LastEditTime: 2022-11-01 15:00:19
+ * @LastEditTime: 2022-11-17 17:09:03
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -172,7 +172,7 @@ export default {
     this.$http.get('/sys/user/info').then(({ data: res }) => {
       res.data.roleIdList.map(val => {
         this.$http.get('/sys/role/' + val).then(role => {
-          console.log('role',role);
+          console.log('role', role)
           if (role.data.data.name === '流程管理员') {
             this.taskEntrustFlag = true
           }
@@ -194,7 +194,7 @@ export default {
       formSaveErrorCallback: null
     }
     // 初始化综合组件
-    this.initProcessMultiple(callbacks);
+    this.initProcessMultiple(callbacks)
   },
   computed: {
     // dataRule () {
@@ -282,7 +282,7 @@ export default {
               .get(
             `/act/task/getTaskVariables?${params}&variableName=allowEntrust`
               ).then(entrust => {
-                if (entrust.data.data.allowEntrust === true) {
+                if (entrust.data.data && entrust.data.data.allowEntrust === true) {
                   this.taskEntrustFlag2 = true
                   if (this.taskEntrustFlag && this.taskEntrustFlag2) {
                     this.$alert('当前审核部门为' + res.data.tAbilityApplicationDTOList[0].resourceOwnerDept.name + '，该部门未配置审核人，请联系运维工程师配置完成后进行流程转办！', '流程提醒', {
@@ -414,9 +414,9 @@ export default {
     },
     // 同意与退回
     agreeOrNot: debounce(
-      function (data,type) {
-          //console.log('datadata',data);
-          //console.log('tttttt',type);
+      function (data, type) {
+        // console.log('datadata',data);
+        // console.log('tttttt',type);
         if (type === '同意') {
           if (this.input !== '') {
             console.log('this.dataForm', this.dataForm)

From 23fd66cd989c3f1dad83901742fc660f763c256e Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 17 Nov 2022 17:42:56 +0800
Subject: [PATCH 20/25] =?UTF-8?q?=E7=82=B9=E5=90=8C=E6=84=8F=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=20=E9=BB=98=E8=AE=A4=E6=B7=BB=E5=8A=A0=E5=90=8C?=
 =?UTF-8?q?=E6=84=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/demo/abilitydemandapply.vue      | 72 +++++++++----------
 .../views/modules/activiti/demo/comments.vue  | 70 +++++++++---------
 .../activiti/demo/putaway-process3.vue        | 66 ++++++++---------
 .../myAgent/demo/ability-resource-shelf.vue   | 68 +++++++++---------
 .../myAgent/demo/competency-application.vue   | 70 +++++++++---------
 5 files changed, 173 insertions(+), 173 deletions(-)

diff --git a/back/src/views/modules/activiti/demo/abilitydemandapply.vue b/back/src/views/modules/activiti/demo/abilitydemandapply.vue
index 73e4bfe7..f9f2fad5 100644
--- a/back/src/views/modules/activiti/demo/abilitydemandapply.vue
+++ b/back/src/views/modules/activiti/demo/abilitydemandapply.vue
@@ -57,7 +57,7 @@
           :disabled="fieldDisabled"
           placeholder="需求描述"
         ></el-input>
-         </el-tooltip>   
+         </el-tooltip>
       </el-form-item>
       <el-form-item v-if="dataForm.enclosure" label="申请附件" prop="enclosure">
         <button
@@ -100,7 +100,7 @@
           <el-input v-model="input" placeholder="请输入审批意见"></el-input>
           <el-button class="agreeButton" @click="agreeOrNot($store.state.contentTabsActiveName,'同意')">同意</el-button>
           <el-button class="rejectButton"  @click="agreeOrNot($store.state.contentTabsActiveName,'驳回')">驳回</el-button>
-        </div> 
+        </div>
       </div>
     </div>
     <!-- 审批弹窗 -->
@@ -244,45 +244,45 @@ export default {
     },
     // 同意与退回
     agreeOrNot: debounce(
-      function (data,type) {
+      function (data, type) {
         this.dataForm.taskId = this.$route.params.taskId
         if (type === '同意') {
-          if (this.input !== '') {
-            console.log('this.dataForm', this.dataForm)
-            const params = qs.stringify({
-              taskId: this.dataForm.taskId,
-              comment: this.input
-            })
-            console.log(params)
-            this.$http
-              .post('/act/task/complete?' + params)
-              .then(({ data: res }) => {
-                if (res.code !== 0) {
-                  this.$message.error(res.msg)
-                  if (this.callbacks.taskHandleErrorCallback) {
-                    this.callbacks.taskHandleErrorCallback(res)
-                  }
-                  return
+          // if (this.input !== '') {
+          console.log('this.dataForm', this.dataForm)
+          const params = qs.stringify({
+            taskId: this.dataForm.taskId,
+            comment: this.input || '同意'
+          })
+          console.log(params)
+          this.$http
+            .post('/act/task/complete?' + params)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                this.$message.error(res.msg)
+                if (this.callbacks.taskHandleErrorCallback) {
+                  this.callbacks.taskHandleErrorCallback(res)
                 }
-                bus.$emit('AbilityResourcesRemovedInit')
-                this.$message({
-                  message: this.$t('prompt.success'),
-                  type: 'success',
-                  duration: 500,
-                  onClose: () => {
-                    this.visible = false
-                    this.dialogVisible = false
-                    if (this.callbacks.taskHandleSuccessCallback) {
-                      this.callbacks.taskHandleSuccessCallback(res)
-                    }
+                return
+              }
+              bus.$emit('AbilityResourcesRemovedInit')
+              this.$message({
+                message: this.$t('prompt.success'),
+                type: 'success',
+                duration: 500,
+                onClose: () => {
+                  this.visible = false
+                  this.dialogVisible = false
+                  if (this.callbacks.taskHandleSuccessCallback) {
+                    this.callbacks.taskHandleSuccessCallback(res)
                   }
-                })
+                }
               })
-              .catch(() => {})
-            this.tabRemoveHandle(data)
-          } else {
-            this.$message.error('请输入审批意见！')
-          }
+            })
+            .catch(() => {})
+          this.tabRemoveHandle(data)
+          // } else {
+          //   this.$message.error('请输入审批意见！')
+          // }
         } else if (type === '驳回') {
           if (this.input !== '') {
             const params = qs.stringify({
diff --git a/back/src/views/modules/activiti/demo/comments.vue b/back/src/views/modules/activiti/demo/comments.vue
index cdb82ce9..6c539f0e 100644
--- a/back/src/views/modules/activiti/demo/comments.vue
+++ b/back/src/views/modules/activiti/demo/comments.vue
@@ -41,7 +41,7 @@
           <el-input v-model="input" placeholder="请输入审批意见"></el-input>
           <el-button class="agreeButton" @click="agreeOrNot($store.state.contentTabsActiveName,'同意')">同意</el-button>
           <el-button class="rejectButton"  @click="agreeOrNot($store.state.contentTabsActiveName,'拒绝')">驳回</el-button>
-        </div> 
+        </div>
       </div>
     </div>
     <!-- 审批弹窗 -->
@@ -154,45 +154,45 @@ export default {
     },
     // 同意与退回
     agreeOrNot: debounce(
-      function (data,type) {
+      function (data, type) {
         this.dataForm.taskId = this.$route.params.taskId
         if (type === '同意') {
-          if (this.input !== '') {
-            console.log('this.dataForm', this.dataForm)
-            const params = qs.stringify({
-              taskId: this.dataForm.taskId,
-              comment: this.input
-            })
-            console.log(params)
-            this.$http
-              .post('/act/task/complete?' + params)
-              .then(({ data: res }) => {
-                if (res.code !== 0) {
-                  this.$message.error(res.msg)
-                  if (this.callbacks.taskHandleErrorCallback) {
-                    this.callbacks.taskHandleErrorCallback(res)
-                  }
-                  return
+          // if (this.input !== '') {
+          console.log('this.dataForm', this.dataForm)
+          const params = qs.stringify({
+            taskId: this.dataForm.taskId,
+            comment: this.input || '同意'
+          })
+          console.log(params)
+          this.$http
+            .post('/act/task/complete?' + params)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                this.$message.error(res.msg)
+                if (this.callbacks.taskHandleErrorCallback) {
+                  this.callbacks.taskHandleErrorCallback(res)
                 }
-                bus.$emit('AbilityResourcesRemovedInit')
-                this.$message({
-                  message: this.$t('prompt.success'),
-                  type: 'success',
-                  duration: 500,
-                  onClose: () => {
-                    this.visible = false
-                    this.dialogVisible = false
-                    if (this.callbacks.taskHandleSuccessCallback) {
-                      this.callbacks.taskHandleSuccessCallback(res)
-                    }
+                return
+              }
+              bus.$emit('AbilityResourcesRemovedInit')
+              this.$message({
+                message: this.$t('prompt.success'),
+                type: 'success',
+                duration: 500,
+                onClose: () => {
+                  this.visible = false
+                  this.dialogVisible = false
+                  if (this.callbacks.taskHandleSuccessCallback) {
+                    this.callbacks.taskHandleSuccessCallback(res)
                   }
-                })
+                }
               })
-              .catch(() => {})
-            this.tabRemoveHandle(data)
-          } else {
-            this.$message.error('请输入审批意见！')
-          }
+            })
+            .catch(() => {})
+          this.tabRemoveHandle(data)
+          // } else {
+          //   this.$message.error('请输入审批意见！')
+          // }
         } else if (type === '拒绝') {
           if (this.input !== '') {
             const params = qs.stringify({
diff --git a/back/src/views/modules/activiti/demo/putaway-process3.vue b/back/src/views/modules/activiti/demo/putaway-process3.vue
index f15c90d4..97829af5 100644
--- a/back/src/views/modules/activiti/demo/putaway-process3.vue
+++ b/back/src/views/modules/activiti/demo/putaway-process3.vue
@@ -234,42 +234,42 @@ export default {
       function (data) {
         this.dataForm.taskId = this.$route.params.taskId
         if (this.dialogType === '同意') {
-          if (this.input !== '') {
-            console.log('this.dataForm', this.dataForm)
-            const params = qs.stringify({
-              taskId: this.dataForm.taskId,
-              comment: this.input
-            })
-            console.log(params)
-            this.$http
-              .post('/act/task/complete?' + params)
-              .then(({ data: res }) => {
-                if (res.code !== 0) {
-                  this.$message.error(res.msg)
-                  if (this.callbacks.taskHandleErrorCallback) {
-                    this.callbacks.taskHandleErrorCallback(res)
-                  }
-                  return
+          // if (this.input !== '') {
+          console.log('this.dataForm', this.dataForm)
+          const params = qs.stringify({
+            taskId: this.dataForm.taskId,
+            comment: this.input || '同意'
+          })
+          console.log(params)
+          this.$http
+            .post('/act/task/complete?' + params)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                this.$message.error(res.msg)
+                if (this.callbacks.taskHandleErrorCallback) {
+                  this.callbacks.taskHandleErrorCallback(res)
                 }
-                bus.$emit('AbilityResourcesRemovedInit')
-                this.$message({
-                  message: this.$t('prompt.success'),
-                  type: 'success',
-                  duration: 500,
-                  onClose: () => {
-                    this.visible = false
-                    this.dialogVisible = false
-                    if (this.callbacks.taskHandleSuccessCallback) {
-                      this.callbacks.taskHandleSuccessCallback(res)
-                    }
+                return
+              }
+              bus.$emit('AbilityResourcesRemovedInit')
+              this.$message({
+                message: this.$t('prompt.success'),
+                type: 'success',
+                duration: 500,
+                onClose: () => {
+                  this.visible = false
+                  this.dialogVisible = false
+                  if (this.callbacks.taskHandleSuccessCallback) {
+                    this.callbacks.taskHandleSuccessCallback(res)
                   }
-                })
+                }
               })
-              .catch(() => {})
-            this.tabRemoveHandle(data)
-          } else {
-            this.$message.error('请输入审批意见！')
-          }
+            })
+            .catch(() => {})
+          this.tabRemoveHandle(data)
+          // } else {
+          //   this.$message.error('请输入审批意见！')
+          // }
         } else if (this.dialogType === '拒绝') {
           if (this.input !== '') {
             const params = qs.stringify({
diff --git a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
index 0c6f5035..9ce39e7a 100644
--- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@@ -251,43 +251,43 @@ export default {
     agreeOrNot: debounce(
       function (data, type) {
         if (type === '同意') {
-          if (this.input !== '') {
-            console.log('this.dataForm', this.dataForm)
-            const params = qs.stringify({
-              taskId: this.taskId,
-              comment: this.input
-            })
-            console.log(params)
-            this.$http
-              .post('/act/task/complete?' + params)
-              .then(({ data: res }) => {
-                if (res.code !== 0) {
-                  this.$message.error(res.msg)
-                  if (this.callbacks.taskHandleErrorCallback) {
-                    this.callbacks.taskHandleErrorCallback(res)
-                  }
-                  return
+          // if (this.input !== '') {
+          console.log('this.dataForm', this.dataForm)
+          const params = qs.stringify({
+            taskId: this.taskId,
+            comment: this.input || '同意'
+          })
+          console.log(params)
+          this.$http
+            .post('/act/task/complete?' + params)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                this.$message.error(res.msg)
+                if (this.callbacks.taskHandleErrorCallback) {
+                  this.callbacks.taskHandleErrorCallback(res)
                 }
-                bus.$emit('abilityResourceShelfInit')
-                this.$message({
-                  message: this.$t('prompt.success'),
-                  type: 'success',
-                  duration: 500,
-                  onClose: () => {
-                    this.visible = false
-                    this.dialogVisible = false
-                    this.input = ''
-                    if (this.callbacks.taskHandleSuccessCallback) {
-                      this.callbacks.taskHandleSuccessCallback(res)
-                    }
+                return
+              }
+              bus.$emit('abilityResourceShelfInit')
+              this.$message({
+                message: this.$t('prompt.success'),
+                type: 'success',
+                duration: 500,
+                onClose: () => {
+                  this.visible = false
+                  this.dialogVisible = false
+                  this.input = ''
+                  if (this.callbacks.taskHandleSuccessCallback) {
+                    this.callbacks.taskHandleSuccessCallback(res)
                   }
-                })
+                }
               })
-              .catch(() => {})
-            this.tabRemoveHandle(data)
-          } else {
-            this.$message.error('请输入审批意见！')
-          }
+            })
+            .catch(() => {})
+          this.tabRemoveHandle(data)
+          // } else {
+          //   this.$message.error('请输入审批意见！')
+          // }
         } else if (type === '驳回') {
           if (this.input !== '') {
             const params = qs.stringify({
diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index 83844d9a..90344a95 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: Light
- * @LastEditTime: 2022-11-17 17:09:03
+ * @LastEditTime: 2022-11-17 17:39:31
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -417,43 +417,43 @@ export default {
       function (data, type) {
         // console.log('datadata',data);
         // console.log('tttttt',type);
-        if (type === '同意') {
-          if (this.input !== '') {
-            console.log('this.dataForm', this.dataForm)
-            const params = qs.stringify({
-              taskId: this.dataForm.taskId,
-              comment: this.input
-            })
-            console.log(params)
-            this.$http
-              .post('/act/task/complete?' + params)
-              .then(({ data: res }) => {
-                if (res.code !== 0) {
-                  this.$message.error(res.msg)
-                  if (this.callbacks.taskHandleErrorCallback) {
-                    this.callbacks.taskHandleErrorCallback(res)
-                  }
-                  return
+        // if (type === '同意') {
+        if (this.input !== '') {
+          console.log('this.dataForm', this.dataForm)
+          const params = qs.stringify({
+            taskId: this.dataForm.taskId,
+            comment: this.input || '同意'
+          })
+          console.log(params)
+          this.$http
+            .post('/act/task/complete?' + params)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                this.$message.error(res.msg)
+                if (this.callbacks.taskHandleErrorCallback) {
+                  this.callbacks.taskHandleErrorCallback(res)
                 }
-                bus.$emit('competencyApplicationInit')
-                this.$message({
-                  message: this.$t('prompt.success'),
-                  type: 'success',
-                  duration: 500,
-                  onClose: () => {
-                    this.visible = false
-                    this.dialogVisible = false
-                    if (this.callbacks.taskHandleSuccessCallback) {
-                      this.callbacks.taskHandleSuccessCallback(res)
-                    }
+                return
+              }
+              bus.$emit('competencyApplicationInit')
+              this.$message({
+                message: this.$t('prompt.success'),
+                type: 'success',
+                duration: 500,
+                onClose: () => {
+                  this.visible = false
+                  this.dialogVisible = false
+                  if (this.callbacks.taskHandleSuccessCallback) {
+                    this.callbacks.taskHandleSuccessCallback(res)
                   }
-                })
+                }
               })
-              .catch(() => { })
-            this.tabRemoveHandle(data)
-          } else {
-            this.$message.error('请输入审批意见！')
-          }
+            })
+            .catch(() => { })
+          this.tabRemoveHandle(data)
+          // } else {
+          //   this.$message.error('请输入审批意见！')
+          // }
         } else if (type === '驳回') {
           if (this.input !== '') {
             const params = qs.stringify({

From cf1e1452c370ac6f36656569563bf83ead30bcf6 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 18 Nov 2022 10:30:24 +0800
Subject: [PATCH 21/25] =?UTF-8?q?=E5=88=86=E7=A6=BB=E8=A5=BF=E6=B5=B7?=
 =?UTF-8?q?=E5=B2=B8=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/api/home.js                         |    9 +-
 front/src/views/home/DetailsPageconetent.vue  |   96 +-
 .../components/GovernmentCloudResources.vue   |  102 +
 .../home/detailsPageInfrastructureTreeXha.vue |  336 ++
 front/src/views/home/infrastructurePage.vue   |  132 +-
 .../src/views/home/infrastructurePageXha.vue  | 2934 +++++++++++++++++
 6 files changed, 3530 insertions(+), 79 deletions(-)
 create mode 100644 front/src/views/home/components/GovernmentCloudResources.vue
 create mode 100644 front/src/views/home/detailsPageInfrastructureTreeXha.vue
 create mode 100644 front/src/views/home/infrastructurePageXha.vue

diff --git a/front/src/api/home.js b/front/src/api/home.js
index 93e088d1..fb90e0d0 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 19:19:40
  * @LastEditors: Light
- * @LastEditTime: 2022-10-31 15:52:57
+ * @LastEditTime: 2022-11-18 09:16:13
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -526,3 +526,10 @@ export function getGisByArea(data) {
     data,
   })
 }
+export function getPolicyCloudService(params) {
+  return request({
+    url: '/resource/getPolicyCloudService',
+    method: 'get',
+    params,
+  })
+}
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 986fda7c..0857e926 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -1,4 +1,5 @@
 <template>
+  itShowQingDao
   <!-- 青岛 -->
   <div class="details-pageconetent" v-if="whoShow1 && whoShow1.itShowQingDao">
     <home-header></home-header>
@@ -21,19 +22,20 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-           <i  class="searchImg" aria-hidden="true"></i>
-           <button
+          <i class="searchImg" aria-hidden="true"></i>
+          <button class="button-reset" @click="globalSearch()">全局搜索</button>
+          <button
             class="button-reset"
-            @click="globalSearch()"
+            style="margin-left: 0.1rem"
+            @click="chongzhi()"
           >
-            全局搜索
+            重置
           </button>
-          <button class="button-reset" style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
           <button
             v-if="Cardsname == '应用资源'"
             class="button-reset"
             @click="applyAll()"
-            style="margin-left: 0.1rem;width:135px"
+            style="margin-left: 0.1rem; width: 135px"
           >
             申请全部应用资源
           </button>
@@ -168,14 +170,15 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-            <i  class="searchImg" aria-hidden="true"></i>
+          <i class="searchImg" aria-hidden="true"></i>
+          <button class="button-reset" @click="globalSearch()">全局搜索</button>
           <button
             class="button-reset"
-            @click="globalSearch()"
+            style="margin-left: 0.1rem"
+            @click="chongzhi()"
           >
-            全局搜索
+            重置
           </button>
-          <button class="button-reset" style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
       </div>
@@ -228,14 +231,15 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-            <i  class="searchImg" aria-hidden="true"></i>
-           <button
+          <i class="searchImg" aria-hidden="true"></i>
+          <button class="button-reset" @click="globalSearch()">全局搜索</button>
+          <button
             class="button-reset"
-            @click="globalSearch()"
+            style="margin-left: 0.1rem"
+            @click="chongzhi()"
           >
-            全局搜索
+            重置
           </button>
-          <button class="button-reset" style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
       </div>
@@ -302,7 +306,7 @@
       <detailsPageconetentTree />
     </div>
     <div class="details-pageconetent-left" v-else>
-      <detailsPageInfrastructureTree />
+      <detailsPageInfrastructureTreeXha />
     </div>
     <div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
       <div class="top-title">
@@ -334,8 +338,14 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-            <i  class="searchImg" aria-hidden="true"></i>
-          <button class="button-reset" style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
+          <i class="searchImg" aria-hidden="true"></i>
+          <button
+            class="button-reset"
+            style="margin-left: 0.1rem"
+            @click="chongzhi()"
+          >
+            重置
+          </button>
           <div class="hengxian"></div>
         </div>
       </div>
@@ -445,7 +455,7 @@
         </div>
       </div>
       <div class="top-content-father">
-        <infrastructurePage
+        <infrastructurePageXha
           ref="camera"
           :searchValue="searchValue"
           :searchType="searchType"
@@ -482,8 +492,14 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-          <i  class="searchImg" aria-hidden="true"></i>
-          <button class="button-reset" style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
+          <i class="searchImg" aria-hidden="true"></i>
+          <button
+            class="button-reset"
+            style="margin-left: 0.1rem"
+            @click="chongzhi()"
+          >
+            重置
+          </button>
         </div>
       </div>
       <KnowledgeBase
@@ -540,8 +556,14 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-            <i  class="searchImg" aria-hidden="true"></i>
-          <button class="button-reset" style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
+          <i class="searchImg" aria-hidden="true"></i>
+          <button
+            class="button-reset"
+            style="margin-left: 0.1rem"
+            @click="chongzhi()"
+          >
+            重置
+          </button>
           <div class="hengxian"></div>
         </div>
       </div>
@@ -706,8 +728,14 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-            <i  class="searchImg" aria-hidden="true"></i>
-          <button class="button-reset"  style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
+          <i class="searchImg" aria-hidden="true"></i>
+          <button
+            class="button-reset"
+            style="margin-left: 0.1rem"
+            @click="chongzhi()"
+          >
+            重置
+          </button>
         </div>
       </div>
       <KnowledgeBase
@@ -747,7 +775,9 @@
   import DetailsPageResource from '@/views/home/components/DetailsPageResource.vue'
   // 基础设施引用
   import infrastructurePage from '@/views/home/infrastructurePage.vue'
+  import infrastructurePageXha from '@/views/home/infrastructurePageXha.vue'
   import detailsPageInfrastructureTree from '@/views/home/detailsPageInfrastructureTree.vue'
+  import detailsPageInfrastructureTreeXha from '@/views/home/detailsPageInfrastructureTreeXha.vue'
   import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   import { useStore } from 'vuex'
   import { message } from 'ant-design-vue'
@@ -1907,7 +1937,9 @@
       KnowledgeBase,
       DetailsPageResource,
       infrastructurePage,
+      infrastructurePageXha,
       detailsPageInfrastructureTree,
+      detailsPageInfrastructureTreeXha,
     },
     beforeUnmount() {
       mybus.off('getCameraByParentId')
@@ -1941,13 +1973,13 @@
         background: rgba(150, 144, 144, 0.3);
         margin-top: 0.2rem;
       }
-     .searchImg{
-      width: 17px;
-      height: 17px;
-     background: url('~@/assets/home/searchInner.png');
-      position: absolute;
-      top: 29px;
-      left: 480px;
+      .searchImg {
+        width: 17px;
+        height: 17px;
+        background: url('~@/assets/home/searchInner.png');
+        position: absolute;
+        top: 29px;
+        left: 480px;
       }
     }
   }
diff --git a/front/src/views/home/components/GovernmentCloudResources.vue b/front/src/views/home/components/GovernmentCloudResources.vue
new file mode 100644
index 00000000..2752e22b
--- /dev/null
+++ b/front/src/views/home/components/GovernmentCloudResources.vue
@@ -0,0 +1,102 @@
+<!--
+ * @Author: Light
+ * @Date: 2022-11-16 16:46:16
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-17 09:46:45
+ * @Description: 政务云资源列表
+-->
+<template>
+  <div class="top">
+    <div>检索结果：60项</div>
+    <div>
+      使用声明:
+      附加增值服务，委办局单位可以根据自身需求，按需采购，由采购单位付费。
+    </div>
+  </div>
+  <div class="bottom">
+    <div class="left"></div>
+    <div class="right">
+      <div class="title">
+        <div>
+          <div class="name">云主机</div>
+          <div class="type">基础服务</div>
+        </div>
+        <div>年份：2022</div>
+      </div>
+      <div class="text">云主机配置</div>
+      <div class="info">
+        <div>一级条目：主机服务</div>
+        <div>规格：1H2G</div>
+      </div>
+    </div>
+  </div>
+</template>
+<script setup></script>
+<style lang="less" scoped>
+  .top {
+    display: flex;
+    justify-content: space-between;
+    color: #333;
+    padding-bottom: 10px;
+    border-bottom: 1px #ccc solid;
+  }
+  .bottom {
+    margin-top: 20px;
+    padding-bottom: 20px;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    border-bottom: 1px #ccc solid;
+    .left {
+      width: 110px;
+      height: 110px;
+      background: url('~@/assets/home/znsf_square.png') no-repeat;
+      background-size: 100%;
+    }
+    .right {
+      flex: 1;
+      margin-left: 20px;
+      .title {
+        display: flex;
+        justify-content: space-between;
+        div:nth-of-type(1) {
+          display: flex;
+          justify-content: flex-start;
+          align-items: center;
+          .name {
+            max-width: 400px;
+            height: 22px;
+            line-height: 24px;
+            overflow: hidden; //超出的文本隐藏
+            display: -webkit-box;
+            -webkit-line-clamp: 1; // 超出多少行
+            -webkit-box-orient: vertical;
+            font-size: 20px;
+            font-weight: 600;
+          }
+          .type {
+            margin-left: 10px;
+            padding: 1px 5px;
+            color: rgba(0, 88, 225, 0.8);
+            background-color: rgba(0, 135, 225, 0.1);
+            border-radius: 15px;
+          }
+        }
+      }
+      .text {
+        height: 50px;
+        overflow: hidden; //超出的文本隐藏
+        display: -webkit-box;
+        -webkit-line-clamp: 2; // 超出多少行
+        -webkit-box-orient: vertical;
+      }
+      .info {
+        display: flex;
+        justify-content: flex-start;
+        div:nth-of-type(1) {
+          margin-right: 50px;
+        }
+      }
+    }
+  }
+</style>
diff --git a/front/src/views/home/detailsPageInfrastructureTreeXha.vue b/front/src/views/home/detailsPageInfrastructureTreeXha.vue
new file mode 100644
index 00000000..b30661cb
--- /dev/null
+++ b/front/src/views/home/detailsPageInfrastructureTreeXha.vue
@@ -0,0 +1,336 @@
+<template>
+  <div class="wrapper">
+    <div class="wrapper-title-left-tree" :key="showKey">
+      <div v-for="item in treeData" :key="item.id" class="primaryNode">
+        <div class="top" @click="showBottom(item)" :class="item.show ? 'topSelect' : ''">
+          {{ item.name }}
+          ({{ item.channelCount }})
+          <DownOutlined v-show="!item.show" />
+          <UpOutlined v-show="item.show" />
+        </div>
+        <div class="bottom" v-show="item.show">
+          <div v-for="val in item.children" :key="val.id" class="item">
+            <div class="up" :class="selectId == val.id ? 'select' : ''"
+              @click="showDown(item, val), onSelect(item, val)">
+              <div>
+                <svg t="1654068878091" class="icon" viewBox="0 0 1024 1024" version="1.1"
+                  xmlns="http://www.w3.org/2000/svg" p-id="2156" width="0.25rem" height="0.25rem"
+                  v-show="selectId == val.id">
+                  <path d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z" p-id="2157" fill="#0058e1"></path>
+                </svg>
+                <span class="name">{{ val.name }}({{ val.channelCount }})</span>
+              </div>
+              <span v-if="item.children.length < 0">{{ val.total }}</span>
+              <span v-else>
+                <down-outlined v-show="!val.show" />
+                <up-outlined v-show="val.show" />
+              </span>
+            </div>
+            <div class="down" v-show="val.show">
+              <div v-for="child in val.children" :key="child.id" class="child"
+                :class="selectId == child.id ? 'select2' : ''" @click="onSelect(item, child, child)">
+                <div>
+                  <svg t="1654068878091" class="icon" viewBox="0 0 1024 1024" version="1.1"
+                    xmlns="http://www.w3.org/2000/svg" p-id="2156" width="0.25rem" height="0.25rem"
+                    v-show="selectId == child.id">
+                    <path d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z" p-id="2157" fill="#0058e1"></path>
+                  </svg>
+                  <span class="name">
+                    {{ child.name }}
+                  </span>
+                </div>
+                <span>{{ child.channelCount }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { defineComponent, ref, watch } from 'vue'
+import { getCameraAllOrgan } from '@/api/videoSurveillance'
+import { getCameraInfoByAreaId } from '@/api/file'
+import mybus from '@/myplugins/mybus'
+import { useRouter } from 'vue-router'
+import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
+import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+
+export default defineComponent({
+  setup() {
+    const router = useRouter()
+    const whoShow1 = ref(whoShow)
+    const showKey = ref(0)
+    const treeData = ref([])
+    const selectId = ref('')
+
+    // 初始化
+    const init = async () => {
+      treeData.value = []
+      console.log(
+        'router.currentRoute.value.query.select',
+        router.currentRoute.value.query.select
+      )
+      let select = router.currentRoute.value.query.select || DETAIL_PAGE_CONTENT_DEFAULT_TAB
+      if (select === '123') {
+        select = ''
+      }
+      console.log(
+        '获取url中的select=====================>',
+        router.currentRoute.value.query.select
+      )
+      if (select == '基础设施') {
+        let res = {};
+        if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
+          res = await getCameraAllOrgan({ parentId: 'S4NbecfYB1DBH8HNULGS34' })
+        } else {
+          // 西海岸
+          res = await getCameraInfoByAreaId({
+            areaId: '70be8c5b664f4bcf869d82f2e8335051',
+          })
+        }
+        treeData.value = res.data && res.data.data || []
+        // 只有一个，默认展开到二级菜单
+        if(res.data && res.data.data.length == 1) {
+          showBottom(treeData.value[0])
+        }
+      }
+    }
+    mybus.on('getDeptList', () => {
+      init()
+    })
+
+    const onSelect = async (item, val, child) => {
+      console.log('item--------onSelect---->', item);
+      console.log('val------onSelect------>', val);
+      console.log('child-----onSelect------->', child);
+      mybus.emit('getCameraByParentId', val.id)
+      mybus.emit('getListByParentId', val.id)
+      let res = {}
+      if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
+        res = await getCameraAllOrgan({ parentId: val.id })
+      } else {
+        // 西海岸
+        res = await getCameraInfoByAreaId({ areaId: val.id })
+      }
+      treeData.value.map((treeDataItem, index) => {
+        if (item.id == treeDataItem.id) {
+          treeData.value[index].children.map((childItem, childIndex) => {
+            if (childItem.id == val.id) {
+              treeData.value[index].children[childIndex].children =
+                res.data.data
+            }
+          })
+        }
+      })
+      if (child) {
+        selectId.value = child.id
+      }
+    }
+
+    watch(selectId, (newVal) => {
+      if (newVal == '') {
+        mybus.emit('getCameraByParentId', '')
+        mybus.emit('getListByParentId', '')
+      }
+    })
+
+    const showBottom = async (item) => {
+      item.show = !item.show;
+      let res = {};
+      if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
+        res = await getCameraAllOrgan({ parentId: item.id })
+      } else {
+        // 西海岸
+        res = await getCameraInfoByAreaId({ areaId: item.id })
+      }
+
+      treeData.value.map((treeDataItem, index) => {
+        if (item.id == treeDataItem.id) {
+          treeData.value[index].children = res.data && res.data.data || []
+          console.log('treeData.value.[index]', treeData.value[index])
+        }
+      })
+    }
+    const showDown = (item, val) => {
+      selectId.value = val.id
+      console.log('item---showDown--------->', item);
+      console.log('val----showDown-------->', val);
+      if (item.children) {
+        val.show = !val.show;
+        // 取消选中
+        if (!val.show) {
+          selectId.value = ''
+        }
+      }
+    }
+    return {
+      treeData,
+      showKey,
+      onSelect,
+      showBottom,
+      showDown,
+      selectId,
+    }
+  },
+  beforeUnmount() {
+    mybus.off('getDeptList')
+    console.log('getDeptList销毁~~~~~~~~~~~~~~~~~~~')
+  },
+  components: {
+    UpOutlined,
+    DownOutlined,
+  },
+})
+</script>
+<style lang="less" scoped>
+.primaryNode {
+  .top {
+    width: 100%;
+    height: 0.4rem;
+    background: rgba(0, 135, 225, 0.1);
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 0.1rem;
+    margin-top: 0.08rem;
+  }
+
+  .top:hover {
+    cursor: pointer;
+    // 0058e1 透明度 0.5
+    background: rgba(0, 88, 225, 0.8);
+    color: white;
+
+    :deep(.anticon) {
+      color: white;
+    }
+  }
+
+  .topSelect {
+    background: #0058e1;
+    color: white;
+
+    :deep(.anticon) {
+      color: white;
+    }
+  }
+
+  .bottom {
+    width: 100%;
+    background: rgba(244, 245, 248, 0.8);
+    padding: 0 0.1rem;
+
+    // margin-bottom: .08rem;
+    .up {
+      cursor: pointer;
+      height: 0.4rem;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      border-top: 0.01rem solid #ccc;
+      padding: 0 0.1rem;
+
+      &>div {
+        display: flex;
+        justify-content: flex-start;
+      }
+
+      .name {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 1;
+        -webkit-box-orient: vertical;
+        word-break: break-all;
+      }
+    }
+
+    .up:hover {
+      .name {
+        color: #0058e1;
+        font-weight: 600;
+      }
+
+      span {
+        color: #0058e1;
+        font-weight: 600;
+      }
+    }
+
+    .select {
+      padding: 0 0.1rem 0 0;
+
+      .name {
+        width: 1.7rem;
+        color: #0058e1 !important;
+        font-weight: 600;
+      }
+
+      span {
+        color: #0058e1;
+        font-weight: 600;
+      }
+    }
+
+    .item:nth-of-type(1) .up {
+      border-top: none;
+    }
+
+    .down {
+      width: 100%;
+
+      .child {
+        cursor: pointer;
+        height: 0.4rem;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 0 0.1rem;
+
+        &>div {
+          display: flex;
+          justify-content: flex-start;
+        }
+
+        .name {
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 1;
+          -webkit-box-orient: vertical;
+          word-break: break-all;
+        }
+      }
+
+      .child:hover {
+        .name {
+          color: #0058e1;
+          font-weight: 600;
+        }
+
+        span {
+          color: #0058e1;
+          font-weight: 600;
+        }
+      }
+
+      .select2 {
+        .name {
+          width: 1.7rem;
+          color: #0058e1;
+          font-weight: 600;
+        }
+
+        span {
+          color: #0058e1;
+          font-weight: 600;
+        }
+
+        padding: 0 0.1rem 0 0;
+      }
+    }
+  }
+}
+</style>
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 85d16d64..316597ea 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -560,6 +560,12 @@
           @change="handleMeeting"
         ></a-table>
       </div>
+      <div
+        class="infrastructrue-table"
+        v-if="!wrjFlag && selectType == '政务云资源'"
+      >
+        <GovernmentCloudResources></GovernmentCloudResources>
+      </div>
       <!-- 西海岸-无人机、单兵设备 -->
       <div class="infrastructrue-table" v-else-if="isXiHaiAn && wrjFlag">
         <a-table
@@ -771,20 +777,10 @@
 </template>
 <script setup>
   import VideoSurveillance from '@/views/home/videoSurveillance'
+  import GovernmentCloudResources from './components/GovernmentCloudResources'
   import { useRouter } from 'vue-router'
-  import { message, Upload } from 'ant-design-vue'
-  import {
-    ref,
-    reactive,
-    onMounted,
-    defineProps,
-    watch,
-    defineComponent,
-    nextTick,
-    defineExpose,
-    computed,
-  } from 'vue'
-  import { getUser, getEnkeUsers } from '@/api/home'
+  import { message } from 'ant-design-vue'
+  import { ref, reactive, onMounted, defineProps, defineExpose } from 'vue'
   import { initiateMeet } from '@/api/file'
   import {
     getCameraByParentId,
@@ -794,17 +790,18 @@
   } from '@/api/videoSurveillance'
   import { getCameraByCondition } from '@/api/file'
   import {
+    getUser,
+    getEnkeUsers,
     sgcInsert,
-    xhaAddCart,
     getRoomSearch,
     getDate,
     setSubmit,
     getYuyue,
     getSoldierList,
     getMaxApplyNum,
+    getPolicyCloudService,
   } from '@/api/home'
   import mybus from '@/myplugins/mybus'
-  import dayjs from 'dayjs'
   import { Form } from 'ant-design-vue'
   import moment from 'moment'
   import { useStore } from 'vuex'
@@ -1123,7 +1120,7 @@
   let clickList = ref([]) //存储点击的tab
   if (!isXiHaiAn) {
     tabList.value.push({
-      title: '城市云脑会客厅',
+      title: '筛选条件',
       content: [],
     })
   }
@@ -1580,7 +1577,7 @@
         dataSource2.value = []
         pagination.value.total = 0
         if (tabList.value[1]) {
-          tabList.value[1].title = '政务云资源分类'
+          tabList.value[1].title = '服务类别'
         }
         selectType.value = '政务云资源'
       } else if (name == '感知资源') {
@@ -1604,10 +1601,12 @@
         }
         selectType.value = '视频会议'
       }
-      clickList.value[indexFather].content.splice(
-        clickList.value[indexFather].content.indexOf(name),
-        1
-      )
+      if (indexFather !== 0 && selectType.value !== '政务云资源') {
+        clickList.value[indexFather].content.splice(
+          clickList.value[indexFather].content.indexOf(name),
+          1
+        )
+      }
     } else {
       if (name == '视频资源') {
         selectType.value = '视频资源'
@@ -1661,17 +1660,21 @@
         }
         clickList.value[indexFather].content[0] = name
         if (tabList.value[1]) {
-          tabList.value[1].title = '政务云资源分类'
-          tabList.value[1].content = [
-            '云主机',
-            '算力主机',
-            '对象存储',
-            '堡垒机',
-            '防火墙',
-            '网闸',
-            '负载均衡',
-            '公网IP',
-          ]
+          if (!isXiHaiAn) {
+            tabList.value[1].title = '服务类别'
+            tabList.value[1].content = [
+              '基础服务',
+              'PaaS服务',
+              '安全服务',
+              '大数据服务',
+              '附加增值服务',
+            ]
+          } else {
+            if (tabList.value[1]) {
+              tabList.value[1].title = ''
+              tabList.value[1].content = []
+            }
+          }
         }
         room.value = true
         wrjFlag.value = false
@@ -1738,11 +1741,51 @@
         emits('add', 6)
         searchData()
       } else {
-        if (clickList.value[indexFather]) {
+        if (
+          clickList.value[indexFather] &&
+          (clickList.value[0].content[0] !== '政务云资源' || indexFather !== 1)
+        ) {
           clickList.value[indexFather].content.push(name)
         }
       }
     }
+    // 市局添加政务云资源
+    console.log(
+      '点击==========>',
+      indexFather,
+      name,
+      clickList.value,
+      clickList.value[0].content[0],
+      clickList.value[indexFather].content.indexOf(name)
+    )
+    if (!isXiHaiAn && indexFather == 0 && name == '政务云资源') {
+      getGovernmentCloud()
+    }
+    if (
+      clickList.value[0].content[0] === '政务云资源' &&
+      name !== '政务云资源'
+    ) {
+      console.log(
+        '点击政务云资源',
+        clickList.value[1].content[0],
+        clickList.value[indexFather].content.indexOf(name) !== -1
+      )
+      if (clickList.value[indexFather].content.indexOf(name) !== -1) {
+        console.log(
+          '点击政务云资源点击过',
+          clickList.value[indexFather].content[0]
+        )
+        clickList.value[indexFather].content.splice(
+          clickList.value[indexFather].content.indexOf(name),
+          1
+        )
+      } else {
+        clickList.value[indexFather].content = [name]
+      }
+      if (!isXiHaiAn) {
+        getGovernmentCloud()
+      }
+    }
     // 改变查询摄像头接口的labelCode数组
     mapSearchParam.value.labelCodes = []
     if (clickList.value[1]) {
@@ -2106,18 +2149,11 @@
   //加入申购车
   const addShoppingCart = () => {
     if (selectedList.value.length > 0) {
-      let _arr = []
-      selectedList.value.map((v) => {
-        _arr.push({
-          delFlag: '0',
-          resourceId: v.idtCameraChannel,
-          note1: [v],
-        })
-      })
-      xhaAddCart(_arr).then((res) => {
-        if (res.data.code !== 0) {
-          return message.error(res.data.msg)
-        }
+      sgcInsert({
+        delFlag: '0',
+        resourceld: '8888888880000000001',
+        note1: selectedList.value,
+      }).then((res) => {
         message.success('添加申购车成功！')
         mybus.emit('getSgcNum')
       })
@@ -2277,7 +2313,11 @@
     } else {
     }
   }
-
+  const getGovernmentCloud = () => {
+    getPolicyCloudService().then((res) => {
+      console.log('获取政务云资源======》', res.data.data)
+    })
+  }
   // 切换tab
   const handleTableChange = (val) => {
     pagination.value.current = val.current
diff --git a/front/src/views/home/infrastructurePageXha.vue b/front/src/views/home/infrastructurePageXha.vue
new file mode 100644
index 00000000..316597ea
--- /dev/null
+++ b/front/src/views/home/infrastructurePageXha.vue
@@ -0,0 +1,2934 @@
+<!-- 基础设施 -->
+<template>
+  <div class="infrastructrueBox">
+    <!-- 选项卡 -->
+    <div class="infrastructrue-tab">
+      <div v-for="(item, index) in tabList" :key="index" class="tabBox">
+        <b class="leftType">{{ item.title }}</b>
+        <el-button
+          @click="nullClick"
+          v-if="item.title == '视频标签'"
+          type="small"
+        >
+          清空
+        </el-button>
+        <span
+          v-for="itemContent in item.content"
+          :key="itemContent"
+          @click="tabClick(index, itemContent)"
+          :class="
+            clickList[index].content.indexOf(itemContent.labelName) != -1 ||
+            clickList[index].content.indexOf(itemContent) != -1
+              ? 'down'
+              : ''
+          "
+        >
+          {{ itemContent.labelName || itemContent }}
+        </span>
+      </div>
+    </div>
+
+    <div v-if="!room" class="roomBox">
+      <div class="leftMake">
+        <div
+          class="leftTop"
+          @click="roomResults"
+          :class="roomYuyue ? 'roomBackground' : 'nullBackground'"
+        >
+          会客厅预约
+        </div>
+        <div
+          class="leftBottom"
+          @click="result"
+          :class="roomResult ? 'roomBackground' : 'nullBackground'"
+        >
+          预约结果
+        </div>
+      </div>
+      <div class="roomSearch">
+        <span>会客厅搜索</span>
+        <div class="searchInput">
+          <a-input-search
+            v-model:value="roomInput"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="onSearch"
+          />
+          <!-- <a-button
+            style="width: 0.8rem; height: 0.36rem; margin-left: 0.7rem"
+            @click="reSetSearch"
+          >
+            重置
+          </a-button> -->
+        </div>
+      </div>
+      <div v-if="roomYuyue">
+        <div class="roomTableList">
+          <span>会客厅列表</span>
+          <div class="roomTime">
+            <span>可用时间查询</span>
+            <a-space direction="vertical" class="roomSpace">
+              <a-date-picker
+                v-model:value="roomCerateDate"
+                placeholder="开始日期"
+                value-format="YYYY-MM-DD"
+                :disabled-date="disabledDate"
+              />
+              <a-time-picker
+                v-model:value="roomCreateTime"
+                placeholder="开始时间"
+                value-format="HH:mm:ss"
+                :disabledHours="disabledStartHours"
+                :disabledMinutes="disabledStartMinutes"
+                :disabledSeconds="disabledStartSeconds"
+              />
+              <a-time-picker
+                v-model:value="roomEndTime"
+                placeholder="结束时间"
+                value-format="HH:mm:ss"
+                :disabledHours="disabledEndHours"
+                :disabledMinutes="disabledEndMinutes"
+                :disabledSeconds="disabledEndSeconds"
+              />
+            </a-space>
+          </div>
+        </div>
+        <div class="roomItem" v-for="item in roomList" :key="item.id">
+          <div class="leftImg">
+            <img :src="item.pic == null ? hys : `${item.pic}`" alt="" />
+          </div>
+          <div class="rightContent">
+            <div class="topContent">{{ item.name }}</div>
+            <div class="centerContent">
+              <span>房间号：{{ item.num }}</span>
+              <span>可容纳人数：{{ item.capacity }}人</span>
+              <span>面积：{{ item.area }}m²</span>
+            </div>
+            <div class="bottonmContent">
+              <a-tooltip>
+                <template #title>{{ item.description }}</template>
+                <span>{{ item.description }}</span>
+              </a-tooltip>
+              <!-- <a-tooltip>
+                {{ item.description }}
+              </a-tooltip>        -->
+            </div>
+          </div>
+          <a-button
+            style="
+              margin-left: 0.8rem;
+              background: #e1edfa;
+              color: #0087ff;
+              border: none;
+              border-radius: 0.06rem;
+            "
+            @click="appointment(item)"
+          >
+            预约
+          </a-button>
+        </div>
+        <a-pagination
+          v-model:current="roomPage"
+          v-model:pageSize="roomLimit"
+          show-quick-jumper
+          :total="roomTotal"
+          :page-size-options="pageSizeOptions"
+          @change="onRoomChange"
+          @showSizeChange="onShowSizeChange"
+          show-size-changer
+        />
+      </div>
+      <div v-if="roomResult" style="display: grid">
+        <a-table
+          :columns="columnsRomm"
+          :data-source="dataRoom"
+          :filterMultiple="false"
+          :align="center"
+          :pagination="false"
+        >
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'bookDate'">
+              <span>
+                {{ record.bookDate }} {{ record.startTime }}-{{
+                  record.endTime
+                }}
+              </span>
+            </template>
+            <template v-if="column.key === 'state'">
+              <span>
+                {{
+                  record.state == 2
+                    ? '通过'
+                    : record.state == 1
+                    ? '审核中'
+                    : '不通过'
+                }}
+              </span>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a @click="look(record)">查看详情</a>
+            </template>
+          </template>
+        </a-table>
+        <a-pagination
+          v-model:current="roomPage"
+          v-model:pageSize="roomLimit"
+          show-quick-jumper
+          :total="roomTotal"
+          :page-size-options="pageSizeOptionsChengguo"
+          @change="onRoomChangeChengguo"
+          @showSizeChange="onShowSizeChangeChengguo"
+          show-size-changer
+        />
+      </div>
+      <a-modal
+        v-model:visible="visibleRoom"
+        width="10rem"
+        title="预约详情"
+        :body-style="bodystyle"
+        class="modalClass"
+        :footer="null"
+      >
+        <div class="modalResult" style="margin-bottom: 0.05rem">预约结果</div>
+        <div
+          style="
+            width: 100%;
+            height: 0.01rem;
+            border-top: 1px solid #ccc;
+            transform: scaleY(0.5);
+          "
+        ></div>
+        <div
+          class="modalExamine"
+          style="display: flex; flex-direction: column; margin-top: 0.2rem"
+        >
+          <span style="margin-bottom: 0.2rem">
+            审核结果：{{
+              lookData.state == 2
+                ? '通过'
+                : lookData.state == 1
+                ? '审核中'
+                : '不通过'
+            }}
+          </span>
+          <span style="width: 8rem; margin-bottom: 0.3rem">
+            审核意见：{{ lookData.auditViem }}
+          </span>
+        </div>
+        <div class="modalYuyue" style="margin-bottom: 0.05rem">预约信息</div>
+        <div
+          style="
+            width: 100%;
+            height: 0.01rem;
+            border-top: 1px solid #ccc;
+            transform: scaleY(0.5);
+          "
+        ></div>
+        <div class="modalTime" style="margin-top: 0.2rem">
+          <div>
+            预约时段：{{ lookData.bookDate }} {{ lookData.startTime }}-{{
+              lookData.endTime
+            }}
+          </div>
+          <div
+            class="modalContent"
+            style="
+              width: 7.5rem;
+              display: flex;
+              justify-content: space-between;
+              margin: 0.15rem 0 0.15rem 0;
+            "
+          >
+            <span>预约人：{{ lookData.name }}</span>
+            <span>联系方式：{{ lookData.phone }}</span>
+            <span>预约部门：{{ lookData.dept }}</span>
+          </div>
+        </div>
+        <div style="width: 8rem; margin-bottom: 0.3rem">
+          使用事项：{{ lookData.matter }}
+        </div>
+      </a-modal>
+      <a-modal
+        v-model:visible="appointmentRoom"
+        title="会客厅预约"
+        width="10rem"
+        @ok="handleOk"
+        :body-style="bodystyle"
+        class="appModal"
+        :footer="null"
+      >
+        <a-form
+          :model="formState"
+          name="basic"
+          :label-col="{ span: 8 }"
+          :wrapper-col="{ span: 16 }"
+          autocomplete="off"
+          @finish="onFinish"
+          @finishFailed="onFinishFailed"
+          :labelAlign="labelPosition"
+        >
+          <a-row>
+            <a-col :span="8">
+              <a-form-item
+                name="bookDate"
+                label="预约日期"
+                v-bind="validateInfos.bookDate"
+                @blur="validate('create', { trigger: 'blur' }).catch(() => {})"
+              >
+                <a-date-picker
+                  style="width: 72%"
+                  v-model:value="formState.bookDate"
+                  value-format="YYYY-MM-DD"
+                  :disabled-date="disabledDate"
+                  @change="handleChange"
+                />
+              </a-form-item>
+              <div
+                :class="roomDateList[0] != null ? 'jinggaoD' : 'jinggaoNull'"
+              >
+                <div class="imgJinggao"></div>
+                <span style="color: #da2a13; font-size: 0.12rem">
+                  当日会客厅可用时段：{{ roomDateList[0] }}
+                </span>
+              </div>
+            </a-col>
+            <a-col :span="8">
+              <a-form-item
+                name="startTime"
+                label="预约时段"
+                v-bind="validateInfos.startTime"
+                style="display: flex"
+              >
+                <a-time-picker
+                  v-model:value="formState.startTime"
+                  placeholder="开始时间"
+                  value-format="HH:mm:ss"
+                  :disabledHours="disabledTimeHours"
+                  :disabledMinutes="disabledTimeMinutes"
+                  :disabledSeconds="disabledTimeSeconds"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="8">
+              <a-time-picker
+                v-model:value="formState.endTime"
+                placeholder="结束时间"
+                value-format="HH:mm:ss"
+                :disabledHours="disabledTimeEndHours"
+                :disabledMinutes="disabledTimeEndMinutes"
+                :disabledSeconds="disabledTimeEndSeconds"
+              />
+            </a-col>
+          </a-row>
+          <a-row style="margin-top: 0.4rem">
+            <a-col :span="8">
+              <a-form-item
+                name="name"
+                label="预约人"
+                v-bind="validateInfos.name"
+              >
+                <a-input v-model:value="formState.name" style="width: 72%" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-item name="phone" label="联系电话">
+                <a-input v-model:value="formState.phone" style="width: 72%" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="8">
+              <a-form-item
+                name="dept"
+                label="预约部门"
+                v-bind="validateInfos.dept"
+              >
+                <a-input v-model:value="formState.dept" style="width: 72%" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row style="margin-top: 0.4rem">
+            <a-col :span="24">
+              <a-form-item
+                name="matter"
+                v-bind="validateInfos.matter"
+                label="使用事项"
+                class="introduction"
+              >
+                <a-textarea v-model:value="formState.matter" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row style="margin-top: 0.4rem">
+            <a-col :span="24">
+              <a-form-item
+                name="uploadRoom"
+                label="附件上传"
+                class="introduction"
+              >
+                <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-form-item
+            :wrapper-col="{ span: 14, offset: 4 }"
+            style="text-align: center; margin-top: 0.4rem"
+          >
+            <a-button @click="appointmentRoom = false" type="primary" danger>
+              取消
+            </a-button>
+            <a-button
+              style="margin-left: 10px"
+              type="primary"
+              @click="onSubmit"
+            >
+              提交
+            </a-button>
+          </a-form-item>
+        </a-form>
+      </a-modal>
+    </div>
+    <div v-if="room">
+      <!-- 地图 -->
+      <div class="map-contain" v-if="showMap">
+        <video-surveillance></video-surveillance>
+      </div>
+      <!-- 功能行 -->
+      <div class="infrastructrue-content" v-if="!wrjFlag">
+        <!-- 表格数据统计 -->
+        <div class="contentNum">
+          <p v-if="selectType !== '视频会议' && isXiHaiAn">
+            备选
+            <span>{{ pagination.total || 0 }}</span>
+            个
+          </p>
+          <p v-if="selectType !== '视频会议' && isXiHaiAn">
+            已选
+            <span>{{ selectedRowKeys.length }}</span>
+            个
+          </p>
+        </div>
+        <!-- 右侧 -->
+        <div class="contentRight">
+          <div class="searchInput" v-if="isXiHaiAn">
+            <a-input-search
+              v-model:value="mapSearchParam.cameraName"
+              placeholder="请输入关键词"
+              enter-button="搜索"
+              size="large"
+              @change="(e) => getCamera(true, e.target.value)"
+            />
+            <a-button
+              type="primary"
+              style="width: 0.8rem; height: 0.36rem; margin-left: 0.7rem"
+              @click="clean"
+            >
+              重置
+            </a-button>
+          </div>
+          <i></i>
+          <!-- 批量预览 -->
+          <a-button
+            type="primary"
+            @click="batchPreview"
+            class="buttonAdd"
+            v-if="isXiHaiAn"
+          >
+            批量预览
+          </a-button>
+          <!-- 添加至申购车 -->
+          <a-button
+            v-if="isXiHaiAn"
+            type="primary"
+            @click="addShoppingCart"
+            class="buttonAdd"
+          >
+            添加至申购车
+          </a-button>
+          <a
+            style="
+              display: inline-block;
+              width: 100px;
+              height: 36px;
+              line-height: 36px;
+              text-align: center;
+              background: #0558e1;
+              border-radius: 5px;
+              font-size: 14px;
+              color: #fff;
+            "
+            v-if="selectType == '视频会议'"
+            href="/static/download/金宏视频会议系统参会终端(10.1.101.504)_20200211.rar"
+          >
+            客户端下载
+          </a>
+          <!-- 一键申请 -->
+          <a-button
+            v-if="isXiHaiAn"
+            type="primary"
+            @click="apply"
+            class="buttonAdd"
+          >
+            一键申请
+          </a-button>
+          <a-button v-else type="primary" @click="goToWeb" class="buttonAdd">
+            <template v-if="selectType == '视频会议'">一键组会</template>
+            <template v-else>我要申请{{ selectType }}</template>
+          </a-button>
+        </div>
+      </div>
+      <!-- 表格 -->
+      <div
+        class="infrastructrue-table"
+        v-if="!wrjFlag && selectType !== '视频会议' && isXiHaiAn"
+      >
+        <a-table
+          class="ant-table-striped"
+          :dataSource="dataSource"
+          :columns="columns"
+          :scroll="{ y: tableHeight }"
+          rowKey="channelId"
+          :rowClassName="
+            (record, index) => (index % 2 === 1 ? 'table-striped' : null)
+          "
+          :pagination="pagination"
+          @change="handleTableChange"
+          :row-selection="{
+            selectedRowKeys: selectedRowKeys,
+            onSelect: onSelectChange,
+            onSelectAll: onSelectAll,
+          }"
+          :loading="loadingCamera"
+        >
+          <template #bodyCell="{ column, record }">
+            <template v-if="isXiHaiAn && column.dataIndex === 'status'">
+              <span>{{ statusText[record.status] || '' }}</span>
+            </template>
+            <template v-if="column.dataIndex === 'operation'">
+              <!-- 离线 -->
+              <a v-if="record.status != 1" class="disabled-text">预览</a>
+              <a-tooltip v-else placement="top">
+                <template #title>请申请后在我的申请中观看视频!</template>
+                <a
+                  @click="
+                    openVideo(
+                      record.channelCode ||
+                        record.channelId ||
+                        record.channelCode.channelId,
+                      record
+                    )
+                  "
+                >
+                  预览
+                </a>
+              </a-tooltip>
+            </template>
+          </template>
+        </a-table>
+      </div>
+      <div
+        class="infrastructrue-table"
+        v-if="!wrjFlag && selectType == '视频会议'"
+      >
+        <a-table
+          class="ant-table-striped"
+          :dataSource="meetingList"
+          :columns="meetingColumns"
+          :scroll="{ y: tableHeight }"
+          rowKey="key"
+          :rowClassName="
+            (record, index) => (index % 2 === 1 ? 'table-striped' : null)
+          "
+          :pagination="meetingPagination"
+          :row-selection="{
+            selectedRowKeys: meetingSelect.data,
+            onChange: meetingOnSelectChange,
+          }"
+          @change="handleMeeting"
+        ></a-table>
+      </div>
+      <div
+        class="infrastructrue-table"
+        v-if="!wrjFlag && selectType == '政务云资源'"
+      >
+        <GovernmentCloudResources></GovernmentCloudResources>
+      </div>
+      <!-- 西海岸-无人机、单兵设备 -->
+      <div class="infrastructrue-table" v-else-if="isXiHaiAn && wrjFlag">
+        <a-table
+          class="ant-table-striped"
+          :dataSource="dataSource2"
+          :columns="columns2"
+          :scroll="{ y: tableHeight }"
+          rowKey="channelId"
+          :rowClassName="
+            (record, index) => (index % 2 === 1 ? 'table-striped' : null)
+          "
+          :pagination="pagination"
+          @change="handleTableChange"
+        >
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.dataIndex === 'operation'">
+              <a-button
+                @click="goToApply(record)"
+                type="link"
+                :disabled="record.state != 1"
+              >
+                申请
+              </a-button>
+              <a-button @click="showWrj(record)" type="link">详情</a-button>
+            </template>
+          </template>
+        </a-table>
+      </div>
+      <!-- 单个预览弹窗 -->
+      <a-modal
+        wrapClassName="single-preview-modal"
+        v-model:visible="visible"
+        :width="960"
+        destroyOnClose
+      >
+        <!-- title="视频预览" -->
+        <template #title>
+          <span>视频预览</span>
+          <span style="color: #ff4d4f; margin-left: 10px">
+            {{ `(请申请后在我的申请中观看视频)` }}
+          </span>
+        </template>
+        <template #footer></template>
+        <div style="width: 100%; display: flex; justify-content: center">
+          <div
+            style="width: 100%; height: 100%; position: relative"
+            v-show="isXiHaiAn"
+          >
+            <!-- 西海岸--预览视频--遮罩 todo-->
+            <div class="video-cover" @click="videoShowMsg"></div>
+            <div class="waterMark waterMark-left-top">
+              {{ userInfo.usernameShow }}
+            </div>
+            <div class="waterMark waterMark-right-top">
+              {{ userInfo.realNameShow }}
+            </div>
+            <div class="waterMark waterMark-left-bottom">
+              {{ userInfo.usernameShow }}
+            </div>
+            <div class="waterMark waterMark-right-bottom">
+              {{ userInfo.realNameShow }}
+            </div>
+            <vue3VideoPlay v-bind="options" />
+          </div>
+        </div>
+      </a-modal>
+
+      <!-- 图片预览 -->
+      <a-modal
+        wrapClassName="single-preview-modal"
+        v-model:visible="picVisible"
+        title="图片预览"
+        :width="960"
+        destroyOnClose
+      >
+        <template #footer></template>
+        <div style="width: 100%; display: flex; justify-content: center">
+          <a-image :src="options.src" />
+        </div>
+      </a-modal>
+      <!-- 批量预览图片弹窗 -->
+      <a-modal
+        wrapClassName="batch-preview-modal"
+        v-model:visible="batchPicVisible"
+        title="图片批量预览"
+        :width="1060"
+        destroyOnClose
+        @cancel="videoClean"
+      >
+        <template #footer></template>
+        <div class="batch-video">
+          <div
+            v-for="item in videoList"
+            :key="item.id"
+            style="width: 100%; height: 100%"
+          >
+            <a-image
+              width="500px"
+              height="281px"
+              :src="item.options.src"
+              fallback="data:image/png;base64,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"
+            />
+          </div>
+        </div>
+        <a-pagination
+          v-model:current="current"
+          :total="videoTotal"
+          defaultPageSize="4"
+          :showSizeChanger="false"
+          @change="batchPicturePreview"
+          show-less-items
+        />
+      </a-modal>
+
+      <!-- 批量预览视频弹窗 -->
+      <a-modal
+        wrapClassName="batch-preview-modal"
+        v-model:visible="batchVisible"
+        title="视频批量预览"
+        :width="1060"
+        destroyOnClose
+        @cancel="videoClean"
+      >
+        <template #footer></template>
+        <div class="batch-video">
+          <div
+            v-for="(item, index) in videoList"
+            :key="item.id"
+            style="width: 100%; height: 100%; position: relative"
+          >
+            <!-- 批量预览视频--遮罩 -->
+            <div
+              class="batch-video-cover"
+              @click="videoShowMsg(index)"
+              v-show="isXiHaiAn"
+            ></div>
+            <div
+              class="batch-waterMark batch-waterMark-left-top"
+              v-show="isXiHaiAn"
+            >
+              {{ userInfo.usernameShow }}
+            </div>
+            <div
+              class="batch-waterMark batch-waterMark-right-top"
+              v-show="isXiHaiAn"
+            >
+              {{ userInfo.realNameShow }}
+            </div>
+            <div
+              class="batch-waterMark batch-waterMark-left-bottom"
+              v-show="isXiHaiAn"
+            >
+              {{ userInfo.usernameShow }}
+            </div>
+            <div
+              class="batch-waterMark batch-waterMark-right-bottom"
+              v-show="isXiHaiAn"
+            >
+              {{ userInfo.realNameShow }}
+            </div>
+            <p></p>
+            <vue3VideoPlay v-bind="item.options" />
+          </div>
+        </div>
+        <a-pagination
+          v-model:current="current"
+          :total="videoTotal"
+          defaultPageSize="4"
+          :showSizeChanger="false"
+          @change="batchPreview"
+          show-less-items
+        />
+      </a-modal>
+
+      <a-modal
+        wrapClassName="wrj"
+        v-model:visible="wrjVisible"
+        :width="1000"
+        :title="wrjName + '详情'"
+        @ok="wrjVisible = false"
+      >
+        <template #footer></template>
+        <div v-for="(db, key) in wrjData" :key="key">
+          <template v-if="typeof db == 'object'">
+            <div
+              style="
+                font-size: 20px;
+                font-weight: 600;
+                margin: 10px 0;
+                text-align: center;
+              "
+            >
+              {{ db.attrType || '--' }}
+            </div>
+            <template v-if="db.attrValue">
+              <div
+                style="padding: 0 30px"
+                v-for="(value, key2) in JSON.parse(db.attrValue)"
+                :key="value"
+              >
+                {{ key2 + '：' + value }}
+              </div>
+            </template>
+          </template>
+        </div>
+      </a-modal>
+    </div>
+  </div>
+</template>
+<script setup>
+  import VideoSurveillance from '@/views/home/videoSurveillance'
+  import GovernmentCloudResources from './components/GovernmentCloudResources'
+  import { useRouter } from 'vue-router'
+  import { message } from 'ant-design-vue'
+  import { ref, reactive, onMounted, defineProps, defineExpose } from 'vue'
+  import { initiateMeet } from '@/api/file'
+  import {
+    getCameraByParentId,
+    getStreamByChannelCode,
+    getCameraAllLabel,
+    selectByChannelCode,
+  } from '@/api/videoSurveillance'
+  import { getCameraByCondition } from '@/api/file'
+  import {
+    getUser,
+    getEnkeUsers,
+    sgcInsert,
+    getRoomSearch,
+    getDate,
+    setSubmit,
+    getYuyue,
+    getSoldierList,
+    getMaxApplyNum,
+    getPolicyCloudService,
+  } from '@/api/home'
+  import mybus from '@/myplugins/mybus'
+  import { Form } from 'ant-design-vue'
+  import moment from 'moment'
+  import { useStore } from 'vuex'
+  const store = useStore()
+  const username = store.getters['user/username']
+  const props = defineProps({
+    // 模糊查
+    searchValue: { type: String, default: '' },
+    searchType: { type: String, default: '' },
+  })
+  const current = ref(1)
+  const videoTotal = ref(0)
+  const router = useRouter()
+  const whoShow1 = ref(whoShow)
+  const isXiHaiAn = whoShow1.value.itShowXiHaiAn
+  const options = reactive({
+    width: '912px', //播放器宽度
+    height: '513px', //播放器高度
+    color: '#409eff', //主题色
+    title: '', //视频名称
+    src: '', //视频源
+    type: 'm3u8', // 视频源类型
+    muted: false, //静音
+    webFullScreen: false,
+    speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
+    autoPlay: isXiHaiAn ? false : true, //自动播放
+    loop: false, //循环播放
+    mirror: false, //镜像画面
+    ligthOff: false, //关灯模式
+    volume: 0.3, //默认音量大小
+    control: isXiHaiAn ? false : true, //是否显示控制
+    controlBtns: isXiHaiAn
+      ? []
+      : [
+          'audioTrack',
+          'quality',
+          'speedRate',
+          'volume',
+          'setting',
+          'pip',
+          'pageFullScreen',
+          'fullScreen',
+        ], //显示所有按钮,
+  })
+  const meetingList = ref([])
+  const meetingPagination = ref({
+    total: 0,
+    current: 1,
+    pageSize: 5, //每页中显示5条数据
+    showSizeChanger: false,
+  })
+  const meetingSelect = reactive({ data: [] })
+  const meetingSelectOld = reactive({ data: [] })
+  const meetingOnSelectChange = (selectedRowKeys) => {
+    console.log(
+      'selectedRowKeys changed: ',
+      selectedRowKeys,
+      meetingSelect.data
+    )
+    meetingSelect.data = selectedRowKeys
+    meetingSelectOld.data[meetingPagination.value.current - 1] =
+      meetingSelect.data
+  }
+  const videoList = ref([])
+  const initMeeting = () => {
+    let str = '青岛市一网统揽项目组/'
+    // meetingSelect.data.map((val) => (str += val + '/'))
+    meetingSelectOld.data.map((val) => {
+      val.map((data) => (str += data + '/'))
+    })
+    initiateMeet(str).then((res) => {
+      console.log('组会=========>', res)
+    })
+  }
+  // 获取会议列表
+  const meetingColumns = ref([
+    {
+      title: '视频会议用户名称',
+      dataIndex: 'hostName',
+      key: 'hostName',
+    },
+  ])
+  const getMeetingList = () => {
+    getEnkeUsers({
+      page: meetingPagination.value.current,
+      limit: meetingPagination.value.pageSize,
+    }).then((res) => {
+      meetingList.value = []
+      res.data.data.list.map((val) => {
+        val.key = val.hostName
+      })
+      meetingList.value = res.data.data.list
+      meetingPagination.value.total = res.data.data.total
+      meetingSelect.data =
+        meetingSelectOld.data[meetingPagination.value.current - 1]
+      console.log('会议列表=============>', res.data.data)
+    })
+  }
+  const hys = ref(require('@/assets/home/hys.png'))
+  getMeetingList()
+  const handleMeeting = (pag, filters, sorter) => {
+    console.log(pag, filters, sorter)
+    meetingPagination.value.current = pag.current
+    getMeetingList()
+  }
+  let visible = ref(false) // 视频预览
+  let picVisible = ref(false) // 图片预览
+  let batchVisible = ref(false) // 视频批量预览
+  let batchPicVisible = ref(false) // 图片批量预览
+  const jcssType = ref(router.currentRoute.value.query.type)
+  const pagination = ref({
+    total: 0,
+    current: 1,
+    pageSize: 10, //每页中显示10条数据
+    showSizeChanger: true,
+    pageSizeOptions: ['10', '30', '50', '100', '1000'], //每页中显示的数据
+  })
+  //会客厅变量区域=======
+  const paginationRoom = ref({
+    total: 0,
+    current: 1,
+    pageSize: 10, //每页中显示10条数据
+    showSizeChanger: true,
+    pageSizeOptions: ['5', '10', '15', '20'], //每页中显示的数据
+  })
+  const formState = reactive({
+    roomId: '',
+    bookDate: '', //日期
+    startTime: '', //开始时间
+    endTime: '', //结束时间
+    name: '',
+    phone: '',
+    dept: '',
+    matter: '',
+    file: '',
+    roomName: '',
+  })
+  const fileList = ref([])
+  const useForm = Form.useForm
+  const roomInput = ref('')
+  const rulesRef = reactive({
+    bookDate: [
+      {
+        type: 'string',
+        required: true,
+        message: '请选择日期',
+      },
+    ],
+    startTime: [
+      {
+        type: 'string',
+        required: true,
+        message: '请选择时间段',
+      },
+    ],
+    name: [
+      {
+        required: true,
+        message: '请输入预约人',
+      },
+    ],
+    matter: [{ min: 1, max: 500, required: true, message: '可输入500字内容' }],
+    dept: [
+      {
+        required: true,
+        message: '请输入部门',
+      },
+    ],
+  })
+  const { resetFields, validateInfos, validate } = useForm(formState, rulesRef)
+  const mapSearchParam = ref({
+    // 地图搜索初始化数据
+    parentId: '',
+    cameraName: '',
+    checkStatus: '1',
+    pageNum: pagination.value.current,
+    pageSize: pagination.value.pageSize,
+    gpsX: '',
+    gpsY: '',
+    radius: '',
+    labelCodes: [],
+  })
+  const showMap = ref(true)
+  const room = ref(true)
+  const roomResult = ref(true)
+  const roomYuyue = ref(true)
+  const visibleRoom = ref(false)
+  const appointmentRoom = ref(false)
+  const labelPosition = ref('left')
+  const apiURL = window.SITE_CONFIG.apiURL
+  const roomList = ref([])
+  const roomPage = ref(1)
+  const roomLimit = ref(5)
+  const roomTotal = ref(0)
+  const pageSizeOptions = ref(['5', '10', '20', '50'])
+  const pageSizeOptionsChengguo = ref(['5', '10', '20', '50'])
+  const dateId = ref(null)
+  const roomDateList = ref([])
+  //开始时间---结束时间
+  const roomCerateDate = ref('')
+  const roomCreateTime = ref('')
+  const roomEndTime = ref('')
+  const roomModalCreateTime = ref('')
+  const roomModalEndTime = ref('')
+  const lookData = ref({})
+
+  // console.log('模糊查传递', props.searchValue)
+  if (props.searchValue) {
+    mapSearchParam.value.cameraName = props.searchValue
+  }
+  if (props.searchType) {
+    tabClick(0, props.searchType.value)
+  }
+  // 消息列表页面
+  let formPage = router.currentRoute.value.query.formPage || ''
+  let zwy = router.currentRoute.value.query.zwy || ''
+  // 设施类型--无人机和单兵设备
+  let facilitiesType = router.currentRoute.value.query.facilitiesType || ''
+  onMounted(() => {
+    console.log('基础设施初始化')
+    let roomStr = router.currentRoute.value.query.str
+    if (roomStr) {
+      roomInput.value = roomStr
+      getCamera()
+    }
+    // 获取用户信息
+    handleUser()
+    if (jcssType.value) {
+      tabClick(0, jcssType.value)
+      if (jcssType.value == '视频资源') {
+        getCamera()
+      }
+    } else {
+      if (isXiHaiAn) {
+        if (facilitiesType) {
+          tabClick(0, facilitiesType)
+        } else {
+          let _obj = {
+            title: '视频标签',
+            content: ['视频资源'],
+          }
+          clickList.value.push(_obj)
+          tabClick(0, '视频资源')
+        }
+      } else {
+        // 默认选中
+        if (formPage && formPage == 'noticePage') {
+          tabClick(0, '城市云脑会客厅')
+          roomYuyue.value = false
+          roomResult.value = true
+          onSearch()
+        } else {
+          // 如果是通过自愿申请跳转 默认打开政务云资源
+          if (zwy) {
+            tabClick(0, '政务云资源')
+          } else {
+            tabClick(0, '城市云脑会客厅')
+          }
+        }
+      }
+    }
+
+    mybus.off('getListByParentId')
+    mybus.on('getListByParentId', (parentId) => {
+      mapSearchParam.value.parentId = parentId
+      getCamera()
+    })
+    mybus.off('changeRoomInput')
+    mybus.on('changeRoomInput', (val) => {
+      console.log('更改=======》')
+      roomInput.value = val
+      onSearch()
+    })
+    mybus.off('getListByMap')
+    mybus.on('getListByMap', (param) => {
+      mapSearchParam.value.gpsX = param.gpsX
+      mapSearchParam.value.gpsY = param.gpsY
+      mapSearchParam.value.radius = param.radius
+      mapSearchParam.value.type = param.type
+      mapSearchParam.value.borderPolygonList = param.borderPolygonList
+      mapSearchParam.value.pageSize = param.type != 0 ? 20000 : 10
+      selectedRowKeys.value = [] //清空选中的点位
+      selectedList.value = []
+
+      dataSource.value = param.dataSource
+      pagination.value.total = param.total
+    })
+    //点位点击
+    mybus.off('pointMarkerClick')
+    mybus.on('pointMarkerClick', (point) => {
+      console.log('pointMarkerClick->point', selectedList.value, point)
+      let check = false //是否勾选
+      if (selectedList.value && selectedList.value.length > 0) {
+        selectedList.value.forEach((ele) => {
+          if (ele.channelCode == point.data.channelCode) {
+            check = true
+          }
+        })
+      }
+      let pointData = new Proxy(point.data, point)
+      onSelectChange(pointData, !check, '', '', 'proxy')
+    })
+  })
+  const selectedList = ref([])
+  const selectedRowKeys = ref([])
+  const tabList = ref([
+    {
+      title: '设施类型',
+      content: isXiHaiAn
+        ? ['视频资源']
+        : username == 'admin'
+        ? ['城市云脑会客厅', '视频资源', '政务云资源', '视频会议']
+        : ['城市云脑会客厅', '视频资源', '政务云资源'],
+    },
+  ])
+  let clickList = ref([]) //存储点击的tab
+  if (!isXiHaiAn) {
+    tabList.value.push({
+      title: '筛选条件',
+      content: [],
+    })
+  }
+  const wrjVisible = ref(false)
+  const wrjName = ref('')
+  const wrjData = ref([])
+
+  // 单兵、无人机-详情
+  const showWrj = (data) => {
+    wrjName.value = data.wrjName
+    wrjData.value = data.deviceAttrDTOList || []
+    wrjVisible.value = true
+  }
+  const goToWrj = (data) => {
+    window.open(data.url)
+  }
+
+  // 西海岸-无人机、单兵设备申请
+  const goToApply = (data) => {
+    console.log(data, dept)
+    let arr = [
+      {
+        arr: [
+          {
+            description: data.description,
+            resourceId: data.id,
+            resourceName: data.wrjName,
+            type: data.type,
+          },
+        ],
+        deptId: dept.deptId || data.deptId || '',
+        deptName: dept.deptName,
+      },
+    ]
+    localStorage.setItem('applyList', JSON.stringify(arr))
+    router.push({
+      path: '/apply',
+    })
+  }
+  if (whoShow1.value.itShowXiHaiAn) {
+    tabList.value[0].content.push('无人机')
+    tabList.value[0].content.push('单兵设备')
+  }
+
+  // 单个预览，当前点击数据
+  const rowClickData = ref(null)
+  // 打开视频预览
+  const openVideo = (id, item) => {
+    rowClickData.value = item
+    // 单个预览
+    if (item && item.status != 1) {
+      return
+      // return message.warning('当前设备离线, 不可预览！')
+    }
+    console.log('打开视频', id)
+    const param = {
+      key: id,
+    }
+    getStreamByChannelCode(param).then((res) => {
+      console.log(res)
+      visible.value = true
+      options.src = res.data.data
+      //options.src ="wss://10.134.135.45:6014/proxy/10.10.20.15:559/openUrl/0kIF7La"
+    })
+    // // 视频测试--勿删
+    // visible.value = true
+    // options.src = 'http://playertest.longtailvideo.com/adaptive/bipbop/gear4/prog_index.m3u8'
+  }
+  // 打开图片预览
+  const openPicture = (id) => {
+    console.log('打开图片', id)
+    const param = {
+      channelCode: id,
+    }
+    selectByChannelCode(param).then((res) => {
+      console.log(res)
+      if (res.data.data && res.data.data[0].picUrl) {
+        options.src = res.data.data[0].picUrl
+        picVisible.value = true
+      } else {
+        message.warning('该点位暂无预览图片！')
+      }
+    })
+  }
+
+  //初始化数据
+  const init = () => {
+    tabList.value.map((item) => {
+      let params = {
+        title: item.title,
+        content: [],
+      }
+      clickList.value.push(params)
+    })
+    mybus.off('tranferToList')
+    mybus.on('tranferToList', () => {
+      console.log('获取到的列表数据')
+    })
+  }
+
+  init()
+  //点击会客厅左侧切换
+  const result = () => {
+    roomYuyue.value = false
+    roomResult.value = true
+    chengguoSearch()
+  }
+  const chengguoSearch = () => {
+    let query = {
+      page: roomPage.value,
+      limit: roomLimit.value,
+      roomName: roomInput.value,
+    }
+    getYuyue(query).then(({ data: res }) => {
+      dataRoom.value = res.data.list
+      roomTotal.value = res.data.total
+    })
+  }
+  const roomResults = () => {
+    roomYuyue.value = true
+    roomResult.value = false
+  }
+  // 查看详情
+  const look = (row) => {
+    visibleRoom.value = true
+    lookData.value = row
+  }
+  //   搜索
+  const onSearch = (searchValue) => {
+    let newQuery = JSON.parse(JSON.stringify(router.currentRoute.value.query))
+    newQuery.str = roomInput.value
+    router
+      .replace({
+        query: newQuery,
+      })
+      .then(() => {})
+    mybus.emit('changeSearchValue', roomInput.value)
+    searchData()
+    chengguoSearch()
+  }
+  //重置
+  const reSetSearch = () => {
+    console.log('重置')
+    roomInput.value = ''
+    searchData()
+    chengguoSearch()
+  }
+  // 时间选择器限制----可用时间查询
+  //获取不可选择的日期
+  const disabledDate = (current) => {
+    const time = moment().endOf('day').subtract(1, 'days')
+    return current && current < time
+  }
+  //获取不可选择的小时
+  const disabledStartHours = () => {
+    if (roomEndTime.value) {
+      let hours = []
+      let hour = roomEndTime.value.substr(0, 2)
+      for (let i = hour; i < 24; i++) {
+        hours.push(i)
+      }
+      return hours
+    }
+  }
+  //获取不可选择的分钟
+  const disabledStartMinutes = (selectedHour) => {
+    if (roomEndTime.value) {
+      let minutes = []
+      let hour = roomEndTime.value.substr(0, 2)
+      let minute = roomEndTime.value.substr(3, 2)
+      if (selectedHour == hour) {
+        for (let i = minute; i < 60; i++) {
+          minutes.push(i)
+        }
+      }
+      return minutes
+    }
+  }
+  //获取不可选择的秒
+  const disabledStartSeconds = (selectedHour, selectedMinute) => {
+    if (roomEndTime.value) {
+      let seconds = []
+      let hour = roomEndTime.value.substr(0, 2)
+      let minute = roomEndTime.value.substr(3, 2)
+      let second = roomEndTime.value.substr(6, 2)
+      if (selectedHour == hour && selectedMinute.value == minute) {
+        for (let i = second - 1; i < 60; i++) {
+          seconds.push(i)
+        }
+      }
+      return seconds
+    }
+  }
+  //获取不可选择的小时
+  const disabledEndHours = () => {
+    if (roomCreateTime.value) {
+      let hours = []
+      let hour = roomCreateTime.value.substr(0, 2)
+      for (let i = 0; i < hour; i++) {
+        hours.push(i)
+      }
+      return hours
+    }
+  }
+  //获取不可选择的分钟
+  const disabledEndMinutes = (selectedHour) => {
+    if (roomCreateTime.value) {
+      let minutes = []
+      let hour = roomCreateTime.value.substr(0, 2)
+      let minute = roomCreateTime.value.substr(3, 2)
+      if (selectedHour == hour) {
+        for (let i = 0; i < minute; i++) {
+          minutes.push(i)
+        }
+      }
+      return minutes
+    }
+  }
+  //获取不可选择的秒
+  const disabledEndSeconds = (selectedHour, selectedMinute) => {
+    if (roomCreateTime.value) {
+      let seconds = []
+      let hour = roomCreateTime.value.substr(0, 2)
+      let minute = roomCreateTime.value.substr(3, 2)
+      let second = roomCreateTime.value.substr(6, 2)
+      if (selectedHour == hour && selectedMinute.value == minute) {
+        for (let i = 0; i <= second; i++) {
+          seconds.push(i)
+        }
+      }
+      return seconds
+    }
+  }
+  // 时间选择器限制----会客厅预约时段
+  //获取不可选择的小时
+  const disabledTimeHours = () => {
+    if (formState.endTime) {
+      let hours = []
+      let hour = formState.endTime.substr(0, 2)
+      for (let i = hour; i < 24; i++) {
+        hours.push(i)
+      }
+      return hours
+    }
+  }
+  //获取不可选择的分钟
+  const disabledTimeMinutes = (selectedHour) => {
+    if (formState.endTime) {
+      let minutes = []
+      let hour = formState.endTime.substr(0, 2)
+      let minute = formState.endTime.substr(3, 2)
+      if (selectedHour == hour) {
+        for (let i = minute; i < 60; i++) {
+          minutes.push(i)
+        }
+      }
+      return minutes
+    }
+  }
+  //获取不可选择的秒
+  const disabledTimeSeconds = (selectedHour, selectedMinute) => {
+    if (formState.endTime) {
+      let seconds = []
+      let hour = formState.endTime.substr(0, 2)
+      let minute = formState.endTime.substr(3, 2)
+      let second = formState.endTime.substr(6, 2)
+      if (selectedHour == hour && selectedMinute.value == minute) {
+        for (let i = second - 1; i < 60; i++) {
+          seconds.push(i)
+        }
+      }
+      return seconds
+    }
+  }
+  //获取不可选择的小时
+  const disabledTimeEndHours = () => {
+    if (formState.startTime) {
+      let hours = []
+      let hour = formState.startTime.substr(0, 2)
+      for (let i = 0; i < hour; i++) {
+        hours.push(i)
+      }
+      return hours
+    }
+  }
+  //获取不可选择的分钟
+  const disabledTimeEndMinutes = (selectedHour) => {
+    if (formState.startTime) {
+      let minutes = []
+      let hour = formState.startTime.substr(0, 2)
+      let minute = formState.startTime.substr(3, 2)
+      if (selectedHour == hour) {
+        for (let i = 0; i < minute; i++) {
+          minutes.push(i)
+        }
+      }
+      return minutes
+    }
+  }
+  //获取不可选择的秒
+  const disabledTimeEndSeconds = (selectedHour, selectedMinute) => {
+    if (formState.startTime) {
+      let seconds = []
+      let hour = formState.startTime.substr(0, 2)
+      let minute = formState.startTime.substr(3, 2)
+      let second = formState.startTime.substr(6, 2)
+      if (selectedHour == hour && selectedMinute.value == minute) {
+        for (let i = 0; i <= second; i++) {
+          seconds.push(i)
+        }
+      }
+      return seconds
+    }
+  }
+  //分页
+  const onRoomChange = (pageNumber) => {
+    roomPage.value = pageNumber
+    searchData()
+  }
+  const onShowSizeChange = (current, pageSize) => {
+    roomLimit.value = pageSize
+    searchData()
+  }
+  const onRoomChangeChengguo = (pageNumber) => {
+    roomPage.value = pageNumber
+    chengguoSearch()
+  }
+  const onShowSizeChangeChengguo = (current, pageSize) => {
+    roomLimit.value = pageSize
+    chengguoSearch()
+  }
+  //预约
+  const appointment = (item) => {
+    dateId.value = item.id
+    formState.roomId = item.id
+    formState.roomName = item.name
+    appointmentRoom.value = true
+  }
+  //预约弹框 选择日期
+  const handleChange = (i) => {
+    let query = {
+      date: i, //查询的riqi
+      roomId: dateId.value, //会客厅主键
+    }
+    getDate(query).then(({ data: res }) => {
+      roomDateList.value = res.data
+    })
+  }
+
+  const columnsRomm = [
+    {
+      title: '会客厅名称',
+      dataIndex: 'roomName',
+      align: 'center',
+    },
+    {
+      title: '预约时段',
+      key: 'bookDate',
+      align: 'center',
+    },
+    {
+      title: '预约状态',
+      key: 'state',
+      align: 'center',
+    },
+    {
+      title: '预约详情',
+      key: 'action',
+      align: 'center',
+    },
+  ]
+  const dataRoom = ref([])
+  const bodystyle = {
+    paddingTop: 0,
+    borderBottom: 0,
+  }
+  const handleOk = (e) => {
+    console.log(e)
+  }
+  //文件上传成功回调
+  const roomUpload = (response) => {
+    if (response.file.response !== undefined) {
+      fileList.value = response.fileList
+      formState.file = response.file.response.data
+    }
+  }
+  //提交预约
+  const onSubmit = () => {
+    validate()
+      .then(() => {
+        setSubmit(formState).then(({ data: res }) => {
+          appointmentRoom.value = false
+          rulesRef.bookDate = []
+          rulesRef.startTime = []
+          rulesRef.name = []
+          rulesRef.matter = []
+          rulesRef.phone = []
+          rulesRef.dept = []
+          formState.roomId = ''
+          formState.bookDate = ''
+          formState.startTime = '' //开始时间
+          formState.endTime = '' //结束时间
+          formState.name = ''
+          formState.phone = ''
+          formState.dept = ''
+          formState.matter = ''
+          formState.file = ''
+          fileList.value = []
+          searchData()
+        })
+      })
+      .catch((err) => {
+        console.log('error', err)
+      })
+  }
+  //会客厅查询接口
+  const searchData = () => {
+    let query = {
+      bookDate: roomCerateDate.value, //	预约开始时间 年月日
+      startTime: roomCreateTime.value, //预约开始时 间时分秒
+      endTime: roomEndTime.value, //	预约结束时间
+      name: roomInput.value, //会客厅名称
+      page: roomPage.value, //页码
+      limit: roomLimit.value, //每页条数
+    }
+    getRoomSearch(query).then(({ data: res }) => {
+      roomList.value = res.data.list
+      roomTotal.value = res.data.total
+    })
+  }
+  const emits = defineEmits(['add'])
+  const selectType = ref('政务云资源')
+  //表格的高度
+  let tableHeight = ref('600')
+  //tab切换点击事件
+  const tabClick = (indexFather, name) => {
+    selectedRowKeys.value = []
+    selectedList.value = []
+    if (clickList.value[indexFather].content.indexOf(name) != -1) {
+      if (name == '视频资源') {
+        room.value = true
+        tableHeight.value = 330
+        showMap.value = true
+        if (tabList.value[1]) {
+          tabList.value[1].title = '视频标签'
+        }
+        selectType.value = '视频资源'
+        console.log('444------------>', 444)
+      } else if (name == '政务云资源') {
+        room.value = true
+        tableHeight.value = 600
+        showMap.value = false
+        dataSource.value = []
+        dataSource2.value = []
+        pagination.value.total = 0
+        if (tabList.value[1]) {
+          tabList.value[1].title = '服务类别'
+        }
+        selectType.value = '政务云资源'
+      } else if (name == '感知资源') {
+        room.value = true
+        tableHeight.value = 330
+        showMap.value = true
+        dataSource.value = []
+        dataSource2.value = []
+        pagination.value.total = 0
+        selectType.value = '感知资源'
+      } else if (name == '城市云脑会客厅') {
+      } else if (name == '视频会议') {
+        room.value = true
+        tableHeight.value = 600
+        showMap.value = false
+        dataSource.value = []
+        dataSource2.value = []
+        pagination.value.total = 0
+        if (tabList.value[1]) {
+          tabList.value[1].title = ''
+        }
+        selectType.value = '视频会议'
+      }
+      if (indexFather !== 0 && selectType.value !== '政务云资源') {
+        clickList.value[indexFather].content.splice(
+          clickList.value[indexFather].content.indexOf(name),
+          1
+        )
+      }
+    } else {
+      if (name == '视频资源') {
+        selectType.value = '视频资源'
+        wrjFlag.value = false
+        tableHeight.value = 330
+        showMap.value = true
+        if (tabList.value[1]) {
+          tabList.value[1].content = []
+          tabList.value[1].title = '视频标签'
+        }
+        if (clickList.value[1]) {
+          clickList.value[1].content = []
+        }
+        clickList.value[indexFather].content[0] = name
+        dataSource.value = []
+        dataSource2.value = []
+        room.value = true
+        getCameraAllLabel().then((res) => {
+          res.data.data.forEach((val) => {
+            if (tabList.value[1]) {
+              tabList.value[1].content.push({
+                labelCode: val.labelCode,
+                labelName: val.labelName,
+              })
+            }
+          })
+        })
+        // 改变查询摄像头接口的labelCode数组
+        mapSearchParam.value.labelCodes = []
+        if (clickList.value[1]) {
+          clickList.value[1].content.map((item) => {
+            mapSearchParam.value.labelCodes.push(item.labelCode)
+          })
+        }
+        mapSearchParam.value.gpsX = ''
+        mapSearchParam.value.gpsY = ''
+        mapSearchParam.value.radius = ''
+        mapSearchParam.value.type = ''
+        mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
+        emits('add', 1)
+        getCamera()
+      } else if (name == '政务云资源') {
+        selectType.value = '政务云资源'
+        tableHeight.value = 600
+        showMap.value = false
+        dataSource.value = []
+        dataSource2.value = []
+        pagination.value.total = 0
+        if (clickList.value[1]) {
+          clickList.value[1].content = []
+        }
+        clickList.value[indexFather].content[0] = name
+        if (tabList.value[1]) {
+          if (!isXiHaiAn) {
+            tabList.value[1].title = '服务类别'
+            tabList.value[1].content = [
+              '基础服务',
+              'PaaS服务',
+              '安全服务',
+              '大数据服务',
+              '附加增值服务',
+            ]
+          } else {
+            if (tabList.value[1]) {
+              tabList.value[1].title = ''
+              tabList.value[1].content = []
+            }
+          }
+        }
+        room.value = true
+        wrjFlag.value = false
+        emits('add', 2)
+      } else if (name == '视频会议') {
+        selectType.value = '视频会议'
+        tableHeight.value = 600
+        showMap.value = false
+        dataSource.value = []
+        dataSource2.value = []
+        pagination.value.total = 0
+        if (clickList.value[1]) {
+          clickList.value[1].content = []
+        }
+        clickList.value[indexFather].content[0] = name
+        if (tabList.value[1]) {
+          tabList.value[1].title = ''
+          tabList.value[1].content = []
+        }
+        room.value = true
+        wrjFlag.value = false
+        // emits('add', 2)
+      } else if (name == '感知资源') {
+        selectType.value = '感知资源'
+        tableHeight.value = 330
+        showMap.value = true
+        if (clickList.value[1]) {
+          clickList.value[1].content = []
+        }
+        pagination.value.total = 0
+        clickList.value[indexFather].content[0] = name
+        if (tabList.value[1]) {
+          tabList.value[1].content = []
+          tabList.value[1].title = '感知资源分类'
+        }
+        dataSource.value = []
+        dataSource2.value = []
+        room.value = true
+        wrjFlag.value = false
+        emits('add', 3)
+      } else if (name == '无人机') {
+        pagination.value.current = 1
+        getSoldierData(indexFather, name)
+      } else if (name == '单兵设备') {
+        pagination.value.current = 1
+        getSoldierData(indexFather, name)
+      } else if (name == '城市云脑会客厅') {
+        showMap.value = false
+        dataSource.value = []
+        dataSource2.value = []
+        pagination.value.total = 0
+        if (clickList.value[1]) {
+          clickList.value[1].content = []
+        }
+        clickList.value[indexFather].content[0] = name
+        if (tabList.value[1]) {
+          tabList.value[1].content = []
+          tabList.value[1].title = ''
+        }
+        wrjFlag.value = true
+        room.value = false
+        roomYuyue.value = true
+        roomResult.value = false
+        emits('add', 6)
+        searchData()
+      } else {
+        if (
+          clickList.value[indexFather] &&
+          (clickList.value[0].content[0] !== '政务云资源' || indexFather !== 1)
+        ) {
+          clickList.value[indexFather].content.push(name)
+        }
+      }
+    }
+    // 市局添加政务云资源
+    console.log(
+      '点击==========>',
+      indexFather,
+      name,
+      clickList.value,
+      clickList.value[0].content[0],
+      clickList.value[indexFather].content.indexOf(name)
+    )
+    if (!isXiHaiAn && indexFather == 0 && name == '政务云资源') {
+      getGovernmentCloud()
+    }
+    if (
+      clickList.value[0].content[0] === '政务云资源' &&
+      name !== '政务云资源'
+    ) {
+      console.log(
+        '点击政务云资源',
+        clickList.value[1].content[0],
+        clickList.value[indexFather].content.indexOf(name) !== -1
+      )
+      if (clickList.value[indexFather].content.indexOf(name) !== -1) {
+        console.log(
+          '点击政务云资源点击过',
+          clickList.value[indexFather].content[0]
+        )
+        clickList.value[indexFather].content.splice(
+          clickList.value[indexFather].content.indexOf(name),
+          1
+        )
+      } else {
+        clickList.value[indexFather].content = [name]
+      }
+      if (!isXiHaiAn) {
+        getGovernmentCloud()
+      }
+    }
+    // 改变查询摄像头接口的labelCode数组
+    mapSearchParam.value.labelCodes = []
+    if (clickList.value[1]) {
+      clickList.value[1].content.map((item) => {
+        mapSearchParam.value.labelCodes.push(item.labelCode)
+      })
+    }
+    console.log('选中的标签code', mapSearchParam.value)
+    mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
+
+    if (name == '政务云资源' || name == '视频会议' || name == '感知资源') {
+      dataSource.value = []
+      dataSource2.value = []
+      console.log('视频会议=========>', dataSource, columns)
+      pagination.value.total = 0
+    } else {
+      if (name !== '无人机' && name !== '单兵设备') {
+        getCamera()
+      }
+    }
+  }
+
+  // 无人机、单兵设备状态
+  const wrjStateObj = {
+    0: '待审批',
+    1: '未申请',
+    2: '通过',
+    3: '未通过',
+  }
+  // 获取无人机、单兵设备
+  const getSoldierData = (indexFather, name) => {
+    room.value = true
+    tableHeight.value = 600
+    showMap.value = false
+    dataSource.value = []
+    dataSource2.value = []
+    if (clickList.value[1]) {
+      clickList.value[1].content = []
+    }
+    clickList.value[indexFather].content[0] = name
+    console.log(
+      'clickList.value[indexFather].content[0]------------>',
+      clickList.value[indexFather].content[0]
+    )
+
+    if (tabList.value[1]) {
+      tabList.value[1].title = ''
+      tabList.value[1].content = []
+    }
+    wrjFlag.value = true
+
+    let _params = {
+      type: name,
+      page: pagination.value.current,
+      limit: pagination.value.pageSize,
+    }
+    getSoldierList(_params)
+      .then((res) => {
+        console.log('res---获取无人机、单兵设备--------->', res)
+        if (res.data.code !== 0) {
+          return message.error(res.data.msg)
+        }
+        let { list = [], total = 0 } = res.data.data
+        pagination.value.total = total
+        if (name == '无人机') {
+          list.map((wrj) => {
+            dataSource2.value.push({
+              wrjName: wrj.name,
+              wrjState: wrjStateObj[wrj.state],
+              url: wrj.url,
+              details: wrj.details,
+              ...wrj,
+            })
+          })
+        }
+        if (name == '单兵设备') {
+          list.map((db) => {
+            dataSource2.value.push({
+              wrjName: db.name,
+              wrjState: wrjStateObj[db.state],
+              details: db.details,
+              type: db.type,
+              ...db,
+            })
+          })
+        }
+      })
+      .catch((err) => {
+        message.error(err)
+      })
+  }
+  // 打开视频批量预览
+  const batchPreview = async function (page) {
+    if (page.layerX) {
+      page = 1
+    }
+    if (selectedList.value.length > 0) {
+      videoTotal.value = selectedList.value.length
+      const arr = JSON.parse(JSON.stringify(selectedList.value))
+      let start = (page - 1) * 4
+      let list = []
+      list = arr.splice(start, 4)
+      const length = list.length
+      videoList.value = []
+      for (let index = 0; index < length; index++) {
+        const param = {
+          key: list[index].channelId,
+        }
+        let ob = {
+          options: {
+            width: '512px', //播放器宽度
+            height: '288px', //播放器高度
+            color: '#409eff', //主题色
+            title: '', //视频名称
+            src: '', //视频源
+            type: 'm3u8', // 视频源类型
+            muted: false, //静音
+            webFullScreen: false,
+            speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
+            autoPlay: isXiHaiAn ? false : true, //自动播放
+            loop: false, //循环播放
+            mirror: false, //镜像画面
+            ligthOff: false, //关灯模式
+            volume: 0.3, //默认音量大小
+            control: isXiHaiAn ? false : true, //是否显示控制
+            controlBtns: isXiHaiAn
+              ? []
+              : [
+                  'audioTrack',
+                  'quality',
+                  'speedRate',
+                  'volume',
+                  'setting',
+                  'pip',
+                  'pageFullScreen',
+                  'fullScreen',
+                ], //显示所有按钮,
+          },
+        }
+        await getStreamByChannelCode(param).then((res) => {
+          // 视频测试
+          // ob.options.src = 'http://playertest.longtailvideo.com/adaptive/bipbop/gear4/prog_index.m3u8'
+          ob.options.src = res.data.data
+          console.log('监测ob的变化', ob)
+          videoList.value.push(ob)
+        })
+      }
+      batchVisible.value = true
+    } else {
+      message.error('请选择需要预览的数据')
+    }
+  }
+  // 打开图片批量预览
+  const batchPicturePreview = async function (page) {
+    if (page.layerX) {
+      page = 1
+    }
+    if (selectedList.value.length > 0) {
+      videoTotal.value = selectedList.value.length
+      const arr = JSON.parse(JSON.stringify(selectedList.value))
+      let start = (page - 1) * 4
+      let list = []
+      list = arr.splice(start, 4)
+      const length = list.length
+      videoList.value = []
+      for (let index = 0; index < length; index++) {
+        const param = {
+          channelCode: list[index].channelId,
+        }
+        let ob = {
+          options: {
+            src: '', //图片源
+          },
+        }
+        selectByChannelCode(param).then((res) => {
+          ob.options.src = (res.data.data && res.data.data[0].picUrl) || ''
+          videoList.value.push(ob)
+        })
+      }
+      batchPicVisible.value = true
+    } else {
+      message.error('请选择需要预览的数据')
+    }
+  }
+  // 清空
+  const nullClick = () => {
+    if (clickList.value[1]) {
+      clickList.value[1].content = []
+    }
+    mapSearchParam.value.labelCodes = ''
+    getCamera()
+  }
+  // 重置
+  const clean = () => {
+    mapSearchParam.value.cameraName = ''
+    selectedList.value = []
+    selectedRowKeys.value = []
+    videoList.value = []
+    pagination.value.current = 1
+    mapSearchParam.value.pageNum = 1
+    mapSearchParam.value.type = 0
+    pagination.value.pageSize = 10
+    getCamera()
+  }
+  const videoClean = () => {
+    //视频预览弹窗关闭后不清除选中行
+    videoList.value = []
+    current.value = 1
+  }
+  // 改变批量预览的分页
+  const changePage = (page) => {}
+  // 一键申请
+  const dept = reactive({})
+  if (infrastructure) {
+    dept.deptId = infrastructure.deptId || ''
+    dept.deptName = infrastructure.deptName || ''
+  }
+
+  // 西海岸--判断设备最大数量个数
+  const judegNumber = () => {
+    return new Promise((resolve, reject) => {
+      getMaxApplyNum(selectedRowKeys.value.length)
+        .then((res) => {
+          resolve(res)
+        })
+        .catch((err) => {
+          reject(err)
+        })
+    })
+  }
+
+  const apply = async () => {
+    if (selectedRowKeys.value.length != 0) {
+      // 判断最大数量
+      let maxNumRes = await judegNumber()
+      if (maxNumRes.data.code != 0) {
+        return
+      }
+      let arr = [
+        {
+          arr: [
+            {
+              description: '',
+              note1: JSON.stringify(selectedList.value),
+              resourceId: '1522550195055828996',
+              resourceName: '摄像头列表',
+              type: '基础设施',
+            },
+          ],
+          deptId: dept.deptId,
+          deptName: dept.deptName,
+        },
+      ]
+      console.log('一键申请', arr)
+      localStorage.setItem('applyList', JSON.stringify(arr))
+      router.push({
+        path: '/apply',
+      })
+    } else {
+      message.error('请选择需要申请的数据')
+    }
+  }
+  const goToWeb = () => {
+    switch (selectType.value) {
+      case '政务云资源':
+        window.open('http://15.72.183.88:8760/yzy/login')
+        break
+      case '视频资源':
+        window.open('http://15.72.183.88:8860/video')
+        break
+      case '视频会议':
+        initMeeting()
+        break
+      default:
+        break
+    }
+  }
+  const wrjFlag = ref(false)
+  // 西海岸-视频资源loading
+  const loadingCamera = ref(false)
+  const getCamera = (flag, str) => {
+    loadingCamera.value = true
+    if (flag) {
+      mapSearchParam.value.cameraName = str
+    }
+    console.log('初始化调用', flag)
+    console.log(
+      '不选左侧树的时候不调用接口',
+      mapSearchParam.value,
+      selectType.value
+    )
+    if (!whoShow1.value.itShowXiHaiAn) {
+      if (selectType.value == '视频资源') {
+        getCameraByParentId(mapSearchParam.value)
+          .then((res) => {
+            console.log('res--查询摄像头---------->', res)
+            loadingCamera.value = false
+            dataSource.value = res.data.data
+            pagination.value.total = res.data.count
+          })
+          .catch((err) => {
+            loadingCamera.value = false
+            message.error(err)
+          })
+      } else {
+        loadingCamera.value = false
+      }
+    } else {
+      let params = {
+        regionId:
+          mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
+        pageNum: mapSearchParam.value.pageNum,
+        pageSize: mapSearchParam.value.pageSize,
+        longitude: mapSearchParam.value.gpsX || '',
+        latitude: mapSearchParam.value.gpsY || '',
+        radius: mapSearchParam.value.radius || '',
+        name: mapSearchParam.value.cameraName,
+        type: mapSearchParam.value.type,
+        borderPolygonList: mapSearchParam.value.borderPolygonList || [],
+      }
+      // todo-临时放开
+      // if (
+      //   params.regionId === '70be8c5b664f4bcf869d82f2e8335051' &&
+      //   !params.name &&
+      //   !params.longitude
+      // ) {
+      //   params.status = ''
+      // }
+      let paramsFather = ''
+      let i = 1
+      for (var key in params) {
+        if (params[key] === '') {
+          delete params[key]
+        } else {
+          if (i != 1) {
+            paramsFather += `&${key}=` + params[key]
+            i += 1
+          } else if (i == 1) {
+            paramsFather += `${key}=` + params[key]
+            i += 1
+          }
+        }
+      }
+      getCameraByCondition(params)
+        .then((res) => {
+          console.log('res--查询摄像头---------->', res)
+          loadingCamera.value = false
+          dataSource.value = res.data.data
+          pagination.value.total = res.data.count
+        })
+        .catch((err) => {
+          loadingCamera.value = false
+          message.error(err)
+        })
+    }
+  }
+  defineExpose({
+    getCamera,
+    reSetSearch,
+  })
+  //加入申购车
+  const addShoppingCart = () => {
+    if (selectedList.value.length > 0) {
+      sgcInsert({
+        delFlag: '0',
+        resourceld: '8888888880000000001',
+        note1: selectedList.value,
+      }).then((res) => {
+        message.success('添加申购车成功！')
+        mybus.emit('getSgcNum')
+      })
+    } else {
+      message.error('请选择需要添加申购车的数据')
+    }
+  }
+  // 表格
+  const dataSource = ref([])
+  const dataSource2 = ref([])
+  const statusText = ref({
+    0: '离线',
+    1: '在线',
+  })
+  const columns = ref([
+    {
+      title: '名称',
+      dataIndex: 'channelName',
+      key: 'channelName',
+    },
+    {
+      title: '归属',
+      dataIndex: 'managementUnitName',
+      width: '60%',
+      key: 'managementUnitName',
+    },
+    {
+      title: '操作',
+      dataIndex: 'operation',
+      width: '10%',
+      key: 'channelId',
+    },
+  ])
+  // 西海岸--状态展示
+  if (isXiHaiAn) {
+    columns.value.splice(2, 0, {
+      title: '状态',
+      dataIndex: 'status',
+      width: '10%',
+      key: 'status',
+    })
+  }
+  const columns2 = ref([
+    {
+      title: '名称',
+      dataIndex: 'wrjName',
+      key: 'wrjName',
+      align: 'center',
+    },
+    {
+      title: '申请状态',
+      dataIndex: 'wrjState',
+      width: '60%',
+      key: 'wrjState',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      dataIndex: 'operation',
+      width: '20%',
+      key: 'wrjName',
+      align: 'center',
+    },
+  ])
+  const onSelectChange = (
+    record,
+    selected,
+    selectedRows,
+    nativeEvent,
+    type
+  ) => {
+    record = JSON.parse(JSON.stringify(record))
+    if (selected) {
+      if (selectedRowKeys.value.length == 1000) {
+        message.warning('最多只能添加1000个摄像头！')
+      } else {
+        selectedList.value.push(record)
+        selectedRowKeys.value.push(record.channelCode || record.channelId)
+      }
+    } else {
+      selectedList.value.forEach((ele, index) => {
+        if (ele.channelCode == record.channelCode) {
+          selectedList.value.splice(index, 1)
+        }
+      })
+      selectedRowKeys.value.splice(
+        selectedRowKeys.value.indexOf(record.channelCode || record.channelId),
+        1
+      )
+    }
+    mybus.emit('selectTablePoint', selectedList.value)
+    console.log('已选中======================>', selectedList.value)
+  }
+  const onSelectChange2 = (
+    record,
+    selected,
+    selectedRows,
+    nativeEvent,
+    type
+  ) => {
+    console.log(
+      '已选中======================>',
+      record,
+      selected,
+      selectedRows,
+      nativeEvent,
+      type
+    )
+    if (selected) {
+      selectedRowKeys.value.push(record.name)
+      selectedRows.value.push(record.name)
+    } else {
+      selectedRowKeys.value.splice(
+        selectedRowKeys.value.indexOf(record.name),
+        1
+      )
+      selectedRows.value.splice(selectedRowKeys.value.indexOf(record.name), 1)
+    }
+  }
+  const onSelectAll = (selected, selectedRows, changeRows) => {
+    if (selected) {
+      changeRows.map((val) => {
+        selectedList.value.push(val)
+        selectedRowKeys.value.push(val.channelCode || val.channelId)
+      })
+      if (selectedRowKeys.value.length > 1000) {
+        message.warning('最多只能添加1000个摄像头！')
+        changeRows.map((val) => {
+          selectedList.value.forEach((ele, index) => {
+            if (ele.channelCode == record.channelCode) {
+              selectedList.value.splice(index, 1)
+            }
+          })
+          selectedRowKeys.value.splice(
+            selectedRowKeys.value.indexOf(val.channelCode || val.channelId),
+            1
+          )
+        })
+      }
+    } else {
+      changeRows.map((val) => {
+        selectedList.value = selectedList.value.filter(
+          (item) => item.idtCameraChannel !== val.idtCameraChannel
+        )
+        selectedRowKeys.value.splice(
+          selectedRowKeys.value.indexOf(val.channelCode || val.channelId),
+          1
+        )
+      })
+    }
+    console.log('heiheiheiehiehei', selected, selectedRows, changeRows)
+    mybus.emit('selectTablePoint', selectedList.value)
+  }
+  const onSelectAll2 = (selected, selectedRows, changeRows) => {
+    console.log(selected, selectedRows, changeRows)
+    if (selected) {
+    } else {
+    }
+  }
+  const getGovernmentCloud = () => {
+    getPolicyCloudService().then((res) => {
+      console.log('获取政务云资源======》', res.data.data)
+    })
+  }
+  // 切换tab
+  const handleTableChange = (val) => {
+    pagination.value.current = val.current
+    pagination.value.pageSize = val.pageSize
+    mapSearchParam.value.pageNum = val.current
+    mapSearchParam.value.pageSize = val.pageSize
+
+    let _arr =
+      clickList.value.filter(
+        (v) => v.content.includes('单兵设备') || v.content.includes('无人机')
+      ) || []
+    let _tab_name = _arr[0] && _arr[0].content && _arr[0].content[0]
+    // 无人机、单兵设备
+    if (_tab_name) {
+      getSoldierData(0, _tab_name)
+    } else {
+      getCamera()
+    }
+  }
+
+  // 视频预览 提示
+  const videoShowMsg = (index) => {
+    let itemData = null
+    if (index) {
+      itemData = selectedList.value[index]
+    }
+    let msg = '请申请后在我的申请中观看视频!'
+    if (
+      (itemData && itemData.status != 1) ||
+      (rowClickData.value && rowClickData.value.status != 1)
+    ) {
+      msg = '当前视频离线不可预览!'
+    } else {
+      msg = '请申请后在我的申请中观看视频!'
+    }
+    message.warning(msg)
+  }
+
+  // 获取用户信息
+  const userInfo = ref(null)
+  const handleUser = () => {
+    getUser()
+      .then((res) => {
+        if (res.data.code != 0) {
+          return message.warning(res.data.msg)
+        }
+        userInfo.value = res.data.data || {}
+        userInfo.value.usernameShow =
+          '西海岸能力超市' +
+          (userInfo.value.deptName || '') +
+          (userInfo.value.username || '')
+        userInfo.value.realNameShow =
+          '西海岸能力超市' +
+          (userInfo.value.deptName || '') +
+          (userInfo.value.realName || '')
+      })
+      .catch((err) => {
+        message.warning(err)
+      })
+  }
+</script>
+<style lang="less" scoped>
+  .infrastructrueBox {
+    padding: 0.2rem;
+    background: #ffffff;
+    border-bottom: 0.01rem solid rgba(150, 144, 144, 0.3);
+
+    .infrastructrue-tab {
+      span {
+        display: inline-block;
+        height: 0.24rem;
+        font-size: 0.14rem;
+        line-height: 0.24rem;
+        border: 0;
+        border-radius: 0.12rem;
+        margin-left: 0.1rem;
+        text-align: center;
+        color: #666666;
+        cursor: pointer;
+        padding: 0 0.08rem;
+      }
+
+      .leftType {
+        margin: 0.2rem 0;
+        margin-right: 0.06rem;
+      }
+
+      .down {
+        background: #0087ff;
+        color: #ffffff;
+      }
+
+      .tabBox {
+        padding-bottom: 0.16rem;
+      }
+    }
+
+    .infrastructrue-content {
+      display: flex;
+      justify-content: space-between;
+      padding: 0.14rem 0.2rem 0.1rem;
+      background: #ffffff;
+
+      .contentNum {
+        position: relative;
+        display: flex;
+
+        p {
+          color: #666666;
+          padding: 0;
+          margin: 0;
+
+          span {
+            color: #0087ff;
+            font-size: 0.2rem;
+            font-weight: 500;
+          }
+        }
+
+        p:first-of-type {
+          padding-right: 0.16rem;
+          margin-right: 0.16rem;
+        }
+
+        .boundary {
+          position: absolute;
+          left: 0.9rem;
+          top: 0.07rem;
+          display: block;
+          width: 0.02rem;
+          border-radius: 0.01rem;
+          height: 0.2rem;
+          background: rgba(150, 144, 144, 0.3);
+        }
+      }
+
+      .contentRight {
+        position: relative;
+        display: flex;
+        justify-content: space-between;
+
+        .boundary {
+          position: absolute;
+          left: 3.74rem;
+          top: 0.07rem;
+          display: block;
+          width: 0.02rem;
+          border-radius: 0.01rem;
+          height: 0.2rem;
+          background: rgba(150, 144, 144, 0.3);
+        }
+
+        .searchInput {
+          display: flex;
+          margin-right: 0.2rem;
+
+          .ant-input-search {
+            max-width: 4rem;
+          }
+
+          :deep(.ant-input) {
+            width: 2rem;
+            height: 0.36rem;
+            font-size: 0.14rem;
+            color: #b2b2b2;
+            background: #f5f5f5;
+          }
+
+          :deep(.ant-input-group-addon) {
+            display: inline-block;
+            margin-left: 0.1rem;
+
+            .ant-input-search-button {
+              width: 0.8rem;
+              height: 0.36rem;
+              background: #0558e1;
+              border-radius: 0.04rem;
+              font-size: 0.14rem;
+            }
+          }
+
+          :deep(.ant-btn) {
+            background: #0558e1;
+            border-radius: 0.04rem;
+          }
+        }
+
+        .buttonAdd {
+          background: #0558e1;
+          border-radius: 0.04rem;
+          height: 0.36rem;
+          border-color: #0558e1;
+          margin-left: 0.1rem;
+        }
+      }
+    }
+
+    .infrastructrue-table {
+      .ant-table-striped :deep(.table-striped) td {
+        background-color: #fafafa;
+      }
+    }
+
+    .map-contain {
+      // width: 9.46rem;
+      height: 4.1rem;
+      margin-left: 0.16rem;
+      position: relative;
+    }
+  }
+
+  .roomBackground {
+    background: #0058e1;
+    color: #ffffff;
+  }
+
+  .nullBackground {
+    background: #f3f5f9;
+    color: #0087ff;
+  }
+
+  :deep(.ant-form-item-control-input-content) {
+    margin-left: 0.15rem;
+  }
+
+  :deep(.ant-col) {
+    .ant-form-item {
+      margin-bottom: 0;
+    }
+  }
+
+  .jinggaoD {
+    display: flex;
+    align-items: center;
+  }
+
+  .jinggaoNull {
+    display: none;
+  }
+
+  .imgJinggao {
+    width: 0.2rem;
+    height: 0.2rem;
+    background: url('~@/assets/home/jingao.png') no-repeat;
+    background-size: 100%;
+  }
+
+  .introduction {
+    width: unset;
+    button {
+      height: 30px;
+      width: 120px;
+      border: 1px solid #bbd3ef;
+      border-radius: 6px;
+      background: #edf4fc;
+      color: #0087ff;
+      font-size: 14px;
+    }
+    :deep(.ant-form-item-control) {
+      margin-left: -2.1rem;
+    }
+  }
+
+  .roomBox {
+    .leftMake {
+      float: left;
+      margin-left: -1rem;
+      margin-top: -0.5rem;
+      font-size: 0.2rem;
+      cursor: pointer;
+
+      .leftTop {
+        width: 0.6rem;
+        height: 1.75rem;
+        border-top-left-radius: 0.08rem;
+        border-bottom-left-radius: 0.08rem;
+        padding: 0.13rem;
+        text-align: center;
+      }
+
+      .leftBottom {
+        width: 0.6rem;
+        height: 1.75rem;
+        border-top-left-radius: 0.08rem;
+        border-bottom-left-radius: 0.08rem;
+        padding: 0.2rem 0.13rem 0.1rem 0.1rem;
+        text-align: center;
+      }
+    }
+
+    .roomSearch {
+      display: flex;
+      align-items: center;
+
+      .searchInput {
+        display: flex;
+        margin-right: 0.2rem;
+        margin-left: 0.2rem;
+
+        // .ant-input-search {
+        //   max-width: 4rem;
+        // }
+        :deep(.ant-input) {
+          width: 2rem;
+          height: 0.36rem;
+          font-size: 0.14rem;
+          color: #b2b2b2;
+          background: #f5f5f5;
+        }
+
+        :deep(.ant-input-group-addon) {
+          display: inline-block;
+          margin-left: 0.1rem;
+
+          .ant-input-search-button {
+            width: 0.8rem;
+            height: 0.36rem;
+            background: #0558e1;
+            border-radius: 0.06rem;
+            font-size: 0.14rem;
+          }
+        }
+
+        :deep(.ant-btn) {
+          border-radius: 0.06rem;
+        }
+      }
+    }
+
+    .roomTableList {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin: 0.4rem 0 0.2rem 0;
+
+      .roomTime {
+        display: flex;
+        align-items: center;
+
+        :deep(.ant-space-vertical) {
+          flex-direction: inherit;
+          margin-left: 0.2rem;
+        }
+      }
+    }
+
+    .roomItem {
+      width: 10.3rem;
+      height: 2rem;
+      border-top: 1px #d5d4d4 solid;
+      display: flex;
+      align-items: center;
+
+      .leftImg {
+        width: 2.4rem;
+        height: 1.75rem;
+        margin: 0 0.3rem 0 0.15rem;
+
+        // background: url('~@/assets/home/yyzy_square.png') no-repeat;
+        background-size: 100%;
+
+        img {
+          width: 100%;
+          height: 100%;
+        }
+      }
+
+      .rightContent {
+        height: 1.75rem;
+        width: 5.8rem;
+
+        .topContent {
+          font-size: 0.2rem;
+          color: #000;
+          font-weight: 600;
+        }
+
+        .centerContent {
+          display: flex;
+          justify-content: space-between;
+          font-size: 0.14rem;
+          margin: 0.15rem 0 0.2rem 0;
+        }
+        .bottonmContent {
+          width: 100%;
+          overflow: hidden; //超出隐藏
+          text-overflow: ellipsis; //超出文本设置为...
+          display: -webkit-box; //将div1转换为盒子模型
+          -webkit-line-clamp: 3; //设置div1的文本为2行
+          -webkit-box-orient: vertical; //从顶部向底部垂直布置子元素
+        }
+      }
+    }
+
+    :deep(.ant-pagination) {
+      float: right;
+    }
+
+    :deep(.ant-pagination) {
+      text-align: end;
+    }
+  }
+  :deep(.ant-table-thead > tr > th) {
+    color: #5580f7 !important;
+    font-size: 16px !important;
+    font-weight: 600 !important;
+  }
+</style>
+<style lang="less">
+  .wrj {
+    .ant-modal-body {
+      height: 700px !important;
+      overflow-y: auto;
+    }
+  }
+
+  .modalClass {
+    .ant-modal-body {
+      height: 4rem !important;
+      overflow-y: scroll !important;
+    }
+
+    .ant-modal-title {
+      font-weight: 600;
+    }
+
+    .ant-modal-content {
+      .ant-modal-header {
+        border-bottom: 0 !important;
+      }
+    }
+  }
+
+  .appModal {
+    .ant-modal-body {
+      height: 4.8rem !important;
+      overflow-y: scroll !important;
+    }
+
+    .ant-modal-title {
+      font-weight: 600;
+    }
+
+    .ant-modal-content {
+      .ant-modal-header {
+        border-bottom: 0 !important;
+      }
+    }
+  }
+
+  .single-preview-modal {
+    .ant-modal-header {
+      background: url(~@/assets/home/video-background.png) no-repeat;
+      background-size: cover;
+    }
+
+    .ant-modal-title {
+      font-size: 0.16rem;
+      font-weight: 500;
+      color: #ffffff;
+    }
+
+    .anticon {
+      color: #ffffff;
+    }
+  }
+
+  .batch-preview-modal {
+    .batch-video {
+      width: 100%;
+      display: grid;
+      grid-template-columns: 50% 50%;
+      grid-template-rows: 50% 50%;
+      justify-content: center;
+      grid-row-gap: 10px;
+      grid-column-gap: 10px;
+    }
+
+    .ant-pagination-item-link {
+      background-color: #5580f7;
+    }
+
+    .ant-modal-header {
+      background: url(~@/assets/home/video-background.png) no-repeat;
+      background-size: cover;
+    }
+
+    .ant-modal-title {
+      font-size: 0.16rem;
+      font-weight: 500;
+      color: #ffffff;
+    }
+
+    .anticon {
+      color: #ffffff;
+    }
+  }
+
+  /*禁用video的controls（要慎重！不要轻易隐藏掉，会导致点击视频不能播放）*/
+  video::-webkit-media-controls {
+    display: none !important;
+  }
+
+  .video-cover {
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    background: transparent;
+    z-index: 99999999;
+    cursor: pointer;
+  }
+
+  .batch-video-cover {
+    position: absolute;
+    left: 0;
+    top: 0;
+    background: transparent;
+    height: 288px;
+    z-index: 99999999;
+    width: 512px;
+    margin-top: 14px;
+    cursor: pointer;
+  }
+
+  .waterMark {
+    position: absolute;
+    z-index: 99999999;
+    color: #0058e1;
+    font-size: 22px;
+    font-weight: bold;
+    opacity: 0.4;
+    transform: rotate(-25deg);
+    width: 470px;
+  }
+
+  // 左上
+  .waterMark-left-top {
+    left: 50px;
+    top: 100px;
+    text-align: left;
+  }
+
+  // 右上
+  .waterMark-right-top {
+    right: 50px;
+    top: 100px;
+    text-align: right;
+  }
+
+  // 左下
+  .waterMark-left-bottom {
+    left: 50px;
+    bottom: 100px;
+    text-align: left;
+  }
+
+  // 右下
+  .waterMark-right-bottom {
+    right: 50px;
+    bottom: 100px;
+    text-align: right;
+  }
+
+  // 批量
+  .batch-waterMark {
+    position: absolute;
+    z-index: 99999999;
+    color: #0058e1;
+    font-size: 14px;
+    opacity: 0.4;
+    transform: rotate(-25deg);
+    width: 200px;
+  }
+
+  // 左上
+  .batch-waterMark-left-top {
+    left: 30px;
+    top: 50px;
+    text-align: left;
+  }
+
+  // 右上
+  .batch-waterMark-right-top {
+    text-align: right;
+    right: 30px;
+    top: 80px;
+  }
+
+  // 左下
+  .batch-waterMark-left-bottom {
+    left: 30px;
+    bottom: 50px;
+    text-align: left;
+  }
+
+  // 右下
+  .batch-waterMark-right-bottom {
+    right: 20px;
+    bottom: 30px;
+    text-align: right;
+  }
+
+  .disabled-text {
+    cursor: not-allowed;
+    opacity: 0.5;
+    color: #666666;
+
+    &:hover {
+      color: #666666;
+    }
+  }
+</style>

From 8f04b9403e1a4073a87f5a96867b76685e006e9d Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Fri, 18 Nov 2022 10:56:19 +0800
Subject: [PATCH 22/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/DetailsPageconetent.vue | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 0857e926..48f7891e 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -803,7 +803,7 @@
       const handleAdd = (value) => {
         flag.value = value
       }
-      const titleName = ref(titleNameArray)
+          const titleName=ref([])
       const openMonitor = () => {
         window.open('http://www.qingdao.gov.cn:8083/ghwd/znwdqd/index.html')
       }
@@ -903,6 +903,16 @@
         pageSize: currentPageSize.value,
         name: '',
       })
+      //调整标题顺序  西海岸基础设施放在最前面
+       const setTitle = () => {
+        let  title = titleNameArray
+        let whoShow1 = ref(whoShow)
+      if( whoShow1 && whoShow1.value.itShowXiHaiAn){
+        title[0] = title.splice(2, 1, title[0])[0];
+      
+      }
+      titleName.value=title
+      }
       // 查询
       const onSearch = () => {
         loading.value = true
@@ -1740,6 +1750,8 @@
       }
       onMounted(() => {
         // 从本地读取查询条件，赋值
+        //西海岸基础设施放在最前面
+        setTitle();
         handleSetSearchData()
         listKey2.value++
         // 获取筛选条件
@@ -1877,6 +1889,7 @@
         )
       }
       return {
+        setTitle,
         listKey,
         ListContent,
         searchValue,

From 74925cc9e059c2d3707b52153664fce72ff12e9b Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Fri, 18 Nov 2022 11:18:56 +0800
Subject: [PATCH 23/25] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E8=AE=BE=E6=96=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 0857e926..335f7da7 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -305,7 +305,7 @@
     <div class="details-pageconetent-left" v-if="Cardsname != '基础设施'">
       <detailsPageconetentTree />
     </div>
-    <div class="details-pageconetent-left" v-else>
+    <div class="details-pageconetent-left" style="left:0.16rem" v-else>
       <detailsPageInfrastructureTreeXha />
     </div>
     <div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
@@ -436,7 +436,7 @@
         <a-empty />
       </div>
     </div>
-    <div class="top" v-else-if="Cardsname === '基础设施'">
+    <div class="top" style="width: 13.5rem;margin-left:0" v-else-if="Cardsname === '基础设施'">
       <div class="top-title">
         <div
           v-for="item in titleName"

From 8a02cc43b4b1405d6df1f356c7805bdb22db15ef Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 18 Nov 2022 15:37:00 +0800
Subject: [PATCH 24/25] =?UTF-8?q?=E6=94=BF=E5=8A=A1=E4=BA=91=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/api/home.js                         |  8 ++--
 .../components/GovernmentCloudResources.vue   | 43 ++++++++++++++-----
 front/src/views/home/infrastructurePage.vue   | 23 ++++++++--
 3 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/front/src/api/home.js b/front/src/api/home.js
index fb90e0d0..4851a2f0 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 19:19:40
  * @LastEditors: Light
- * @LastEditTime: 2022-11-18 09:16:13
+ * @LastEditTime: 2022-11-18 14:09:20
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -526,10 +526,10 @@ export function getGisByArea(data) {
     data,
   })
 }
-export function getPolicyCloudService(params) {
+export function getPolicyCloudService(data) {
   return request({
     url: '/resource/getPolicyCloudService',
-    method: 'get',
-    params,
+    method: 'post',
+    data,
   })
 }
diff --git a/front/src/views/home/components/GovernmentCloudResources.vue b/front/src/views/home/components/GovernmentCloudResources.vue
index 2752e22b..4861b8fb 100644
--- a/front/src/views/home/components/GovernmentCloudResources.vue
+++ b/front/src/views/home/components/GovernmentCloudResources.vue
@@ -2,36 +2,59 @@
  * @Author: Light
  * @Date: 2022-11-16 16:46:16
  * @LastEditors: Light
- * @LastEditTime: 2022-11-17 09:46:45
+ * @LastEditTime: 2022-11-18 15:35:25
  * @Description: 政务云资源列表
 -->
 <template>
   <div class="top">
-    <div>检索结果：60项</div>
+    <div>检索结果：{{ props.governmentCloud.total }}项</div>
     <div>
       使用声明:
       附加增值服务，委办局单位可以根据自身需求，按需采购，由采购单位付费。
     </div>
   </div>
-  <div class="bottom">
+  <div
+    class="bottom"
+    v-for="(item, index) in props.governmentCloud.data"
+    :key="item.service_item_tier1 + index"
+  >
     <div class="left"></div>
     <div class="right">
       <div class="title">
         <div>
-          <div class="name">云主机</div>
-          <div class="type">基础服务</div>
+          <div class="name">{{ item.service_item_tier1 }}</div>
+          <div class="type">{{ item.service_type }}</div>
         </div>
-        <div>年份：2022</div>
+        <div>年份：{{ item.year }}</div>
       </div>
-      <div class="text">云主机配置</div>
+      <div class="text">{{ item.service_description }}</div>
       <div class="info">
-        <div>一级条目：主机服务</div>
-        <div>规格：1H2G</div>
+        <div>一级条目：{{ item.service_item_tier2 }}</div>
+        <div>规格：{{ item.specification }}</div>
       </div>
     </div>
   </div>
+  <a-pagination
+    v-model:current="current"
+    :pageSize="5"
+    :total="props.governmentCloud.total"
+    :showSizeChanger="false"
+    @change="changeCurrent"
+    show-less-items
+  />
 </template>
-<script setup></script>
+<script setup>
+  import { ref, defineProps, defineEmits } from 'vue'
+  const props = defineProps({
+    governmentCloud: { type: Object, default: null },
+  })
+  const emit = defineEmits(['getGovernmentCloud'])
+  const current = ref(props.governmentCloud.current)
+  const changeCurrent = (current) => {
+    console.log(current)
+    emit('getGovernmentCloud', current)
+  }
+</script>
 <style lang="less" scoped>
   .top {
     display: flex;
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 316597ea..99fb0dbe 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -562,9 +562,13 @@
       </div>
       <div
         class="infrastructrue-table"
+        :key="showKey"
         v-if="!wrjFlag && selectType == '政务云资源'"
       >
-        <GovernmentCloudResources></GovernmentCloudResources>
+        <GovernmentCloudResources
+          :governmentCloud="governmentCloud"
+          @getGovernmentCloud="getGovernmentCloud"
+        ></GovernmentCloudResources>
       </div>
       <!-- 西海岸-无人机、单兵设备 -->
       <div class="infrastructrue-table" v-else-if="isXiHaiAn && wrjFlag">
@@ -1553,6 +1557,7 @@
   }
   const emits = defineEmits(['add'])
   const selectType = ref('政务云资源')
+  const showKey = ref(0)
   //表格的高度
   let tableHeight = ref('600')
   //tab切换点击事件
@@ -1783,7 +1788,9 @@
         clickList.value[indexFather].content = [name]
       }
       if (!isXiHaiAn) {
-        getGovernmentCloud()
+        getGovernmentCloud(1)
+        governmentCloud.current = 1
+        showKey.value++
       }
     }
     // 改变查询摄像头接口的labelCode数组
@@ -2313,9 +2320,17 @@
     } else {
     }
   }
-  const getGovernmentCloud = () => {
-    getPolicyCloudService().then((res) => {
+  const governmentCloud = reactive({ data: [], total: 0, current: 1 })
+  const getGovernmentCloud = (page) => {
+    getPolicyCloudService({
+      limit: 5,
+      page: page || 1,
+      name: '',
+      type: clickList.value[1].content[0],
+    }).then((res) => {
       console.log('获取政务云资源======》', res.data.data)
+      governmentCloud.data = res.data.data.list
+      governmentCloud.total = res.data.data.total
     })
   }
   // 切换tab

From 84ea475d6472e2462005790a034fb7e0828c1ec5 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 18 Nov 2022 15:38:56 +0800
Subject: [PATCH 25/25] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=20=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/DetailsPageconetent.vue  | 34 +++++++++++--------
 .../views/home/infrastructureApplication.vue  | 12 +++++++
 2 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100644 front/src/views/home/infrastructureApplication.vue

diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 4a804b38..7bd057a7 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -1,5 +1,4 @@
 <template>
-  itShowQingDao
   <!-- 青岛 -->
   <div class="details-pageconetent" v-if="whoShow1 && whoShow1.itShowQingDao">
     <home-header></home-header>
@@ -305,7 +304,7 @@
     <div class="details-pageconetent-left" v-if="Cardsname != '基础设施'">
       <detailsPageconetentTree />
     </div>
-    <div class="details-pageconetent-left" style="left:0.16rem" v-else>
+    <div class="details-pageconetent-left" style="left: 0.16rem" v-else>
       <detailsPageInfrastructureTreeXha />
     </div>
     <div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
@@ -436,7 +435,11 @@
         <a-empty />
       </div>
     </div>
-    <div class="top" style="width: 13.5rem;margin-left:0" v-else-if="Cardsname === '基础设施'">
+    <div
+      class="top"
+      style="width: 13.5rem; margin-left: 0"
+      v-else-if="Cardsname === '基础设施'"
+    >
       <div class="top-title">
         <div
           v-for="item in titleName"
@@ -507,6 +510,9 @@
         :resourceTotal="resourceTotal"
       ></KnowledgeBase>
     </div>
+    <div v-if="Cardsname == '基础设施'">
+      <infrastructureApplication></infrastructureApplication>
+    </div>
     <div class="talk-monitor" @click="openMonitor">
       <a-tooltip>
         <template #title>问答机器人</template>
@@ -778,6 +784,7 @@
   import infrastructurePageXha from '@/views/home/infrastructurePageXha.vue'
   import detailsPageInfrastructureTree from '@/views/home/detailsPageInfrastructureTree.vue'
   import detailsPageInfrastructureTreeXha from '@/views/home/detailsPageInfrastructureTreeXha.vue'
+  import infrastructureApplication from '@/views/home/infrastructureApplication.vue'
   import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   import { useStore } from 'vuex'
   import { message } from 'ant-design-vue'
@@ -803,7 +810,7 @@
       const handleAdd = (value) => {
         flag.value = value
       }
-          const titleName=ref([])
+      const titleName = ref([])
       const openMonitor = () => {
         window.open('http://www.qingdao.gov.cn:8083/ghwd/znwdqd/index.html')
       }
@@ -904,15 +911,14 @@
         name: '',
       })
       //调整标题顺序  西海岸基础设施放在最前面
-       const setTitle = () => {
-        let  title = titleNameArray
-        let whoShow1 = ref(whoShow)
-      if( whoShow1 && whoShow1.value.itShowXiHaiAn){
-        title[0] = title.splice(2, 1, title[0])[0];
-      
-      }
-      titleName.value=title
-      }
+      const setTitle = () => {
+        let title = titleNameArray
+        let whoShow1 = ref(whoShow)
+        if (whoShow1 && whoShow1.value.itShowXiHaiAn) {
+          title[0] = title.splice(2, 1, title[0])[0]
+        }
+        titleName.value = title
+      }
       // 查询
       const onSearch = () => {
         loading.value = true
@@ -1751,7 +1757,7 @@
       onMounted(() => {
         // 从本地读取查询条件，赋值
         //西海岸基础设施放在最前面
-        setTitle();
+        setTitle()
         handleSetSearchData()
         listKey2.value++
         // 获取筛选条件
diff --git a/front/src/views/home/infrastructureApplication.vue b/front/src/views/home/infrastructureApplication.vue
new file mode 100644
index 00000000..d8688692
--- /dev/null
+++ b/front/src/views/home/infrastructureApplication.vue
@@ -0,0 +1,12 @@
+<!--
+ * @Author: Light
+ * @Date: 2022-11-18 11:53:43
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-18 11:54:11
+ * @Description: 告诉大家这是什么
+-->
+<template>
+  <div>基础设施申请</div>
+</template>
+<script setup></script>
+<style lang="less" scoped></style>