Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/src/views/abilityStatistics/components/SharingSituation.vue

@@ -56,7 +56,7 @@
         </div>
 
         <div class="volume_box">
-          <div class="fugai"></div>
+          <!-- <div class="fugai"></div> -->
           <div
             v-for="(item, index) in dataLists"
             :key="item"
@@ -201,20 +201,20 @@
     })
   }
   let photoBg = ref([
-    require('../../../assets/abilityStatistics/yingyongziyuan-bg.png'),
-    require('../../../assets/abilityStatistics/zhishiku-bg.png'),
-    require('../../../assets/abilityStatistics/zujianfuwu-bg.png'),
-    require('../../../assets/abilityStatistics/shujuziyuan-bg.png'),
-    require('../../../assets/abilityStatistics/jichujianshe-bg.png'),
-    require('../../../assets/abilityStatistics/yingyongziyuan-bg.png'),
+    require('../../../assets/abilityStatistics/yyzy-bg.png'),
+    require('../../../assets/abilityStatistics/kfzj-bg.png'),
+    require('../../../assets/abilityStatistics/ywzj-bg.png'),
+    require('../../../assets/abilityStatistics/tcfw-bg.png'),
+    require('../../../assets/abilityStatistics/znsf-bg.png'),
+    require('../../../assets/abilityStatistics/hkt-bg.png'),
   ])
   let photo = ref([
-    require('../../../assets/abilityStatistics/yingyongziyuan.png'),
-    require('../../../assets/abilityStatistics/zhishiku.png'),
-    require('../../../assets/abilityStatistics/zujianfuwu.png'),
-    require('../../../assets/abilityStatistics/shujuziyuan.png'),
-    require('../../../assets/abilityStatistics/jichujianshe.png'),
-    require('../../../assets/abilityStatistics/yingyongziyuan.png'),
+    require('../../../assets/abilityStatistics/yyzy.png'),
+    require('../../../assets/abilityStatistics/kfzj.png'),
+    require('../../../assets/abilityStatistics/ywzj.png'),
+    require('../../../assets/abilityStatistics/tcfw.png'),
+    require('../../../assets/abilityStatistics/znsf.png'),
+    require('../../../assets/abilityStatistics/hkt.png'),
   ])
   //申请量接口
   let dataLists = ref([])
@@ -379,12 +379,12 @@
         display: flex;
         margin-bottom: 20px;
         color: #fff;
-        .fugai {
-          width: 40px;
-          height: 390px;
-          background: #0058e1;
-          margin-top: 1px;
-        }
+        // .fugai {
+        //   width: 40px;
+        //   height: 390px;
+        //   background: #0058e1;
+        //   margin-top: 1px;
+        // }
         .volume_box-son {
           width: 120px;
           height: 390px;
@@ -417,6 +417,11 @@
             bottom: 44px;
           }
         }
+        .volume_box-son:nth-of-type(1) {
+          width: 140px;
+          padding-left: 28px;
+          background-position-x: 10px;
+        }
       }
     }
   }

front/src/views/home/AbilityToApplyFor.vue

@@ -289,6 +289,9 @@
       margin-bottom: 0.2rem;
       display: flex;
       justify-content: space-between;
