From 39af4d876bc4a6501b3d12a29efbdca490fe3ee2 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期六, 24 八月 2024 17:30:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/screen/newPage/index.vue | 4 +--- src/views/system/report/index.vue | 11 +++++++---- src/views/system/work-order/index.vue | 19 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/views/screen/newPage/index.vue b/src/views/screen/newPage/index.vue index e05723c..298f604 100644 --- a/src/views/screen/newPage/index.vue +++ b/src/views/screen/newPage/index.vue @@ -86,9 +86,8 @@ overflow: hidden; overflow-x: auto; margin-top: -9px; - height: 90%; "> - <div style="width: 750px"> + <div style="width: 780px"> <CarChart class="wrapper-item" :carList="carList"></CarChart> </div> </div> @@ -100,7 +99,6 @@ <div style=" overflow: auto; margin-top: -9px; - height: 90%; "> <div style="width: 1100px"> <VideoChart class="wrapper-item" :videoList="videoList"></VideoChart> diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue index 23cd7f8..3e386a8 100644 --- a/src/views/system/report/index.vue +++ b/src/views/system/report/index.vue @@ -412,6 +412,7 @@ }, // 琛ㄥ崟閲嶇疆 reset() { + this.daterangeCreateTime = []; this.form = { id: null, unitId: null, @@ -423,9 +424,9 @@ reportContent: null, reportMaterials: null, deleted: null, - errorType: null + errorType: null, }; - this.resetForm("form"); + // this.resetForm("form"); }, /** 鎼滅储鎸夐挳鎿嶄綔 */ handleQuery() { @@ -450,14 +451,14 @@ /** 鏂板鎸夐挳鎿嶄綔 */ handleAdd() { this.reset(); - this.addOrImport = 'add' + this.addOrImport = 'add'; this.open = true; this.title = "娣诲姞鎶ュ"; }, /** 瀵煎叆鎸夐挳鎿嶄綔 */ handleImport() { this.reset(); - this.addOrImport = 'import' + this.addOrImport = 'import'; this.open = true; this.title = "瀵煎叆鎶ュ"; }, @@ -473,6 +474,7 @@ this.daterangeCreateTime = [response.data.beginCreateTime, response.data.endCreateTime] this.form = response.data; this.form.errorType = this.form.errorType.split(','); + this.addOrImport = 'add'; this.open = true; this.title = "淇敼鎶ュ"; }); @@ -500,6 +502,7 @@ }, /** 鎻愪氦鎸夐挳 */ submitForm() { + this.form.pointId = this.form.pointId ? this.form.pointId : this.form.serialNumber; this.$refs["form"].validate(valid => { if (valid) { this.form.beginCreateTime = this.daterangeCreateTime[0] diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue index 3eec75d..125e50e 100644 --- a/src/views/system/work-order/index.vue +++ b/src/views/system/work-order/index.vue @@ -12,9 +12,7 @@ </el-form-item> <el-form-item label="鏁呴殰绫诲瀷" prop="errorTypeList"> <el-select v-model="queryParams.errorTypeList" multiple placeholder="鏁呴殰绫诲瀷" clearable @clear="handleQuery"> - <el-option v-for="dict in dict.type.error_type" - :value="dict.value" - :label="dict.label"/> + <el-option v-for="dict in dict.type.error_type" :value="dict.value" :key="dict.value" :label="dict.label" /> </el-select> </el-form-item> <el-form-item label="宸ュ崟鐘舵��" prop="status"> @@ -44,7 +42,7 @@ </el-col> </el-row> - <el-row v-if="workOrderList && workOrderList.length > 0" :gutter="20" v-loading="loading"> + <el-row :gutter="20" v-loading="loading"> <el-col :xl="6" :lg="8" :md="12" :sm="24" v-for="item in workOrderList" :key="item.id"> <div class="my-col"> <div style="padding-left: 10px; padding-top: 8px"> @@ -130,7 +128,7 @@ </el-col> </el-row> - <el-empty v-else description="鏆傛棤鏁版嵁"></el-empty> + <el-empty v-if="empty" description="鏆傛棤鏁版嵁"></el-empty> <pagination v-show="total>0" @@ -240,9 +238,7 @@ > <el-form-item label="鏁呴殰绫诲瀷" prop="errorType"> <el-select v-model="batchAuditingWorkOrder.errorTypes" multiple placeholder="鏁呴殰绫诲瀷"> - <el-option v-for="(item, index) in errorTypeOptions" :label="item.dictLabel" :value="item.dictValue" - :key="index" - ></el-option> + <el-option v-for="dict in dict.type.error_type" :value="dict.value" :key="dict.value" :label="dict.label" /> </el-select> </el-form-item> <el-form-item label="瀹℃牳璇存槑" prop="auditingRemark"> @@ -381,7 +377,6 @@ getYwAuditingList } from '@/api/platform/work-order' import { addReport } from '@/api/platform/report' -import { getDicts } from '@/api/system/dict/data' export default { name: 'Work-order', @@ -389,8 +384,8 @@ components: {}, data() { return { + empty: false, openShowCurrent: null, - errorTypeOptions: [], ywConditions: [], batchAuditingVisible: false, batchAuditingWorkOrder: { @@ -657,6 +652,7 @@ }, /** 鏌ヨ杩愮淮宸ュ崟鍒楄〃 */ getList() { + this.empty = false; this.loading = true this.queryParams.params = {} this.queryParams['start'] = this.daterangeYwHandleTime ? this.daterangeYwHandleTime[0] : null @@ -673,6 +669,9 @@ this.workOrderList = response.data this.total = response.total this.loading = false + if (this.total === 0) { + this.empty = true + } }) }, // 鍙栨秷鎸夐挳 -- Gitblit v1.8.0