From cc4feb05e7da0c2e90d703ca5b88a6d2c3a7f9be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com> Date: Tue, 27 Aug 2024 01:15:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=89=8D=E5=8F=B0?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=BE=E8=AE=A1=E9=9B=8F=E5=BD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 23 ++--- src/components/ef/panel.vue | 2 +- src/layout/components/Navbar.vue | 152 ++++++++++++++++++++++++++++++- src/main.js | 17 +--- src/router/index.js | 4 +- src/views/task/task/easyFlow.vue | 57 ++++++++++++ vue.config.js | 2 +- 7 files changed, 224 insertions(+), 33 deletions(-) create mode 100644 src/views/task/task/easyFlow.vue diff --git a/package.json b/package.json index b85cc59..db43daf 100644 --- a/package.json +++ b/package.json @@ -40,33 +40,28 @@ "axios": "0.24.0", "clipboard": "2.0.8", "core-js": "3.25.3", - "echarts": "^5.5.1", - "element-ui": "^2.9.1", + "echarts": "5.4.0", + "element-ui": "2.9.1", "file-saver": "2.0.5", "fuse.js": "6.4.3", "highlight.js": "9.18.5", - "jquery": "^3.5.1", "js-beautify": "1.13.0", "js-cookie": "3.0.1", "jsencrypt": "3.0.0-rc.1", - "jsplumb": "^2.15.6", "lodash": "4.17.15", "nprogress": "0.2.0", - "panzoom": "^9.4.1", "quill": "1.3.7", "screenfull": "5.0.2", "sortablejs": "1.10.2", - "view-design": "^4.5.0-beta.3", - "vue": "^2.5.2", + "vue": "2.6.12", "vue-click-outside": "^1.1.0", "vue-codemirror": "^4.0.6", - "vue-contextmenujs": "^1.3.13", "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", "vue-meta": "2.4.0", - "vue-router": "^3.2.0", + "vue-router": "3.4.9", "vuedraggable": "2.23.0", - "vuex": "^3.4.0" + "vuex": "3.6.0" }, "devDependencies": { "@vue/cli-plugin-babel": "4.4.6", @@ -79,17 +74,15 @@ "connect": "3.6.6", "eslint": "7.15.0", "eslint-plugin-vue": "7.2.0", + "less": "^4.2.0", + "less-loader": "^12.2.0", "lint-staged": "10.5.3", "runjs": "4.4.2", "sass": "1.32.13", "sass-loader": "10.1.1", "script-ext-html-webpack-plugin": "2.1.5", "svg-sprite-loader": "5.1.1", - "vue-template-compiler": "2.6.12", - "@vue/cli-plugin-router": "~4.5.0", - "@vue/cli-plugin-vuex": "~4.5.0", - "less": "^3.0.4", - "less-loader": "^5.0.0" + "vue-template-compiler": "2.6.12" }, "engines": { "node": ">=8.9", diff --git a/src/components/ef/panel.vue b/src/components/ef/panel.vue index be198e1..400e5fe 100644 --- a/src/components/ef/panel.vue +++ b/src/components/ef/panel.vue @@ -67,7 +67,7 @@ import nodeMenu from '@/components/ef/node_menu' import FlowInfo from '@/components/ef/info' import FlowHelp from '@/components/ef/help' - import FlowNodeForm from './node_form' + import FlowNodeForm from '@/components/ef/node_form' import lodash from 'lodash' import { getDataA } from './data_A' import { getDataB } from './data_B' diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 7ccea26..966031b 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -6,7 +6,12 @@ + +
+ + + @@ -46,8 +163,19 @@ import Hamburger from '@/components/Hamburger' import Screenfull from '@/components/Screenfull' import SizeSelect from '@/components/SizeSelect' import Search from '@/components/HeaderSearch' +import {findList, lookNotice} from "@/api/system/notice"; export default { + data(){ + return{ + drawer:false, + type:0, + state:0, + notices:[], + dialogVisible:false, + notice:{} + } + }, components: { Breadcrumb, TopNav, @@ -63,6 +191,7 @@ export default { 'device' ]), setting: { + get() { return this.$store.state.settings.showSettings }, @@ -79,7 +208,28 @@ export default { } } }, + created() { + }, methods: { + lookNotice(notice) { + this.dialogVisible = true + lookNotice(notice.id, notice.state).then(res => { + this.notice = res.data + }) + this.findAll(); + }, + drawerTru() { + this.drawer = true + this.findAll() + }, + findAll() { + findList({ state: this.state, noticeType: this.type }).then(res => { + this.notices = res.data; + }) + }, + selectNotice() { + this.findAll(); + }, toggleSideBar() { this.$store.dispatch('app/toggleSideBar') }, @@ -136,7 +286,7 @@ export default { .right-menu { float: right; - height: 100%; + height: 70%; line-height: 50px; &:focus { diff --git a/src/main.js b/src/main.js index 69ef8f1..0c72ebe 100644 --- a/src/main.js +++ b/src/main.js @@ -2,9 +2,6 @@ import Vue from 'vue' import Cookies from 'js-cookie' -import Contextmenu from 'vue-contextmenujs' -import ViewUI from 'view-design'; - import Element from 'element-ui' import './assets/styles/element-variables.scss' @@ -19,8 +16,8 @@ import {download} from '@/utils/request' import './assets/icons' // icon import './permission' // permission control -import {getDicts} from "/src/api/system/dict/data"; -import {getConfigKey} from "/src/api/system/config"; +import {getDicts} from "@/api/system/dict/data"; +import {getConfigKey} from "@/api/system/config"; import {addDateRange, handleTree, parseTime, resetForm, selectDictLabel, selectDictLabels} from "@/utils/muyu"; // 分页组件 import Pagination from "@/components/Pagination"; @@ -40,10 +37,9 @@ import DictTag from '@/components/DictTag' import VueMeta from 'vue-meta' // 字典数据组件 import DictData from '@/components/DictData' -import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' import '@/components/ef/index.css' -Vue.use(ElementUI, {size: 'small'}) + // 全局方法挂载 Vue.prototype.getDicts = getDicts @@ -64,9 +60,6 @@ Vue.component('Editor', Editor) Vue.component('FileUpload', FileUpload) Vue.component('ImageUpload', ImageUpload) Vue.component('ImagePreview', ImagePreview) - -Vue.use(Contextmenu); -Vue.use(ViewUI); Vue.use(directive) Vue.use(plugins) Vue.use(VueMeta) @@ -92,6 +85,4 @@ new Vue({ router, store, render: h => h(App) -}).$mount('#app') - - +}) diff --git a/src/router/index.js b/src/router/index.js index 97f629c..4d9fcc1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -47,9 +47,9 @@ export const constantRoutes = [ children: [// 父级路由下面还有子路由 { path: 'index/:id',// 这个index可以自己定义 - component: () => import('@/components/ef/panel.vue'), + component: () => import('@/views/task/task/easyFlow.vue'), name: "easyFlow", - meta: { title: '设计', icon: 'dashboard', activeMenu: '/task/info' } + meta: { title: '设计', icon: 'dashboard', activeMenu: '/task/task' } } ] }, diff --git a/src/views/task/task/easyFlow.vue b/src/views/task/task/easyFlow.vue new file mode 100644 index 0000000..4b2ba15 --- /dev/null +++ b/src/views/task/task/easyFlow.vue @@ -0,0 +1,57 @@ + + + + diff --git a/vue.config.js b/vue.config.js index 0f59bdd..8088d26 100644 --- a/vue.config.js +++ b/vue.config.js @@ -37,7 +37,7 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://172.13.1.1/prod-api`, + target: `http://172.13.1.1/prod-api/`, // target: `http://127.0.0.1/8080`, `http://172.13.1.1/prod-api`, changeOrigin: true, pathRewrite: {