+      background: url("~@/assets/newHome/biaoti.png") no-repeat;
+    background-position-y: 7px;
+    padding-left: 17px;
     }
 
     .ability-to-apply-for-content {
@@ -297,7 +300,7 @@
 
       .dep-name {
         color: #0558e1;
-        font-size: 0.22rem;
+        font-size: 0.18rem;
         display: flex;
         align-items: center;
         line-height: 0.22rem;
@@ -346,7 +349,7 @@
 
       .description {
         width: 8.8rem;
-        color: rgba(0, 0, 0, 0.45);
+        color: rgba(0, 0, 0, 0.70);
       }
 
       .remove {

front/src/views/home/algorithmCompare.vue

@@ -678,11 +678,21 @@
     height: 100vh;
     width: 100%;
   }
+  :deep .ant-anchor-link{
+    height: 50px !important;
+    line-height: 50px;
+    margin:0px !important;
+  }
+:deep .ant-anchor-link-active > .ant-anchor-link-title {
+    color: #fff;
+    width: 100%;
+    height: 100%;
+    background: #0058e1;
+}
+:deep .ant-anchor-link-title:only-child {
    
-  // @font-face {
-  //     font-family: 'num-typeface';
-  //     src: url('~@/assets/newHome/font/num-typeface.otf');
-  // }
+    padding-left: 14px;
+}
 
   .border {
     border: 1px solid #dddee1;
@@ -768,22 +778,22 @@
 
       .top {
         width: 100%;
-        height: 100px;
+        height: 137px;
         margin-bottom: 20px;
         display: flex;
         align-items: center;
-        justify-content: flex-start;
+        justify-content: flex-end;
 
         .td-name {
-          height: 100px;
+          height: 137px;
           display: flex;
           align-items: center;
           justify-content: center;
         }
 
         .td {
-          height: 100px;
-          line-height: 100px;
+          height: 137px;
+          line-height: 137px;
           position: relative;
           display: flex;
           justify-content: center;
@@ -877,9 +887,9 @@
   }
 
   .add-img {
-    height: 60px;
-    width: 60px;
-    background: url('~@/assets/newHome/add-on.png');
+    height: 40px;
+    width: 40px;
+    background: url('~@/assets/newHome/add-grey.png');
     background-size: 100% 100%;
     cursor: pointer;
   }

front/src/views/home/apply.vue

@@ -8,96 +8,44 @@
         </div>
         <div class="form-container">
           <div v-if="applySuccess">
-            <a-form
-              ref="formRef"
-              :model="formName"
-              name="basic"
-              :label-col="{ style: { width: '106px' } }"
-              :wrapper-col="{ style: { width: '230px' } }"
-              labelAlign="left"
-              autocomplete="off"
-            >
+            <div style="    background: #f6f7f9;
+                padding: 24px 14px 14px 20px;
+                margin-bottom: 10px;
+                margin-top: 10px;
+                margin-bottom: 20px">
+              <a-form ref="formRef" :model="formName" name="basic" :label-col="{ style: { width: '106px' } }"
+                :wrapper-col="{ style: { width: '230px' } }" labelAlign="left" autocomplete="off">
                 <div class="base-info flex-row-start">
-                <a-form-item
-                  label="申请标题"
-                  name="title"
-                  :rules="[{ required: true, message: '请输入申请标题' }]"
-                >
-                  <a-input
-                    placeholder="请输入能力申请标题"
-                    v-model:value="formName.title"
-                  />
+                  <a-form-item label="申请标题" name="title" :rules="[{ required: true, message: '请输入申请标题' }]">
+                    <a-input placeholder="请输入能力申请标题" v-model:value="formName.title" />
                   </a-form-item>
                   <!-- 西海岸-摄像头-增加过期时间 -->
-                <a-form-item
-                  v-if="isCamera && isXiHaiAn"
-                  label="过期时间"
-                  name="expireDate"
-                  :rules="[{ required: true, message: '请选择过期时间' }]"
-                  style="margin-left: 22px"
-                >
-                  <a-select
-                    v-model:value="formName.expireDate"
-                    placeholder="请选择过期时间"
-                    style="width: 200px"
-                    :options="expireDateOptions"
-                  ></a-select>
+                  <a-form-item v-if="isCamera && isXiHaiAn" label="过期时间" name="expireDate"
+                    :rules="[{ required: true, message: '请选择过期时间' }]" style="margin-left: 22px">
+                    <a-select v-model:value="formName.expireDate" placeholder="请选择过期时间" style="width: 200px"
+                      :options="expireDateOptions"></a-select>
                   </a-form-item>
                 </div>
                 <div class="base-info">
-                <a-form-item
-                  label="申请人信息"
-                  name="user"
-                  :rules="[{ required: true, message: '请输入申请人' }]"
-                >
-                  <a-input
-                    placeholder="请输入申请人"
-                    v-model:value="formName.user"
-                    disabled
-                  />
+                  <a-form-item label="申请人信息" name="user" :rules="[{ required: true, message: '请输入申请人' }]">
+                    <a-input placeholder="请输入申请人" v-model:value="formName.user" disabled />
                   </a-form-item>
-                <a-form-item
-                  style="margin: 0 22px"
-                  label="电话"
-                  name="phone"
-                  :rules="[
+                  <a-form-item style="margin: 0 0px" label="电话" name="phone" :rules="[
   {
     required: true,
     pattern: /^1[3456789]\d{9}$/,
     message: '请输入正确的电话号码',
   },
-                  ]"
-                >
-                  <a-input
-                    placeholder="请输入申请人电话"
-                    v-model:value="formName.phone"
-                  />
+]">
+                    <a-input placeholder="请输入申请人电话" v-model:value="formName.phone" />
                   </a-form-item>
-                <a-form-item
-                  label="单位"
-                  name="unit"
-                  :rules="[{ required: true, message: '请输入单位' }]"
-                >
-                  <a-input
-                    placeholder="请输入单位"
-                    v-model:value="formName.unit"
-                    disabled
-                    v-if="deptFlage"
-                  />
-                  <a-select
-                    v-else
-                    placeholder="请选择归属部门"
-                    v-model:value="formName.unit"
-                    :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-                    show-search
-                    :filterOption="true"
-                    @change="deptIdChangeFunction"
-                  >
-                    <a-select-option
-                      v-for="(item, index) in deptNameAll"
-                      :key="`${index}-${item}`"
-                      :value="item.name"
-                    >
+                  <a-form-item label="单位" name="unit" :rules="[{ required: true, message: '请输入单位' }]">
+                    <a-input placeholder="请输入单位" v-model:value="formName.unit" disabled v-if="deptFlage" />
+                    <a-select v-else placeholder="请选择归属部门" v-model:value="formName.unit"
+                      :getPopupContainer="(triggerNode) => triggerNode.parentNode" show-search :filterOption="true"
+                      @change="deptIdChangeFunction">
+                      <a-select-option v-for="(item, index) in deptNameAll" :key="`${index}-${item}`"
+                        :value="item.name">
                         {{ item.name }}
                       </a-select-option>
                     </a-select>
@@ -105,63 +53,29 @@
                 </div>
                 <div class="base-info" v-if="flag">
                   <div style="margin-bottom: 24px">
-                  <a-form-item
-                    style="margin-bottom: 0"
-                    label="应用系统"
-                    name="applicationSystem"
-                    :rules="[{ required: true, message: '请选择应用系统' }]"
-                  >
-                    <a-select
-                      v-model:value="formName.applicationSystem"
-                      show-search
-                      placeholder="请选择应用系统"
-                      style="width: 230px"
-                      :options="systemOptions"
-                      @focus="handleFocus"
-                      @blur="handleBlur"
-                      @change="systemHandleChange"
-                      @search="systemHandleSearch"
-                    ></a-select>
+                    <a-form-item style="margin-bottom: 0" label="应用系统" name="applicationSystem"
+                      :rules="[{ required: true, message: '请选择应用系统' }]">
+                      <a-select v-model:value="formName.applicationSystem" show-search placeholder="请选择应用系统"
+                        style="width: 230px" :options="systemOptions" @focus="handleFocus" @blur="handleBlur"
+                        @change="systemHandleChange" @search="systemHandleSearch"></a-select>
                     </a-form-item>
-                  <span
-                    style="font-size: 12px; color: #666; padding-left: 106px"
-                  >
+                    <span style="font-size: 12px; color: #666; padding-left: 106px">
                       如选项没有系统请新增
                     </span>
                   </div>
-                <a-form-item
-                  class="applicationScene"
-                  label="应用领域"
-                  name="applicationScene"
-                  :rules="[{ required: true, message: '请选择应用领域' }]"
-                  style="width: 6.93rem"
-                >
-                  <a-select
-                    v-model:value="formName.applicationScene"
-                    :options="applicationSceneOpthion"
-                    mode="tags"
-                    :size="size"
-                    placeholder="请选择应用领域"
-                    :filterOption="false"
-                    :searchValue="false"
-                    style="width: 5.87rem"
-                  ></a-select>
+                  <a-form-item class="applicationScene" label="应用领域" name="applicationScene"
+                    :rules="[{ required: true, message: '请选择应用领域' }]" style="width: 6.93rem">
+                    <a-select v-model:value="formName.applicationScene" :options="applicationSceneOpthion" mode="tags"
+                      :size="size" placeholder="请选择应用领域" :filterOption="false" :searchValue="false"
+                      style="width: 5.87rem"></a-select>
                   </a-form-item>
                 </div>
                 <div>
-                <a-form-item
-                  label="需求依据"
-                  name="applicationBackground"
-                  :rules="[
+                  <a-form-item label="需求依据" name="applicationBackground" :rules="[
   { required: true, message: '请输入需求依据' },
   { min: 50, message: '需求依据最少为50个字' },
-                  ]"
-                >
-                  <a-textarea
-                    placeholder="请输入需求依据"
-                    v-model:value="formName.applicationBackground"
-                    :rows="4"
-                  />
+]">
+                    <a-textarea placeholder="请输入需求依据" v-model:value="formName.applicationBackground" :rows="4" />
                   </a-form-item>
                 </div>
 
