diff --git a/jero-web/package-lock.json b/jero-web/package-lock.json index e33ef2742..9b7bbe7ae 100644 --- a/jero-web/package-lock.json +++ b/jero-web/package-lock.json @@ -11,6 +11,7 @@ "@antv/data-set": "^0.11.4", "@tinymce/tinymce-vue": "^2.1.0", "@toast-ui/editor": "^2.1.2", + "amfe-flexible": "^2.2.1", "ant-design-vue": "^1.7.2", "area-data": "^5.0.6", "axios": "^0.21.1", @@ -33,6 +34,7 @@ "nprogress": "^0.2.0", "tinymce": "^5.3.2", "v-viewer": "^1.6.4", + "vant": "^2.12.54", "viser-vue": "^2.4.8", "vue": "^2.6.10", "vue-area-linkage": "^5.1.0", @@ -1337,7 +1339,6 @@ "version": "7.12.5", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz", "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==", - "dev": true, "dependencies": { "regenerator-runtime": "^0.13.4" } @@ -1718,11 +1719,20 @@ "node": ">= 8" } }, + "node_modules/@vant/icons": { + "version": "1.8.0", + "resolved": "https://registry.npmmirror.com/@vant/icons/-/icons-1.8.0.tgz", + "integrity": "sha512-sKfEUo2/CkQFuERxvkuF6mGQZDKu3IQdj5rV9Fm0weJXtchDSSQ+zt8qPCNUEhh9Y8shy5PzxbvAfOOkCwlCXg==" + }, + "node_modules/@vant/popperjs": { + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/@vant/popperjs/-/popperjs-1.3.0.tgz", + "integrity": "sha512-hB+czUG+aHtjhaEmCJDuXOep0YTZjdlRR+4MSmIFnkCQIxJaXLQdSsR90XWvAI2yvKUI7TCGqR8pQg2RtvkMHw==" + }, "node_modules/@vue/babel-helper-vue-jsx-merge-props": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz", - "integrity": "sha512-QOi5OW45e2R20VygMSNhyQHvpdUwQZqGPc748JLGCYEy+yp8fNFNdbNIGAgZmi9e+2JHPd6i6idRuqivyicIkA==", - "dev": true + "integrity": "sha512-QOi5OW45e2R20VygMSNhyQHvpdUwQZqGPc748JLGCYEy+yp8fNFNdbNIGAgZmi9e+2JHPd6i6idRuqivyicIkA==" }, "node_modules/@vue/babel-plugin-transform-vue-jsx": { "version": "1.2.1", @@ -2957,6 +2967,11 @@ "node": ">=0.4.2" } }, + "node_modules/amfe-flexible": { + "version": "2.2.1", + "resolved": "https://registry.npmmirror.com/amfe-flexible/-/amfe-flexible-2.2.1.tgz", + "integrity": "sha512-L2VfvDzoETBjhRptg5u/IUuzHSuxm22JpSRb404p/TBGeRfwWmmNEbB+TFPIP/sS/+pbM18bCFH9QnMojLuPNw==" + }, "node_modules/ansi-colors": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", @@ -16596,8 +16611,7 @@ "node_modules/regenerator-runtime": { "version": "0.13.7", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", - "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==", - "dev": true + "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==" }, "node_modules/regenerator-transform": { "version": "0.10.1", @@ -19224,6 +19238,21 @@ "spdx-expression-parse": "^3.0.0" } }, + "node_modules/vant": { + "version": "2.12.54", + "resolved": "https://registry.npmmirror.com/vant/-/vant-2.12.54.tgz", + "integrity": "sha512-t7DCiLxNosDrg0Jm5EY9p0A5cAMo5OadmizbYtPEc0ru+OJKEa3kcfxtKIK5on7ZPqoOkyYJt8e6BQ1VDMPsrg==", + "dependencies": { + "@babel/runtime": "7.x", + "@vant/icons": "^1.7.1", + "@vant/popperjs": "^1.1.0", + "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0", + "vue-lazyload": "1.2.3" + }, + "peerDependencies": { + "vue": ">= 2.6.0" + } + }, "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -19401,6 +19430,11 @@ "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.26.8.tgz", "integrity": "sha512-BN2OXolO15AKS95yNF8oOtARibaO6RxyKkAYNV4XpOmL7S4eVZYMIDtyvDv+XGZaiUmBJSH9mdNqzexvGMnK2A==" }, + "node_modules/vue-lazyload": { + "version": "1.2.3", + "resolved": "https://registry.npmmirror.com/vue-lazyload/-/vue-lazyload-1.2.3.tgz", + "integrity": "sha512-DC0ZwxanbRhx79tlA3zY5OYJkH8FYp3WBAnAJbrcuoS8eye1P73rcgAZhyxFSPUluJUTelMB+i/+VkNU/qVm7g==" + }, "node_modules/vue-loader": { "version": "15.9.6", "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.6.tgz", @@ -22253,7 +22287,6 @@ "version": "7.12.5", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz", "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==", - "dev": true, "requires": { "regenerator-runtime": "^0.13.4" } @@ -22602,11 +22635,20 @@ } } }, + "@vant/icons": { + "version": "1.8.0", + "resolved": "https://registry.npmmirror.com/@vant/icons/-/icons-1.8.0.tgz", + "integrity": "sha512-sKfEUo2/CkQFuERxvkuF6mGQZDKu3IQdj5rV9Fm0weJXtchDSSQ+zt8qPCNUEhh9Y8shy5PzxbvAfOOkCwlCXg==" + }, + "@vant/popperjs": { + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/@vant/popperjs/-/popperjs-1.3.0.tgz", + "integrity": "sha512-hB+czUG+aHtjhaEmCJDuXOep0YTZjdlRR+4MSmIFnkCQIxJaXLQdSsR90XWvAI2yvKUI7TCGqR8pQg2RtvkMHw==" + }, "@vue/babel-helper-vue-jsx-merge-props": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz", - "integrity": "sha512-QOi5OW45e2R20VygMSNhyQHvpdUwQZqGPc748JLGCYEy+yp8fNFNdbNIGAgZmi9e+2JHPd6i6idRuqivyicIkA==", - "dev": true + "integrity": "sha512-QOi5OW45e2R20VygMSNhyQHvpdUwQZqGPc748JLGCYEy+yp8fNFNdbNIGAgZmi9e+2JHPd6i6idRuqivyicIkA==" }, "@vue/babel-plugin-transform-vue-jsx": { "version": "1.2.1", @@ -23666,6 +23708,11 @@ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, + "amfe-flexible": { + "version": "2.2.1", + "resolved": "https://registry.npmmirror.com/amfe-flexible/-/amfe-flexible-2.2.1.tgz", + "integrity": "sha512-L2VfvDzoETBjhRptg5u/IUuzHSuxm22JpSRb404p/TBGeRfwWmmNEbB+TFPIP/sS/+pbM18bCFH9QnMojLuPNw==" + }, "ansi-colors": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", @@ -35155,8 +35202,7 @@ "regenerator-runtime": { "version": "0.13.7", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", - "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==", - "dev": true + "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==" }, "regenerator-transform": { "version": "0.10.1", @@ -37319,6 +37365,18 @@ "spdx-expression-parse": "^3.0.0" } }, + "vant": { + "version": "2.12.54", + "resolved": "https://registry.npmmirror.com/vant/-/vant-2.12.54.tgz", + "integrity": "sha512-t7DCiLxNosDrg0Jm5EY9p0A5cAMo5OadmizbYtPEc0ru+OJKEa3kcfxtKIK5on7ZPqoOkyYJt8e6BQ1VDMPsrg==", + "requires": { + "@babel/runtime": "7.x", + "@vant/icons": "^1.7.1", + "@vant/popperjs": "^1.1.0", + "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0", + "vue-lazyload": "1.2.3" + } + }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -37470,6 +37528,11 @@ "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.26.8.tgz", "integrity": "sha512-BN2OXolO15AKS95yNF8oOtARibaO6RxyKkAYNV4XpOmL7S4eVZYMIDtyvDv+XGZaiUmBJSH9mdNqzexvGMnK2A==" }, + "vue-lazyload": { + "version": "1.2.3", + "resolved": "https://registry.npmmirror.com/vue-lazyload/-/vue-lazyload-1.2.3.tgz", + "integrity": "sha512-DC0ZwxanbRhx79tlA3zY5OYJkH8FYp3WBAnAJbrcuoS8eye1P73rcgAZhyxFSPUluJUTelMB+i/+VkNU/qVm7g==" + }, "vue-loader": { "version": "15.9.6", "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.6.tgz", diff --git a/jero-web/package.json b/jero-web/package.json index 1cd46fe3c..cc4cfe967 100644 --- a/jero-web/package.json +++ b/jero-web/package.json @@ -13,6 +13,7 @@ "@antv/data-set": "^0.11.4", "@tinymce/tinymce-vue": "^2.1.0", "@toast-ui/editor": "^2.1.2", + "amfe-flexible": "^2.2.1", "ant-design-vue": "^1.7.2", "area-data": "^5.0.6", "axios": "^0.21.1", @@ -35,6 +36,7 @@ "nprogress": "^0.2.0", "tinymce": "^5.3.2", "v-viewer": "^1.6.4", + "vant": "^2.12.54", "viser-vue": "^2.4.8", "vue": "^2.6.10", "vue-area-linkage": "^5.1.0", diff --git a/jero-web/public/index.html b/jero-web/public/index.html index a25deeb75..37f7a397c 100644 --- a/jero-web/public/index.html +++ b/jero-web/public/index.html @@ -4,7 +4,8 @@ - + + 蔚来全球法规平台 diff --git a/jero-web/src/assets/wendang.png b/jero-web/src/assets/wendang.png new file mode 100644 index 000000000..c776e6a50 Binary files /dev/null and b/jero-web/src/assets/wendang.png differ diff --git a/jero-web/src/assets/yuebao.png b/jero-web/src/assets/yuebao.png new file mode 100644 index 000000000..b807862c5 Binary files /dev/null and b/jero-web/src/assets/yuebao.png differ diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue index 5b1a81350..54d6b519d 100644 --- a/jero-web/src/components/tools/UserMenu.vue +++ b/jero-web/src/components/tools/UserMenu.vue @@ -32,7 +32,7 @@
- + @@ -214,8 +214,8 @@ hiddenClick() { this.shows = false }, - Jumpflybook(){ - window.open('https://eicgyqr5mc.feishu.cn/docx/doxcnY2GbQfMSMqLP0eIFzFlEcd', '_blank'); + Jumpflybook() { + window.open('https://eicgyqr5mc.feishu.cn/docx/doxcnY2GbQfMSMqLP0eIFzFlEcd', '_blank') }, /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/ ...mapActions(['Logout']), @@ -381,6 +381,7 @@ .action { color: rgba(0, 0, 0, 0.65) !important; + font-size: 14px; } .action .avatar { diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index a38ca4bad..41af2b58f 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -477,6 +477,34 @@ export const constantRouterMap = [ name: 'TaskPlanList', component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/projectStatusBoard/components/TaskPlanList') }, + + + /* 手机端开始 */ + //搜索 + { + path: '/phoneSearch', + name: 'phoneSearch', + component: () => import('@/views/phoneView/search') + }, + //待办中心 + { + path: '/phoneToDoCenter', + name: 'phoneToDoCenter', + component: () => import('@/views/phoneView/toDoCenter') + }, + //任务数据 + { + path: '/phoneTaskData', + name: 'phoneTaskData', + component: () => import('@/views/phoneView/taskData') + }, + //我的 + { + path: '/phoneHome', + name: 'phoneHome', + component: () => import('@/views/phoneView/home') + }, + /* 手机端结束 */ // { // path:'/vehicleinformation', // name: 'vehicleinformation', diff --git a/jero-web/src/main.js b/jero-web/src/main.js index 171fe1fb7..ea78ffa30 100644 --- a/jero-web/src/main.js +++ b/jero-web/src/main.js @@ -65,12 +65,16 @@ import '@/components/JVxeCells/install' // 挂载全局使用的方法 import VueDraggableResizable from 'vue-draggable-resizable' +import Vant from 'vant'; +import 'vant/lib/index.css'; +import 'amfe-flexible/index.js' Vue.component('vue-draggable-resizable', VueDraggableResizable) Vue.config.productionTip = false Vue.use(Storage, config.storageOptions) Vue.use(Antd) Vue.use(VueAxios, router) Vue.use(Viser) +Vue.use(Vant); Vue.use(hasPermission) Vue.use(JDictSelectTag) Vue.use(Print) diff --git a/jero-web/src/views/phoneView/components/header.vue b/jero-web/src/views/phoneView/components/header.vue new file mode 100644 index 000000000..56d84d65b --- /dev/null +++ b/jero-web/src/views/phoneView/components/header.vue @@ -0,0 +1,30 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/phoneView/home.vue b/jero-web/src/views/phoneView/home.vue new file mode 100644 index 000000000..53dc7330f --- /dev/null +++ b/jero-web/src/views/phoneView/home.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/phoneView/search.vue b/jero-web/src/views/phoneView/search.vue new file mode 100644 index 000000000..a452cf96e --- /dev/null +++ b/jero-web/src/views/phoneView/search.vue @@ -0,0 +1,193 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/phoneView/taskData.vue b/jero-web/src/views/phoneView/taskData.vue new file mode 100644 index 000000000..a76af35ee --- /dev/null +++ b/jero-web/src/views/phoneView/taskData.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/phoneView/toDoCenter.vue b/jero-web/src/views/phoneView/toDoCenter.vue new file mode 100644 index 000000000..0429dd858 --- /dev/null +++ b/jero-web/src/views/phoneView/toDoCenter.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file