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

ruoyi-ui/README.md

@@ -177,4 +177,9 @@ export const additionalNotes = {
     autosize: { minRows: 6, maxRows: 6 },
     showWordLimit: true,
   },
+  visible: data => { //现隐控制
+    if (data.searchType == 1) {
+        return true
+    }
+  },
 };

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

@@ -30,6 +30,7 @@ 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 { merge, cloneDeep } from "lodash"
+import request from "@/utils/request";
 
 export default {
   name: 'HomeFilter',
@@ -109,6 +110,19 @@ export default {
             ],
           },
         }),
+        {
+          label: "设备类型:",
+          key: "deviceType",
+          type: "select",
+          options: {
+            options: []
+          },
+          // visible: data => {
+          //   if (data.searchType == 1) {
+          //     return true
+          //   }
+          // },
+        },
       ]
     }
   },
@@ -132,7 +146,20 @@ export default {
       if (!data.endStakeMark[0] || !data.endStakeMark[1]) delete data.endStakeMark;
 
       this.filterEnd(data)
+    },
+    async getDeviceTypeOptions() {
+      // try {
+      // await request({
+      //   url: `/business/employees/organization`,
+      //   method: "POST",
+      //   data: {},
+      // });
+      // } catch (e) { console.error(e); }
+      // return ;
     }
+  },
+  async created() {
+    // await this.getDeviceTypeOptions();
   }
 }
 </script>