From 0babf2d3251a3e0e476a595fa0826401da9d1c80 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Tue, 22 Aug 2023 16:35:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AF=84=E5=88=86=E8=A1=A8=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/huizhou.ts | 8 + .../assessmentManagement/rankList/index.scss | 1 + .../scoreStandard/index.scss | 4 + .../scoreStandard/index.vue | 5 +- .../assessmentManagement/unitList/index.scss | 2 +- .../assessmentManagement/unitList/index.vue | 33 +- .../unitScore/components/scoreTableNew.vue | 696 ++++++++++-------- .../assessmentManagement/unitScore/index.scss | 4 + .../assessmentManagement/unitScore/index.vue | 45 +- .../goverment/huizhou/droneImaging/index.scss | 12 +- .../goverment/huizhou/droneImaging/index.vue | 7 +- 11 files changed, 474 insertions(+), 343 deletions(-) diff --git a/src/api/modules/huizhou.ts b/src/api/modules/huizhou.ts index a3cf981..dc7d91e 100644 --- a/src/api/modules/huizhou.ts +++ b/src/api/modules/huizhou.ts @@ -284,6 +284,14 @@ export const noScoreDetail = (params: any) => { export const addScoreDetail = (params: any) => { return http.post(BASEURL + `/gov/enterpriseScoreDetail/add`, params); }; +// 单位评分明细表(编辑打分) +export const updateScoreDetail = (params: any) => { + return http.post(BASEURL + `/gov/enterpriseScoreDetail/edit`, params); +}; +// 单位评分明细表(清空打分) +export const deleteScoreDetail = (params: any) => { + return http.post(BASEURL + `/gov/enterpriseScoreDetail/deleteBatch`, params); +}; // 查看排行榜列表得分信息 export const rankScoreList = (params: any) => { return http.post(BASEURL + `/gov/enterpriseScore/rankList`, params); diff --git a/src/views/goverment/huizhou/assessmentManagement/rankList/index.scss b/src/views/goverment/huizhou/assessmentManagement/rankList/index.scss index 6ea213b..f7543bc 100644 --- a/src/views/goverment/huizhou/assessmentManagement/rankList/index.scss +++ b/src/views/goverment/huizhou/assessmentManagement/rankList/index.scss @@ -181,6 +181,7 @@ background: #1b2a54; } .leftProject { + width: 100%; color: #333333; font-size: 20px; height: 40px; diff --git a/src/views/goverment/huizhou/assessmentManagement/scoreStandard/index.scss b/src/views/goverment/huizhou/assessmentManagement/scoreStandard/index.scss index 1b20ffa..17c847b 100644 --- a/src/views/goverment/huizhou/assessmentManagement/scoreStandard/index.scss +++ b/src/views/goverment/huizhou/assessmentManagement/scoreStandard/index.scss @@ -25,6 +25,7 @@ height: 93%; } .leftProject { + width: 100%; color: #333333; font-size: 20px; height: 40px; @@ -55,6 +56,9 @@ } } } + .addStyle { + display: none; + } } } } diff --git a/src/views/goverment/huizhou/assessmentManagement/scoreStandard/index.vue b/src/views/goverment/huizhou/assessmentManagement/scoreStandard/index.vue index 0871659..8c36b81 100644 --- a/src/views/goverment/huizhou/assessmentManagement/scoreStandard/index.vue +++ b/src/views/goverment/huizhou/assessmentManagement/scoreStandard/index.vue @@ -126,7 +126,7 @@ const formConfig = reactive({ { label: "标准分", prop: "standardScore", - type: "input" + type: "number" } // { // label: "图片显示", @@ -179,7 +179,8 @@ const formConfig = reactive({ required: true, message: "请输入", trigger: "blur" - } + }, + { max: 100, message: "最大值不能超过100", trigger: "blur" } ] } }); diff --git a/src/views/goverment/huizhou/assessmentManagement/unitList/index.scss b/src/views/goverment/huizhou/assessmentManagement/unitList/index.scss index 4050b0a..af86426 100644 --- a/src/views/goverment/huizhou/assessmentManagement/unitList/index.scss +++ b/src/views/goverment/huizhou/assessmentManagement/unitList/index.scss @@ -25,7 +25,7 @@ height: 93%; } .leftProject { - width: 52%; + width: 100%; color: #333333; font-size: 20px; height: 40px; diff --git a/src/views/goverment/huizhou/assessmentManagement/unitList/index.vue b/src/views/goverment/huizhou/assessmentManagement/unitList/index.vue index 2bbd73e..244d560 100644 --- a/src/views/goverment/huizhou/assessmentManagement/unitList/index.vue +++ b/src/views/goverment/huizhou/assessmentManagement/unitList/index.vue @@ -31,13 +31,18 @@ 新增 - 删除 - @@ -126,7 +136,8 @@ import scoreTable from "./components/scoreTable.vue"; import addCompany from "./components/addCompany.vue"; import scoreTableNew from "./components/scoreTableNew.vue"; import { getDicList } from "@/api/modules/jxjview"; -import { scorePage, enterpriseList, engineerList, scoreAdd } from "@/api/modules/huizhou"; +import { scorePage, enterpriseList, engineerList, scoreAdd, deleteScoreDetail } from "@/api/modules/huizhou"; +import { useHandleData } from "@/hooks/useHandleData"; const relativeInfo = ref({}); const dicMainData = ref([]); const openScore = ref(false); @@ -191,6 +202,16 @@ const columns: ColumnProps[] = [ prop: "engineeringName", label: "项目名称" }, + { + prop: "scoreFlag", + label: "评分状态", + isShow: false, + search: { el: "select" }, + enum: [ + { label: "已评分", value: 1 }, + { label: "未评分", value: 0 } + ] + }, // { // prop: "creditCode", // label: "统一社会信用代码" @@ -203,7 +224,7 @@ const columns: ColumnProps[] = [ prop: "score", label: "分数" }, - { prop: "operation", label: "操作", width: 120, fixed: "right" } + { prop: "operation", label: "操作", width: 150, fixed: "right" } ]; const imgOption = ref([ "../../../../../assets/images/hzImg/assessmentImg/dicIcon1.png", @@ -223,6 +244,14 @@ const companyType = ref({}); const proTable = ref(); const enterpriseDataList = ref([]); const engineerDataList = ref([]); +// 清空评分 +const clearScore = async (ids: []) => { + console.log(ids); + let idString = ids.join(","); + await useHandleData(deleteScoreDetail, { ids: idString }, "清空所选打分明细"); + proTable.value?.clearSelection(); + proTable.value?.getTableList(); +}; const confirmScore = (val: any) => { console.log(val); openScore.value = val; diff --git a/src/views/goverment/huizhou/droneImaging/index.scss b/src/views/goverment/huizhou/droneImaging/index.scss index 74c5899..bc1a799 100644 --- a/src/views/goverment/huizhou/droneImaging/index.scss +++ b/src/views/goverment/huizhou/droneImaging/index.scss @@ -264,8 +264,16 @@ border-radius: 50%; } -:deep(.el-form .el-form-item__content .el-range-editor) { - width: 200px; +:deep() { + .el-form .el-form-item__content .el-range-editor { + width: 300px; + } + .el-range-separator { + color: var(--el-menu-text-color); + } + .el-range-input { + font-size: 18px; + } } :deep() { .el-form-item__content > :not(button) { diff --git a/src/views/goverment/huizhou/droneImaging/index.vue b/src/views/goverment/huizhou/droneImaging/index.vue index 7a39473..f1615a5 100644 --- a/src/views/goverment/huizhou/droneImaging/index.vue +++ b/src/views/goverment/huizhou/droneImaging/index.vue @@ -71,7 +71,7 @@
-
时间：{{ item.createTime }}
+
时间：{{ item.uploadTime }}
@@ -358,8 +358,9 @@ const getVideoData = async () => { const handleCurrentChange = async (page: number) => {}; // form日期选择后改变入参 const onDatePicker = () => { - form.value.startTime = form.value.createTime[0]; - form.value.endTime = form.value.createTime[1]; + console.log(form.value.createTime); + form.value.startTime = form.value.createTime ? form.value.createTime[0] : null; + form.value.endTime = form.value.createTime ? form.value.createTime[1] : null; }; // 获取项目名称分页 const getProPage = async () => {