Merge branch 'main' of http://61.139.16.27:26684/zy_oyj/sgxt_web

src/components/aboutTable/DarkTable.vue

@@ -130,7 +130,7 @@ const props = defineProps({
     default: 180
   },
   tableHeight: {
-    type: Number
+    type: Number || String,
   },
   isScroll: {
     type: Number,

src/views/home/index.vue

@@ -61,11 +61,9 @@
           <el-icon :size="20" v-if="ispLayBack" @click="closeLayBack">
             <Bell />
           </el-icon>
-          <!--  -->
           <el-icon :size="20" v-else @click="openLayBack">
             <MuteNotification />
           </el-icon>
-
         </div>
         <div style="width: 100%;border: 1px sienna;position: relative">
           <GdMap></GdMap>

src/views/home/layout/head.vue

@@ -148,8 +148,8 @@ const store = useStore();
 const router = useRouter();
 const route = useRoute();
 const btns = reactive({
-  rightBtn: ["四色预警", "重点人群"],
-  leftBtn: ["智能布控", '研判首页'],
+  rightBtn: ["实站支撑", "安全监控"],
+  leftBtn: ["数据整合", '分析研判'],
   moreBtn: [
     { name: '后台', img: require('@/assets/images/Group427322486.png') },
     { name: '退出登录', img: require('@/assets/images/Group427322485.png') }]
@@ -185,22 +185,20 @@ const handleBtns = (val) => {
 
   btnsActive.value = val;
   switch (val) {
-    case "智能布控":
-      router.push("/DeploymentArea");
+    case "数据整合":
+      router.push("/resourceMonitoring");
       break;
-    case "四色预警":
-      router.push("/IdentityManage");
+    case "实站支撑":
+      router.push("/InfoCollection");
       break;
-    case "研判首页":
+    case "分析研判":
       router.push("/ResearchHome");
       break;
     case "后台":
       router.push("/editPassword");
       break;
-    case "重点人群":
-      router.push("/mpvPeo");
-      // const NPShref = router.resolve({ path: '/KeyPopulations', query: {}});
-      // window.open(NPShref.href, "_blank");
+    case "安全监控":
+      router.push("/BaseLibrary");
       break;
     case "退出登录":
       store.dispatch("user/logout");

src/views/home/model/warningLevels.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="comom-title">
- <div class="title">预警等级统计</div>
+ <div class="title">四色预警统计</div>
   </div>
   <div class="comom-cnt" style="border-right: 1px solid #ebebeb;width: 100%;" v-loading="loadingyj">
      <WarningCount ref="yjjbRef"></WarningCount>

src/views/home/model/warningPoints.vue

@@ -23,6 +23,7 @@ import { qcckGet } from "@/api/qcckApi.js";
 const pageData = reactive({
   tableData: [],
   keyCount: 0,
+  tableHeight: '100%',
   tableConfiger: {
     loading: false,
     rowHieght: 61,
@@ -46,6 +47,7 @@ const getList = () => {
   pageData.tableConfiger.loading = true
   qcckGet({},'/mosty-gsxt/tbYjxx/selectYjxxFzTen').then(res => {
       let list = res || []
+      list = list.concat(list)
       pageData.tableData = list.map((item, index) => {
         item.order = index + 1
         return item