liujq 4 år sedan
förälder
incheckning
ec286edbde

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/index.html


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/css/chunk-0a673ae7.12644414.css


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/css/chunk-0c6db779.7ed6ad5b.css


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/css/chunk-f0aa10e6.a5bfe2c0.css


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/js/app.fdeebd38.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/js/chunk-060a14dc.0b501a4b.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/js/chunk-060a14dc.a6931eda.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/js/chunk-0a673ae7.0c86e1cc.js


+ 1 - 0
dist/static/js/chunk-0c6db779.f0a59077.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0c6db779"],{"14da":function(t,s,a){},"26fc":function(t,s,a){t.exports=a.p+"static/img/404_cloud.0f4bc32b.png"},"8cdb":function(t,s,a){"use strict";a.r(s);var c=function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("div",{staticClass:"wscn-http404-container"},[a("div",{staticClass:"wscn-http404"},[t._m(0),a("div",{staticClass:"bullshit"},[a("div",{staticClass:"bullshit__oops"},[t._v("哎呀!")]),a("div",{staticClass:"bullshit__headline"},[t._v(t._s(t.message)+t._s(t.count)+"秒后自动跳回首页")]),a("div",{staticClass:"bullshit__info"},[t._v("请检查您输入的网址是否正确,或单击下面的按钮返回首页。")]),a("a",{staticClass:"bullshit__return-home",attrs:{href:"/"}},[t._v("返回首页")])])])])},i=[function(){var t=this,s=t.$createElement,c=t._self._c||s;return c("div",{staticClass:"pic-404"},[c("img",{staticClass:"pic-404__parent",attrs:{src:a("a36b"),alt:"404"}}),c("img",{staticClass:"pic-404__child left",attrs:{src:a("26fc"),alt:"404"}}),c("img",{staticClass:"pic-404__child mid",attrs:{src:a("26fc"),alt:"404"}}),c("img",{staticClass:"pic-404__child right",attrs:{src:a("26fc"),alt:"404"}})])}],n={name:"Page404",data:function(){return{count:5}},created:function(){var t=this,s=window.setInterval((function(){t.count--,t.count<1&&(window.clearInterval(s),t.$router.push("/"))}),1e3)},computed:{message:function(){return"老板说你不能进入这个页面。。。"}}},e=n,l=(a("9caa"),a("2877")),r=Object(l["a"])(e,c,i,!1,null,"e9e54ed8",null);s["default"]=r.exports},"9caa":function(t,s,a){"use strict";a("14da")},a36b:function(t,s,a){t.exports=a.p+"static/img/404.a57b6f31.png"}}]);

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/js/chunk-70388036.394321e9.js


+ 0 - 1
dist/static/js/chunk-f0aa10e6.9e524746.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-f0aa10e6"],{"14e9c":function(t,s,c){},"26fc":function(t,s,c){t.exports=c.p+"static/img/404_cloud.0f4bc32b.png"},"2bc5":function(t,s,c){"use strict";c("14e9c")},"8cdb":function(t,s,c){"use strict";c.r(s);var i=function(){var t=this,s=t.$createElement,c=t._self._c||s;return c("div",{staticClass:"wscn-http404-container"},[c("div",{staticClass:"wscn-http404"},[t._m(0),c("div",{staticClass:"bullshit"},[c("div",{staticClass:"bullshit__oops"},[t._v("哎呀!")]),c("div",{staticClass:"bullshit__headline"},[t._v(t._s(t.message))]),c("div",{staticClass:"bullshit__info"},[t._v("请检查您输入的网址是否正确,或单击下面的按钮返回首页。")]),c("a",{staticClass:"bullshit__return-home",attrs:{href:"/"}},[t._v("返回首页")])])])])},a=[function(){var t=this,s=t.$createElement,i=t._self._c||s;return i("div",{staticClass:"pic-404"},[i("img",{staticClass:"pic-404__parent",attrs:{src:c("a36b"),alt:"404"}}),i("img",{staticClass:"pic-404__child left",attrs:{src:c("26fc"),alt:"404"}}),i("img",{staticClass:"pic-404__child mid",attrs:{src:c("26fc"),alt:"404"}}),i("img",{staticClass:"pic-404__child right",attrs:{src:c("26fc"),alt:"404"}})])}],l={name:"Page404",computed:{message:function(){return"老板说你不能进入这个页面。。。"}}},e=l,n=(c("2bc5"),c("2877")),r=Object(n["a"])(e,i,a,!1,null,"bf558d2a",null);s["default"]=r.exports},a36b:function(t,s,c){t.exports=c.p+"static/img/404.a57b6f31.png"}}]);

