wenhongquan 2 jaren geleden
bovenliggende
commit
323c5490b7

+ 18 - 18
src/components/HomeComponents/messageTable.vue

@@ -1,22 +1,22 @@
 <template>
 <template>
-    <div class="messagePageClass">
-        <div class="titleBg">
-            <div class="titleFont">车辆报站</div>
-        </div>
-        <div class="divContent">
-            <div style="margin-left: 1vw;max-height: 30vh;overflow-y: scroll;" class="tableClass">
-                <div v-for="(item, index) in messageList">
-                    <div style="display: flex;flex-direction: row;justify-content: space-around;margin-top: 20px;">
-                        <div :class="item.type == 1 ? 'carClass' : 'goodClass'">{{ item.carNum }}</div>
-                        <div class="contentClass">{{ item.content }}</div>
-                        <div class="stationClass">{{ item.station }}</div>
-                        <div class="timeClass">{{ item.time }}</div>
-                    </div>
-                    <el-divider />
-                </div>
-            </div>
+  <div class="messagePageClass">
+    <div class="titleBg">
+      <div class="titleFont">车辆报站</div>
+    </div>
+    <div class="divContent">
+      <div style="margin-left: 1vw;max-height: 30vh;overflow-y: scroll;" class="tableClass">
+        <div v-for="(item, index) in messageList" :key="index">
+          <div style="display: flex;flex-direction: row;justify-content: space-around;margin-top: 20px;">
+            <div :class="item.type == 1 ? 'carClass' : 'goodClass'">{{ item.carNum }}</div>
+            <div class="contentClass">{{ item.content }}</div>
+            <div class="stationClass">{{ item.station }}</div>
+            <div class="timeClass">{{ item.time }}</div>
+          </div>
+          <el-divider />
         </div>
         </div>
-        <!-- <div>
+      </div>
+    </div>
+    <!-- <div>
             <div class="title" style="padding-left: 0.5vw;">到站提醒</div>
             <div class="title" style="padding-left: 0.5vw;">到站提醒</div>
             <div style="margin-left: 1vw;max-height: 20vh;overflow-y: scroll;" class="tableClass">
             <div style="margin-left: 1vw;max-height: 20vh;overflow-y: scroll;" class="tableClass">
                 <div v-for="(item, index) in messageList">
                 <div v-for="(item, index) in messageList">
@@ -30,7 +30,7 @@
                 </div>
                 </div>
             </div>
             </div>
         </div> -->
         </div> -->
-    </div>
+  </div>
 </template>
 </template>
 
 
 <script setup name="CarInfo" lang="ts">
 <script setup name="CarInfo" lang="ts">

+ 12 - 12
src/components/HomeComponents/warnTable.vue

@@ -2,7 +2,7 @@
     <div class="warnPageClass">
     <div class="warnPageClass">
         <div class="messagePageClass">
         <div class="messagePageClass">
             <div class="titleBg">
             <div class="titleBg">
-                <div class="titleFont">设备报警</div>
+                <div class="titleFont">设备告警</div>
             </div>
             </div>
             <div class="divContent">
             <div class="divContent">
                 <div style="padding-left: 1vw;max-height: 30vh;overflow-y: scroll;" class="tableClass">
                 <div style="padding-left: 1vw;max-height: 30vh;overflow-y: scroll;" class="tableClass">
@@ -27,16 +27,16 @@
 
 
 <script setup name="CarInfo" lang="ts">
 <script setup name="CarInfo" lang="ts">
 
 
