diff --git a/src/api/priotity.js b/src/api/priotity.js new file mode 100644 index 0000000..57724d5 --- /dev/null +++ b/src/api/priotity.js @@ -0,0 +1,33 @@ +import request from '@/utils/request' + +export function getPriority(params) { + return request({ + url: '/priority/select', + method: 'get', + params + }) +} + +export function modifyPriority(data) { + return request({ + url: '/priority/modify', + method: 'post', + data + }) +} + +export function addUser(data) { + return request({ + url: '/priority/add-user', + method: 'post', + data + }) +} + +export function deleteUser(data) { + return request({ + url: '/priority/delete-user', + method: 'post', + data + }) +} \ No newline at end of file diff --git a/src/craft.js b/src/craft.js new file mode 100644 index 0000000..1142c5a --- /dev/null +++ b/src/craft.js @@ -0,0 +1,14 @@ +new Promise(function (resolve, reject) { + console.log(1111); + resolve(2222); +}).then(function (value) { + setTimeout(() => { + console.log(value); + }, 1000) + return 3333; +}).then(function (value) { + console.log(value); + throw "An error"; +}).catch(function (err) { + console.log(err); +}); \ No newline at end of file diff --git a/src/icons/svg/权限.svg b/src/icons/svg/权限.svg new file mode 100644 index 0000000..a84cb54 --- /dev/null +++ b/src/icons/svg/权限.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 3b08cae..2ec3d39 100644 --- a/src/main.js +++ b/src/main.js @@ -4,7 +4,7 @@ import 'normalize.css/normalize.css' // A modern alternative to CSS resets import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' -import locale from 'element-ui/lib/locale/lang/en' // lang i18n +// import locale from 'element-ui/lib/locale/lang/en' // lang i18n import '@/styles/index.scss' // global css @@ -34,9 +34,9 @@ Vue.prototype.req = request // } // set ElementUI lang to EN -Vue.use(ElementUI, { locale }) +// Vue.use(ElementUI, { locale }) // 如果想要中文版 element-ui,按如下方式声明 -// Vue.use(ElementUI) +Vue.use(ElementUI) Vue.config.productionTip = false diff --git a/src/router/index.js b/src/router/index.js index 6f7652b..0895e0e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -150,15 +150,16 @@ export const constantRoutes = [ }, { - path: '/hello', + path: '/priority', component: Layout, + children: [{ - path: 'hello', - name: 'hello', - component: () => import('@/views/hello/hello'), + path: 'priority', + name: 'priority', + component: () => import('@/views/priority/priority'), meta: { - title: 'Hello', - icon: 'plane' + title: '权限管理', + icon: '权限' } }] }, diff --git a/src/views/job/show.vue b/src/views/job/show.vue index 8f62627..949e9d9 100644 --- a/src/views/job/show.vue +++ b/src/views/job/show.vue @@ -167,45 +167,47 @@ export default { created() {}, mounted() { // 请求组织架构 - jobApi.getFramework().then( - (res) => { - let originalMindData = res.data; - // 添加 id 和 expanded - // let i = 1; - originalMindData["expanded"] = true; - let addId = function (data) { - // if (!data.hasOwnProperty("id")) { - // data["id"] = i; - // i += 1; - // } - if (!data.hasOwnProperty("expanded")) { - data["expanded"] = false; - } - if (data.hasOwnProperty("children")) { - for (let j = 0; j < data["children"].length; j++) { - addId(data["children"][j]); + jobApi + .getFramework() + .then( + (res) => { + let originalMindData = res.data; + // 添加 id 和 expanded + // let i = 1; + originalMindData["expanded"] = true; + let addId = function (data) { + // if (!data.hasOwnProperty("id")) { + // data["id"] = i; + // i += 1; + // } + if (!data.hasOwnProperty("expanded")) { + data["expanded"] = false; + } + if (data.hasOwnProperty("children")) { + for (let j = 0; j < data["children"].length; j++) { + addId(data["children"][j]); + } + } + }; + addId(originalMindData); + + // 修改方向 + for (let j = 0; j < originalMindData["children"].length; j++) { + if (j % 2 == 0) { + originalMindData["children"][j]["direction"] = "right"; + } else { + originalMindData["children"][j]["direction"] = "left"; } } - }; - addId(originalMindData); + this.mindData = originalMindData; - // 修改方向 - for (let j = 0; j < originalMindData["children"].length; j++) { - if (j % 2 == 0) { - originalMindData["children"][j]["direction"] = "right"; - } else { - originalMindData["children"][j]["direction"] = "left"; - } + // 展示思维导图 + this.showChart(); + }, + (err) => { + console.log("err: ", err); } - this.mindData = originalMindData; - - // 展示思维导图 - this.showChart(); - }, - (err) => { - console.log("err: ", err); - } - ); + ); // this.intervalId = setInterval(() => { // if (this.jm) { diff --git a/src/views/priority/components/add.vue b/src/views/priority/components/add.vue new file mode 100644 index 0000000..01bccb3 --- /dev/null +++ b/src/views/priority/components/add.vue @@ -0,0 +1,177 @@ + + + + + \ No newline at end of file diff --git a/src/views/priority/components/modify.vue b/src/views/priority/components/modify.vue new file mode 100644 index 0000000..75022c7 --- /dev/null +++ b/src/views/priority/components/modify.vue @@ -0,0 +1,174 @@ + + + + + \ No newline at end of file diff --git a/src/views/priority/components/select.vue b/src/views/priority/components/select.vue new file mode 100644 index 0000000..361ff4c --- /dev/null +++ b/src/views/priority/components/select.vue @@ -0,0 +1,171 @@ + + + + + + diff --git a/src/views/priority/priority.vue b/src/views/priority/priority.vue new file mode 100644 index 0000000..0213561 --- /dev/null +++ b/src/views/priority/priority.vue @@ -0,0 +1,51 @@ + + + + + \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index ee11d71..b34a86a 100644 --- a/vue.config.js +++ b/vue.config.js @@ -38,8 +38,8 @@ module.exports = { }, proxy: { '/': { - // target: 'http://127.0.0.1:4523/m1/1256020-0-default/', - target: 'http://192.168.31.102:8000', + target: 'http://127.0.0.1:4523/m1/1256020-0-default/', + // target: 'http://192.168.31.102:8000', changeOrigin: true, pathRewrite: { }