From bcb0fac678a056065d3eb8640d907b733d40a2dd Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Tue, 15 Oct 2024 17:01:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E8=AE=A1=E5=88=92=20=E7=AD=89?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=90=AD=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 40 +- package-lock.json | 40 +- package.json | 3 +- pages.json | 16 +- .../dayPlan/components/time-select.vue | 39 ++ pages/workPlan/dayPlan/index.vue | 377 ++++++++++++++++++ .../index/components/day-risk-view.vue | 5 - .../index/components/risk-calendar.vue | 54 ++- pages/workPlan/index/index.vue | 5 + pages/workPlan/util/tabbar.js | 2 +- .../workbench/components/custody-model.vue | 43 ++ .../components/infrastructure-model.vue | 67 ++++ .../workbench/components/production-model.vue | 67 ++++ pages/workPlan/workbench/index.vue | 53 +++ 14 files changed, 745 insertions(+), 66 deletions(-) create mode 100644 pages/workPlan/dayPlan/components/time-select.vue create mode 100644 pages/workPlan/dayPlan/index.vue create mode 100644 pages/workPlan/workbench/components/custody-model.vue create mode 100644 pages/workPlan/workbench/components/infrastructure-model.vue create mode 100644 pages/workPlan/workbench/components/production-model.vue create mode 100644 pages/workPlan/workbench/index.vue diff --git a/main.js b/main.js index 8e78ed1..5869387 100644 --- a/main.js +++ b/main.js @@ -5,9 +5,13 @@ import store from './store' // #ifndef VUE3 import Vue from 'vue' import config from './config.js' + +import moment from 'moment' +moment.locale('zh-cn') Vue.config.productionTip = false // Vue.prototype.$api = $api Vue.prototype.$store = store +Vue.prototype.$moment = moment Vue.prototype.$adpid = '1111111111' Vue.prototype.$backgroundAudioData = { playing: false, @@ -33,23 +37,23 @@ Vue.prototype.$verificationToken = function () { header: { Authorization: uni.getStorageSync('access_token') }, - success: (res) => { - console.log('🚀 ~ res:', res) - let data = res.data - console.log('🚀 ~ res.data:', data) - if (data === '' || data === undefined) { - uni.showToast({ - title: '已在其他设备登录,请重新登录', - icon: 'none' - }) - uni.reLaunch({ - url: '/pages/login' - }) - } - }, - fail: (err) => { - console.log('🚀 ~ err:', err) - } + success: res => { + console.log('🚀 ~ res:', res) + let data = res.data + console.log('🚀 ~ res.data:', data) + if (data === '' || data === undefined) { + uni.showToast({ + title: '已在其他设备登录,请重新登录', + icon: 'none' + }) + uni.reLaunch({ + url: '/pages/login' + }) + } + }, + fail: err => { + console.log('🚀 ~ err:', err) + } }) } @@ -63,7 +67,7 @@ app.$mount() // #ifdef VUE3 import { createSSRApp } from 'vue' -import { data } from 'uview-ui/libs/mixin/mixin'; +import { data } from 'uview-ui/libs/mixin/mixin' export function createApp() { const app = createSSRApp(App) app.use(store) diff --git a/package-lock.json b/package-lock.json index 4ddc616..2fa3fa9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3,41 +3,6 @@ "version": "3.4.5", "lockfileVersion": 1, "requires": true, - "packages": { - "": { - "name": "hello-uniapp", - "version": "3.4.5", - "license": "MIT", - "dependencies": { - "crypto-js": "^4.2.0", - "image-tools": "^1.4.0", - "luch-request": "^3.1.1" - } - }, - "node_modules/@dcloudio/types": { - "version": "2.6.12", - "resolved": "https://registry.npmjs.org/@dcloudio/types/-/types-2.6.12.tgz", - "integrity": "sha512-mrCMwcINy1IFjU9VUqLeWBkj404yWs5paLDttBcA+eqUjanuUQbBcTVPqlrGgkyzLXDcV2oDDZRSNxNpXi4kMQ==" - }, - "node_modules/crypto-js": { - "version": "4.2.0", - "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz", - "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==" - }, - "node_modules/image-tools": { - "version": "1.4.0", - "resolved": "https://registry.npmmirror.com/image-tools/-/image-tools-1.4.0.tgz", - "integrity": "sha512-TKtvJ6iUwM0mfaD4keMnk1ENHFC470QEjBfA3IlvKdEOufzvWbjbaoNcoyYq6HlViF8+d5tOS1ooE6j7CHf1lQ==" - }, - "node_modules/luch-request": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/luch-request/-/luch-request-3.1.1.tgz", - "integrity": "sha512-p7+mlcEtgRcd0OfXC4XZbyiwSr1XgCeqNT7LlVUjnk7InYl/8d5Rk7BUqAYNA2WRafI1wRIUQWRWZRpeUwWR0w==", - "dependencies": { - "@dcloudio/types": "^2.0.16" - } - } - }, "dependencies": { "@dcloudio/types": { "version": "2.6.12", @@ -61,6 +26,11 @@ "requires": { "@dcloudio/types": "^2.0.16" } + }, + "moment": { + "version": "2.30.1", + "resolved": "https://repo.huaweicloud.com/repository/npm/moment/-/moment-2.30.1.tgz", + "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==" } } } diff --git a/package.json b/package.json index 1452229..54e2948 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,8 @@ "dependencies": { "crypto-js": "^4.2.0", "image-tools": "^1.4.0", - "luch-request": "^3.1.1" + "luch-request": "^3.1.1", + "moment": "^2.30.1" }, "dcloudext": { "sale": { diff --git a/pages.json b/pages.json index 9450372..91beccc 100644 --- a/pages.json +++ b/pages.json @@ -211,7 +211,6 @@ "navigationBarTitleText": "图片学习" } }, - ////实名制二期-移动端 { //首页 @@ -631,7 +630,6 @@ "navigationStyle": "custom" } }, - { "path": "pages/HealthExaminationApp/index/index", "style": { @@ -692,13 +690,25 @@ "navigationBarTitleText": "消息通知" } }, - /* 作业计划移动端 */ { "path": "pages/workPlan/index/index", "style": { "navigationStyle": "custom" } + }, + /* 工作台 */ + { + "path": "pages/workPlan/workbench/index", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/workPlan/dayPlan/index", + "style": { + "navigationStyle": "custom" + } } ], "globalStyle": { diff --git a/pages/workPlan/dayPlan/components/time-select.vue b/pages/workPlan/dayPlan/components/time-select.vue new file mode 100644 index 0000000..400b2b3 --- /dev/null +++ b/pages/workPlan/dayPlan/components/time-select.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/pages/workPlan/dayPlan/index.vue b/pages/workPlan/dayPlan/index.vue new file mode 100644 index 0000000..04ac27f --- /dev/null +++ b/pages/workPlan/dayPlan/index.vue @@ -0,0 +1,377 @@ + + + + + diff --git a/pages/workPlan/index/components/day-risk-view.vue b/pages/workPlan/index/components/day-risk-view.vue index 45b8ebd..fc0adaf 100644 --- a/pages/workPlan/index/components/day-risk-view.vue +++ b/pages/workPlan/index/components/day-risk-view.vue @@ -37,11 +37,6 @@ export default { + diff --git a/pages/workPlan/index/index.vue b/pages/workPlan/index/index.vue index 024fc60..0c7864c 100644 --- a/pages/workPlan/index/index.vue +++ b/pages/workPlan/index/index.vue @@ -71,5 +71,10 @@ export default { background: #fff; box-sizing: border-box; padding: 0 10rpx; + + h2 { + margin: 20rpx 0; + font-size: 26rpx; + } } diff --git a/pages/workPlan/util/tabbar.js b/pages/workPlan/util/tabbar.js index fee747f..c061d7f 100644 --- a/pages/workPlan/util/tabbar.js +++ b/pages/workPlan/util/tabbar.js @@ -12,7 +12,7 @@ export default { //新版本新增,页面被打开方式,默认为reLaunch }, { - pagePath: 'pages/realName/workbench/index', + pagePath: 'pages/workPlan/workbench/index', iconPath: '/static/realName/work.png', selectedIconPath: '/static/realName/workSelected.png', text: '工作台' diff --git a/pages/workPlan/workbench/components/custody-model.vue b/pages/workPlan/workbench/components/custody-model.vue new file mode 100644 index 0000000..6af5b72 --- /dev/null +++ b/pages/workPlan/workbench/components/custody-model.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/pages/workPlan/workbench/components/infrastructure-model.vue b/pages/workPlan/workbench/components/infrastructure-model.vue new file mode 100644 index 0000000..1c92159 --- /dev/null +++ b/pages/workPlan/workbench/components/infrastructure-model.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/pages/workPlan/workbench/components/production-model.vue b/pages/workPlan/workbench/components/production-model.vue new file mode 100644 index 0000000..e8b9dcb --- /dev/null +++ b/pages/workPlan/workbench/components/production-model.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/pages/workPlan/workbench/index.vue b/pages/workPlan/workbench/index.vue new file mode 100644 index 0000000..51c2f6f --- /dev/null +++ b/pages/workPlan/workbench/index.vue @@ -0,0 +1,53 @@ + + + + +