Merge branch 'main' of http://175.6.124.250:3100/Libt/multiple-police-situations

src/views/index.vue

@@ -2,46 +2,47 @@
   <!-- <v-scale-screen width="1185" height="784"> -->
   <div class="content" id="app">
     <div class="community_top" v-if="isshow">
-      <div style="margin-left: 26px">
+      <div class="lefttit">多元警情融合及预警管控平台</div>
-        <ul style="display: flex; margin-top: 27px">
+      <div style="margin-left: 16px">
+        <ul style="display: flex; margin-top: 14px">
           <li>
+            <img style="vertical-align: middle" src="@/views/page/indeximag/ddh.png" alt="" />
             <router-link active-class="ist2" style="color: #b2b6c3; padding: 10px 18px; vertical-align: middle; font-weight: bold" to="/index/indexmin">服务总览</router-link>
-            <img style="vertical-align: middle" src="@/views/page/indeximag/ddh.png" alt="" />
           </li>
           <li>
+            <img style="vertical-align: middle" src="@/views/page/indeximag/ddh.png" alt="" />
             <router-link active-class="ist" style="color: #b2b6c3; padding: 10px 18px; margin-left: 10px; vertical-align: middle; font-weight: bold" to="/index/index">安保力量</router-link>
-            <img style="vertical-align: middle" src="@/views/page/indeximag/ddh.png" alt="" />
           </li>
           <li>
+            <img style="vertical-align: middle" src="@/views/page/indeximag/ddh.png" alt="" />
             <router-link active-class="ist" style="color: #b2b6c3; padding: 10px 18px; margin-left: 10px; vertical-align: middle; font-weight: bold" to="/index/command">警情推送</router-link>
-            <img style="vertical-align: middle" src="@/views/page/indeximag/ddh.png" alt="" />
           </li>
           <li>
-            <router-link active-class="ist" style="color: #b2b6c3; padding: 10px 18px; margin-left: 10px; vertical-align: middle; font-weight: bold" to="/index/system">智能布控</router-link>
             <img style="vertical-align: middle" src="@/views/page/indeximag/ddh.png" alt="" />
+            <router-link active-class="ist" style="color: #b2b6c3; padding: 10px 18px; margin-left: 10px; vertical-align: middle; font-weight: bold" to="/index/system">智能布控</router-link>
           </li>
         </ul>
       </div>
-      <div style="margin-right: 100px">
+      <div style="">
-        <ul style="display: flex; margin-top: 27px">
+        <ul style="display: flex; margin-top: 14px">
           <li>
+            <img style="vertical-align: middle" src="@/views/page/indeximag/ddh.png" alt="" />
             <router-link active-class="ist3" style="color: #b2b6c3; padding: 10px 18px; vertical-align: middle; font-weight: bold" to="/index/histordata">AI预警</router-link>
-            <img style="vertical-align: middle" src="@/views/page/indeximag/ddh.png" alt="" />
           </li>
           <li>
+            <img style="vertical-align: middle" src="@/views/page/indeximag/ddh.png" alt="" />
             <router-link active-class="ist" style="color: #b2b6c3; padding: 10px 18px; vertical-align: middle; font-weight: bold" to="/index/analysis">统计分析</router-link>
-            <img style="vertical-align: middle" src="@/views/page/indeximag/ddh.png" alt="" />
           </li>
           <li>
-            <router-link active-class="ist" style="color: #b2b6c3; padding: 10px 18px; vertical-align: middle; font-weight: bold" to="/index/information">资源管理</router-link>
             <img style="vertical-align: middle" src="@/views/page/indeximag/ddh.png" alt="" />
+            <router-link active-class="ist" style="color: #b2b6c3; padding: 10px 18px; vertical-align: middle; font-weight: bold" to="/index/information">资源管理</router-link>
           </li>
         </ul>
         <el-popconfirm title="确定退出吗？" @confirm="confirmEvent">
           <template #reference>
             <el-icon :size="20" style="display: inline-block; position: absolute; top: 31px; right: 32px; margin-left: 10px; vertical-align: middle; color: #9a4b48; font-weight: bold">
               <switch-button />
-              <!-- <span style="color:#fff;">{{loginname}}</span> -->
+              <span style="color: #fff; position: absolute; right: 29px; font-weight: 100; font-size: 16px">{{ loginname }}</span>
             </el-icon>
           </template>
         </el-popconfirm>
@@ -222,7 +223,6 @@ const confirmEvent = () => {
 .active {
   color: #fff;
 }
-
 .content {
   width: 100%;
   height: 100vh;
@@ -238,13 +238,12 @@ const confirmEvent = () => {
     height: 77px;
     // background:#4880FF;
     background: #07315e;
-    background-image: url(@/views/page/imag/titleBg1.png);
+    // background-image: url(@/views/page/imag/titleBg1.png);
     background-size: auto 100%;
     background-repeat: no-repeat;
     background-position-x: 55%;
     display: flex;
-    justify-content: space-between;
+    // justify-content: space-between;
-
     .title {
       float: left;
       height: 100%;
@@ -259,6 +258,19 @@ const confirmEvent = () => {
       -webkit-background-clip: text;
       -webkit-text-fill-color: transparent;
     }
+    .lefttit {
+      height: 60px;
+      line-height: 60px;
+      font-size: 18px;
+      font-weight: 600;
+      letter-spacing: 2px;
+      color: #ffffff;
+      background: -webkit-linear-gradient(45deg, #ffffff, #a1d7ff);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+      // background: linear-gradient(to bottom, #ffffff, #a1d7ff);
+      margin-left: 10px;
+    }
   }
 
   .community_top > ul:first-child {
@@ -290,11 +302,10 @@ const confirmEvent = () => {
     margin-right: 10px;
     padding: 2px 0px;
   }
-
   .community_center {
     // width: calc(100% - 100px);
     width: 100%;
-    height: calc(100% - 68px);
+    height: calc(100% - 51px);
     overflow: hidden;
     // height: 100%;
     // margin: 10px 50px 30px 50px;

src/views/page/indexMim.vue

@@ -1102,7 +1102,7 @@
 
 			.right_bottm {
 				width: 97%;
-				height: 33%;
+				height: 35%;
 				padding: 5px;
 			}
 		}