-const messageList = ref([{ carNum: '闽JY3013', content: '闽J-Y3013车辆未到站报警,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 },
-{ carNum: '闽JY3013', content: '闽J-Y3013车辆未到站报警,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 2 },
-{ carNum: '闽JY3013', content: '闽J-Y3013车辆未到站报警,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 },
-{ carNum: '闽JY3013', content: '闽J-Y3013车辆未到站报警,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 },
-{ carNum: '闽JY3013', content: '闽J-Y3013车辆未到站报警,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 2 },
-{ carNum: '闽JY3013', content: '闽J-Y3013车辆未到站报警,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 },
-{ carNum: '闽JY3013', content: '闽J-Y3013车辆未到站报警,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 },
-{ carNum: '闽JY3013', content: '闽J-Y3013车辆未到站报警,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 2 },
-{ carNum: '闽JY3013', content: '闽J-Y3013车辆未到站报警,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 },
-{ carNum: '闽JY3013', content: '闽J-Y3013车辆未到站报警,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 }
+const messageList = ref([{ carNum: '闽JY3013', content: '闽J-Y3013GPS已离线,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 },
+{ carNum: '闽JY3013', content: '闽J-Y3013GPS已离线,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 2 },
+{ carNum: '闽JY3013', content: '闽J-Y3013GPS已离线,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 },
+{ carNum: '闽JY3013', content: '闽J-Y3013GPS已离线,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 },
+{ carNum: '闽JY3013', content: '闽J-Y3013GPS已离线,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 2 },
+{ carNum: '闽JY3013', content: '闽J-Y3013GPS已离线,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 },
+{ carNum: '闽JY3013', content: '闽J-Y3013GPS已离线,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 },
+{ carNum: '闽JY3013', content: '闽J-Y3013GPS已离线,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 2 },
+{ carNum: '闽JY3013', content: '闽J-Y3013GPS已离线,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 },
+{ carNum: '闽JY3013', content: '闽J-Y3013GPS已离线,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 }
 ]);
 ]);
 
 
 onMounted(() => {
 onMounted(() => {
@@ -165,4 +165,4 @@ onMounted(() => {
     width: 5vw;
     width: 5vw;
     text-align: center;
     text-align: center;
 }
 }
-</style>
+</style>

+ 19 - 19
src/components/HomeStatics/warnTable.vue

@@ -1,28 +1,28 @@
 <template>
 <template>
-    <div class="countPageClass" style="padding-left: 1vw;padding-top: 1.5vh;padding-right: 2vw;">
-        <div class="title">告警信息</div>
-        <div style="padding-left: 1vw;max-height: 20vh;overflow-y: scroll;" class="tableClass">
-            <div v-for="(item, index) in messageList" style="margin-top:20px;" >
-                <div style="display: flex;flex-direction: row;justify-content: space-around;align-items: center;">
-                    <div>
-                        <img v-if="item.type == 1" src="@/assets/images/home/Rectangle8.png" />
-                        <img v-if="item.type == 2" src="@/assets/images/home/Rectangle8(1).png" />
-                    </div>
-                    <div class="contentClass">{{ item.content }}</div>
-                    <div class="timeClass">{{ item.time }}</div>
-                </div>
-                <el-divider />
-            </div>
+  <div class="countPageClass" style="padding-left: 1vw;padding-top: 1.5vh;padding-right: 2vw;">
+    <div class="title">设备告警</div>
+    <div style="padding-left: 1vw;max-height: 20vh;overflow-y: scroll;" class="tableClass">
+      <div v-for="(item, index) in messageList" style="margin-top:20px;" :key="index">
+        <div style="display: flex;flex-direction: row;justify-content: space-around;align-items: center;">
+          <div>
+            <img v-if="item.type == 1" src="@/assets/images/home/Rectangle8.png" />
+            <img v-if="item.type == 2" src="@/assets/images/home/Rectangle8(1).png" />
+          </div>
+          <div class="contentClass">{{ item.content }}</div>
+          <div class="timeClass">{{ item.time }}</div>
         </div>
         </div>
+        <el-divider />
+      </div>
     </div>
     </div>
+  </div>
 </template>
 </template>
 
 
 <script setup name="CarInfo" lang="ts">
 <script setup name="CarInfo" lang="ts">
 
 
-const messageList = ref([{ carNum: '闽JY3013', content: '闽J-Y3013车辆未到站报警,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 },
-{ carNum: '闽JY3013', content: '闽J-Y3013车辆未到站报警,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 2 },
-{ carNum: '闽JY3013', content: '闽J-Y3013车辆未到站报警,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 },
-{ carNum: '闽JY3013', content: '闽J-Y3013车辆未到站报警,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 }
+const messageList = ref([{ carNum: '闽JY3013', content: '闽J-Y3013车辆GPS离线,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 },
+{ carNum: '闽JY3013', content: '铁湖站点的快递柜已离线,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 2 },
+{ carNum: '闽JY3013', content: '闽J-Y3013车辆GPS离线,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 },
+{ carNum: '闽JY3013', content: '铁湖站点的LED已离线,请及时处理。', station: '铁湖站', time: '5/10 17:26', type: 1 }
 ]);
 ]);
 
 
 onMounted(() => {
 onMounted(() => {
@@ -120,4 +120,4 @@ onMounted(() => {
     width: 5vw;
     width: 5vw;
     text-align: center;
     text-align: center;
 }
 }
-</style>
+</style>

+ 2 - 4
src/views/home.vue

@@ -9,9 +9,7 @@
     <pieEchartsS style="position: absolute;top: 10vh;right: 1vw;z-index: 1000;"></pieEchartsS>
     <pieEchartsS style="position: absolute;top: 10vh;right: 1vw;z-index: 1000;"></pieEchartsS>
     <stationPieS style="position: absolute;top:37vh;right: 1vw;z-index: 1000;"></stationPieS>
     <stationPieS style="position: absolute;top:37vh;right: 1vw;z-index: 1000;"></stationPieS>
     <warnTableS style="position: absolute;top: 65vh;right: 1vw;z-index: 1000;"></warnTableS>
     <warnTableS style="position: absolute;top: 65vh;right: 1vw;z-index: 1000;"></warnTableS>
-    <mapDiv :showMarket="showMarket" :darkType="darkType" style="width:100%;height:100vh;padding: 0 0 0 0" ref="mapElm">
-    </mapDiv>
-
+    <mapDiv :showMarket="showMarket" :darkType="darkType" style="width:100%;height:100vh;padding: 0 0 0 0" ref="mapElm"> </mapDiv>
   </div>
   </div>
 </template>
 </template>
 
 
@@ -62,4 +60,4 @@ const goTarget = (url: string) => {
     text-transform: none;
     text-transform: none;
   }
   }
 }
 }
-</style>
+</style>

+ 1 - 2
src/views/index.vue

@@ -7,8 +7,7 @@
         <messageTable style="width: 100%;margin-top: 1vh;"></messageTable>
         <messageTable style="width: 100%;margin-top: 1vh;"></messageTable>
       </div>
       </div>
       <div style="width: 50%;margin-left: 1%;">
       <div style="width: 50%;margin-left: 1%;">
-        <mapDiv :showMarket="showMarket" :darkType="darkType" style="width:100%;height:86vh;padding: 0 0 0 0"
-          ref="mapElm"></mapDiv>
+        <mapDiv :showMarket="showMarket" :darkType="darkType" style="width:100%;height:86vh;padding: 0 0 0 0" ref="mapElm"></mapDiv>
       </div>
       </div>
       <div style="width:24%;margin-left: 1%;">
       <div style="width:24%;margin-left: 1%;">
         <pieEcharts></pieEcharts>
         <pieEcharts></pieEcharts>