feat vh/vw优化首页图片 & 移除HomeFilter rules规则

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

@@ -28,7 +28,7 @@
 <script>
 import Button from '@screen/components/Buttons/Button.vue';
 import Form from '@screen/components/FormConfig';
-import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
+import * as PresetFormItems from "@screen/common/PresetFormItems.js";
 import { merge, cloneDeep } from "lodash"
 import request from "@/utils/request";
 
@@ -42,74 +42,8 @@ export default {
     return {
       activeIcon: null,
       formList: [
-        merge(cloneDeep(PresetFormItems.station), {
+        PresetFormItems.startStation,
-          required: false,
+        PresetFormItems.endStation,
-          label: "起始桩号:",
-          options: {
-            options: [
-              {
-                rules: [
-                  {
-                    message: "请补全桩号",
-                    callback(value, data) {
-                      if (!value?.trim() && data.startStakeMark[1]?.trim())
-                        return false;
-                      else return true;
-                    },
-                  },
-                ],
-                key: "startStakeMark[0]",
-              },
-              {
-                rules: [
-                  {
-                    message: "请补全桩号",
-                    callback(value, data) {
-                      if (!value?.trim() && data.startStakeMark[0]?.trim())
-                        return false;
-                      else return true;
-                    },
-                  },
-                ],
-                key: "startStakeMark[1]",
-              },
-            ],
-          },
-        }),
-        merge(cloneDeep(PresetFormItems.station), {
-          required: false,
-          label: "结束桩号:",
-          options: {
-            options: [
-              {
-                rules: [
-                  {
-                    message: "请补全桩号",
-                    callback(value, data) {
-                      if (!value?.trim() && data.endStakeMark[1]?.trim())
-                        return false;
-                      else return true;
-                    },
-                  },
-                ],
-                key: "endStakeMark[0]",
-              },
-              {
-                rules: [
-                  {
-                    message: "请补全桩号",
-                    callback(value, data) {
-                      if (!value?.trim() && data.endStakeMark[0]?.trim())
-                        return false;
-                      else return true;
-                    },
-                  },
-                ],
-                key: "endStakeMark[1]",
-              },
-            ],
-          },
-        }),
         {
           label: "设备类型:",
           key: "deviceType",

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

@@ -12,8 +12,8 @@
         </div>
         <!-- <Form labelWidth="90px" column="1" class="form" ref="FormConfigRef" :formList="formList" /> -->
         <img class="image" src="@screen/images/home-Frame/logoMean.jpg">
-				<div class="footer">
+        <!-- <div class="footer">
-				</div>
+        </div> -->
       </div>
     </ElPopover>
   </div>
@@ -56,6 +56,7 @@ div.el-popper.global-input-search-popover {
   position: relative;
   padding-top: 36px;
   transform: translateY(24px);
+  margin-top: 3vh;
 
   .body {
     .title {
@@ -72,8 +73,8 @@ div.el-popper.global-input-search-popover {
 </style>
 <style lang='scss' scoped>
 .image {
-	width: 1440px;
+  width: 45vw;
-	height: 900px;
+  height: 65vh;
 }
 
 .HomeFrame {