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

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

@@ -286,5 +286,10 @@
         // background-color: #000 !important;
       }
     }
+    .el-image__placeholder{
+      background-color: #133242;
+      background-image: url("~@/assets/images/no_img.png");
+      background-size: contain;
+    }
 
 }

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue

@@ -290,8 +290,7 @@ export default {
     initDevice() {
       //设备在线离线率接口
 
-      getSystemStatusType().then((res) => {
+      if (process.env.NODE_ENV == "development") {
-        if (IS_TESTING && (!res.data || res.msg == "暂无数据")) {
           this.equipments = [];
           this.equipSeries.forEach((item) => {
             this.equipments.push({
@@ -305,6 +304,8 @@ export default {
           });
           return;
         }
+
+      getSystemStatusType().then((res) => {
         let allList = [];
         let sort = res.data["排序规则"].rule.split(",");
         sort.forEach((i) => {

ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js

@@ -14,11 +14,11 @@ export const searchFormList = [
       valueFormat: "yyyy-MM-dd HH:mm:ss",
     },
   },
-  PresetFormItems.directionCreater("CheckboxGroup"),
+  PresetFormItems.directionCreater("RadioGroup"),
   {
     label: "发布状态:",
     key: "releaseStatus",
-    type: "checkboxGroup",
+    type: "RadioGroup",
     default: [],
     options: {
       options: [

ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue

@@ -17,14 +17,13 @@
 
         <InputSearch
           ref="searchComp"
-          style="width: 402px"
+          style="width: 480px"
           :formList="searchFormList"
           :formConfigOptions="{ dFormData: { eventState: '0' } }"
           @handleSearch="handleSearch"
         />
 
     </div>
-
     <!-- 内容 -->
     <div class="body">
       <Table :data="tableData" height="100%">
@@ -139,6 +138,7 @@ export default {
         ...this.searchData,
         // releaseContent: data.releaseContent || "",
         direction: data.direction || "",
+        releaseStatus: data.releaseStatus,
         startTime,
         endTime,
         // stakeMark: stakeMark,
@@ -153,7 +153,7 @@ export default {
         return DirectionTypes[row.direction];
       },
     formatterStatus(row, column) {
-        return ["","成功"][row.releaseStatus];
+      return ["失败", "成功"][row.releaseStatus];
       },
     initData() {
       request({