Merge branch 'plus1.1.0' of https://git.yfzx.zjtys.com.cn/cold-coffee/cxsfjx_project into plus1.1.0

src/assets/font/font.css

+@font-face {
+    /*给字体命名*/
+    font-family: 'YouSheBiaoTiHei';
+    /*引入字体文件*/
+    src: url('./YouSheBiaoTiHei.ttf');
+}
\ No newline at end of file

src/layout/head.vue

@@ -136,7 +136,7 @@ export default defineComponent({
           disabed: false,
         },
       ],
-      curYearIndex: 2,
+      curYearIndex: 4,
     };
   },
   created() { },

src/main.ts

@@ -5,12 +5,15 @@ import App from './App.vue'
 import router from "./route/index"
 import store  from './store'
 
+
+// 引入字体
+import '../src/assets/font/font.css';
+
 const app = createApp(App);
 
 app.use(ElementPlus);
 app.use(router)
 app.use(store)
-
 app.mount('#app')
 
 

src/views/dataCenter/map/index.vue

@@ -15,8 +15,8 @@
           <div class="sfqx" v-if="curDataType == '2022Two'">
             <p>创新示范区县</p>
             <div class="text">
-              <div v-for="(txt,index) in sfqx" :key="index">
-                {{txt}}
+              <div v-for="(txt, index) in sfqx" :key="index">
+                {{ txt }}
               </div>
             </div>
           </div>
@@ -25,13 +25,15 @@
     </el-col>
     <el-col :span="7">
       <div class="map-right">
-
         <div class="card-item rank-list">
           <RankList />
         </div>
         <div class="card-item incom-graphic">
-          <Income />
+          <IndicatorWarning />
         </div>
+        <!-- <div class="card-item incom-graphic">
+          <Income />
+        </div> -->
       </div>
     </el-col>
   </el-row>
@@ -42,13 +44,21 @@
       <StrongArmyCard />
     </el-col>
     <el-col class="card-item">
-      <CardItem title="军民协同创新" :infoList="list" :toPage="dataCenterRouter.INNOVATION" />
+      <CardItem
+        title="军民协同创新"
+        :infoList="list"
+        :toPage="dataCenterRouter.INNOVATION"
+      />
     </el-col>
     <el-col class="card-item">
       <Industrial />
     </el-col>
     <el-col class="card-item">
-      <CardItem :infoList="list2x" title="资源开放共享" :toPage="dataCenterRouter.RESORCE_SHARE" />
+      <CardItem
+        :infoList="list2x"
+        title="资源开放共享"
+        :toPage="dataCenterRouter.RESORCE_SHARE"
+      />
     </el-col>
     <el-col class="card-item">
       <SystemConstruct />
@@ -63,6 +73,7 @@ import Map from "./model/Map/index.vue";
 // import InvestmentProgress from "./model/InvestmentProgress/index.vue";
 import InvestmentProgress from "./model/InvestmentProgress/new20220913.vue";
 import Income from "./model/Income/index.vue";
+import IndicatorWarning from "./model/indicatorWarning/index.vue";
 import StrongArmyCard from "./model/CardList/strongArmy.vue";
 import CardItem from "./model/CardList/index.vue";
 import Industrial from "./model/CardList/industrial.vue";
