1
0
zhangwenjian 5 жил өмнө
parent
commit
010d8e10a2

+ 0 - 29
src/api/system/rolemenu.js

@@ -1,29 +0,0 @@
-import request from '@/utils/request'
-
-export function getList(query) {
-  return request({
-    url: '/api/v1/rolemenu',
-    method: 'get',
-    params: query
-  })
-}
-export function CreaterolemenuData(value) {
-  return request({
-    url: '/api/v1/rolemenu',
-    method: 'post',
-    params: value
-  })
-}
-export function UpdateData(id, value) {
-  return request({
-    url: '/api/v1/rolemenu/' + id,
-    method: 'put',
-    params: value
-  })
-}
-export function DeleteData(role_id, menu_id) {
-  return request({
-    url: '/api/v1/rolemenu/' + role_id + menu_id,
-    method: 'delete'
-  })
-}

+ 1 - 0
src/icons/svg/heart.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1586677636967" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4697" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 939.2c-22.4 0-44.8-8-64-24-115.2-102.4-312-276.8-331.2-296-64-64-92.8-152-81.6-241.6 16-126.4 120-232 248-248 84.8-11.2 168 16 230.4 72 62.4-56 145.6-81.6 230.4-72 129.6 16 230.4 118.4 248 248 11.2 89.6-17.6 177.6-81.6 241.6-22.4 19.2-219.2 193.6-334.4 296-19.2 16-41.6 24-64 24zM161.6 574.4c12.8 12.8 139.2 124.8 329.6 292.8 12.8 11.2 30.4 11.2 41.6 0 193.6-169.6 316.8-280 329.6-292.8 49.6-49.6 72-118.4 64-188.8-12.8-99.2-92.8-179.2-192-192-75.2-9.6-147.2 17.6-198.4 73.6-12.8 14.4-35.2 14.4-48 0-49.6-57.6-121.6-83.2-198.4-73.6-99.2 12.8-179.2 92.8-192 192-8 70.4 14.4 139.2 64 188.8z m633.6-35.2c-8 0-16-3.2-22.4-9.6-12.8-12.8-12.8-32 0-44.8 17.6-17.6 28.8-41.6 28.8-67.2 0-52.8-43.2-96-96-96-17.6 0-32-14.4-32-32s14.4-32 32-32c88 0 160 72 160 160 0 43.2-16 83.2-46.4 113.6-8 4.8-16 8-24 8z" p-id="4698"></path></svg>

+ 1 - 3
src/utils/request.js

@@ -56,9 +56,7 @@ service.interceptors.response.use(
           type: 'warning'
         }
       ).then(() => {
-        store.dispatch('user/LogOut').then(() => {
-          location.reload() // 为了重新实例化vue-router对象 避免bug
-        })
+        location.reload() // 为了重新实例化vue-router对象 避免bug
       })
     } else if (code === 400) {
       Message({

+ 16 - 6
src/views/menu/index.vue

@@ -160,23 +160,33 @@
               </el-popover>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item v-if="form.menuType == 'M' || form.menuType == 'C'" label="路由名称" prop="menuName">
               <el-input v-model="form.menuName" placeholder="请输入路由名称" />
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item v-if="form.menuType != 'F'" label="路由地址" prop="path">
-              <el-input v-model="form.path" placeholder="请输入路由地址" />
-            </el-form-item>
-          </el-col>
           <el-col v-if="form.menuType == 'M' || form.menuType == 'C'" :span="12">
             <el-form-item label="组件路径" prop="component">
               <el-input v-model="form.component" placeholder="请输入组件路径" />
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item v-if="form.menuType == 'M' || form.menuType == 'C'" label="是否外链">
+              <el-radio-group v-model="form.isFrame">
+                <el-radio label="0">是</el-radio>
+                <el-radio label="1">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item v-if="form.menuType != 'F'" label="路由地址" prop="path">
+              <el-input v-model="form.path" placeholder="请输入路由地址" />
+            </el-form-item>
+          </el-col>
+
           <el-col :span="12">
             <el-form-item v-if="form.menuType == 'F' || form.menuType == 'C'" label="权限标识">
               <el-input v-model="form.permission" placeholder="请权限标识" maxlength="50" />

+ 1 - 1
src/views/post/index.vue

@@ -92,7 +92,7 @@
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createdAt" width="180">
         <template slot-scope="scope">
-          <span>{{ scope.row.createdAt }}</span>
+          <span>{{ parseTime(scope.row.createdAt) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">