@@ -169,20 +83,10 @@
                 <div v-if="isXiHaiAn">
                   <a-row style="margin-top: 0.4rem">
                     <a-col :span="24">
-                    <a-form-item
-                      name="attachment"
-                      label="附件上传"
-                      class="introduction"
-                      :rules="[{ required: true, message: '请上传附件' }]"
-                    >
-                      <a-upload
-                        :max-count="1"
-                        accept=".doc,.docx,pdf"
-                        v-model:file-list="fileList"
-                        :action="`${apiURL}/upload`"
-                        @remove="handleRemove"
-                        @change="roomUpload"
-                      >
+                      <a-form-item name="attachment" label="附件上传" class="introduction"
+                        :rules="[{ required: true, message: '请上传附件' }]">
+                        <a-upload :max-count="1" accept=".doc,.docx,pdf" v-model:file-list="fileList"
+                          :action="`${apiURL}/upload`" @remove="handleRemove" @change="roomUpload">
                           <a-button>
                             <upload-outlined>选择上传附件</upload-outlined>
                           </a-button>
@@ -195,35 +99,25 @@
                   </a-row>
                   <a-row>
                     <a-col :span="24" style="margin-left: 106px">
-                    <a
-                      href="/static/download/感知资源申请表.doc"
-                      download="感知资源申请表"
-                    >
+                      <a href="/static/download/感知资源申请表.doc" download="感知资源申请表">
                         感知资源申请表模板下载
                       </a>
                     </a-col>
                   </a-row>
                 </div>
 
