From 43d0a2668d0a7363839cac6a7bcab1f484e8f6a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’> Date: Thu, 14 Nov 2024 08:45:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/api/base/coreDepartment.js | 11 +- src/api/equipment/base/inspection/items.js | 9 +- .../equipment/analysis/quality/index.vue | 36 +- .../inspection/Settings/add-or-updata.vue | 95 +- .../base/inspection/items/showDetail.vue | 5 +- .../Confirm/WaitingList--add--unplanned.vue | 206 +- .../Confirm/WaitingListPlanned--edit.vue | 332 +- .../Confirm/WaitingListUnplanned--edit.vue | 24 +- .../maintain/PlanConfig/add-or-updata.vue | 11 +- .../items/components/add-or-updata.vue | 22 +- src/views/equipment/base/repair/index.vue | 10 +- .../base/spareParts/Config/index.vue | 17 +- .../equipment/base/spareParts/List/index.vue | 5 +- yarn.lock | 2925 ++--------------- 15 files changed, 525 insertions(+), 3185 deletions(-) diff --git a/package.json b/package.json index b51a8bc6..ec1259cb 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "license": "MIT", "scripts": { "local": "vue-cli-service serve --mode local", - "dev": "vue-cli-service serve --mode dev", + "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --mode dev", "front": "vue-cli-service serve --mode front", "build:prod": "vue-cli-service build --mode prod", "build:stage": "vue-cli-service build --mode stage", diff --git a/src/api/base/coreDepartment.js b/src/api/base/coreDepartment.js index 5e452bc2..eeb34ff5 100644 --- a/src/api/base/coreDepartment.js +++ b/src/api/base/coreDepartment.js @@ -3,7 +3,7 @@ * @Date: 2023-10-21 11:50:46 * @LastEditTime: 2023-10-30 14:37:28 * @LastEditors: DY - * @Description: + * @Description: */ import request from '@/utils/request' @@ -65,4 +65,11 @@ export function getCoreDepartmentList(query) { method: 'get', params: query }) -} \ No newline at end of file +} +export function getDepartmentList(query) { + return request({ + url: '/system/dept/list', + method: 'get', + params: query + }) +} diff --git a/src/api/equipment/base/inspection/items.js b/src/api/equipment/base/inspection/items.js index da183b67..936e5579 100644 --- a/src/api/equipment/base/inspection/items.js +++ b/src/api/equipment/base/inspection/items.js @@ -5,13 +5,6 @@ * @LastEditors: zhp * @Description: */ -/* - * @Author: zhp - * @Date: 2024-07-12 15:31:41 - * @LastEditTime: 2024-07-22 09:33:20 - * @LastEditors: zhp - * @Description: - */ import request from '@/utils/request' @@ -26,7 +19,7 @@ export function getItemPageData(data) { return request({ url: '/base/equipment-check-program/page', method: 'get', - data + params: data }) } diff --git a/src/views/equipment/analysis/quality/index.vue b/src/views/equipment/analysis/quality/index.vue index b2590f89..75c22521 100644 --- a/src/views/equipment/analysis/quality/index.vue +++ b/src/views/equipment/analysis/quality/index.vue @@ -252,7 +252,7 @@ export default { computed: {}, created() { this.fillLineOptions(); - this.fillProductOptions(); + // this.fillProductOptions(); }, mounted() { // window.addEventListener('resize', () => { @@ -284,23 +284,23 @@ export default { ); }, - async fillProductOptions() { - const { data } = await this.$axios({ - url: '/base/core-product/listAll', - method: 'get', - }); - const cfg = this.searchBarFormConfig.find( - (item) => item.__index == 'product' - ); - this.$set( - cfg, - 'selectOptions', - data.map((item) => ({ - id: item.id, - name: item.name, - })) - ); - }, + // async fillProductOptions() { + // const { data } = await this.$axios({ + // url: '/base/core-product/listAll', + // method: 'get', + // }); + // const cfg = this.searchBarFormConfig.find( + // (item) => item.__index == 'product' + // ); + // this.$set( + // cfg, + // 'selectOptions', + // data.map((item) => ({ + // id: item.id, + // name: item.name, + // })) + // ); + // }, async getList() { const { data } = await this.$axios({ diff --git a/src/views/equipment/base/inspection/Settings/add-or-updata.vue b/src/views/equipment/base/inspection/Settings/add-or-updata.vue index c500c4c3..515f0635 100644 --- a/src/views/equipment/base/inspection/Settings/add-or-updata.vue +++ b/src/views/equipment/base/inspection/Settings/add-or-updata.vue @@ -6,84 +6,60 @@ * @Description: --> - - - - {{ '添加内容' }} - - - + + + + {{ '添加内容' }} + + + 巡检单名称 {{ dataForm.name }} - + 部门 {{ dataForm.department }} - - 巡检时间 + + 计划巡检时间 {{ parseTime(dataForm.planCheckTime) }} - + - + - - - 巡检内容 - + + + 巡检内容 + - - + + 添加 - - - - - + + + + + - - + - + - - + +