+ 15 - 1
src/views/404.vue

@@ -9,7 +9,7 @@
       </div>
       <div class="bullshit">
         <div class="bullshit__oops">哎呀!</div>
-        <div class="bullshit__headline">{{ message }}</div>
+        <div class="bullshit__headline">{{ message }}{{count}}秒后自动跳回首页</div>
         <div class="bullshit__info">请检查您输入的网址是否正确,或单击下面的按钮返回首页。</div>
         <a href="/" class="bullshit__return-home">返回首页</a>
       </div>
@@ -21,6 +21,20 @@
 
 export default {
   name: 'Page404',
+  data () {
+    return {
+      count: 5,
+    }
+  },
+  created () {
+    let timer = window.setInterval(() => {
+      this.count--
+      if (this.count < 1) {
+        window.clearInterval(timer)
+        this.$router.push('/')
+      }
+    }, 1000)
+  },
   computed: {
     message() {
       return '老板说你不能进入这个页面。。。'

+ 3 - 2
src/views/base/components/popup/MenuEdit.vue

@@ -4,7 +4,7 @@
   :show-close="false"
   :close-on-click-modal="false"
   :visible.sync="isShow"
-  :title="this.curType === 'edit' ? '编辑菜单' : '添加菜单'"
+  :title="this.curType === 'edit' ? '编辑节点' : '添加节点'"
   :fullscreen="false"
   width="470px"
   custom-class="xl-dialog"
@@ -85,8 +85,9 @@ export default {
       } else {
         this.formData = [
           {label: '上级节点', key: 'parentIdArr', type: 'cascader', options: this.parentData.curData, props: { checkStrictly: true }},
-          {label: '节点名称', key: 'name', rules: 1},
           {label: '节点类型', key: 'perm_type', type: 'select', options: this.$dictData.perm_type, rules: 1, changeHandle: this.typeChange},
+          {label: '接口名称', key: 'name', rules: 1},
+          {label: '接口路径', key: 'route', rules: 1},
           {label: '状态', key: 'perm_status', type: 'select', clearable: false, options: this.$dictData.perm_status},
         ]
       }

+ 9 - 9
src/views/base/menu.vue

@@ -5,6 +5,7 @@
     <el-tree
       :data="curData"
       node-key="id"
+      default-expand-all
       :expand-on-click-node="false">
       <span class="custom-tree-node" slot-scope="{ node, data }">
         <span>{{ node.data.name }} --  {{pTypeObj[node.data.perm_type]}} ----{{node.data.path}} ---- --  {{mhObj[node.data.menu_hidden]}}/{{psObj[node.data.perm_status]}} ----{{node.data.sort}}</span>
@@ -89,16 +90,15 @@ export default {
       const curArr = JSON.parse(JSON.stringify(arr))
       curArr.forEach(item => {
         let obj = {...item}
-        if (item.perm_type === '2' || item.perm_type === '1') {
-          obj.label = item.name
-          obj.value = item.id
-          obj.ids = ids ? [...ids, item.id] : [item.id]
-          if (item.children && item.children.length > 0) {
-            obj.children = this.formatData(item.children, obj.ids)
-          }
-          if (obj.children && obj.children.length === 0) delete obj.children
-          newArr.push(obj)
+        if (item.perm_type === '2' || item.perm_type === '1') {}
+        obj.label = item.name
+        obj.value = item.id
+        obj.ids = ids ? [...ids, item.id] : [item.id]
+        if (item.children && item.children.length > 0) {
+          obj.children = this.formatData(item.children, obj.ids)
         }
+        if (obj.children && obj.children.length === 0) delete obj.children
+        newArr.push(obj)
       })
       return newArr
     },

Vissa filer visades inte eftersom för många filer har ändrats