From 408ff1c8b056c509e413c42d76f78bd3c05ff99b Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Sat, 23 Dec 2023 18:04:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2xiugai?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- package-lock.json | 99 +- package.json | 2 +- src/api/task.ts | 2 +- src/main.ts | 5 + src/views/task/popTaskDetail.vue | 102 +- src/views/task/taskCalendar.vue | 16 +- src/views/task_template/edit.vue | 30 +- yarn.lock | 6642 +++++++++++++++--------------- 9 files changed, 3481 insertions(+), 3421 deletions(-) diff --git a/.env.development b/.env.development index 106536e..5e1a309 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,8 @@ NODE_ENV = 'development' -# VITE_APP_BASE_URL = 'http://192.168.1.162:8000' +VITE_APP_BASE_URL = 'http://192.168.1.22:8000' # -VITE_APP_BASE_URL = 'https://ceshi-worker-task.lihaink.cn' +# VITE_APP_BASE_URL = 'https://ceshi-worker-task.lihaink.cn' # VITE_APP_BASE_URL = 'https://preview-worker-task.lihaink.cn' diff --git a/package-lock.json b/package-lock.json index 9b75e01..7ccaecb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "axios": "^0.27.2", "css-color-function": "^1.3.3", "echarts": "^5.3.3", - "element-plus": "^2.2.9", + "element-plus": "^2.4.4", "highlight.js": "^11.6.0", "nprogress": "^0.2.0", "pinia": "^2.0.14", @@ -651,9 +651,9 @@ } }, "node_modules/@element-plus/icons-vue": { - "version": "2.0.6", - "resolved": "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.0.6.tgz", - "integrity": "sha512-lPpG8hYkjL/Z97DH5Ei6w6o22Z4YdNglWCNYOPcB33JCF2A4wye6HFgSI7hEt9zdLyxlSpiqtgf9XcYU+m5mew==", + "version": "2.3.1", + "resolved": "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz", + "integrity": "sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==", "peerDependencies": { "vue": "^3.2.0" } @@ -770,18 +770,27 @@ "dev": true }, "node_modules/@floating-ui/core": { - "version": "0.7.3", - "resolved": "https://registry.npmmirror.com/@floating-ui/core/-/core-0.7.3.tgz", - "integrity": "sha512-buc8BXHmG9l82+OQXOFU3Kr2XQx9ys01U/Q9HMIrZ300iLc8HLMgh7dcCqgYzAzf4BkoQvDcXf5Y+CuEZ5JBYg==" + "version": "1.5.2", + "resolved": "https://registry.npmmirror.com/@floating-ui/core/-/core-1.5.2.tgz", + "integrity": "sha512-Ii3MrfY/GAIN3OhXNzpCKaLxHQfJF9qvwq/kEJYdqDxeIHa01K8sldugal6TmeeXl+WMvhv9cnVzUTaFFJF09A==", + "dependencies": { + "@floating-ui/utils": "^0.1.3" + } }, "node_modules/@floating-ui/dom": { - "version": "0.5.4", - "resolved": "https://registry.npmmirror.com/@floating-ui/dom/-/dom-0.5.4.tgz", - "integrity": "sha512-419BMceRLq0RrmTSDxn8hf9R3VCJv2K9PUfugh5JyEFmdjzDo+e8U5EdR8nzKq8Yj1htzLm3b6eQEEam3/rrtg==", + "version": "1.5.3", + "resolved": "https://registry.npmmirror.com/@floating-ui/dom/-/dom-1.5.3.tgz", + "integrity": "sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==", "dependencies": { - "@floating-ui/core": "^0.7.3" + "@floating-ui/core": "^1.4.2", + "@floating-ui/utils": "^0.1.3" } }, + "node_modules/@floating-ui/utils": { + "version": "0.1.6", + "resolved": "https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.1.6.tgz", + "integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==" + }, "node_modules/@highlightjs/vue-plugin": { "version": "2.1.0", "resolved": "https://registry.npmmirror.com/@highlightjs/vue-plugin/-/vue-plugin-2.1.0.tgz", @@ -1032,9 +1041,9 @@ } }, "node_modules/@types/web-bluetooth": { - "version": "0.0.14", - "resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.14.tgz", - "integrity": "sha512-5d2RhCard1nQUC3aHcq/gHzWYO6K0WJmAbjO7mQJgCQKtZpgXxv1rOM6O/dBDhDYYVutk1sciOgNSe+5YyfM8A==" + "version": "0.0.16", + "resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz", + "integrity": "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==" }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "5.62.0", @@ -1735,51 +1744,27 @@ } }, "node_modules/@vueuse/core": { - "version": "8.9.4", - "resolved": "https://registry.npmmirror.com/@vueuse/core/-/core-8.9.4.tgz", - "integrity": "sha512-B/Mdj9TK1peFyWaPof+Zf/mP9XuGAngaJZBwPaXBvU3aCTZlx3ltlrFFFyMV4iGBwsjSCeUCgZrtkEj9dS2Y3Q==", + "version": "9.13.0", + "resolved": "https://registry.npmmirror.com/@vueuse/core/-/core-9.13.0.tgz", + "integrity": "sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==", "dependencies": { - "@types/web-bluetooth": "^0.0.14", - "@vueuse/metadata": "8.9.4", - "@vueuse/shared": "8.9.4", + "@types/web-bluetooth": "^0.0.16", + "@vueuse/metadata": "9.13.0", + "@vueuse/shared": "9.13.0", "vue-demi": "*" - }, - "peerDependencies": { - "@vue/composition-api": "^1.1.0", - "vue": "^2.6.0 || ^3.2.0" - }, - "peerDependenciesMeta": { - "@vue/composition-api": { - "optional": true - }, - "vue": { - "optional": true - } } }, "node_modules/@vueuse/metadata": { - "version": "8.9.4", - "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-8.9.4.tgz", - "integrity": "sha512-IwSfzH80bnJMzqhaapqJl9JRIiyQU0zsRGEgnxN6jhq7992cPUJIRfV+JHRIZXjYqbwt07E1gTEp0R0zPJ1aqw==" + "version": "9.13.0", + "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-9.13.0.tgz", + "integrity": "sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==" }, "node_modules/@vueuse/shared": { - "version": "8.9.4", - "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-8.9.4.tgz", - "integrity": "sha512-wt+T30c4K6dGRMVqPddexEVLa28YwxW5OFIPmzUHICjphfAuBFTTdDoyqREZNDOFJZ44ARH1WWQNCUK8koJ+Ag==", + "version": "9.13.0", + "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-9.13.0.tgz", + "integrity": "sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==", "dependencies": { "vue-demi": "*" - }, - "peerDependencies": { - "@vue/composition-api": "^1.1.0", - "vue": "^2.6.0 || ^3.2.0" - }, - "peerDependenciesMeta": { - "@vue/composition-api": { - "optional": true - }, - "vue": { - "optional": true - } } }, "node_modules/@wangeditor/basic-modules": { @@ -2950,17 +2935,17 @@ "dev": true }, "node_modules/element-plus": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.2.9.tgz", - "integrity": "sha512-jYbL0JkCdv95rkT6trZJjCAizLPySa0qcd2cgq+57SKQnCZAcNDDq4GbTuFRnNavdoeCJnuM3HIficTIUpsMOQ==", + "version": "2.4.4", + "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.4.4.tgz", + "integrity": "sha512-TlKubXJgxwhER0dw+8ULn9hr9kZjraV4R6Q/eidwWUwCKxwXYPBGmMKsZ/85tlxlhMYbcLZd/YZh6G3QkHX4fg==", "dependencies": { "@ctrl/tinycolor": "^3.4.1", - "@element-plus/icons-vue": "^2.0.6", - "@floating-ui/dom": "^0.5.4", + "@element-plus/icons-vue": "^2.3.1", + "@floating-ui/dom": "^1.0.1", "@popperjs/core": "npm:@sxzz/popperjs-es@^2.11.7", "@types/lodash": "^4.14.182", "@types/lodash-es": "^4.17.6", - "@vueuse/core": "^8.7.5", + "@vueuse/core": "^9.1.0", "async-validator": "^4.2.5", "dayjs": "^1.11.3", "escape-html": "^1.0.3", @@ -2968,7 +2953,7 @@ "lodash-es": "^4.17.21", "lodash-unified": "^1.0.2", "memoize-one": "^6.0.0", - "normalize-wheel-es": "^1.1.2" + "normalize-wheel-es": "^1.2.0" }, "peerDependencies": { "vue": "^3.2.0" diff --git a/package.json b/package.json index 5107dee..9f956c2 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "axios": "^0.27.2", "css-color-function": "^1.3.3", "echarts": "^5.3.3", - "element-plus": "^2.2.9", + "element-plus": "^2.4.4", "highlight.js": "^11.6.0", "nprogress": "^0.2.0", "pinia": "^2.0.14", diff --git a/src/api/task.ts b/src/api/task.ts index 1e3d2db..5597509 100644 --- a/src/api/task.ts +++ b/src/api/task.ts @@ -35,5 +35,5 @@ export function getDayTaskList(params: any) { //任务日程-详情 export function taskProgress(params: any) { - return request.get({ url: '/adminapi/task/taskProgress', params }) + return request.get({ url: '/task/taskProgress', params }) } \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index 28b93c5..daca99c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,6 +1,10 @@ import { createApp } from 'vue' import App from './App.vue' import install from './install' +import ElementPlus from 'element-plus' +import 'element-plus/dist/index.css' + + import './permission' import './styles/index.scss' import 'virtual:svg-icons-register' @@ -12,6 +16,7 @@ window._AMapSecurityConfig = { const app = createApp(App) app.use(install) +app.use(ElementPlus) app.provide('base_url', configs.baseUrl+configs.urlPrefix); app.mount('#app') app.config.warnHandler = () => null diff --git a/src/views/task/popTaskDetail.vue b/src/views/task/popTaskDetail.vue index 110c534..45dbf50 100644 --- a/src/views/task/popTaskDetail.vue +++ b/src/views/task/popTaskDetail.vue @@ -1,46 +1,45 @@