Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/package.json

@@ -74,6 +74,7 @@
     "less-loader": "^7.2.1",
     "lodash": "^4.17.21",
     "mathjs": "^11.7.0",
+    "mitt": "^3.0.1",
     "moment": "^2.29.1",
     "mpegts.js": "^1.7.3",
     "normalize.css": "7.0.0",
@@ -104,11 +105,10 @@
     "vue-slick-carousel": "^1.0.6",
     "vue-splitpane": "1.0.4",
     "vue-video-player": "^5.0.2",
-    "vuedraggable": "2.24.3",
+    "vuedraggable": "^2.24.3",
     "vuescroll": "^4.18.1",
     "vuex": "3.6.0",
-    "zrender": "^5.4.4",
-    "mitt": "^3.0.1"
+    "zrender": "^5.4.4"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",
@@ -154,4 +154,4 @@
     "> 1%",
     "last 2 versions"
   ]
-}
+}

ruoyi-ui/src/assets/styles/JiHeExpressway.scss

@@ -277,4 +277,14 @@
       .el-time-spinner__item.active{ color: #fff !important;}
     }
 
+    .el-picker-panel{
+      .today div a,.today div span{
+        color: #ff0 !important;
+        font-weight: bold !important;
+      }
+      .current div a.cell {
+        // background-color: #000 !important;
+      }
+    }
+
 }

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue

@@ -61,20 +61,20 @@
                 <el-tabs v-model="activeTab" @tab-click="tabClickFn">
                   <el-tab-pane label="详情信息" name="first">
                     <div class="show_bottom_tab_box">
-                      <div class="deviceInfo">
-                        <div class="deviceInfo_l">设备名称</div>
+                      <div class="deviceInfo title">
+                        <div class="deviceInfo_l">设备名称:</div>
                         <div class="deviceInfo_r">
                           {{ selectedDevice.deviceName }}
                         </div>
                       </div>
                       <div class="deviceInfo">
-                        <div class="deviceInfo_l">设备桩号</div>
+                        <div class="deviceInfo_l">设备桩号:</div>
                         <div class="deviceInfo_r">
                           {{ selectedDevice.stakeMark }}
                         </div>
                       </div>
                       <div class="deviceInfo">
-                        <div class="deviceInfo_l">屏幕像素</div>
+                        <div class="deviceInfo_l">屏幕像素:</div>
                         <div class="deviceInfo_r">
                           {{
                             JSON.parse(selectedDevice.otherConfig).screenSize
@@ -82,6 +82,12 @@
                           px
                         </div>
                       </div>
+                      <div class="deviceInfo">
+                        <div class="deviceInfo_l">设备状态</div>
+                        <div class="deviceInfo_r">
+                          {{ selectedDevice.deviceState == 1 ? "在线" : "离线" }}
+                        </div>
+                      </div>
                       <!-- <div class="deviceInfo" v-for="item in tabDataInfoList" :key="item.id">
                       <div class="deviceInfo_l">{{ item.tit }}: </div>
                       <div class="deviceInfo_r" :style="{ 'color': item.col }"> {{ item.txt }}</div>
@@ -763,11 +769,12 @@ export default {
 }
 
 .deviceInfo {
-  width: 50%;
+  width: 33.333%;
   padding: 10px 0;
   display: flex;
   // flex-wrap: wrap;
-  align-items: stretch;
+  align-items: center;
+  &.title{ width: 100%;}
 }
 
 .show_bottom_tab_box {
@@ -780,7 +787,7 @@ export default {
 .deviceInfo_l {
   color: #3de8ff;
   font-size: 14px;
-  width: 70px;
+  width: 60px;
   display: flex;
   flex-direction: row;
   align-items: center;

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js

@@ -429,7 +429,7 @@ export function getContent(data) {
       align-items: center;
       padding-bottom: 9px;
       align-self: center;
-    ">
+    " onmouseover="this.parentNode.style.zIndex=13;" onmouseout="this.parentNode.style.zIndex=12;">
       ${data.length}
     </div>
 `;

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue

@@ -341,7 +341,9 @@ export default {
     },
 
     uploadFile() {
-      uploadFile({ url: "/business/shifts/importEquipment" });
+      uploadFile({ url: "/business/shifts/importEquipment" }).then(() => {
+        this.getData();
+      })
     },
   },
 };

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/index.vue

@@ -19,7 +19,7 @@
 
     <!-- 分页 -->
     <div class="footer">
-      <Pagination :total="90" />
+      <Pagination :total="90"  layout="total, sizes, prev, pager, next"/>
     </div>
   </div>
 </template>