@@ -79,12 +90,13 @@ export default defineComponent({
     Map,
     InvestmentProgress,
     Income,
+    IndicatorWarning,
     StrongArmyCard,
     CardItem,
     Industrial,
     SystemConstruct,
   },
-  setup() { },
+  setup() {},
   computed: {
     ...mapState({
       curDataType: (state) => state.curDataType,
@@ -100,7 +112,15 @@ export default defineComponent({
   data() {
     return {
       dataCenterRouter: DataCenterRouter,
-      sfqx: ["上城区,西湖区,萧山区", "海曙区,鄞州区,象山县", "南湖区,德清县,长兴县", "诸暨市,永康市,衢江区", "温岭市,缙云县,滨江区", "北仑区,海宁市,柯桥区", "普陀区"]
+      sfqx: [
+        "上城区,西湖区,萧山区",
+        "海曙区,鄞州区,象山县",
+        "南湖区,德清县,长兴县",
+        "诸暨市,永康市,衢江区",
+        "温岭市,缙云县,滨江区",
+        "北仑区,海宁市,柯桥区",
+        "普陀区",
+      ],
     };
   },
 });

src/views/dataCenter/map/model/Map/index.vue

@@ -104,7 +104,7 @@ export default defineComponent({
           }
         })
         item.fiveItems = fiveItems;
-        item.score = score;
+        item.score = score.toFixed(1);
       })
       this.cityScore = mapData;
       return mapData;

src/views/dataCenter/map/model/Performance/mock.js

 export default {
-  // "杭州",
-  // "宁波",
-  // "温州",
-  // "湖州",
-  // "嘉兴",
-  // "绍兴",
-  // "金华",
-  // "衢州",
-  // "舟山",
-  // "台州",
-  // "丽水",
-  "2022Two": [{
-    name: "服务强军兴军",
-    type: "level_1",
-    value: [21.25,21.0,14.25,18.75,22.5,20.25,15.75,21.0,12.25,12.0,17.25],
-  },
-  {
-    name: "军民协同创新",
-    type: "level_3",
-    value: [18.5,13.5,9.5,3.5,13.0,11.5,4.0,13.0,2.5,6.5,2.5],
-  },
-  {
-    name: "产业融合发展",
-    type: "level_2",
-    value: [9.0,10.0,11.0,3.0,11,13.0,11.5,10.5,7.0,11.0,5.0],
-  },
-  {
-    name: "资源开放共享",
-    type: "level_4",
-    value: [12.0,13.5,10.0,13.0,14.5,14.0,9.0,9.0,9.0,12.5,8.0],
-  },
-  {
-    name: "五大体系建设",
-    type: "level_5",
-    value: [10.9,10.4,6.3,7.4,9.2,8.4,5.65,9.4,10.5,7.4,5.9],
-  }],
-  "2022One": [{
-    name: "服务强军兴军",
-    type: "level_1",
-    value: [20, 18.5, 12.75, 13.75, 18.25, 21.25, 7.75, 16.75, 19.75, 15, 17.75],
-  },
-  {
-    name: "军民协同创新",
-    type: "level_3",
-    value: [14.5, 14.5, 7.5, 10, 14.5, 11, 6.5, 15.5, 1, 2.5, 6],
-  },
-  {
-    name: "产业融合发展",
-    type: "level_2",
-    value: [6, 11.5, 7.5, 8.5, 13.5, 11.5, 11.5, 13.25, 7, 10.5, 7.5],
-  },
-  {
-    name: "资源开放共享",
-    type: "level_4",
-    value: [10, 12, 10, 10, 13, 12, 8, 10, 9, 10, 11],
-  },
-  {
-    name: "五大体系建设",
-    type: "level_5",
-    value: [13, 10.5, 7.2, 8, 7, 9.2, 6, 7, 6.9, 4.125, 6],
-  }],
-  "typeFour": [{
-      name: "服务强军兴军",
-      type: "level_1",
-      value: [28.5, 24.5, 26, 24, 27, 26, 20, 24.5, 21.5, 24.5, 18],
-    },
-    {
-      name: "军民协同创新",
-      type: "level_3",
+    // "杭州",
+    // "宁波",
+    // "温州",
+    // "湖州",
+    // "嘉兴",
+    // "绍兴",
+    // "金华",
+    // "衢州",
+    // "舟山",
+    // "台州",
+    // "丽水",
+    "2022Two": [{
+            name: "服务强军兴军",
+            type: "level_1",
+            value: [21.3, 21.0, 14.3, 18.8, 22.5, 20.3, 15.75, 21.0, 12.3, 12.0, 17.25],
+        },
+        {
+            name: "军民协同创新",
+            type: "level_3",
+            value: [18.5, 13.5, 9.5, 3.5, 13.0, 11.5, 4.0, 13.0, 2.5, 6.5, 2.5],
+        },
+        {
+            name: "产业融合发展",
+            type: "level_2",
+            value: [9.0, 10.0, 11.0, 3.0, 11, 13.0, 11.5, 10.5, 7.0, 11.0, 5.0],
+        },
+        {
+            name: "资源开放共享",
+            type: "level_4",
+            value: [12.0, 13.5, 10.0, 13.0, 14.5, 14.0, 9.0, 9.0, 9.0, 12.5, 8.0],
+        },
+        {
+            name: "五大体系建设",
+            type: "level_5",
+            value: [10.9, 10.4, 6.3, 7.4, 9.2, 8.4, 5.65, 9.4, 10.5, 7.4, 5.9],
+        },
+        {
+            name: "加减分项",
+            type: "level_6",
+            value: [12.0, 11.5, 4.5, 3.5, 8.5, 15.0, 0.0, 8.5, 12.0, 6.0, 1.5],
+        }
+    ],
+    "2022One": [{
+            name: "服务强军兴军",
+            type: "level_1",
+            value: [20, 18.5, 12.75, 13.75, 18.25, 21.25, 7.75, 16.75, 19.75, 15, 17.75],
+        },
+        {
+            name: "军民协同创新",
+            type: "level_3",
+            value: [14.5, 14.5, 7.5, 10, 14.5, 11, 6.5, 15.5, 1, 2.5, 6],
+        },
+        {
+            name: "产业融合发展",
+            type: "level_2",
+            value: [6, 11.5, 7.5, 8.5, 13.5, 11.5, 11.5, 13.25, 7, 10.5, 7.5],
+        },
+        {
+            name: "资源开放共享",
+            type: "level_4",
+            value: [10, 12, 10, 10, 13, 12, 8, 10, 9, 10, 11],
+        },
+        {
+            name: "五大体系建设",
+            type: "level_5",
+            value: [13, 10.5, 7.2, 8, 7, 9.2, 6, 7, 6.9, 4.125, 6],
+        }
+    ],
+    "typeFour": [{
+            name: "服务强军兴军111",
+            type: "level_1",
+            value: [28.5, 24.5, 26, 24, 27, 26, 20, 24.5, 21.5, 24.5, 18],
+        },
+        {
+            name: "军民协同创新",
+            type: "level_3",
 
-      value: [18, 14, 10, 13.5, 15.5, 16, 9.5, 9.5, 6.5, 9.5, 10.5],
-    },
-    {
-      name: "产业融合发展",
-      type: "level_2",
+            value: [18, 14, 10, 13.5, 15.5, 16, 9.5, 9.5, 6.5, 9.5, 10.5],
+        },
+        {
+            name: "产业融合发展",
+            type: "level_2",
 
-      value: [16.5, 15.5, 8, 12.5, 13, 16.5, 15, 10.5, 17.5, 13, 14.5],
-    },
-    {
-      name: "资源开放共享",
-      type: "level_4",
+            value: [16.5, 15.5, 8, 12.5, 13, 16.5, 15, 10.5, 17.5, 13, 14.5],
+        },
+        {
+            name: "资源开放共享",
+            type: "level_4",
 
-      value: [14, 13, 14, 13.4, 14, 12, 12, 12, 15, 14, 11.5],
-    },
-    {
-      name: "五大体系建设",
-      type: "level_5",
+            value: [14, 13, 14, 13.4, 14, 12, 12, 12, 15, 14, 11.5],
+        },
+        {
+            name: "五大体系建设",
+            type: "level_5",
 
-      value: [15, 15, 15, 14, 14, 15, 13.6, 13, 14, 14, 12],
-    },
-  ],
-  "typeThree": [{
-    name: "服务强军兴军",
-    type: "level_1",
-    value: [19.5, 27, 22.5, 22, 22, 26, 24, 19, 22, 21, 11],
-  },
-  {
-    name: "军民协同创新",
-    type: "level_3",
+            value: [15, 15, 15, 14, 14, 15, 13.6, 13, 14, 14, 12],
+        },
+    ],
+    "typeThree": [{
+            name: "服务强军兴军",
+            type: "level_1",
+            value: [19.5, 27, 22.5, 22, 22, 26, 24, 19, 22, 21, 11],
+        },
+        {
+            name: "军民协同创新",
+            type: "level_3",
 
-    value: [20, 15.5, 8, 13.5, 16.5, 15.5, 9.5, 12, 7.5, 4.5, 7],
-  },
-  {
-    name: "产业融合发展",
-    type: "level_2",
+            value: [20, 15.5, 8, 13.5, 16.5, 15.5, 9.5, 12, 7.5, 4.5, 7],
+        },
+        {
+            name: "产业融合发展",
+            type: "level_2",
 
-    value: [15.5, 14, 13, 10.5, 16.5, 18.5, 10.5, 11.5, 13, 10, 17.5],
-  },
-  {
-    name: "资源开放共享",
-    type: "level_4",
+            value: [15.5, 14, 13, 10.5, 16.5, 18.5, 10.5, 11.5, 13, 10, 17.5],
+        },
+        {
+            name: "资源开放共享",
+            type: "level_4",
 
-    value: [15, 13.4, 13, 14, 13, 13, 12.5, 12, 10.5, 13.5, 8.5],
-  },
-  {
-    name: "五大体系建设",
-    type: "level_5",
+            value: [15, 13.4, 13, 14, 13, 13, 12.5, 12, 10.5, 13.5, 8.5],
+        },
+        {
+            name: "五大体系建设",
+            type: "level_5",
 
-    value: [15, 15, 12, 13.5, 14, 15, 14, 13, 14, 13, 12.2],
-  },
-  ],
-  "typeTwo": [{
-    name: "服务强军兴军",
-    type: "level_1",
-    value: [25, 27, 18, 22, 28, 24, 19, 20, 21, 22, 19],
-  },
-  {
-    name: "军民协同创新",
-    type: "level_3",
+            value: [15, 15, 12, 13.5, 14, 15, 14, 13, 14, 13, 12.2],
+        },
+    ],
+    "typeTwo": [{
+            name: "服务强军兴军",
+            type: "level_1",
+            value: [25, 27, 18, 22, 28, 24, 19, 20, 21, 22, 19],
+        },
+        {
+            name: "军民协同创新",
+            type: "level_3",
 
-    value: [19, 13.5, 6.5, 12.5, 15.5, 14, 6.5, 10.5, 8, 4, 6],
-  },
-  {
-    name: "产业融合发展",
-    type: "level_2",
+            value: [19, 13.5, 6.5, 12.5, 15.5, 14, 6.5, 10.5, 8, 4, 6],
+        },
+        {
+            name: "产业融合发展",
+            type: "level_2",
 
-    value: [14.5, 9, 6, 10, 13, 14, 13.5, 8, 6, 12.5, 15],
-  },
-  {
-    name: "资源开放共享",
-    type: "level_4",
+            value: [14.5, 9, 6, 10, 13, 14, 13.5, 8, 6, 12.5, 15],
+        },
+        {
+            name: "资源开放共享",
+            type: "level_4",
 
-    value: [13.2, 14, 10, 11, 14, 12.5, 7.5, 13.5, 10, 12, 10],
-  },
-  {
-    name: "五大体系建设",
-    type: "level_5",
+            value: [13.2, 14, 10, 11, 14, 12.5, 7.5, 13.5, 10, 12, 10],
+        },
+        {
+            name: "五大体系建设",
+            type: "level_5",
 
-    value: [14, 15, 10.4, 12, 11, 15, 13, 13, 13, 11, 11.2],
-  },
-  ],
+            value: [14, 15, 10.4, 12, 11, 15, 13, 13, 13, 11, 11.2],
+        },
+    ],
 }
\ No newline at end of file

src/views/dataCenter/map/model/indicatorWarning/index.vue

+<template>
+  <div style="height: 100%">
+    <MapTitle text="指标预警" />
+    <!-- 内容 -->
+    <div class="rankingContent">
+      <!-- 头部 -->
+      <div class="rankingBox">
+        <div class="tableBox">
+          <el-row class="tabletit">
+            <el-col :span="6">指标号</el-col>
+            <el-col :span="6">预警等级</el-col>
+            <el-col :span="12">风险事件</el-col>
+          </el-row>
+        </div>
+      </div>
+      <div class="contentBox">
+        <div class="table-list">
+          <el-row
+            class="table_cell"
+            v-for="(item, index) in tableData"
+            :key="index"
+            :dataIndex="index"
+          >
+            <el-col :span="6">
+              <div class="num">
+                <div>{{ item.num }}</div>
+              </div>
+            </el-col>
+            <el-col :span="6">
+              <div class="grade-box">
+                <img
+                  v-if="item.grade == 1"
+                  src="../../../../../assets/img/grade1.png"
+                  class="grade-icon"
+                />
+                <img
+                  v-else
+                  src="../../../../../assets/img/grade2.png"
+                  class="grade-icon"
+                />
+                <div
+                  class="name"
+                  :style="{ color: gradeType[item.grade].color }"
+                >
+                  {{ gradeType[item.grade].name }}
+                </div>
+              </div>
+            </el-col>
+            <el-col :span="12">{{ item.event }}</el-col>
+          </el-row>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import MapTitle from "@/components/mapTitle/index.vue";
+import { Bottom, Top } from "@element-plus/icons";
+import Mock from "./mock";
+import { mapState } from "vuex";
+
+export default {
+  components: {
+    MapTitle,
+    Bottom,
+    Top,
+  },
+  computed: {
+    ...mapState({
+      curDataType: (state) => state.curDataType,
+    }),
+    tableData() {
+      return Mock[this.curDataType];
+    },
+  },
+  data() {
+    return {
+      gradeType: {
+        1: {
+          name: "高",
+          color: "#ef4b4b",
+        },
+        2: {
+          name: "中",
+          color: "#f78131",
+        },
+      },
+    };
+  },
+};
+</script>
+<style>
+/* 火狐出行滚动条 */
+.rank-list .el-scrollbar__view::-webkit-scrollbar {
+  display: none;
+  width: 0 !important;
+}
+
+/* .rank-list .el-scrollbar__wrap {
+  width: calc(100% + 20px);
+} */
+</style>
+<style lang="scss" scoped>
+.rankingContent {
+  display: flex;
+  height: 100%;
+  width: 100%;
+  flex-direction: column;
+  // margin-top: 10px;
+  padding-top: 10px;
+  box-sizing: border-box;
+}
+
+.rankingBox {
+  height: 40px;
+  font-weight: bold;
+  font-size: 14px;
+  background-color: #0e4781 !important;
+
+  .tableBox {
+    color: #ffffff;
+    width: calc(100% - 0px);
+    .tabletit {
+      margin: 0px 20px;
+    }
+
+    .el-col {
+      color: #d4f7ff;
+      font-size: 12px;
+      padding: 8px 0;
+      line-height: 23px;
+    }
+
+    .el-row {
+      border-bottom: 1px dashed #10529a;
+    }
+  }
+}
+.contentBox {
+  color: #fff;
+  font-size: 16px;
+  //   height: 200px;
+
+  .table-list {
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    .el-row {
+      padding: 0 20px;
+      //   border-bottom: 1px dashed #10529a;
+      display: flex;
+      align-items: center;
+    }
+    .el-row:nth-child(even) {
+      background-color: #3395ff30;
+    }
+    .el-col {
+      color: #d4f7ff;
+      font-size: 12px;
+      padding: 8px 0;
+      line-height: 18px;
+    }
+    .num {
+      font-family: "YouSheBiaoTiHei";
+      color: #ffffff;
+      font-size: 17px;
+    }
+    .grade-box {
+      display: flex;
+      align-items: center;
+      .grade-icon {
+        width: 15px;
+      }
+      .name {
+        margin-left: 10px;
+        font-family: "YouSheBiaoTiHei";
+        font-size: 16px;
+      }
+    }
+  }
+}
+</style>

src/views/dataCenter/map/model/indicatorWarning/mock.js

+export default {
+  "2022Two": [
+    {
+      num: 2, grade: 2, event: "全年重大示范项目完成率滞后",
+    },
+    {
+      num: 10, grade: 2, event: "截止本季度，军工单位科技成果转让收入规模偏低",
+    },
+    {
+      num: 12, grade: 1, event: "新增保密资质企业数少；未启动省级军民融合产业示范基地评价",
+    },
+    {
+      num: 15, grade: 2, event: "县市区资源共享平台建设滞后",
+    },
+    {
+      num: 16, grade: 2, event: "军民需求对接活动偏少",
+    },
+
+  ],
+  "2022One": [
+    {
+      num: 2, grade: 2, event: "全年重大示范项目完成率滞后",
+    },
+    {
+      num: 10, grade: 2, event: "截止本季度，军工单位科技成果转让收入规模偏低",
+    },
+    {
+      num: 12, grade: 1, event: "新增保密资质企业数少；未启动省级军民融合产业示范基地评价",
+    },
+    {
+      num: 15, grade: 2, event: "县市区资源共享平台建设滞后",
+    },
+    {
+      num: 16, grade: 2, event: "军民需求对接活动偏少",
+    },
+  ],
+  "typeFour": [
+    {
+      num: 2, grade: 2, event: "全年重大示范项目完成率滞后",
+    },
+    {
+      num: 10, grade: 2, event: "截止本季度，军工单位科技成果转让收入规模偏低",
+    },
+    {
+      num: 12, grade: 1, event: "新增保密资质企业数少；未启动省级军民融合产业示范基地评价",
+    },
+    {
+      num: 15, grade: 2, event: "县市区资源共享平台建设滞后",
+    },
+    {
+      num: 16, grade: 2, event: "军民需求对接活动偏少",
+    },
+  ],
+  "typeThree": [
+    {
+      num: 2, grade: 2, event: "全年重大示范项目完成率滞后",
+    },
+    {
+      num: 10, grade: 2, event: "截止本季度，军工单位科技成果转让收入规模偏低",
+    },
+    {
+      num: 12, grade: 1, event: "新增保密资质企业数少；未启动省级军民融合产业示范基地评价",
+    },
+    {
+      num: 15, grade: 2, event: "县市区资源共享平台建设滞后",
+    },
+    {
+      num: 16, grade: 2, event: "军民需求对接活动偏少",
+    },
+  ],
+  "typeTwo": [
+    {
+      num: 2, grade: 2, event: "全年重大示范项目完成率滞后",
+    },
+    {
+      num: 10, grade: 2, event: "截止本季度，军工单位科技成果转让收入规模偏低",
+    },
+    {
+      num: 12, grade: 1, event: "新增保密资质企业数少；未启动省级军民融合产业示范基地评价",
+    },
+    {
+      num: 15, grade: 2, event: "县市区资源共享平台建设滞后",
+    },
+    {
+      num: 16, grade: 2, event: "军民需求对接活动偏少",
+    },
+  ],
+
+
+}
\ No newline at end of file