+
+              </a-form>
+            </div>
             <div class="bottom-btn">
-                <a-button
-                  class="cancel-apply"
-                  type="primary"
-                  html-type="cancle"
-                  @click="resetFields()"
-                >
-                  退出申请
+
+              <a-button class="confirm-apply" type="primary" html-type="submit" @click="processStartHandle()">
+                申请
               </a-button>
-                <a-button
-                  class="confirm-apply"
-                  type="primary"
-                  html-type="submit"
-                  @click="processStartHandle()"
-                >
-                  提交申请
+              <a-button class="cancel-apply" type="primary" html-type="cancle" @click="resetFields()">
+                取消
               </a-button>
             </div>
-            </a-form>
           </div>
           <div class="success" v-else>
             <div>
@@ -237,15 +131,15 @@
   </div>
 </template>
 <script>
-  import { willApplyCameraBatchDelete } from '@/api/home'
-  import AbilityToApplyFor from './AbilityToApplyFor.vue'
-  import HomeHeader from '@/views/home/components/header'
-  import { reactive, ref, watch, onBeforeUnmount } from 'vue'
-  import { useRouter } from 'vue-router'
-  import { message } from 'ant-design-vue'
-  import qs from 'qs'
-  import { Upload } from 'ant-design-vue'
-  import {
+import { willApplyCameraBatchDelete } from '@/api/home'
+import AbilityToApplyFor from './AbilityToApplyFor.vue'
+import HomeHeader from '@/views/home/components/header'
+import { reactive, ref, watch, onBeforeUnmount } from 'vue'
+import { useRouter } from 'vue-router'
+import { message } from 'ant-design-vue'
+import qs from 'qs'
+import { Upload } from 'ant-design-vue'
+import {
   lastestPage,
   tabilityapplication,
   startOfBusinessKey,
@@ -256,22 +150,22 @@
   getUserInfo,
   relaunch,
   selectOne,
-  } from '@/api/home'
-  import { getDeptAll } from '@/api/user'
-  import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
-  import mybus from '@/myplugins/mybus'
-  import { sgcDel, getApplyForm } from '@/api/personalCenter'
-  import {
+} from '@/api/home'
+import { getDeptAll } from '@/api/user'
+import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
+import mybus from '@/myplugins/mybus'
+import { sgcDel, getApplyForm } from '@/api/personalCenter'
+import {
   pageWithAttrs,
   updateIntegrationServices,
   getAppListByDept,
-  } from '@/api/home'
-  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
-  import { getIntegrationDetail, soldierApply } from '@/api/home'
-  import { useStore } from 'vuex'
-  import * as moment from 'moment'
+} from '@/api/home'
+import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+import { getIntegrationDetail, soldierApply } from '@/api/home'
+import { useStore } from 'vuex'
+import * as moment from 'moment'
 
