diff --git a/package.json b/package.json index 25528ee..c7cc7fa 100644 --- a/package.json +++ b/package.json @@ -15,30 +15,30 @@ }, "dependencies": { "@riophae/vue-treeselect": "^0.4.0", + "@vue-office/docx": "^1.6.2", + "@vue-office/excel": "^1.7.11", + "@vue-office/pdf": "^2.0.2", + "@vue/composition-api": "^1.7.2", "axios": "0.18.1", - "echarts": "^5.0.0", "bpmn-js": "^7.3.1", "bpmn-js-properties-panel": "^0.37.2", "camunda-bpmn-moddle": "^4.4.0", "core-js": "3.6.5", - "element-ui": "2.15.14", + "echarts": "^5.0.0", "element-resize-detector": "^1.2.4", + "element-ui": "2.15.14", "gojs": "^2.3.11", "js-cookie": "2.2.0", + "moment": "^2.29.4", "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", "vue": "2.6.10", + "vue-grid-layout": "^2.4.0", "vue-router": "3.0.6", "vuex": "3.1.0", "vxe-table": "^3.8.22", - "wujie-vue2": "^1.0.22", - "moment": "^2.29.4", - "vue-grid-layout": "^2.4.0", - "@vue-office/docx": "^1.6.2", - "@vue-office/excel": "^1.7.11", - "@vue-office/pdf": "^2.0.2", - "@vue/composition-api": "^1.7.2" + "wujie-vue2": "^1.0.22" }, "devDependencies": { "@vue/cli-plugin-babel": "4.4.4", diff --git a/src/components/Progress/jscindex.vue b/src/components/Progress/jscindex.vue new file mode 100644 index 0000000..be049d2 --- /dev/null +++ b/src/components/Progress/jscindex.vue @@ -0,0 +1,179 @@ + + + + + diff --git a/src/layout/components/Navbar/index.vue b/src/layout/components/Navbar/index.vue index 5da3745..9de932c 100644 --- a/src/layout/components/Navbar/index.vue +++ b/src/layout/components/Navbar/index.vue @@ -52,7 +52,7 @@ - + diff --git a/src/main.js b/src/main.js index 00dddd3..9924559 100644 --- a/src/main.js +++ b/src/main.js @@ -39,6 +39,7 @@ Vue.use(ElementUI) // vxetable import { VxeIcon, VxeTable, VxeColumn, VxeColgroup, VxeTableEditModule, VxeTableValidatorModule, VxeModal, VxeToolbar } from 'vxe-table' +// import vxeTable from 'vxe-table' import 'vxe-table/styles/index.scss' Vue.use(VxeTableEditModule) Vue.use(VxeTableValidatorModule) @@ -48,6 +49,7 @@ Vue.use(VxeColumn) Vue.use(VxeColgroup) Vue.use(VxeModal) Vue.use(VxeToolbar) +// Vue.use(vxeTable) import domZIndex from 'dom-zindex' domZIndex.setCurrent(2000) diff --git a/src/router/index.js b/src/router/index.js index 6160efd..b809c79 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -89,6 +89,18 @@ export const constantRoutes = [ meta: { title: '首页', icon: 'dashboard' } }] }, + { + path: '/jsc', + component: Layout, + redirect: '/jsc', + meta: { title: '驾驶舱', icon: 'dashboard' }, + children: [{ + path: 'jsc', + name: 'jsc', + component: () => import('@/views/jsc/jsc'), + meta: { title: '驾驶舱', icon: 'dashboard' } + }] + }, { path: '/info', component: Layout, diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f8d3e63..7fe355b 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -67,12 +67,14 @@ export default { computed: {}, created() { this.$store.dispatch('app/getLayout').then(res => { + this.layoutList = res?.filter(item => layout.find(lay => lay.i === item.i)).map(item => { layout.forEach(lay => { lay.i === item.i ? item.component = lay.component : '' }) return item }) ?? [] + console.log("this.layoutList",this.layoutList,'res',res) }) }, methods: { diff --git a/src/views/jsc/components/all.vue b/src/views/jsc/components/all.vue new file mode 100644 index 0000000..e53429f --- /dev/null +++ b/src/views/jsc/components/all.vue @@ -0,0 +1,362 @@ + + + + + diff --git a/src/views/jsc/components/car.vue b/src/views/jsc/components/car.vue new file mode 100644 index 0000000..e6f2200 --- /dev/null +++ b/src/views/jsc/components/car.vue @@ -0,0 +1,140 @@ + + + + + diff --git a/src/views/jsc/components/evection.vue b/src/views/jsc/components/evection.vue new file mode 100644 index 0000000..01e1241 --- /dev/null +++ b/src/views/jsc/components/evection.vue @@ -0,0 +1,150 @@ + + + + + diff --git a/src/views/jsc/components/level.vue b/src/views/jsc/components/level.vue new file mode 100644 index 0000000..a6d5554 --- /dev/null +++ b/src/views/jsc/components/level.vue @@ -0,0 +1,146 @@ + + + + + diff --git a/src/views/jsc/components/overtime.vue b/src/views/jsc/components/overtime.vue new file mode 100644 index 0000000..d011eaf --- /dev/null +++ b/src/views/jsc/components/overtime.vue @@ -0,0 +1,147 @@ + + + + + diff --git a/src/views/jsc/components/total.vue b/src/views/jsc/components/total.vue new file mode 100644 index 0000000..a236da1 --- /dev/null +++ b/src/views/jsc/components/total.vue @@ -0,0 +1,153 @@ + + + + + diff --git a/src/views/jsc/jsc.vue b/src/views/jsc/jsc.vue new file mode 100644 index 0000000..fbc8f91 --- /dev/null +++ b/src/views/jsc/jsc.vue @@ -0,0 +1,124 @@ + + + + + diff --git a/src/views/jsc/static/icon1.png b/src/views/jsc/static/icon1.png new file mode 100644 index 0000000..710fa42 Binary files /dev/null and b/src/views/jsc/static/icon1.png differ diff --git a/src/views/jsc/static/icon2.png b/src/views/jsc/static/icon2.png new file mode 100644 index 0000000..9dc89e3 Binary files /dev/null and b/src/views/jsc/static/icon2.png differ diff --git a/src/views/jsc/static/icon3.png b/src/views/jsc/static/icon3.png new file mode 100644 index 0000000..e538db6 Binary files /dev/null and b/src/views/jsc/static/icon3.png differ diff --git a/src/views/jsc/static/icon4.png b/src/views/jsc/static/icon4.png new file mode 100644 index 0000000..3befb84 Binary files /dev/null and b/src/views/jsc/static/icon4.png differ diff --git a/src/views/jsc/static/icon5.png b/src/views/jsc/static/icon5.png new file mode 100644 index 0000000..bd3cc72 Binary files /dev/null and b/src/views/jsc/static/icon5.png differ diff --git a/src/views/jsc/static/icon6.png b/src/views/jsc/static/icon6.png new file mode 100644 index 0000000..4509f8b Binary files /dev/null and b/src/views/jsc/static/icon6.png differ diff --git a/src/views/jsc/static/icon7.png b/src/views/jsc/static/icon7.png new file mode 100644 index 0000000..87a21ec Binary files /dev/null and b/src/views/jsc/static/icon7.png differ diff --git a/src/views/jsc/static/icon8.png b/src/views/jsc/static/icon8.png new file mode 100644 index 0000000..558bd3b Binary files /dev/null and b/src/views/jsc/static/icon8.png differ diff --git a/src/views/jsc/static/icon9.png b/src/views/jsc/static/icon9.png new file mode 100644 index 0000000..e3f4325 Binary files /dev/null and b/src/views/jsc/static/icon9.png differ