From 5932bbf1b08305c7a322747fb970f32768bfdc50 Mon Sep 17 00:00:00 2001
From: liwei <wei.li@le-it.com.cn>
Date: Wed, 25 Aug 2021 13:52:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/request.js               |   6 +-
 src/server/system/menu.js           |   2 +
 src/views/system/menu/addOrEdit.vue | 175 ++++++++++++++++++++++++++++
 src/views/system/menu/index.vue     |  25 ++--
 4 files changed, 192 insertions(+), 16 deletions(-)
 create mode 100644 src/views/system/menu/addOrEdit.vue

diff --git a/src/server/request.js b/src/server/request.js
index 80f4a71..8000500 100644
--- a/src/server/request.js
+++ b/src/server/request.js
@@ -15,14 +15,16 @@ service.interceptors.request.use(
 
 service.interceptors.response.use(
   (response) => {
+    console.log(code);
     const code = response.data.code;
     if (code === 200) {
       return response.data;
-    } else if (code === 401) {
-      location.href = `${location.origin}/${location.hash}`
     }
   },
   (error) => {
+    if (error.response && error.response.data && error.response.data.code == 401) {
+      location.href = `${location.origin}/#/login`;
+    }
     return Promise.reject(error.response.data);
   }
 );
diff --git a/src/server/system/menu.js b/src/server/system/menu.js
index aed2789..a44b539 100644
--- a/src/server/system/menu.js
+++ b/src/server/system/menu.js
@@ -1,4 +1,6 @@
 import { post, put, get } from "../api";
+// 获取菜单树形数据
+export const getTreeMenu = (params) =>get('/admin/menu/menulist', params);
 // 新增菜单
 export const addMenu = (params) =>post('/admin/menu/addmenu', params);
 // 修改菜单
diff --git a/src/views/system/menu/addOrEdit.vue b/src/views/system/menu/addOrEdit.vue
new file mode 100644
index 0000000..e201a33
--- /dev/null
+++ b/src/views/system/menu/addOrEdit.vue
@@ -0,0 +1,175 @@
+<template>
+  <el-dialog
+    title="配置菜单"
+    model-value
+    width="600px"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" :model="formData" :rules="rules" label-width="80px">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="上级菜单">
+            <treeselect
+              v-model="formData.parent_id"
+              :options="treeMenu"
+              :normalizer="normalizer"
+              :show-count="true"
+              placeholder="选择上级菜单"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="菜单标题" prop="title">
+            <el-input v-model="formData.title" placeholder="请输入菜单标题" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="显示排序">
+            <el-input-number
+              v-model="formData.sort"
+              controls-position="right"
+              :min="0"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="菜单类型" prop="menu_type">
+            <el-radio-group v-model="formData.menu_type">
+              <el-radio label="M">目录</el-radio>
+              <el-radio label="C">菜单</el-radio>
+              <el-radio label="F">按钮</el-radio>
+              <el-radio label="A">接口</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" v-if="formData.menu_type == 'A'">
+          <el-form-item label="请求方式">
+            <el-radio-group v-model="formData.action">
+              <el-radio label="GET">GET</el-radio>
+              <el-radio label="POST">POST</el-radio>
+              <el-radio label="PUT">PUT</el-radio>
+              <el-radio label="DELETE">DELETE</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="菜单图标">
+            <el-popover
+              placement="bottom-start"
+              width="460"
+              trigger="click"
+              @show="$refs['iconSelect'].reset()"
+            >
+              <el-input
+                suffix-icon="reference"
+                v-model="formData.icon"
+                placeholder="点击选择图标"
+                readonly
+              >
+                <svg-icon
+                  v-if="formData.icon"
+                  suffix-icon="prefix"
+                  :icon-class="formData.icon"
+                  class="el-input__icon"
+                  style="height: 32px; width: 16px"
+                />
+                <i
+                  v-else
+                  suffix-icon="prefix"
+                  class="el-icon-search el-input__icon"
+                />
+              </el-input>
+            </el-popover>
+          </el-form-item>
+        </el-col>
+        <el-col
+          :span="12"
+          v-if="formData.menu_type == 'M' || formData.menu_type == 'C'"
+        >
+          <el-form-item label="路由名称" prop="menu_name">
+            <el-input
+              v-model="formData.menu_name"
+              placeholder="请输入路由名称"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col
+          v-if="formData.menu_type == 'M' || formData.menu_type == 'C'"
+          :span="12"
+        >
+          <el-form-item label="组件路径" prop="component">
+            <el-input
+              v-model="formData.component"
+              placeholder="请输入组件路径"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" v-if="formData.menu_type != 'F'">
+          <el-form-item label="路由地址" prop="path">
+            <el-input v-model="formData.path" placeholder="请输入路由地址" />
+          </el-form-item>
+        </el-col>
+
+        <el-col
+          :span="12"
+          v-if="formData.menu_type == 'F' || formData.menu_type == 'C'"
+        >
+          <el-form-item label="权限标识">
+            <el-input
+              v-model="formData.permission"
+              placeholder="请权限标识"
+              maxlength="50"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button
+          type="primary"
+          class="dialog-submit-button"
+          @click="submitForm"
+          >确 定</el-button
+        >
+        <el-button class="dialog-cancel-button" @click="cancel"
+          >取 消</el-button
+        >
+      </span>
+    </template>
+  </el-dialog>
+</template>
+<script>
+import { getTreeMenu } from "@/server/system/menu";
+export default {
+  data() {
+    return {
+      formData: {},
+      // 菜单树选项
+      treeMenu: [],
+    };
+  },
+  methods: {
+    // 确认
+    submitForm() {},
+    // 取消
+    cancel() {},
+    // 查询菜单下拉树结构
+    getTreeMenu() {
+      getTreeMenu().then(({code, data}) => {
+        if(code ==200 && data){
+          let treeMenu = [{ menu_id: 0, title: '主类目', children: [] }]
+          treeMenu.children = data
+          this.treeMenu=treeMenu;
+        }
+      })
+    },
+  },
+  created(){
+    this.getTreeMenu();
+  }
+};
+</script>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 3f17a5b..0100e45 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -89,36 +89,33 @@
           </template>
         </el-table-column>
       </el-table>
-      <!-- 分页 -->
-      <Pagination
-        v-show="pagination.total > 0"
-        v-model:pagination="pagination"
-        @change="getList"
-      />
     </ContentContainer>
+    <AddOrEdit />
   </div>
 </template>
 <script>
 import SearchTemplate from "@/components/SearchTemplate.vue";
 import ContentContainer from "@/components/ContentContainer.vue";
 import { ListMixin } from "@/mixins/ListMixin";
-import { getMenuDetails } from '@/server/system/menu'
+import { getMenuDetails } from "@/server/system/menu";
+import AddOrEdit from "./addOrEdit.vue";
 export default {
   components: {
     SearchTemplate,
     ContentContainer,
+    AddOrEdit
   },
   mixins: [ListMixin],
   data() {
     return {
-      queryTableDataUrl:'/admin/menu/menulist',
+      queryTableDataUrl: "/admin/menu/menulist",
       loading: false,
     };
   },
   methods: {
     // 搜索按钮操作
     handleQuery() {
-      this.pagination.pageNumber=1;
+      this.pagination.pageNumber = 1;
       this.getList();
     },
     // 新增菜单
@@ -128,11 +125,11 @@ export default {
     // 删除
     handleDelete(item) {},
   },
-  mounted(){
-    getMenuDetails({id:261}).then(res=>{
-      debugger
-    })
-  }
+  mounted() {
+    getMenuDetails({ id: 261 }).then((res) => {
+      console.log(res);
+    });
+  },
 };
 </script>
 <style lang="less" scoped>