From 1f58ba7ed5cc118d911b13ce9eb79a049e839e76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 30 May 2023 15:16:09 +0800 Subject: [PATCH 01/78] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/package-lock.json | 83 +++++++- jero-web/package.json | 2 + jero-web/public/index.html | 3 +- jero-web/src/assets/wendang.png | Bin 0 -> 422 bytes jero-web/src/assets/yuebao.png | Bin 0 -> 373 bytes jero-web/src/components/tools/UserMenu.vue | 7 +- jero-web/src/config/router.config.js | 28 +++ jero-web/src/main.js | 4 + .../src/views/phoneView/components/header.vue | 30 +++ jero-web/src/views/phoneView/home.vue | 13 ++ jero-web/src/views/phoneView/search.vue | 193 ++++++++++++++++++ jero-web/src/views/phoneView/taskData.vue | 13 ++ jero-web/src/views/phoneView/toDoCenter.vue | 13 ++ 13 files changed, 375 insertions(+), 14 deletions(-) create mode 100644 jero-web/src/assets/wendang.png create mode 100644 jero-web/src/assets/yuebao.png create mode 100644 jero-web/src/views/phoneView/components/header.vue create mode 100644 jero-web/src/views/phoneView/home.vue create mode 100644 jero-web/src/views/phoneView/search.vue create mode 100644 jero-web/src/views/phoneView/taskData.vue create mode 100644 jero-web/src/views/phoneView/toDoCenter.vue 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 0000000000000000000000000000000000000000..c776e6a50c398613954167ba6c97933103130e63 GIT binary patch literal 422 zcmV;X0a^ZuP)Px$U`a$lR7gwh)vr#&P#6X9b9xJdE`UOSz(DrLpumryP&@z$f+s-W5OfKdA_Q<# zI9`Ak7z!+EC7HmDWQG7OTj=cvYeFC})^**2S@n0%FZbljEivSeiSn(?s)8yZ2rhK< z?z~f0f53QlS(zvT+$2d6X=%Y4UY+ZoNIW35w5SYq0CEeUN64`s$dxjTOF$kqxB{tM?@p-pbiSz)>TgsZb1+V}}S+iM! zd;jpO?}_}jQgSAOlfZNA7(h5W2F#{_#!K9#2ydX$xhH~CaSwN!7s#`Ao#_xT(|G}; z0zqXU2vGo7@ZBoE01?~woZ=t=)5^6s&HfWGtn9u4n%%Gf)PYw$>@*Vzn3K69A$Ccs zP5~nDNjddhXRj|HX-$zg7y+Y-B6r}QDjMcnH1yXrveX0vJ^axUq<KP)Px$FG)l}R7gwhl|fE}Koo}Gb4aYy6Sy(zq8-nm3ywnVL0T_jnx2GPFw{i1x^T%f zH4MK2ErFy=EkaC8*%99RzxU5S!!Y&yaFf0ms=y|CNko}*hQa8LAl_&bJ?*M%1bD+6 z0NK=<_|XOMq?&uX? zS~K&Yi%0;htTB3|~6P0R+rbqaX4Q1&}bYiFPj0cLoz{qRXOB zsu?lQ_X30*-&+&s;_h8^Hohf`clucAg8*%___2e20ECc0VO#N{kI5%ue|HAIQm!}e z4Y@7rk29#8gQJ808gicpO-S|3%vWu9Pqh!gi#7VX_Pg#v_@FzvD`4ZL-xc5!j05o* Ts<+>T00000NkvXXu0mjfZRw$- literal 0 HcmV?d00001 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 From 885a612709bd942d514fbc6a71866fab34e11139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 30 May 2023 17:56:02 +0800 Subject: [PATCH 02/78] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/phoneView/home.vue | 40 +++- jero-web/src/views/phoneView/search.vue | 16 +- jero-web/src/views/phoneView/taskData.vue | 177 +++++++++++++- jero-web/src/views/phoneView/toDoCenter.vue | 248 +++++++++++++++++++- 4 files changed, 473 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/phoneView/home.vue b/jero-web/src/views/phoneView/home.vue index 53dc7330f..1f260c78a 100644 --- a/jero-web/src/views/phoneView/home.vue +++ b/jero-web/src/views/phoneView/home.vue @@ -1,13 +1,47 @@ \ No newline at end of file diff --git a/jero-web/src/views/phoneView/search.vue b/jero-web/src/views/phoneView/search.vue index a452cf96e..1d761c423 100644 --- a/jero-web/src/views/phoneView/search.vue +++ b/jero-web/src/views/phoneView/search.vue @@ -63,7 +63,19 @@ }, methods: { onChange(value) { - console.log(value) + if (value == 'toDoCenter') { + this.$router.push({ + path: '/phoneToDoCenter' + }) + } else if (value == 'taskData') { + this.$router.push({ + path: '/phoneTaskData' + }) + } else if (value == 'home') { + this.$router.push({ + path: '/phoneHome' + }) + } } } } @@ -81,7 +93,7 @@ .header-box { width: 100%; text-align: center; - padding-top: 2.5rem; + padding-top: 2.2rem; display: flex; align-items: center; justify-content: center; diff --git a/jero-web/src/views/phoneView/taskData.vue b/jero-web/src/views/phoneView/taskData.vue index a76af35ee..acac3b1f7 100644 --- a/jero-web/src/views/phoneView/taskData.vue +++ b/jero-web/src/views/phoneView/taskData.vue @@ -1,13 +1,188 @@ \ No newline at end of file diff --git a/jero-web/src/views/phoneView/toDoCenter.vue b/jero-web/src/views/phoneView/toDoCenter.vue index 0429dd858..986b26fcf 100644 --- a/jero-web/src/views/phoneView/toDoCenter.vue +++ b/jero-web/src/views/phoneView/toDoCenter.vue @@ -1,13 +1,257 @@ \ No newline at end of file From e1aff1fbb6e9497f7826abc759b00cf91c64adcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Wed, 31 May 2023 11:47:04 +0800 Subject: [PATCH 03/78] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/phoneView/home.vue | 159 +++++++++++- jero-web/src/views/phoneView/search.vue | 2 +- jero-web/src/views/phoneView/taskData.vue | 256 ++++++++++++++++---- jero-web/src/views/phoneView/toDoCenter.vue | 15 +- 4 files changed, 386 insertions(+), 46 deletions(-) diff --git a/jero-web/src/views/phoneView/home.vue b/jero-web/src/views/phoneView/home.vue index 1f260c78a..b7dd10795 100644 --- a/jero-web/src/views/phoneView/home.vue +++ b/jero-web/src/views/phoneView/home.vue @@ -1,5 +1,53 @@ @@ -198,6 +202,7 @@ font-family: Blue Sky Noto-Bold, Blue Sky Noto; font-weight: bold; color: #41475E; + word-break: break-all; } .text-left-button { @@ -205,6 +210,7 @@ font-family: Blue Sky Noto-Light, Blue Sky Noto; font-weight: 300; color: #595E72; + word-break: break-all; } .text-right { diff --git a/jero-web/src/views/phoneView/searchList.vue b/jero-web/src/views/phoneView/searchList.vue index 1a6daa94d..14b8bf851 100644 --- a/jero-web/src/views/phoneView/searchList.vue +++ b/jero-web/src/views/phoneView/searchList.vue @@ -95,6 +95,9 @@ activeTab: '' } }, + mounted() { + document.title = 'NIO GRP' + }, methods: { iconClick() { this.$router.go(-1) diff --git a/jero-web/src/views/phoneView/taskData.vue b/jero-web/src/views/phoneView/taskData.vue index 7154f3e81..e8c94eec0 100644 --- a/jero-web/src/views/phoneView/taskData.vue +++ b/jero-web/src/views/phoneView/taskData.vue @@ -146,6 +146,9 @@ language: localStorage.getItem('language') } }, + mounted() { + document.title = 'NIO GRP' + }, methods: { onChange(value) { if (value == 'toDoCenter') { diff --git a/jero-web/src/views/phoneView/toDoCenter.vue b/jero-web/src/views/phoneView/toDoCenter.vue index 9626898d5..49883e485 100644 --- a/jero-web/src/views/phoneView/toDoCenter.vue +++ b/jero-web/src/views/phoneView/toDoCenter.vue @@ -10,31 +10,86 @@
- - - + + +
- +
-
+
ISO 16750-4-2003
- 类别 + {{$t('category')}} 设计符合性流程
- 项目 + {{$t('project')}} Aries-G1.1-中国台湾-00
- 节点 + {{$t('node')}} + 符合性审查 +
+
+ 符合性审查 +
+
+
+ +
+
+
+ ISO 16750-4-2003 +
+
+ {{$t('category')}} + 设计符合性流程 +
+
+ {{$t('project')}} + Aries-G1.1-中国台湾-00 +
+
+ {{$t('node')}} + 符合性审查 +
+
+ 符合性审查 +
+
+
+ +
+
+
+ ISO 16750-4-2003 +
+
+ {{$t('category')}} + 设计符合性流程 +
+
+ {{$t('project')}} + Aries-G1.1-中国台湾-00 +
+
+ {{$t('node')}} 符合性审查
@@ -48,6 +103,59 @@ {{$t('taskStatistics')}} {{$t('mine')}} + + +
+ + + + + + + + + + + + +
+ {{$t('phoneReset')}} + {{$t('query')}} +
+
+
@@ -57,10 +165,20 @@ data() { return { active: 'toDoCenter', + show: false, + checked: false, + date: '', + columns: ['近一个月', '近三个月', '近六个月', '近一年'], + showPicker: false, value: '', - activeTab: '' + activeTab: '', + language: localStorage.getItem('language'), + form: {} } }, + mounted() { + document.title = 'NIO GRP' + }, methods: { onChange(value) { if (value == 'search') { @@ -77,11 +195,21 @@ }) } }, - toDoCenterClick(){ + toDoCenterClick() { this.$router.push({ path: '/phoneHandlingPage' }) }, + searchIconClick() { + this.show = true + }, + onSubmit() { + + }, + onConfirm(value) { + this.value = value + this.showPicker = false + } } } @@ -180,7 +308,7 @@ .search-right { position: absolute; right: 0.4rem; - top: 0.07rem; + top: 0; } .search-right-icon { @@ -223,6 +351,10 @@ display: inline-block; } + .content-box-left-one { + width: 1.5rem; + } + .content-box-text { margin-left: 0.3rem; } @@ -248,4 +380,163 @@ background: #fff; padding-top: 0.4rem; } + + .popup-box { + width: 100%; + height: 100vh; + } + + ::v-deep .van-form .van-cell__title { + font-size: 0.38rem; + font-family: PingFang SC-Regular, PingFang SC; + font-weight: 500; + color: #595E72; + width: 100%; + } + + ::v-deep .van-form .van-radio__icon .van-icon { + width: 0.45rem; + height: 0.45rem; + line-height: 0.45rem; + } + + ::v-deep .van-form .van-radio__icon--checked .van-icon { + background-color: #00BEBE; + border-color: #00BEBE; + } + + ::v-deep .van-form .van-radio__icon { + height: 0.45rem; + } + + ::v-deep .van-form .van-radio__label { + font-size: 0.38rem; + font-family: PingFang SC-Regular, PingFang SC; + font-weight: 500; + color: #040B29; + } + + .textarea { + display: block; + } + + ::v-deep .van-form .textarea .van-field__control { + margin-top: 0.1rem; + } + + .uploader { + display: block; + } + + .uploader-button { + margin-top: 0.2rem; + } + + .uploader-button .van-button--primary { + background-color: #fff; + border: 0.03rem solid #00BEBE; + color: #01A0AC; + font-size: 0.38rem; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + } + + .uploader-button .van-button { + height: 0.9rem; + border-radius: 0.12rem; + } + + .uploader-button .van-button .van-icon { + font-size: 0.42rem; + font-weight: 500; + } + + .formClass { + padding-top: 1.1rem; + } + + ::v-deep .van-checkbox { + margin-bottom: 0.2rem; + } + + ::v-deep .van-field__body { + margin-top: 0.2rem; + } + + ::v-deep .van-checkbox__icon .van-icon { + height: 0.45rem; + width: 0.45rem; + line-height: 0.45rem; + } + + ::v-deep .van-checkbox__icon--checked .van-icon { + background-color: #00BEBE; + border-color: #00BEBE; + } + + .time-text { + display: flex; + align-items: center; + justify-content: center; + width: 100%; + border: 0.02rem #E6E7EC solid; + height: 1rem; + font-size: 0.38rem; + color: #040B29; + font-weight: 500; + border-radius: 0.16rem; + } + + .Mode-text { + display: flex; + align-items: center; + font-size: 0.32rem; + font-weight: 500; + color: #040B29; + width: calc(100% - 1.3rem); + margin-right: 0.2rem; + } + + ::v-deep .van-switch { + background-color: #BBBDC7; + height: 0.6rem; + width: 1.17rem; + } + + ::v-deep .van-switch__node { + width: 0.6rem; + height: 0.6rem; + } + + ::v-deep .van-switch--on { + background-color: #00B3BE; + } + + ::v-deep .van-switch--on .van-switch__node { + transform: translateX(0.56rem) + } + + .button { + position: absolute; + bottom: 0.2rem; + left: 0; + text-align: right; + width: 100%; + padding: 0 0.4rem; + } + + .reset { + background-color: rgba(187, 189, 199, 1); + border: none; + height: 0.8rem; + font-size: 0.38rem; + } + + .primary { + background-color: #01A0AC; + border: none; + height: 0.8rem; + font-size: 0.38rem; + margin-left: 0.2rem; + } \ No newline at end of file From 115f6dfc6080118d24d6de36d3f8662a48448729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 5 Jun 2023 13:56:20 +0800 Subject: [PATCH 10/78] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/assets/icon_single_screen.svg | 4 + jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 2 + jero-web/src/views/phoneView/search.vue | 68 ++++- jero-web/src/views/phoneView/searchList.vue | 3 + jero-web/src/views/phoneView/toDoCenter.vue | 273 ++++++++++++++++---- 6 files changed, 293 insertions(+), 59 deletions(-) create mode 100644 jero-web/src/assets/icon_single_screen.svg diff --git a/jero-web/src/assets/icon_single_screen.svg b/jero-web/src/assets/icon_single_screen.svg new file mode 100644 index 000000000..df20a10a1 --- /dev/null +++ b/jero-web/src/assets/icon_single_screen.svg @@ -0,0 +1,4 @@ + + + + diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index c77797015..16de61ccf 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1869,4 +1869,6 @@ module.exports = { treatmentMode:'Treatment Mode', onlyMobilePhoneAreDisplayed:'Only the tasks that can be handled by the mobile phone are displayed', phoneReset:'Reset', + noMore:'No More', + loading:'Loading...', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index dc43982e9..4b33317d2 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1970,4 +1970,6 @@ module.exports = { treatmentMode:'处理方式', onlyMobilePhoneAreDisplayed:'仅展示手机端可处理的任务', phoneReset:'重置', + noMore:'没有更多了', + loading:'加载中...', } \ No newline at end of file diff --git a/jero-web/src/views/phoneView/search.vue b/jero-web/src/views/phoneView/search.vue index 57d4639aa..b6aecc904 100644 --- a/jero-web/src/views/phoneView/search.vue +++ b/jero-web/src/views/phoneView/search.vue @@ -5,7 +5,8 @@ NIO GRP
- +
@@ -13,7 +14,8 @@
{{$t('DocumentLibrary')}}
-
{{$t('stored')+ ' '+568+' ' + $t('individual')+$t('document')}}
+
{{$t('stored')+ ' '+documentLibraryTotal+' ' + $t('individual')+$t('document')}} +
{{$t('goToCheck')}} @@ -25,7 +27,9 @@
{{$t('problemKnowledgeBase')}}
-
{{$t('stored')+ ' '+568+' ' + $t('individual')+$t('problemKnowledgeBase')}}
+
{{$t('stored')+ ' '+problemKnowledgeBaseTotal+' ' + + $t('individual')+$t('problemKnowledgeBase')}} +
{{$t('goToCheck')}} @@ -37,7 +41,8 @@
{{$t('monthlyReportRegulations')}}
-
{{$t('stored')+ ' '+568+' ' + $t('individual')+$t('monthlyReportRegulations')}} +
{{$t('stored')+ ' '+monthlyReportRegulationsTotal+' ' + + $t('individual')+$t('monthlyReportRegulations')}}
@@ -54,16 +59,24 @@ @@ -192,6 +373,11 @@ position: relative; } + .box-showModal { + position: absolute; + height: 100%; + } + .header-search { width: 100%; display: flex; @@ -376,6 +562,15 @@ justify-content: flex-end; text-align: right; margin-top: 0.3rem; + /*margin-bottom: 0.3rem;*/ + } + + .comment-text-button-one { + display: flex; + align-items: center; + justify-content: flex-end; + text-align: right; + margin-top: 0.3rem; } .commentRight { @@ -398,9 +593,53 @@ .reply-box { background: #F6F7F8; - border-radius: 0.16rem; - padding: 0.4rem; - margin-top: 0.3rem; + /*border-radius: 0.16rem;*/ + padding: 0.4rem 0.4rem 0 0.4rem; margin-left: 0.5rem; } + + .reply-box:last-child { + padding-bottom: 0.4rem; + border-bottom-left-radius: 0.16rem; + border-bottom-right-radius: 0.16rem; + } + + .reply-box:first-child { + border-top-left-radius: 0.16rem; + border-top-right-radius: 0.16rem; + } + + .icon-active { + color: #00B3BE !important; + } + + .input-text { + position: fixed; + bottom: 0; + left: 0; + width: 100%; + background: #F6F7FA; + padding: 0.2rem 0.4rem; + } + + .input-text .van-cell-group { + display: flex; + background: transparent; + align-items: center; + } + + .input-text .van-cell { + width: calc(100% - 1.8rem); + display: inline-block; + border-radius: 0.6rem; + margin-right: 0.3rem; + } + + .input-text .van-button { + width: 1.8rem; + height: 1rem; + border-radius: 0.4rem; + background: #01A0AC; + border: none; + } \ No newline at end of file From 6f9e74d2319c1f892e679645195ccf32818151db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 6 Jun 2023 17:53:29 +0800 Subject: [PATCH 14/78] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 2 + .../src/views/phoneView/documentDetails.vue | 176 ++++++++++++------ jero-web/src/views/phoneView/myCollection.vue | 169 +++++++++++++++-- jero-web/src/views/phoneView/mySubscribe.vue | 24 ++- .../views/phoneView/problemKnowledgeBase.vue | 29 +-- .../src/views/phoneView/processManagement.vue | 165 +++++++++++++--- jero-web/src/views/phoneView/search.vue | 15 +- jero-web/src/views/phoneView/searchList.vue | 8 +- jero-web/src/views/phoneView/taskData.vue | 174 ++++++++++++----- jero-web/src/views/phoneView/toDoCenter.vue | 148 ++++++++++++--- 11 files changed, 725 insertions(+), 187 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 3385d6548..54cfaddf0 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1873,4 +1873,6 @@ module.exports = { loading:'Loading...', howAboutComment:'How about a comment', send:'Send', + pleaseProcessThePC:'Please process it on the PC', + clickAndSelect:'Click and select', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index cd0d1cca7..a1a57afa3 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1974,4 +1974,6 @@ module.exports = { loading:'加载中...', howAboutComment:'说点什么评论一下吧', send:'发送', + pleaseProcessThePC:'请在PC端处理', + clickAndSelect:'点击选择', } \ No newline at end of file diff --git a/jero-web/src/views/phoneView/documentDetails.vue b/jero-web/src/views/phoneView/documentDetails.vue index 18c964193..f3574576d 100644 --- a/jero-web/src/views/phoneView/documentDetails.vue +++ b/jero-web/src/views/phoneView/documentDetails.vue @@ -3,7 +3,7 @@
- GB 7258-2017《机动车运行安全技术条件》 + {{serial_number}}
@@ -17,85 +17,144 @@
- -
- 编号 - GB 7258-2017 -
-
- 标题 - 机动车运行安全技术条件 -
-
- 新车型实施日期 - 机动车运行安全技新车型实施日期新车型实施日期新车型实施日期术条件 -
- - -
-
- 发布稿（必读） -
-
- 线控底盘技术发展与标准化需求研究报告.pdf -
-
- 线控底盘技术发展与标准化需求研究报告.pdf -
-
- 线控底盘技术发展与标准化需求研究报告.pdf -
-
+
+
+ +
+ {{ol.db_field_txt}} + {{ol.value || '--'}} +
+ -
-
- 发布稿（必读） -
-
- 线控底盘技术发展与标准化需求研究报告dsfdsfsdfdsfdsdsdsfdsfdsfs.pdf -
-
- 线控底盘技术发展与标准化需求研究报告.pdf -
-
- 线控底盘技术发展与标准化需求研究报告.pdf -
-
- - -
-
这里是条款
-
-
- 在产车 + +
+
+ {{ol.db_field_txt}} +
+
+
+ {{valItem.fileName}} +
+
-
- 2023-10-11 + +
+
+ + + +
+
{{item.standNumberOrClause}}
+
+
+ {{item.implementationTypeText}} +
+
+ {{item.implementationDate}} +
+
+
+ {{item.remarks}}
-
- 这里是备注这里是备注这里是备注这里是备注这里是备注这里是备注这里是备注 -
-
+
@@ -157,6 +165,14 @@ color: #595E72; margin-top: 0.13rem; word-break: break-all; + overflow: hidden; + display: -webkit-box; + text-overflow: ellipsis; + /*! autoprefixer: off */ + -webkit-box-orient: vertical; + -webkit-line-clamp: 3; + /*! autoprefixer: on;*/ + text-justify: inter-ideograph; } .content-text-right .van-icon { diff --git a/jero-web/src/views/phoneView/problemKnowledgeBase.vue b/jero-web/src/views/phoneView/problemKnowledgeBase.vue index 2df98537d..a734a68d9 100644 --- a/jero-web/src/views/phoneView/problemKnowledgeBase.vue +++ b/jero-web/src/views/phoneView/problemKnowledgeBase.vue @@ -41,20 +41,21 @@ {{queryForm.browsingHistoryCount}}
-
- - - - {{queryForm.collectCount}} - -
+
- - + + {{queryForm.praiseCount}}
+
+ + + + {{queryForm.collectCount}} + +
@@ -191,7 +192,7 @@ }, getQueryBy() { let query = { - id: '1bbe56abe27b410998365f20e6023e38' + id: this.$route.query.id } getAction(this.url.queryById, query).then((res) => { if (res.success) { @@ -225,7 +226,7 @@ this.queryForm.praiseCount = this.queryForm.praiseCount - 1 } let query = { - problemKnowledgeBaseId: this.queryForm.id, + problemKnowledgeBaseId: this.$route.query.id, praiseUserId: this.userInfo().id, praiseStatus: praiseStatus, id: this.queryForm.praiseEO ? this.queryForm.praiseEO.id : undefined @@ -251,7 +252,7 @@ this.queryForm.collectCount = this.queryForm.collectCount - 1 } let query = { - problemKnowledgeBaseId: this.queryForm.id, + problemKnowledgeBaseId: this.$route.query.id, collectUserId: this.userInfo().id, collectStatus: collectStatus, id: this.queryForm.collectEO ? this.queryForm.collectEO.id : undefined @@ -264,7 +265,7 @@ }, releaseData() { let query = { - problemKnowledgeBaseId: '1bbe56abe27b410998365f20e6023e38' + problemKnowledgeBaseId: this.$route.query.id } getAction('/problemKnowledgeBase/problemKnowledgeBaseCommentEO/list', query).then((res) => { if (res.success) { @@ -328,7 +329,7 @@ sendClick() { if (this.num == 1) { let query = { - problemKnowledgeBaseId: this.queryForm.id, + problemKnowledgeBaseId: this.$route.query.id, commentContent: this.sendValue, commentUserId: this.userInfo().id } diff --git a/jero-web/src/views/phoneView/processManagement.vue b/jero-web/src/views/phoneView/processManagement.vue index e15e82a9b..dd4156822 100644 --- a/jero-web/src/views/phoneView/processManagement.vue +++ b/jero-web/src/views/phoneView/processManagement.vue @@ -10,50 +10,55 @@
- 项目名称 - Aries-G1.1-中国台湾-00 + {{$t('entryName')}} + {{queryForm.projectName+'-'+queryForm.projectVersion}}
- 法规编号 - ISO 16750-4-2003 + {{$t('regulationNo')}} + {{queryForm.serialNumber || '--'}}
- 标题 - 机动车运行安全技术条件 + {{$t('title')}} + {{queryForm.title || '--'}}
- 子标题 - 机动车运行安全技新车型实施日期新车型实施日期新车型实施日期术条件 + {{$t('subtitle')}} + {{queryForm.subtitle || '--'}}
- 适用增补件 - 机动车运行安全技新 + {{$t('applicableSupplement')}} + {{queryForm.applicableSupplement || '--'}}
+
- 发起人 - -- + {{$t('Sponsor')}} + {{queryProject[queryData.Sponsor] || '--'}}
- 责任人 - -- + {{$t('personLiable')}} + {{queryProject[queryData.personLiable] || '--'}}
- 交付日期 - 2023-10-20 + {{$t('deliveryDate')}} + {{queryProject[queryData.DueDate] || '--'}} +
+
+ {{$t('typeOfDeliverables')}} + {{queryProject[queryData.typeOfDeliverables] || '--'}}
- 交付物模板 + {{$t('deliverableTemplate')}}
线控底盘技术发展与标准化需求研究报告.pdf
- 交付物说明 + {{$t('descriptionDeliverables')}}
- 这里是交付物说明这里是交付物说明这里是交付物说明这里是交付物说明这里是交付物说明 + {{queryProject[queryData.remarks] || '--'}}
@@ -179,27 +184,124 @@ + + {{$t('loading')}} +
+ + \ No newline at end of file diff --git a/jero-web/src/views/phoneView/problemKnowledgeBase.vue b/jero-web/src/views/phoneView/problemKnowledgeBase.vue index 714ca659d..fe61bb78e 100644 --- a/jero-web/src/views/phoneView/problemKnowledgeBase.vue +++ b/jero-web/src/views/phoneView/problemKnowledgeBase.vue @@ -161,6 +161,7 @@ window.addEventListener('mousedown', this.handleonmousedown) this.getQueryBy() this.releaseData() + this.viewAdd() }, watch: { sendValue: function(res) { @@ -193,6 +194,14 @@ iconClick() { this.$router.go(-1) }, + viewAdd() { + let query = { + problemKnowledgeBaseId: this.$route.query.id, + browsingUserId: this.userInfo().id + } + postAction('/problemKnowledgeBase/problemKnowledgeBaseBrowsingHistoryEO/add', query).then((res) => { + }) + }, getQueryBy() { let query = { id: this.$route.query.id diff --git a/jero-web/src/views/phoneView/processManagement.vue b/jero-web/src/views/phoneView/processManagement.vue index aeed6d421..2719435ec 100644 --- a/jero-web/src/views/phoneView/processManagement.vue +++ b/jero-web/src/views/phoneView/processManagement.vue @@ -369,7 +369,6 @@ let fileSuffix = fileName.substring(index1, index2) val.fileSuffix = fileSuffix }) - console.log(this.dataSourceFile) } else { this.dataSourceFile = [] } diff --git a/jero-web/src/views/phoneView/toDoCenter.vue b/jero-web/src/views/phoneView/toDoCenter.vue index c8cd27d8f..49c73930d 100644 --- a/jero-web/src/views/phoneView/toDoCenter.vue +++ b/jero-web/src/views/phoneView/toDoCenter.vue @@ -241,7 +241,7 @@ }, onClear(){ - + }, onChange(value) { if (value == 'search') { @@ -376,7 +376,10 @@ query: query }) } else if (row.flowType == '21') { - + this.$router.push({ + path: '/phoneHandlingPage', + query: query + }) } else { Toast(this.$t('pleaseProcessThePC')) } From ba7282653d3e3b0ffb491b0ea583a241723994d0 Mon Sep 17 00:00:00 2001 From: wangzhijiang <1358525938@qq.com> Date: Thu, 8 Jun 2023 17:08:01 +0800 Subject: [PATCH 32/78] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF-=E6=90=9C?= =?UTF-8?q?=E7=B4=A2-=E6=A0=B9=E6=8D=AE=E7=94=A8=E6=88=B7=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=96=87=E6=A1=A3=E5=BA=93=E8=AE=A2=E9=98=85=E5=92=8C?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SearchCenterController.java | 9 +++++- .../phone/service/ISearchCenterService.java | 2 ++ .../service/impl/SearchCenterServiceImpl.java | 30 +++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/controller/SearchCenterController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/controller/SearchCenterController.java index 5ab87d0b2..48b4894fe 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/controller/SearchCenterController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/controller/SearchCenterController.java @@ -5,10 +5,10 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.modules.phone.service.ISearchCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.Map; @@ -27,4 +27,11 @@ public class SearchCenterController { public Result> getDataCount() { return this.searchCenterService.getDataCount(); } + + @AutoLog(value = "手机端-搜索-根据用户获取文档库订阅和收藏信息") + @ApiOperation(value = "手机端-搜索-根据用户获取文档库订阅和收藏信息", notes = "手机端-搜索-根据用户获取文档库订阅和收藏信息") + @GetMapping(value = "/getWdkCollectAndSubscribeInfoByUser") + public Result> getWdkCollectAndSubscribeInfoByUser(@RequestParam Map params) { + return this.searchCenterService.getWdkCollectAndSubscribeInfoByUser(params); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/ISearchCenterService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/ISearchCenterService.java index 87b53cd4e..02c235eac 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/ISearchCenterService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/ISearchCenterService.java @@ -7,4 +7,6 @@ import java.util.Map; public interface ISearchCenterService { Result> getDataCount(); + + Result> getWdkCollectAndSubscribeInfoByUser(Map params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/SearchCenterServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/SearchCenterServiceImpl.java index 3245ff4d5..3b3fb61b3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/SearchCenterServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/SearchCenterServiceImpl.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.collection.entity.OnlCgformCollection; +import com.jero.modules.collection.service.IOnlCgformCollectionService; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.phone.service.ISearchCenterService; import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO; @@ -13,12 +15,15 @@ import com.jero.modules.problemKnowledgeBase.enums.ReleaseStatusEnum; import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseEOService; import com.jero.modules.report.entity.LawsMonthlyReportManageEO; import com.jero.modules.report.service.ILawsMonthlyReportManageEOService; +import com.jero.modules.subscribe.entity.OnlCgformSubscribe; +import com.jero.modules.subscribe.service.IOnlCgformSubscribeService; import com.jero.modules.system.service.ISysUserService; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.HashMap; +import java.util.List; import java.util.Map; @Service @@ -32,6 +37,10 @@ public class SearchCenterServiceImpl implements ISearchCenterService { private IProblemKnowledgeBaseEOService problemKnowledgeBaseEOService; @Autowired private ILawsMonthlyReportManageEOService lawsMonthlyReportManageEOService; + @Autowired + private IOnlCgformCollectionService onlCgformCollectionService; + @Autowired + private IOnlCgformSubscribeService onlCgformSubscribeService; @Override public Result> getDataCount() { @@ -71,4 +80,25 @@ public class SearchCenterServiceImpl implements ISearchCenterService { result.put("lawsMonthlyReportManageCount", lawsMonthlyReportManageCount); return Result.OK(result); } + + @Override + public Result> getWdkCollectAndSubscribeInfoByUser(Map params) { + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + Map result = new HashMap<>(); + + String id = (String) params.get("id"); + QueryWrapper collectionQueryWrap = new QueryWrapper<>(); + collectionQueryWrap.lambda().eq(OnlCgformCollection::getDocumentId, id); + collectionQueryWrap.lambda().eq(OnlCgformCollection::getCreateBy, currentUser.getUsername()); + List collectionList = this.onlCgformCollectionService.list(collectionQueryWrap); + + QueryWrapper subscribeQueryWrap = new QueryWrapper(); + subscribeQueryWrap.lambda().eq(OnlCgformSubscribe::getDocumentId, id); + subscribeQueryWrap.lambda().eq(OnlCgformSubscribe::getCreateBy, currentUser.getUsername()); + List subscribeList = this.onlCgformSubscribeService.list(subscribeQueryWrap); + + result.put("subscribeList", subscribeList); + result.put("collectionList", collectionList); + return Result.OK(result); + } } From 40727cedbafb375cd72ff7cba3fd8d29beade2ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 8 Jun 2023 17:19:36 +0800 Subject: [PATCH 33/78] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/phoneView/myCollection.vue | 12 +++- jero-web/src/views/phoneView/mySubscribe.vue | 11 ++- .../src/views/phoneView/recentBrowsing.vue | 69 +++++++++++++++++-- jero-web/src/views/phoneView/search.vue | 2 +- jero-web/src/views/phoneView/searchList.vue | 13 +++- 5 files changed, 96 insertions(+), 11 deletions(-) diff --git a/jero-web/src/views/phoneView/myCollection.vue b/jero-web/src/views/phoneView/myCollection.vue index fccacd66d..7360ff52e 100644 --- a/jero-web/src/views/phoneView/myCollection.vue +++ b/jero-web/src/views/phoneView/myCollection.vue @@ -172,9 +172,16 @@ } }) }, - - + recentBrowseAdd(browseType, id) { + let query = { + browseType: browseType, + browseDataId: id + } + postAction('/phone/recentBrowse/add', query).then((res) => { + }) + }, collectionClick(item) { + this.recentBrowseAdd('Document Library', item.documentId) this.$router.push({ path: '/phoneDocumentDetails', query: { @@ -183,6 +190,7 @@ }) }, problemKnowledgeBaseClick(item) { + this.recentBrowseAdd('Knowledge sharing', item.id) this.$router.push({ path: '/phoneProblemKnowledgeBase', query: { diff --git a/jero-web/src/views/phoneView/mySubscribe.vue b/jero-web/src/views/phoneView/mySubscribe.vue index 485227ab6..8a694d09c 100644 --- a/jero-web/src/views/phoneView/mySubscribe.vue +++ b/jero-web/src/views/phoneView/mySubscribe.vue @@ -88,14 +88,23 @@ } }) }, + recentBrowseAdd(browseType, id) { + let query = { + browseType: browseType, + browseDataId: id + } + postAction('/phone/recentBrowse/add', query).then((res) => { + }) + }, collectionClick(item) { + this.recentBrowseAdd('Document Library', item.documentId) this.$router.push({ path: '/phoneDocumentDetails', query: { id: item.documentId } }) - }, + } } } diff --git a/jero-web/src/views/phoneView/recentBrowsing.vue b/jero-web/src/views/phoneView/recentBrowsing.vue index 1dee741f1..30fe64857 100644 --- a/jero-web/src/views/phoneView/recentBrowsing.vue +++ b/jero-web/src/views/phoneView/recentBrowsing.vue @@ -8,18 +8,19 @@
-
+
- 测试类别 - - - 测试检验项目 + {{item.title || '--'}} + + +
- ISO 898-1-2013 + {{item.browseTypeName}}
@@ -31,14 +32,61 @@