Merge branch 'config_href_url' into dev

# Conflicts:
#	src/style/cus-element.scss

src/out/config.js

@@ -4,22 +4,52 @@ window.cusConfig = {
     screenHref: [
       {
         label: '分平台&子系统',
+        span: 2,
         children: [
-          {label:'进出岛物流监管', href: 'http://59.212.31.24:8080/hnwl_lgs/login.jsp'},
-          {label:'跨部门视频调度', href: 'http://10.110.80.31:8777/'},
-          {label:'船舶管控系统', href: 'http://172.25.187.23/MainPage'},
-          {label:'渔业监控管理系统', href: 'http://59.212.42.6:8080/authplatform'},
+          {label:'社管平台船舶管控系统', href: 'http://172.25.187.23/MainPage'},
+          {label:'进出岛资金流监管系统', href: ''},
+          {label:'进出岛物流监管服务系统', href: 'http://59.212.31.24:8080/hnwl_lgs/login.jsp'},
+          {label:'网信大数据系统', href: ''},
+          {label:'南海态势感知系统', href: ''},
+          {label:'卫星遥感系统', href: ''},
+          {label:'无人机巡查服务平台', href: ''},
+          {label:'中兵北斗卫星定位管控系统', href: ''},
+          {label:'环岛立体管控分平台', href: ''},
+          {label:'低慢小监控系统', href: ''},
+          {label:'中国海事水上动态监管协同管理系统', href: ''},
+          {label:'导助航综合应用系统', href: ''},
+          {label:'海洋与渔业综合管理系统', href: 'http://59.212.42.6:8080/authplatform'},
+          {label:'境外游艇动态管理系统', href: ''},
+          {label:'通信大数据系统', href: ''},
           {label:'综治分平台', href: 'http://172.22.11.28:8080'},
+          {label:'公共安全视频联网社管共享平台', href: 'http://10.110.80.31:8777/'},
+          {label:'“零关税”进口交通工具及游艇监管', href: 'http://59.212.31.24:8080/hnwl_lgs/index'},
+        ]
+      },
+      {
+        label: '态势感知',
+        span: 2,
+        children: [
+          {label:'打私态势信息展示', href: ''},
+          {label:'免签外国人信息概览展示', href: ''},
+          {label:'人流态势信息展示', href: ''},
+          {label:'物流态势信息展示', href: ''},
+          {label:'资金流态势信息展示', href: ''},
+          {label:'网信大数据态势信息展示', href: ''},
+          {label:'外国人出入境态势信息展示', href: ''},
+          {label:'边检外国人信息态势展示', href: ''},
+          {label:'军民融合办态势信息展示', href: ''},
         ]
       },
       {
         label: '赋能工具',
+        span: 2,
         children: [
-          {label:'指挥处置中台', href: 'http://10.110.35.47/#/18fb6a8c73ad039b47f3692d104779628p06931RW2m?sessionToken=${token}'},
           {label:'智慧新搜索', href: 'http://10.110.31.95/zhxss/token.action?new=yes&sessionToken=${token}&menu=JCZJ'},
-          {label:'数据魔方', href: 'https://dataexplore.dataq.base.sgpt.gov/data-explore?new=yes&sessionToken=${token}&menu=JCZJ'},
-          {label:'全息档案', href: 'http://10.110.31.10:81/qxda/token.action?new=yes&sessionToken=${token}&menu=JCZJ'},
+          {label:'大数据建模平台（新版数据魔方）', href: ''},
           {label:'知识图谱', href: 'http://10.110.31.21:9090/kg/main.action?o1=${username}&k1=4781bd4d46d414953cac085a00bea062&menuId=5ab0b6c913c0161460d9ced1'},
+          {label:'指挥处置中台', href: 'http://10.110.35.47/#/18fb6a8c73ad039b47f3692d104779628p06931RW2m?sessionToken=${token}'},
+          {label:'全息档案', href: 'http://10.110.31.10:81/qxda/token.action?new=yes&sessionToken=${token}&menu=JCZJ'},
           {label:'NLP文本分析', href: 'http://10.110.31.10:83/nlpwbfx/token.action?new=yes&sessionToken=${token}&menu=JCZJ'},
           {label:'NLP文本分析', href: 'http://10.110.31.10:83/nlpwbfx/token.action?new=yes&sessionToken=${token}&menu=JCZJ'},
           {label:'NLP文本分析', href: 'http://10.110.31.10:83/nlpwbfx/token.action?new=yes&sessionToken=${token}&menu=JCZJ'},
@@ -40,22 +70,19 @@ window.cusConfig = {
       },
       {
         label: '监测预警',
+        span: 2,
         children: [
           {label:'人员监测预警', href: 'http://10.110.35.47/#/37d819244d11ccc378b5ab81ab0bf3c82ROvvkHxCWl?sessionToken=${token}'},
           {label:'车辆监测预警', href: 'http://10.110.35.47/#/ec6a44faf281d8b26ba6212d8630fd80aC22mf7Ulo5?sessionToken=${token}'},
           {label:'船舶监测预警', href: 'http://10.110.35.47/#/285d14382590899aa0ae03057652dc8dLd3Xs6UMSjB?sessionToken=${token}'},
           {label:'低慢小监测预警', href: 'http://10.110.35.47/#/2762daa317e26f0a2702cd47b12a2082AOi6e2iaQHI?sessionToken=${token}'},
-          {label:'金融风险防护', href: 'http://10.110.35.47/#/67f16a90373f30585fca3f4d253c9b6eTNt3Ma2724K?sessionToken=${token}'},
-          {label:'线索处理工作台', href: 'http://10.110.35.47/#/f8dcc44e7cebe61c81601e0dbeeae9f2Ujtr5CngL0q?sessionToken=${token}'},
-        ]
-      },
-      {
-        label: '风险防控',
-        children: [
+          {label:'短视频舆情监控', href: ''},
+          {label:'岸线图像识别比对', href: ''},
         ]
       },
       {
         label: '其他',
+        span: 2,
         children: [
           {label:'总体平台首页', href: 'http://10.110.35.47/#/be140952abede706ffc654e817ffe0014F2oB6MfXS0?sessionToken=${token}'},
           {label:'监测预警', href: 'http://10.110.35.47/#/56b3447bf45143c7186709702078575duR0qnFpe9Rq?sessionToken=${token}'},
@@ -71,23 +98,39 @@ window.cusConfig = {
     screenHref: [
       {
         label: '反走私',
+        span: 2,
         children: [
           {label:'反走私系统', href: 'http://74.10.24.107'},
           {label:'岸线防护圈系统', href: 'http://74.10.28.118:8090'},
+          {label:'预防警务', href: 'http://74.6.54.120:8080/web/login'},
+          {label:'环岛电子围栏系统', href: ''},
+          {label:'海南公安视频图像信息联网平台', href: 'http://10.184.1.61:8080/'},
+          {label:'公安部视频图像信息综合应用平台', href: 'https://szqt.ga/'},
+          {label:'公安交通集成指挥平台', href: 'https://10.185.16.228:9443/rmweb'},
+          {label:'全国被盗抢机动车信息资源库', href: 'http://bdqqc.xz.ga/dqc_ywk/login/pages/login.jsp'},
         ]
       },
       {
         label: '人流管控',
+        span: 1,
         children: [
-          {label:'59国免签人员', href: 'http://74.6.53.16:7778/screen/share/index.html#/TJ58fd4a6b58224003811ecb0b1513c9'},
           {label:'进出岛人脸识别', href: 'http://74.10.30.180:10000/#/login'},
           {label:'进出岛人员分析', href: 'http://74.6.57.207:18080/1016/auth/login!LoginFail.action'},
+          {label:'边检总站分析平台', href: 'http://74.142.0.121:8000/zz'},
+        ]
+      },
+      {
+        label: '境外人员管控',
+        span: 1,
+        children: [
+          {label:'59国免签人员', href: 'http://74.6.53.16:7778/screen/share/index.html#/TJ58fd4a6b58224003811ecb0b1513c9'},
           {label:'外国人免签进出岛', href: 'http://74.6.54.73:31001/login'},
           {label:'境外人员管理系统', href: 'http://74.6.54.73:31003/login'},
         ]
       },
       {
         label: '业务研判',
+        span: 1,
         children: [
           {label:'大数据实战平台', href: 'http://74.6.57.207:8080/stars/auth/login!toLoginPage.action'},
           {label:'情报信息应用平台', href: 'http://10.184.14.28:8081/SSO/lg?url=http://10.184.14.30:8082/qbwymh/lg'},
@@ -96,20 +139,12 @@ window.cusConfig = {
       },
       {
         label: '赋能工具',
+        span: 1,
         children: [
           {label:'数据魔方', href: 'http://74.6.57.207:8080/stars/auth/login!toLoginPage.action'},
           {label:'全息档案', href: 'http://74.6.57.207:8080/stars/auth/login!toLoginPage.action'},
         ]
       },
-      {
-        label: '其他系统',
-        children: [
-          {label:'边检总站分析平台', href: 'http://74.142.0.121:8000/zz'},
-        ]
-      },
     ],
-  },
-  video: {
-    source: 'rtmp' // hls  rtmp
   }
 }

src/style/cus-element.scss

@@ -14,3 +14,10 @@
   font-family: 'fzcqjt';
   src: url("@/style/fzcqjt.ttf");
 }
+
+.__text-ellipsis {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  word-break: break-all;
+}

src/views/common/static.ts

@@ -7,10 +7,10 @@ import InfoSub3 from './img/info-sub-3.png'
 import InfoSub4 from './img/info-sub-4.png'
 import InfoSub5 from './img/info-sub-5.png'
 import InfoSub6 from './img/info-sub-6.png'
-import InfoMain1 from './img/info-main-1.jpg'
+import InfoMain1 from './img/info-main-1.png'
 import InfoMain2 from './img/info-main-2.png'
 import InfoMain3 from './img/info-main-3.png'
-import InfoMain4 from './img/info-main-4.jpg'
+import InfoMain4 from './img/info-main-4.png'
 import InfoMain5 from './img/info-main-5.png'
 import LogoIcon from './img/logo-icon.png'
 import LogoIconZwww from './img/logo-icon_zwww.png'
@@ -36,31 +36,33 @@ export const infoMapper = [
     mainImg: InfoMain2,
   },
   {
-    label: '组织架构',
+    label: '职能定位',
     enLabel: 'Organization Structure',
     remark: '中央、海南省委省政府对社管平台的建设高度重视，相关领导多次到社管平台调研指导工作，并作出一系列重要批示。',
     subImg: InfoSub3,
     mainImg: InfoMain3,
   },
   {
-    label: '总体规划',
+    label: '总体架构',
     enLabel: 'Master Planning',
     remark: '根据顶层设计文件要求，社管平台按照“强化共用、整合通用、开放应用”的架构理念，打造“1551”社会管理业务架构体系...',
     subImg: InfoSub4,
     mainImg: InfoMain4,
   },
   {
-    label: '大厅职能',
+    label: '系统汇聚',
     enLabel: 'Hall Functions',
     remark: '社管平台联勤联动工作在建设领导小组统一领导下，由指挥中心负责，联勤协调处指挥调度，情指行组具体落实。',
     subImg: InfoSub5,
     mainImg: InfoMain5,
   },
-  {
-    label: '成果展示',
+]
+if (window?.cusConfig?.version === 'zwww') {
+  infoMapper.push({
+    label: '实战专报',
     enLabel: 'Achievement-Exhibition',
     remark: '近年来，平台通过船舶管控系统精准预警重点海域和重要时段涉海信息，配合海南海警局、海岸警察总队等部门破获了系列重大案件...',
     subImg: InfoSub6,
     href: `/${store.state.app.apiProxy.staticApi}/video/cgzs.mp4`
-  },
-]
+  })
+}

src/views/pc/index.vue

@@ -45,23 +45,21 @@
         </template>
       </el-dropdown>
     </div>
-    <div class="pc-href">
-      <div class="pc-href-before-block"/>
+    <div class="pc-href" :style="`grid-template-columns: ${HrefMapper.map(v => v.span + 'fr').join(' ')};`">
       <template v-for="(item, index) in HrefMapper">
         <div class="pc-href-block">
           <div class="pc-href-block-head">
             <img src="../common/img/bottom-label.png"/>{{item.label}}<img src="../common/img/bottom-icon.png"/>
           </div>
-          <div class="pc-href-block-content">
+          <div class="pc-href-block-content" :style="`grid-template-columns: repeat(${item.span}, 1fr);`">
             <template v-for="(h, hI) in item.children">
-              <div class="phbc-item __hover" @click="toHref(h)">
+              <div class="phbc-item __hover __text-ellipsis" :style="`cursor: ${h.href ? 'pointer' : 'not-allowed'};`" @click="h.href ? toHref(h) : null">
                 <img src="../common/img/bottom-item-label.png"/><p>{{h.label}}</p>
               </div>
             </template>
           </div>
         </div>
       </template>
-      <div class="pc-href-after-block"/>
     </div>
     <div v-show="showInfo" class="info-dialog animate__animated animate__fadeInRight" ref="ref_infoDialog">
       <img :src="infoCurrent"/>
@@ -287,48 +285,25 @@ export default defineComponent({
         color: #82D6FF;
       }
     }
-    $pcHrefRight: 100px;
-    $pcHrefItemWidth: 264px;
     .pc-href {
+      width: 100%;
       //opacity: 0.8;
       z-index: 2;
       position: absolute;
       bottom: 0;
-      right: $pcHrefRight;
+      right: 0;
       box-sizing: border-box;
       display: grid;
-      grid-template-columns: repeat(5, $pcHrefItemWidth);
       column-gap: 2px;
-      $skewXDeg: -30deg;
-      transform: skewX($skewXDeg);
       background-color: #234382;
-      .pc-href-before-block {
-        position: absolute;
-        background-color: rgba(57, 85, 135, 0.8);
-        width: 80px;
-        height: 255px;
-        left: -80px;
-        bottom: 0;
-      }
       .pc-href-block {
         width: 100%;
-        height: 332px;
+        height: 277px;
         $pcHrefBlockHeadHeight: 45px;
         .pc-href-block-head {
           position: relative;
-          transform: skewX(-$skewXDeg);
           white-space: nowrap;
-          &:after {
-            content: '';
-            position: absolute;
-            top: 0;
-            bottom: 0;
-            left: 0;
-            right: 0;
-            background: #0C3165;
-            z-index: -1;
-            transform: skewX($skewXDeg);
-          }
+          background: #0C3165;
           height: $pcHrefBlockHeadHeight;
           font-size: 24px;
           font-weight: 400;
@@ -341,7 +316,7 @@ export default defineComponent({
             }
             &:last-child {
               position: absolute;
-              right: -100px;
+              right: -57px;
             }
           }
         }
@@ -349,25 +324,16 @@ export default defineComponent({
           height: calc(100% - #{$pcHrefBlockHeadHeight});
           box-sizing: border-box;
           background-color: #031336;
-          padding: 10px 16px;
+          padding: 10px;
           display: grid;
-          grid-template-columns: repeat(1, 100%);
-          grid-template-rows: repeat(5, calc((100% - (10px * 4)) / 5));
-          row-gap: 10px;
+          grid-template-rows: repeat(4, 48px);
+          gap: 8px;
+          &:first-child {
+            grid-template-columns: repeat(2, 1fr);
+          }
           .phbc-item {
             position: relative;
-            transform: skewX(-$skewXDeg);
-            &:after {
-              content: '';
-              position: absolute;
-              top: 0;
-              bottom: 0;
-              left: 0;
-              right: 0;
-              background: #071F47;
-              z-index: -1;
-              transform: skewX($skewXDeg);
-            }
+            background-color: #071F47;
             font-size: 20px;
             font-weight: normal;
             color: #FFFFFF;
@@ -384,16 +350,6 @@ export default defineComponent({
           }
         }
       }
-      .pc-href-after-block {
-        z-index: -1;
-        transform: skewX(-$skewXDeg);
-        position: absolute;
-        background-color: rgba(3, 19, 54, 0.7);
-        width: $pcHrefItemWidth;
-        height: 100%;
-        right: -$pcHrefRight;
-        bottom: 0;
-      }
     }
     $infoItemActiveWidth: 1425px;
     .info-dialog {