-  export default {
+export default {
   name: '',
   props: {},
   components: {
@@ -352,8 +246,7 @@
     const isCamera = ref(false)
     // 西海岸-是否是开发区公安分局，是的话，增加上传附件字段
     let note1 = JSON.parse(
-        (list.value[0] && list.value[0].arr && list.value[0].arr[0].note1) ||
-          '[]'
+      (list.value[0] && list.value[0].arr && list.value[0].arr[0].note1) || '[]'
     )
     let iskfq = ref(
       note1.some(
@@ -758,10 +651,10 @@
               processDefinitionKey: processDefinitionKey,
               businessKey: businessKey,
             })
-              updateInstanceId(params).then(() => {})
+            updateInstanceId(params).then(() => { })
           }
         })
-          .catch(() => {})
+        .catch(() => { })
     }
     const options = ref([
       {
@@ -974,10 +867,14 @@
       iskfq,
     }
   },
-  }
+}
 </script>
 <style scoped lang="less">
-  #apply-container {
+:deep .ant-form-item-label-left {
+  text-align: right;
+}
+
+#apply-container {
   // background-color: #f5f8fc;
   height: 100%;
   width: 100%;
@@ -1002,8 +899,11 @@
   }
 
   .form-container {
-      padding: 20px 20px 30px 20px;
+    //padding: 20px 20px 30px 20px;
     overflow: hidden;
+    margin-top: 15px;
+
+    // background: #f6f7f9;
     .title {
       font-size: 20px;
       color: #000;
@@ -1056,9 +956,9 @@
     font-weight: bold;
     color: #000;
   }
-  }
+}
 
-  .applicationScene {
+.applicationScene {
   :deep(.ant-select-selector) {
     overflow-x: scroll;
   }
@@ -1066,41 +966,51 @@
   :deep(.ant-select-selection-overflow) {
     flex-wrap: nowrap;
   }
-  }
+}
 
-  textarea {
+textarea {
   resize: none;
   font-size: 14px;
-  }
+}
 
-  .bottom-btn {
+.bottom-btn {
   display: flex;
   justify-content: center;
   // position: fixed;
-  }
+}
 
-  .cancel-apply {
+.cancel-apply {
   width: 80px;
-    height: 38px;
+  height: 32px;
+  text-align: center;
+  background: #fff;
+  color: #0558e1;
+  border: 1px solid #0558e1;
+  border-radius: 2px;
+  font-size: 14px;
+}
+
+.cancel-apply:hover {
+  background: #fff;
+  color: #0558e1;
+  opacity: 0.8;
+}
+
+.confirm-apply {
   margin-right: 20px;
-    background: #e1edfa;
-    color: #0087ff;
-    font-size: 14px;
-    border-radius: 6px;
-    border: none;
-    padding: 0;
-    text-align: center;
-  }
-
-  .confirm-apply {
   width: 80px;
-    height: 38px;
-    background: #0087ff;
-    color: #fff;
-    font-size: 14px;
-    border-radius: 6px;
-    border: none;
-    padding: 0;
+  height: 32px;
   text-align: center;
-  }
+  background: #0558e1;
+  color: #fff;
+  border: 1px solid #0558e1;
+  border-radius: 2px;
+  font-size: 14px;
+}
+
+.confirm-apply :hover {
+  background: #0558e1;
+  color: #fff;
+  opacity: 0.8;
+}
 </style>

front/src/views/home/infrastructurePage.vue

@@ -117,11 +117,14 @@
           </div>
           <a-button
             style="
-              margin-left: 0.8rem;
-              background: #e1edfa;
-              color: #0087ff;
-              border: none;
-              border-radius: 0.06rem;
+               width: 80px; 
+               height: 32px;
+               text-align: center;
+               background: #0558e1;
+                color: #fff;
+                border: 1px solid #0558e1;
+                border-radius: 2px;
+                font-size: 14px;
             "
             @click="appointment(item)"
           >
@@ -2830,7 +2833,7 @@
       .rightContent {
         height: 1.75rem;
         width: 5.8rem;
-
+        margin-right:72px;
         .topContent {
           font-size: 0.2rem;
           color: #000;