添加类别选择及联合查询

.env.prod

@@ -1,3 +1,3 @@
 NODE_ENV=production
-VUE_APP_BASEURL=http://121.43.55.7:10091/dtbservice
-VUE_APP_OAUTHURL=http://121.43.55.7:8888/oauth
+VUE_APP_BASEURL=http://localhost:10091/dtbservice
+VUE_APP_OAUTHURL=http://localhost:8888/oauth

src/api/data/MenuData.js

@@ -2,6 +2,9 @@ import request from "@/utils/request";
 import constant from "@/utils/constant";
 
 const getMenuData = (params) => {
+    if (!params.parentId) {
+        return new Promise((resolve, reject) => {resolve({})});
+    }
     return request.postForm(constant.dtbserverProxy + '/menu/getMenuDataList', params)
 }
 

src/components/dataManage/CategoryMenu.vue

@@ -0,0 +1,96 @@
+<template>
+  <div id="CategoryMenu" v-loading="loading">
+    <div style="margin: 0 auto;margin-bottom: 5px">数据类别:</div>
+    <el-menu :default-active="firstOption" class="Category-menu" @select="currChange">
+      <el-menu-item v-for="item in list" :key=item.id :index="item.id+''" >
+        <el-icon>
+          <IconPark-list-view/>
+        </el-icon>
+        <template #title>
+          <el-tooltip effect="dark" :content="item.title" placement="right">
+            <span style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{ item.title }}</span>
+          </el-tooltip>
+        </template>
+      </el-menu-item>
+    </el-menu>
+    <el-empty v-if="!list || list.length<1" :description="'无类别'" ></el-empty>
+  </div>
+</template>
+
+<script>
+import menuApi from "@/api/data/MenuData";
+
+export default {
+  data() {
+    return {
+      firstOption: '',
+      list: [],
+      loading: false,
+    }
+  },
+  props: {
+    type: String,
+    currVal: String,
+  },
+  watch: {
+  },
+  emits: ["update:currVal"],
+  setup(props, context) {
+    const methods = {
+      currChange(index) {
+        context.emit('update:currVal', index)
+      },
+    }
+    return methods;
+  },
+  created() {
+    this.getMenu();
+  },
+  mounted() {
+  },
+  methods: {
+    getMenu() {
+      let app = this;
+      app.loading = true;
+      let params = {
+        type: "1",
+        parentId: this.$constant.menuIds[this.type],
+      }
+      app.list = [];
+      app.firstOption = '';
+      menuApi.getMenuData(params).then(res=>{
+        if (res.code===200) {
+          app.list = res.content;
+          if (app.list.length>0) {
+            app.firstOption = app.list[0].id+'';
+            app.currChange(app.firstOption);
+          }
+        }
+        app.loading = false
+      }).catch(()=>{
+        app.loading = false
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+#CategoryMenu {
+  display: inline-block;
+  width: 15%;
+  height: 100%;
+  margin-right: 1%;
+}
+#CategoryMenu .el-menu-item {
+  border-radius: 15px;
+  margin-right: 5%;
+  font-weight: normal;
+}
+.Category-menu .el-menu-item {
+  height: 40px;
+}
+.Category-menu .el-menu-item span {
+  font-size: 16px !important;
+}
+</style>

src/components/dataManage/dataDetail/BusinessDataDetail.vue

@@ -144,7 +144,7 @@ export default {
       let app = this;
       let params = {
         type: "1",
-        parentId: "3",
+        parentId: this.$constant.menuIds['business'],
       }
       menuApi.getMenuData(params).then(res=>{
         if (res.code===200) {

src/components/dataManage/dataDetail/IotDataDetail.vue

@@ -174,7 +174,7 @@ export default {
       let app = this;
       let params = {
         type: "1",
-        parentId: "4",
+        parentId: this.$constant.menuIds['iot'],
       }
       menuApi.getMenuData(params).then(res => {
         if (res.code === 200) {

src/components/dataManage/dataDetail/MetaDataDetail.vue

@@ -152,7 +152,7 @@ export default {
       let app = this;
       let params = {
         type: "1",
-        parentId: "3",
+        parentId: this.$constant.menuIds['meta'],
       }
       menuApi.getMenuData(params).then(res => {
         if (res.code === 200) {

src/components/dataManage/dataDetail/ModelDataDetail.vue

@@ -211,7 +211,7 @@ export default {
       let app = this;
       let params = {
         type: "1",
-        parentId: "4",
+        parentId: this.$constant.menuIds['model'],
       }
       menuApi.getMenuData(params).then(res => {
         if (res.code === 200) {

src/components/dataManage/dataDetail/ThreeDimensionalDataDetail.vue

@@ -210,7 +210,7 @@ export default {
       let app = this;
       let params = {
         type: "1",
-        parentId: "2",
+        parentId: this.$constant.menuIds['threeD'],
       }
       menuApi.getMenuData(params).then(res => {
         if (res.code === 200) {

src/components/dataManage/dataDetail/TwoDimensionalDataDetail.vue

@@ -143,7 +143,7 @@ export default {
       let app = this;
       let params = {
         type: "1",
-        parentId: "1",
+        parentId: this.$constant.menuIds['twoD'],
       }
       menuApi.getMenuData(params).then(res=>{
         if (res.code===200) {

src/components/dataManage/dataShow/BusinessData.vue

@@ -1,12 +1,25 @@
 <!-- 业务数据 -->
 <template>
-  <div id="data">
+  <CategoryMenu :type="'business'" v-model:currVal="currCategory"></CategoryMenu>
+  <div v-if="currCategory && currCategory!==''" class="data">
     <el-button v-if="auth" type="primary" @click="addDataClick">录入业务数据</el-button>
     <el-button v-if="auth" type="warning" @click="batchDelete">批量删除</el-button>
     <div class="operation">
       <el-form :model="filterForm" :inline="true">
-        <el-form-item label="地名地址库名称：">
-          <el-input v-model="filterForm.address" placeholder="请输入地名地址库名称"></el-input>
+        <el-form-item label="标题：" style="width: 15%">
+          <el-input v-model="filterForm.title" placeholder="请输入标题"></el-input>
+        </el-form-item>
+        <el-form-item label="描述：" style="width: 17%">
+          <el-input v-model="filterForm.content" placeholder="请输入描述"></el-input>
+        </el-form-item>
+        <el-form-item label="地名地址库：" style="width: 20%">
+          <el-input v-model="filterForm.address" placeholder="请输入名称"></el-input>
+        </el-form-item>
+        <el-form-item label="导入类型：" style="width: 20%">
+          <el-select v-model="filterForm.importType" placeholder="请选择类型">
+            <el-option value="单条数据录入">单条数据录入</el-option>
+            <el-option value="Shape文件导入">Shape文件导入</el-option>
+          </el-select>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="search">搜索</el-button>
@@ -80,6 +93,7 @@
 <script>
 import api from '@/api/data/BusinessData'
 import BusinessDataDetail from "@/components/dataManage/dataDetail/BusinessDataDetail";
+import CategoryMenu from "@/components/dataManage/CategoryMenu";
 
 export default {
   data() {
@@ -96,11 +110,14 @@ export default {
         total: 0,
       },
 
+      currCategory: '',
+
       isDetailShow: false,
     }
   },
   components: {
-    BusinessDataDetail
+    BusinessDataDetail,
+    CategoryMenu,
   },
   created() {
     let userInfo = this.$store.state.userInfo;
@@ -125,6 +142,10 @@ export default {
         app.pageInfo.page = 1;
       }, 50)
     },
+    "currCategory": function () {
+      this.resetCategory();
+      this.getData();
+    }
   },
   methods: {
     handleLoading(flag) {
@@ -137,13 +158,24 @@ export default {
         }, 500);
       }
     },
+    resetCategory() {
+      let auth = this.$data.auth;
+      let currCategory = this.$data.currCategory;
+      Object.assign(this.$data, this.$options.data());
+      this.auth = auth;
+      this.currCategory = currCategory;
+    },
     getData() {
       let app = this;
+      if (!(app.currCategory && app.currCategory!=='')) {
+        return;
+      }
       let params = {
-        address: app.filterForm.address,
+        menuId: app.currCategory,
         page: app.pageInfo.page,
         pageSize: app.pageInfo.pageSize,
       }
+      Object.assign(params, app.filterForm)
       app.handleLoading(true)
       api.getData(params).then(res => {
         if (res.code === 200) {
@@ -263,7 +295,5 @@ export default {
 </script>
 
 <style>
-#data .operation {
-  float: right;
-}
+
 </style>

src/components/dataManage/dataShow/IotData.vue

@@ -1,12 +1,25 @@
 <!-- 物联感知数据 -->
 <template>
-  <div id="data">
+  <CategoryMenu :type="'iot'" v-model:currVal="currCategory"></CategoryMenu>
+  <div class="data" v-if="currCategory && currCategory!==''">
     <el-button v-if="auth" type="primary" @click="addDataClick">录入物联感知数据</el-button>
     <el-button v-if="auth" type="warning" @click="batchDelete">批量删除</el-button>
     <div class="operation">
       <el-form :model="filterForm" :inline="true">
-        <el-form-item label="地名地址库名称：">
-          <el-input v-model="filterForm.address" placeholder="请输入地名地址库名称"></el-input>
+        <el-form-item label="标题：" style="width: 15%">
+          <el-input v-model="filterForm.title" placeholder="请输入标题"></el-input>
+        </el-form-item>
+        <el-form-item label="描述：" style="width: 17%">
+          <el-input v-model="filterForm.content" placeholder="请输入描述"></el-input>
+        </el-form-item>
+        <el-form-item label="地名地址库：" style="width: 20%">
+          <el-input v-model="filterForm.address" placeholder="请输入名称"></el-input>
+        </el-form-item>
+        <el-form-item label="导入类型：" style="width: 20%">
+          <el-select v-model="filterForm.importType" placeholder="请选择类型">
+            <el-option value="单条数据录入">单条数据录入</el-option>
+            <el-option value="Shape文件导入">Shape文件导入</el-option>
+          </el-select>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="search">搜索</el-button>
@@ -91,6 +104,7 @@
 <script>
 import api from '@/api/data/IotData'
 import IotDataDetail from "@/components/dataManage/dataDetail/IotDataDetail";
+import CategoryMenu from "@/components/dataManage/CategoryMenu";
 
 export default {
   data() {
@@ -107,11 +121,14 @@ export default {
         total: 0,
       },
 
+      currCategory: '',
+
       isDetailShow: false,
     }
   },
   components: {
-    IotDataDetail
+    IotDataDetail,
+    CategoryMenu,
   },
   created() {
     let userInfo = this.$store.state.userInfo;
@@ -136,6 +153,10 @@ export default {
         app.pageInfo.page = 1;
       }, 50)
     },
+    "currCategory": function () {
+      this.resetCategory();
+      this.getData();
+    }
   },
   methods: {
     handleLoading(flag) {
@@ -148,13 +169,24 @@ export default {
         }, 500);
       }
     },
+    resetCategory() {
+      let auth = this.$data.auth;
+      let currCategory = this.$data.currCategory;
+      Object.assign(this.$data, this.$options.data());
+      this.auth = auth;
+      this.currCategory = currCategory;
+    },
     getData() {
       let app = this;
+      if (!(app.currCategory && app.currCategory!=='')) {
+        return;
+      }
       let params = {
-        address: app.filterForm.address,
+        menuId: app.currCategory,
         page: app.pageInfo.page,
         pageSize: app.pageInfo.pageSize,
       }
+      Object.assign(params, app.filterForm)
       app.handleLoading(true)
       api.getData(params).then(res => {
         if (res.code === 200) {
@@ -274,7 +306,5 @@ export default {
 </script>
 
 <style>
-#data .operation {
-  float: right;
-}
+
 </style>

src/components/dataManage/dataShow/MetaData.vue

@@ -1,12 +1,25 @@
 <!-- 业务数据 -->
 <template>
-  <div id="data">
+  <CategoryMenu :type="'meta'" v-model:currVal="currCategory"></CategoryMenu>
+  <div class="data" v-if="currCategory && currCategory!==''">
     <el-button v-if="auth"  type="primary" @click="addDataClick">录入元数据</el-button>
     <el-button v-if="auth"  type="warning" @click="batchDelete">批量删除</el-button>
     <div class="operation">
       <el-form :model="filterForm" :inline="true">
-        <el-form-item label="地名地址库名称：">
-          <el-input v-model="filterForm.name" placeholder="请输入地名地址库名称"></el-input>
+        <el-form-item label="标题：" style="width: 15%">
+          <el-input v-model="filterForm.title" placeholder="请输入标题"></el-input>
+        </el-form-item>
+        <el-form-item label="描述：" style="width: 17%">
+          <el-input v-model="filterForm.content" placeholder="请输入描述"></el-input>
+        </el-form-item>
+        <el-form-item label="地名地址库：" style="width: 20%">
+          <el-input v-model="filterForm.address" placeholder="请输入名称"></el-input>
+        </el-form-item>
+        <el-form-item label="导入类型：" style="width: 20%">
+          <el-select v-model="filterForm.importType" placeholder="请选择类型">
+            <el-option value="单条数据录入">单条数据录入</el-option>
+            <el-option value="Shape文件导入">Shape文件导入</el-option>
+          </el-select>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="search">搜索</el-button>
@@ -81,6 +94,7 @@
 import api from '@/api/data/MetaData'
 import MetaDataDetail from "@/components/dataManage/dataDetail/MetaDataDetail";
 import menuApi from "@/api/data/MenuData";
+import CategoryMenu from "@/components/dataManage/CategoryMenu";
 
 export default {
   data() {
@@ -96,12 +110,14 @@ export default {
         pageSize: 10,
         total: 0,
       },
+      currCategory: '',
 
       isDetailShow: false,
     }
   },
   components: {
-    MetaDataDetail
+    MetaDataDetail,
+    CategoryMenu,
   },
   created() {
     let userInfo = this.$store.state.userInfo;
@@ -126,6 +142,10 @@ export default {
         app.pageInfo.page = 1;
       }, 50)
     },
+    "currCategory": function () {
+      this.resetCategory();
+      this.getData();
+    }
   },
   methods: {
     handleLoading(flag) {
@@ -138,13 +158,24 @@ export default {
         }, 500);
       }
     },
+    resetCategory() {
+      let auth = this.$data.auth;
+      let currCategory = this.$data.currCategory;
+      Object.assign(this.$data, this.$options.data());
+      this.auth = auth;
+      this.currCategory = currCategory;
+    },
     getData() {
       let app = this;
+      if (!(app.currCategory && app.currCategory!=='')) {
+        return;
+      }
       let params = {
-        address: app.filterForm.address,
+        menuId: app.currCategory,
         page: app.pageInfo.page,
-        pageSize: app.pageInfo.pageSize
+        pageSize: app.pageInfo.pageSize,
       }
+      Object.assign(params, app.filterForm)
       app.handleLoading(true)
       api.getData(params).then(res => {
         if (res.code === 200) {
@@ -228,7 +259,5 @@ export default {
 </script>
 
 <style>
-#data .operation {
-  float: right;
-}
+
 </style>

src/components/dataManage/dataShow/ModelData.vue

@@ -1,12 +1,25 @@
 <!-- 模型数据 -->
 <template>
-  <div id="data">
+  <CategoryMenu :type="'model'" v-model:currVal="currCategory"></CategoryMenu>
+  <div class="data" v-if="currCategory && currCategory!==''">
     <el-button v-if="auth"  type="primary" @click="addDataClick">录入模型数据</el-button>
     <el-button v-if="auth"  type="warning" @click="batchDelete">批量删除</el-button>
     <div class="operation">
       <el-form :model="filterForm" :inline="true">
-        <el-form-item label="地名地址库名称：">
-          <el-input v-model="filterForm.name" placeholder="请输入地名地址库名称"></el-input>
+        <el-form-item label="标题：" style="width: 15%">
+          <el-input v-model="filterForm.title" placeholder="请输入标题"></el-input>
+        </el-form-item>
+        <el-form-item label="描述：" style="width: 17%">
+          <el-input v-model="filterForm.content" placeholder="请输入描述"></el-input>
+        </el-form-item>
+        <el-form-item label="地名地址库：" style="width: 20%">
+          <el-input v-model="filterForm.address" placeholder="请输入名称"></el-input>
+        </el-form-item>
+        <el-form-item label="导入类型：" style="width: 20%">
+          <el-select v-model="filterForm.importType" placeholder="请选择类型">
+            <el-option value="单条数据录入">单条数据录入</el-option>
+            <el-option value="Shape文件导入">Shape文件导入</el-option>
+          </el-select>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="search">搜索</el-button>
@@ -90,6 +103,7 @@
 <script>
 import api from '@/api/data/ModelData'
 import ModelDataDetail from "@/components/dataManage/dataDetail/ModelDataDetail";
+import CategoryMenu from "@/components/dataManage/CategoryMenu";
 
 export default {
   data() {
@@ -106,11 +120,14 @@ export default {
         total: 0,
       },
 
+      currCategory: '',
+
       isDetailShow: false,
     }
   },
   components: {
-    ModelDataDetail
+    ModelDataDetail,
+    CategoryMenu,
   },
   created() {
     let userInfo = this.$store.state.userInfo;
@@ -135,6 +152,10 @@ export default {
         app.pageInfo.page = 1;
       }, 50)
     },
+    "currCategory": function () {
+      this.resetCategory();
+      this.getData();
+    }
   },
   methods: {
     handleLoading(flag) {
@@ -147,13 +168,24 @@ export default {
         }, 500);
       }
     },
+    resetCategory() {
+      let auth = this.$data.auth;
+      let currCategory = this.$data.currCategory;
+      Object.assign(this.$data, this.$options.data());
+      this.auth = auth;
+      this.currCategory = currCategory;
+    },
     getData() {
       let app = this;
+      if (!(app.currCategory && app.currCategory!=='')) {
+        return;
+      }
       let params = {
-        address: app.filterForm.address,
+        menuId: app.currCategory,
         page: app.pageInfo.page,
-        pageSize: app.pageInfo.pageSize
+        pageSize: app.pageInfo.pageSize,
       }
+      Object.assign(params, app.filterForm)
       app.handleLoading(true)
       api.getData(params).then(res => {
         if (res.code === 200) {
@@ -230,7 +262,5 @@ export default {
 </script>
 
 <style>
-#data .operation {
-  float: right;
-}
+
 </style>

src/components/dataManage/dataShow/ThreeDimensionalData.vue

@@ -1,12 +1,26 @@
 <!-- 三维数据 -->
 <template>
-  <div id="data">
+  <CategoryMenu :type="'threeD'" v-model:currVal="currCategory"></CategoryMenu>
+
+  <div class="data" v-if="currCategory && currCategory!==''">
     <el-button v-if="auth"  type="primary" @click="addDataClick">录入三维数据</el-button>
     <el-button v-if="auth"  type="warning" @click="batchDelete">批量删除</el-button>
     <div class="operation">
       <el-form :model="filterForm" :inline="true">
-        <el-form-item label="地名地址库名称：">
-          <el-input v-model="filterForm.name" placeholder="请输入地名地址库名称"></el-input>
+        <el-form-item label="标题：" style="width: 15%">
+          <el-input v-model="filterForm.title" placeholder="请输入标题"></el-input>
+        </el-form-item>
+        <el-form-item label="描述：" style="width: 17%">
+          <el-input v-model="filterForm.content" placeholder="请输入描述"></el-input>
+        </el-form-item>
+        <el-form-item label="地名地址库：" style="width: 20%">
+          <el-input v-model="filterForm.address" placeholder="请输入名称"></el-input>
+        </el-form-item>
+        <el-form-item label="导入类型：" style="width: 20%">
+          <el-select v-model="filterForm.importType" placeholder="请选择类型">
+            <el-option value="单条数据录入">单条数据录入</el-option>
+            <el-option value="Shape文件导入">Shape文件导入</el-option>
+          </el-select>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="search">搜索</el-button>
@@ -90,6 +104,7 @@
 <script>
 import api from '@/api/data/ThreeDimensionalData'
 import ThreeDimensionalDataDetail from "@/components/dataManage/dataDetail/ThreeDimensionalDataDetail";
+import CategoryMenu from "@/components/dataManage/CategoryMenu";
 
 export default {
   data() {
@@ -106,11 +121,14 @@ export default {
         total: 0,
       },
 
+      currCategory: '',
+
       isDetailShow: false,
     }
   },
   components: {
-    ThreeDimensionalDataDetail
+    ThreeDimensionalDataDetail,
+    CategoryMenu,
   },
   created() {
     let userInfo = this.$store.state.userInfo;
@@ -135,6 +153,10 @@ export default {
         app.pageInfo.page = 1;
       }, 50)
     },
+    "currCategory": function () {
+      this.resetCategory();
+      this.getData();
+    }
   },
   methods: {
     handleLoading(flag) {
@@ -147,13 +169,24 @@ export default {
         }, 500);
       }
     },
+    resetCategory() {
+      let auth = this.$data.auth;
+      let currCategory = this.$data.currCategory;
+      Object.assign(this.$data, this.$options.data());
+      this.auth = auth;
+      this.currCategory = currCategory;
+    },
     getData() {
       let app = this;
+      if (!(app.currCategory && app.currCategory!=='')) {
+        return;
+      }
       let params = {
-        address: app.filterForm.name,
+        menuId: app.currCategory,
         page: app.pageInfo.page,
-        pageSize: app.pageInfo.pageSize
+        pageSize: app.pageInfo.pageSize,
       }
+      Object.assign(params, app.filterForm)
       app.handleLoading(true)
       api.getData(params).then(res => {
         if (res.code === 200) {
@@ -230,7 +263,5 @@ export default {
 </script>
 
 <style>
-#data .operation {
-  float: right;
-}
+
 </style>

src/components/dataManage/dataShow/TwoDimensionalData.vue

@@ -1,12 +1,26 @@
 <!-- 二维数据 -->
 <template>
-  <div id="data">
+  <CategoryMenu :type="'twoD'" v-model:currVal="currCategory" ></CategoryMenu>
+
+  <div v-if="currCategory && currCategory!==''" class="data">
     <el-button v-if="auth" type="primary" @click="addDataClick">录入二维数据</el-button>
-    <el-button v-if="auth" type="warning" @click="batchDelete">批量删除</el-button>
+    <el-button v-if="auth" type="warning" @click="batchDelete">批量删除</el-button><br>
     <div class="operation">
       <el-form :model="filterForm" :inline="true">
-        <el-form-item label="地名地址库名称：">
-          <el-input v-model="filterForm.address" placeholder="请输入地名地址库名称"></el-input>
+        <el-form-item label="标题：" style="width: 15%">
+          <el-input v-model="filterForm.title" placeholder="请输入标题"></el-input>
+        </el-form-item>
+        <el-form-item label="描述：" style="width: 17%">
+          <el-input v-model="filterForm.content" placeholder="请输入描述"></el-input>
+        </el-form-item>
+        <el-form-item label="地名地址库：" style="width: 20%">
+          <el-input v-model="filterForm.address" placeholder="请输入名称"></el-input>
+        </el-form-item>
+        <el-form-item label="导入类型：" style="width: 20%">
+          <el-select v-model="filterForm.importType" placeholder="请选择类型">
+            <el-option value="单条数据录入">单条数据录入</el-option>
+            <el-option value="Shape文件导入">Shape文件导入</el-option>
+          </el-select>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="search">搜索</el-button>
@@ -81,6 +95,7 @@
 import api from '@/api/data/TwoDimensionalData'
 import mockData from '@/static/files/mockData'
 import TwoDimensionalDataDetail from "@/components/dataManage/dataDetail/TwoDimensionalDataDetail";
+import CategoryMenu from "@/components/dataManage/CategoryMenu";
 
 export default {
   data() {
@@ -97,11 +112,14 @@ export default {
         total: 0,
       },
 
+      currCategory: '',
+
       isDetailShow: false,
     }
   },
   components: {
-    TwoDimensionalDataDetail
+    TwoDimensionalDataDetail,
+    CategoryMenu,
   },
   created() {
     let userInfo = this.$store.state.userInfo;
@@ -126,6 +144,10 @@ export default {
         app.pageInfo.page = 1;
       }, 50)
     },
+    "currCategory": function () {
+      this.resetCategory();
+      this.getData();
+    }
   },
   methods: {
     handleLoading(flag) {
@@ -138,13 +160,24 @@ export default {
         }, 500);
       }
     },
+    resetCategory() {
+      let auth = this.$data.auth;
+      let currCategory = this.$data.currCategory;
+      Object.assign(this.$data, this.$options.data());
+      this.auth = auth;
+      this.currCategory = currCategory;
+    },
     getData() {
       let app = this;
+      if (!(app.currCategory && app.currCategory!=='')) {
+        return;
+      }
       let params = {
-        address: app.filterForm.address,
+        menuId: app.currCategory,
         page: app.pageInfo.page,
         pageSize: app.pageInfo.pageSize,
       }
+      Object.assign(params, app.filterForm)
       app.handleLoading(true)
       api.getData(params).then(res => {
         if (res.code === 200) {
@@ -263,8 +296,6 @@ export default {
 }
 </script>
 
-<style>
-#data .operation {
-  float: right;
-}
+<style scoped>
+
 </style>

src/components/home/DataManage.vue

@@ -120,12 +120,12 @@ export default {
 }
 
 #dataManage .left {
-  width: 20%;
+  width: 14%;
   display: inline-block;
 }
 
 #dataManage .content {
-  width: 78%;
+  width: 83%;
   height: 100%;
   display: inline-block;
   vertical-align: top;
@@ -139,7 +139,14 @@ export default {
   font-weight: 600;
   color: #373737;
 }
-#dataManage .dataManage-menu .is-active {
-  color: #6566f4;
+.data {
+  display: inline-block;
+  width: 83%;
+  vertical-align: top;
+}
+.data .operation {
+  margin-top: 10px;
+  margin-left: 10px;
+  display: block;
 }
 </style>

src/components/home/DataPublish.vue

@@ -77,7 +77,4 @@ export default {
   font-weight: 600;
   color: #373737;
 }
-#dataPublish .dataPublish-menu .is-active {
-  color: #6566f4;
-}
 </style>

src/components/home/PluginManage.vue

@@ -77,7 +77,4 @@ export default {
   font-weight: 600;
   color: #373737;
 }
-#pluginManage .pluginManage-menu .is-active {
-  color: #6566f4;
-}
 </style>

src/components/home/SystemManage.vue

@@ -22,6 +22,18 @@
             </el-icon>
             <span>系统日志</span>
           </el-menu-item>
+          <el-menu-item index="4">
+            <el-icon>
+              <IconPark-log />
+            </el-icon>
+            <span>接口授权</span>
+          </el-menu-item>
+          <el-menu-item index="5">
+            <el-icon>
+              <IconPark-log />
+            </el-icon>
+            <span>接口监控</span>
+          </el-menu-item>
         </el-menu>
       </el-scrollbar>
     </div>
@@ -98,7 +110,4 @@ export default {
   font-weight: 600;
   color: #373737;
 }
-#SystemMgrContainer .SystemMgr-menu .is-active {
-  color: #6566f4;
-}
 </style>

src/static/datas/ServiceData.json

@@ -26,19 +26,5 @@
         "type": "",
         "desc": "",
         "standard": ""
-    },
-    {
-        "serviceName": "授权服务",
-        "url": "",
-        "type": "",
-        "desc": "",
-        "standard": ""
-    },
-    {
-        "serviceName": "接口检测服务",
-        "url": "",
-        "type": "",
-        "desc": "",
-        "standard": ""
     }
 ]

src/utils/constant.js

@@ -3,6 +3,14 @@
 export default {
     serviceId: 9, // 对接oauth服务id
     authType: 90, // 菜单权限在oauth中类型id
+    menuIds: {
+        'twoD': '1',
+        'threeD': '2',
+        'business': '3',
+        'model': '4',
+        'meta': '5',
+        'iot': '6',
+    },
     oauthProxy: '/proxy_oauth', // oauth 代理地址前缀
     dtbserverProxy: '/proxy_dtbserver' // dtbserver 代理地址前缀
 }

src/views/HomeView.vue

@@ -285,4 +285,7 @@ export default {
 .el-dialog__body {
   padding-top: 10px;
 }
+.el-menu .is-active {
+  color: #6566f4 !important;
+}
 </style>