菜单栏更新

minggao/src/page/forecasting/trap/trap.vue

@@ -3,27 +3,27 @@
   <div class="cbdbox">
     <div class="cbdboxs_search">
       <el-input v-model="idinput" placeholder="请输入设备ID"></el-input>
-      <el-select v-model="inoffvalue" placeholder="请选择所在监测点">
+      <el-select v-model="trapvalue" placeholder="请选择所在监测点">
         <el-option
-          v-for="item in inoffoptions"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
+          v-for="item in traponsoptions"
+          :key="item.point_id"
+          :label="item.point_name"
+          :value="item.point_id"
         >
         </el-option>
       </el-select>
       <el-select v-model="versionsvalue" placeholder="请选择组织">
         <el-option
           v-for="item in versionsoptions"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
+          :key="item.org_id"
+          :label="item.org_name"
+          :value="item.org_id"
         >
         </el-option>
       </el-select>
-      <el-select v-model="versionsvalue" placeholder="请选择诱捕器">
+      <el-select v-model="inoffvalue" placeholder="请选择诱捕器状态">
         <el-option
-          v-for="item in versionsoptions"
+          v-for="item in inoffoptions"
           :key="item.value"
           :label="item.label"
           :value="item.value"
@@ -90,24 +90,19 @@ export default {
       idinput: "",
       inoffvalue: "",
       inoffoptions: [
-        { label: "在线", value: "0" },
-        { label: "离线", value: "1" },
+        { label: "停用", value: "0" },
+        { label: "正常", value: "1" },
       ],
       versionsvalue: "",
-      versionsoptions: [
-        { label: "全部", value: "" },
-        { label: "版本1", value: "1" },
-        { label: "版本2", value: "2" },
-        { label: "版本3", value: "3" },
-        { label: "版本4", value: "4" },
-        { label: "版本5", value: "5" },
-      ],
+      versionsoptions: [], //组织
+      trapvalue: "",
+      traponsoptions: [], //监测点
       queryInfo: {
         page: 1,
-        is_online: "",
-        ename: "",
-        f_id: "",
-        dver: "",
+        point_id: "", //监测点id
+        trap_number: "", //设备id
+        org_id: "", //组织id
+        trap_status: "", //状态
       },
       tableData: [],
       device_id: "",
@@ -121,7 +116,8 @@ export default {
   watch: {},
   //方法集合
   methods: {
-    getcbdlist() {//获取设备列表
+    getcbdlist() {
+      //获取设备列表
       this.loading = true;
       this.$axios({
         method: "POST",
@@ -129,7 +125,10 @@ export default {
         data: this.qs.stringify({
           page_size: 10,
           page: this.queryInfo.page,
-          trap_number: this.queryInfo.f_id,
+          trap_number: this.queryInfo.trap_number,
+          point_id: this.queryInfo.point_id,
+          org_id: this.queryInfo.org_id,
+          trap_status: this.queryInfo.trap_status,
         }),
       }).then((res) => {
         this.loading = false;
@@ -141,27 +140,23 @@ export default {
         }
       });
     },
-    getmon(){//获取监测点列表
-      this.$axios({
-        method: "POST",
-        url: "/api/api_gateway?method=monitor_manage.maintain.checkpoint_list",
-      }).then((res) => {
-        console.log(res.data.data);
-      });
-    },
-    getorgin(){//获取组织列表
+    getmon() {
+      //获取监测点列表 组织列表
       this.$axios({
         method: "POST",
-        url: "/api/api_gateway?method=sysmenage.usermanager.org_list",
+        url: "/api/api_gateway?method=monitor_manage.trap_manage.trap_org",
       }).then((res) => {
         console.log(res.data.data);
+        this.versionsoptions = res.data.data.org_data; //组织
+        this.traponsoptions = res.data.data.point_data;
       });
     },
     search() {
-      this.queryInfo.f_id = this.idinput;
-      this.queryInfo.is_online = this.inoffvalue;
-      this.queryInfo.dver = this.versionsvalue;
-      // console.log(this.inoffvalue,this.versionsvalue)
+      this.queryInfo.point_id = this.trapvalue;
+      this.queryInfo.trap_number = this.idinput;
+      this.queryInfo.org_id = this.versionsvalue;
+      this.queryInfo.trap_status = this.inoffvalue;
+      console.log(this.inoffvalue,this.versionsvalue,this.inoffvalue)
       this.getcbdlist();
     },
     pageChange(e) {
@@ -176,8 +171,7 @@ export default {
   beforeMount() {}, //生命周期 - 挂载之前
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
-    this.getmon()
-    this.getorgin()
+    this.getmon();
     this.getcbdlist();
   },
   beforeUpdate() {}, //生命周期 - 更新之前
@@ -209,8 +203,8 @@ export default {
     }
   }
 }
-/deep/.el-button--info{
-  background-color: #409EFF;
-    border-color: #409EFF;
+/deep/.el-button--info {
+  background-color: #409eff;
+  border-color: #409eff;
 }
 </style>

minggao/src/page/home/index.vue

@@ -37,24 +37,58 @@
               <i class="el-icon-collection-tag"></i>
               <span>{{ item.purview_name }}</span>
             </template>
-            <el-submenu
-              :index="'/index/' + items.pur_id"
-              v-for="items in item.children"
-              :key="items.pur_id"
-              @click="skip('/index/' + items.menu)"
-            >
-              <span slot="title"><i class="el-icon-collection-tag"></i>{{ items.purview_name }}</span>
-              <el-menu-item-group>
-                <el-menu-item
-                  v-for="item2 in items.children"
-                  :index="'/index/' + item2.pur_id"
-                  :key="item2.pur_id"
-                  @click="skip('/index/' + item2.menu)"
+            <template v-for="items in item.children">
+              <el-submenu
+                :index="'/index/' + items.pur_id"
+                v-if="items.children"
+                :key="items.pur_id"
+                @click="skip('/index/' + items.menu)"
+              >
+                <span slot="title"
+                  ><i class="el-icon-collection-tag"></i
+                  >{{ items.purview_name }}</span
+                >
+                <el-menu-item-group>
+                  <el-menu-item
+                    v-for="item2 in items.children"
+                    :index="'/index/' + item2.pur_id"
+                    :key="item2.pur_id"
+                    @click="skip('/index/' + item2.menu)"
+                  >
+                    <span slot="title"
+                      ><i class="el-icon-collection-tag"></i
+                      >{{ item2.purview_name }}</span
+                    >
+                  </el-menu-item>
+                </el-menu-item-group>
+              </el-submenu>
+              <el-menu-item
+                :index="'/index/' + items.pur_id"
+                v-else
+                :key="items.pur_id"
+                @click="skip('/index/' + items.menu)"
+              >
+                <span slot="title"
+                  ><i class="el-icon-collection-tag"></i
+                  >{{ items.purview_name }}</span
                 >
-                  <span slot="title"><i class="el-icon-collection-tag"></i>{{ item2.purview_name }}</span>
-                </el-menu-item>
-              </el-menu-item-group>
-            </el-submenu>
+              </el-menu-item>
+            </template>
+            <!-- <template v-else>
+              <el-menu-item-group>
+                  <el-menu-item
+                    v-for="items in item.children"
+                    :index="'/index/' + items.pur_id"
+                    :key="items.pur_id"
+                    @click="skip('/index/' + items.menu)"
+                  >
+                    <span slot="title"
+                      ><i class="el-icon-collection-tag"></i
+                      >{{ items.purview_name }}</span
+                    >
+                  </el-menu-item>
+                </el-menu-item-group>
+            </template> -->
           </el-submenu>
         </el-menu>
       </div>