From 043c591be4650cc254e3467e8d5b5d90ed2f9984 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期一, 29 四月 2024 18:00:00 +0800
Subject: [PATCH] Merge branch 'master' into dev-threejs
---
src/views/system/calculate/order/index.vue | 133 ++++++++++++--------------
src/views/system/point/index.vue | 84 +---------------
src/api/platform/check-result.js | 12 ++
src/views/system/contract/index.vue | 2
src/api/platform/contract-score.js | 2
src/views/system/score/default/index.vue | 24 +++-
6 files changed, 98 insertions(+), 159 deletions(-)
diff --git a/src/api/platform/check-result.js b/src/api/platform/check-result.js
index 578e87a..23b723b 100644
--- a/src/api/platform/check-result.js
+++ b/src/api/platform/check-result.js
@@ -3,12 +3,20 @@
// 鏌ヨ鑰冩牳缁撴灉鍒楄〃
export function listCheckResult(query) {
return request({
- url: '/check/result/list',
- method: 'get',
+ url: '/check/result/list?pageNum=' + query.pageNum + '&pageSize=' + query.pageSize,
+ method: 'post',
data: query
})
}
+// 鏌ヨ鑰冩牳缁撴灉璇︽儏
+export function resultRecord(id) {
+ return request({
+ url: '/check/result/record/list?resultId=' + id,
+ method: 'get'
+ })
+}
+
// 鏌ヨ鑰冩牳缁撴灉璇︾粏
export function getCheckResult(id) {
return request({
diff --git a/src/api/platform/contract-score.js b/src/api/platform/contract-score.js
index 8e111ea..da595be 100644
--- a/src/api/platform/contract-score.js
+++ b/src/api/platform/contract-score.js
@@ -3,7 +3,7 @@
// 鏌ヨ杩濊瀹℃牳鍒楄〃
export function listAuditing(data) {
return request({
- url: '/contract/score/list',
+ url: '/contract/score/list?pageNum=' + data.pageNum + '&pageSize=' + data.pageSize,
method: 'post',
data: data
})
diff --git a/src/views/system/calculate/order/index.vue b/src/views/system/calculate/order/index.vue
index f694391..9aa6437 100644
--- a/src/views/system/calculate/order/index.vue
+++ b/src/views/system/calculate/order/index.vue
@@ -1,14 +1,17 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
- <el-form-item label="鑰冩牳瀵硅薄" prop="checkUnitId">
- <el-input
- v-model="queryParams.checkUnitName"
- placeholder="璇疯緭鍏ヨ�冩牳瀵硅薄"
- clearable
- @clear="handleQuery"
- @keyup.enter.native="handleQuery"
- />
+ <el-form-item label="鑰冩牳瀵硅薄" prop="unitId">
+ <el-select v-model="queryParams.unitId" @change="handleQuery" clearable placeholder="鑰冩牳瀵硅薄">
+ <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍙戝竷鐘舵��" prop="unitId">
+ <el-select v-model="queryParams.publish" @change="handleQuery" clearable placeholder="鍙戝竷鐘舵��">
+ <el-option label="鏈彂甯�" :value="0" />
+ <el-option label="宸插彂甯�" :value="1" />
+ </el-select>
</el-form-item>
<el-form-item label="鑰冩牳鏃堕棿">
<el-date-picker
@@ -62,19 +65,23 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-card class="box-card" v-for="item in checkResultList" :key="item.id">
- <div slot="header" class="clearfix">
- <span>{{ item.contractName }}</span>
- <el-button style="float: right; padding: 3px 6px" type="text" @click="handleDetail(item)">璇︽儏</el-button>
- </div>
- <div class="text item">鑰冩牳<span class="time">{{ item.unitName }}</span></div>
- <div class="text item">鑰冩牳鍒嗘暟<span class="time">{{ item.score }}</span></div>
- <div class="text item">鑰冩牳鏃堕棿
- <span class="time">{{ item.checkTime }}</span>
- <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish != 1" v-hasPermi="['result:contract:publish']">纭鍙戝竷</el-button>
- <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish == 1" v-hasPermi="['result:contract:publish']">宸插彂甯�</el-button>
- </div>
- </el-card>
+ <el-row v-loading="loading">
+ <el-col :span="8" v-for="(item, index) in checkResultList" :key="index">
+ <el-card class="box-card">
+ <div slot="header" class="clearfix">
+ <span>{{ item.contractName }}</span>
+ <el-button style="float: right; padding: 3px 6px" type="text" @click="handleDetail(item)">璇︽儏</el-button>
+ </div>
+ <div class="text item">鑰冩牳瀵硅薄<span class="time">{{ item.unitName }}</span></div>
+ <div class="text item">鑰冩牳鍒嗘暟<span class="time">{{ item.score }}</span></div>
+ <div class="text item">鑰冩牳鏃堕棿
+ <span class="time">{{ item.checkTime }}</span>
+ <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish != 1" v-hasPermi="['result:contract:publish']">纭鍙戝竷</el-button>
+ <el-button size="small" round style="float: right;" disabled v-show="item.publish == 1" v-hasPermi="['result:contract:publish']">宸插彂甯�</el-button>
+ </div>
+ </el-card>
+ </el-col>
+ </el-row>
<pagination
@@ -122,18 +129,24 @@
show-summary
style="width: 100%">
<el-table-column
- prop="name"
+ prop="ruleName"
label="瑙勫垯鍚�"
- width="180">
+ :show-overflow-tooltip="true"
+ width="300">
</el-table-column>
<el-table-column
- prop="content"
- label="鎸囨爣"
- width="180">
+ label="鎵ｅ噺鏂瑰紡"
+ align="center"
+ prop="deductCategory"
+ width="180px">
+ </el-table-column>
+ <el-table-column
+ prop="num"
+ label="鎸囨爣">
</el-table-column>
<el-table-column
prop="score"
- label="寰楀垎">
+ label="鎵ｅ垎">
</el-table-column>
</el-table>
</el-dialog>
@@ -151,7 +164,8 @@
</template>
<script>
-import { listCheckResult, getCheckResult, delCheckResult, addCheckResult, updateCheckResult,manualScore, publishCheckResult } from "@/api/platform/check-result";
+import { resultRecord, listCheckResult, getCheckResult, delCheckResult, addCheckResult, updateCheckResult,manualScore, publishCheckResult } from "@/api/platform/check-result";
+import { unitSelect } from "@/api/platform/unit";
export default {
name: "CheckResult",
@@ -162,23 +176,7 @@
detail:{
},
- tableData: [{
- name: '瑙嗛骞冲潎鍦ㄧ嚎鐜�',
- content: '97%',
- score: '-5'
- }, {
- name: '涓�鏈轰竴妗�24灏忔椂鏈慨澶�',
- content: '5涓�',
- score: '-0.5'
- }, {
- name: '瀛樺偍鏁呴殰',
- content: '5灏忔椂',
- score: '-0.3'
- }, {
- name: '鏃堕挓涓嶅悓姝�24灏忔椂鏈慨澶�',
- content: '3涓�',
- score: '-0.5'
- }],
+ tableData: [],
manualScoreOpen: false,
manualScoreForm: {},
manualScoreTitle: '',
@@ -213,36 +211,29 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
- }
+ },
+ unitList: []
};
},
created() {
this.getList();
+ this.getUnitSelect();
},
methods: {
- frequencyFormatter(row) {
- if (row.frequency === "1") {
- return "鏈堝害鑰冩牳"
- }
- if (row.frequency === "2") {
- return "瀛ｅ害鑰冩牳"
- }
- },
- examineRangeFormatter(row) {
- if (row.examineRange === "1") {
- return "鍒嗗眬鑰冩牳"
- }
- if (row.examineRange === "2") {
- return "甯傚眬鑰冩牳"
- }
+ getUnitSelect() {
+ // 杩愮淮鍗曚綅涓嬫媺鍒楄〃
+ unitSelect().then((res) => {
+ this.unitList = res.data;
+ })
},
/** 鏌ヨ鑰冩牳缁撴灉鍒楄〃 */
getList() {
this.loading = true;
if (null != this.daterangeCheckTime && '' != this.daterangeCheckTime) {
- this.queryParams["start"] = this.daterangeCheckTime[0];
- this.queryParams["end"] = this.daterangeCheckTime[1];
+ this.queryParams["createStartTime"] = this.daterangeCheckTime[0];
+ this.queryParams["createEndTime"] = this.daterangeCheckTime[1];
}
+ console.log("this.queryParams", this.queryParams)
listCheckResult(this.queryParams).then(response => {
this.checkResultList = response.rows;
this.total = response.total;
@@ -293,11 +284,12 @@
this.manualScoreOpen = true;
},
handleDetail(row) {
+ resultRecord(row.id).then(res => {
+ this.tableData = res.rows;
+ })
this.detail = row;
- this.detail.carOnlineRate = '97%';
- this.detailTitle = '鑰冩牳缁撴灉';
+ this.detailTitle = '鑰冩牳缁撴灉璇︽儏';
this.detailOpen = true;
-
},
handlePublish(row) {
let text = row.publish == 1 ? '鍙栨秷鍙戝竷' : '鍙戝竷';
@@ -312,13 +304,13 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
- this.queryParams.pageNum = 1;
this.getList();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.daterangeCheckTime = [];
this.resetForm("queryForm");
+ this.queryParams = {};
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
@@ -375,9 +367,9 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- this.download('system/checkResult/export', {
+ this.download('check/result/export', {
...this.queryParams
- }, `checkResult_${new Date().getTime()}.xlsx`)
+ }, `鍚堝悓鑰冩牳缁撴灉_${new Date().getTime()}.xlsx`)
},
}
@@ -404,6 +396,7 @@
clear: both
}
.box-card {
- width: 350px;
+ width: 400px;
+ margin-bottom: 20px;
}
</style>
diff --git a/src/views/system/contract/index.vue b/src/views/system/contract/index.vue
index 61ac223..8a0d0e7 100644
--- a/src/views/system/contract/index.vue
+++ b/src/views/system/contract/index.vue
@@ -33,7 +33,7 @@
<el-collapse-item v-for="(item, index) in ruleData" :key="index" :title="item.ruleName" :name="index">
<div class="inline-input-container" v-for="(item, index) in item.children" :key="index">
<b>{{ item.ruleDesc }}</b> <br v-if="item.ruleDesc"/>
- <el-tooltip class="item" v-for="(item, index) in item.children" :key="index" effect="dark" :content="item.deductCategory == '鍒嗘暟涔樹互鏁伴噺' ? '鎵�' + item.calcFraction + '涔樹互鏁伴噺 ' : item.deductCategory == '闄や互鏁伴噺鍚庝箻浠ュ垎鏁�' ? '鎵�' + item.calcFraction + '鍒�/' + item.calcUnit + '灏忔椂' : item.deductCategory + ' ' + item.calcFraction" placement="top">
+ <el-tooltip class="item" v-for="(item, index) in item.children" :key="index" effect="dark" :content="item.deductCategory == '鍒嗘暟涔樹互鏁伴噺' ? '鎵�' + item.calcFraction + '鍒�*鏁伴噺 ' : item.deductCategory == '闄や互鏁伴噺鍚庝箻浠ュ垎鏁�' ? '鎵�' + item.calcFraction + '鍒�/' + item.calcUnit + '灏忔椂' : '鎵�' + item.calcFraction + '鍒�'" placement="top">
<span>{{ item.ruleCondition }}<br/></span>
<!-- {{ item.deductCategory }} {{ item.calcFraction }}{{ item.calcUnit ? "/" + item.calcUnit : '' }} -->
</el-tooltip>
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index fe561c1..6d51e3f 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -4,16 +4,6 @@
<el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
<el-input v-model="queryParams.pointName" placeholder="璇疯緭鍏ョ偣浣嶅悕绉�" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
- <el-form-item label="鐐逛綅寮�濮嬫椂闂�" prop="startTime">
- <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鐐逛綅寮�濮嬫椂闂�">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="鐐逛綅缁撴潫鏃堕棿" prop="endTime">
- <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鐐逛綅缁撴潫鏃堕棿">
- </el-date-picker>
- </el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -57,16 +47,6 @@
<dict-tag :options="dict.type.point_tag" :value="scope.row.pointTags" />
</template>
</el-table-column>
- <el-table-column label="鐐逛綅寮�濮嬫椂闂�" align="center" prop="startTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鐐逛綅缁撴潫鏃堕棿" align="center" prop="endTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
<el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName" />
<el-table-column label="鐩戠閮ㄩ棬" align="center" prop="deptName" />
<el-table-column label="杩愮淮绫诲埆" align="center" prop="category">
@@ -76,7 +56,6 @@
<div v-else-if="scope.row.category === 3">浜鸿劯璇嗗埆</div>
</template>
</el-table-column>
- <el-table-column label="杩愮淮鐘舵��" align="center" prop="status" />
<el-table-column label="澶囨敞" align="center" prop="remark" />
<el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -123,10 +102,8 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鐐逛綅鏃跺尯" prop="timezone">
- <el-date-picker @change="dateChange" v-model="form.timezone" type="daterange" align="right" unlink-panels
- range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
- </el-date-picker>
+ <el-form-item label="鐐逛綅澶囨敞" prop="remark">
+ <el-input type="textarea" v-model="form.remark"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -147,11 +124,6 @@
<el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
</el-select>
- </el-form-item>
- <el-form-item label="杩愮淮鏃堕棿娈�" prop="timezone">
- <el-date-picker @change="dateChange" v-model="batchEditForm.timezone" type="daterange" align="right"
- unlink-panels range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
- </el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -180,15 +152,11 @@
ids: [],
unitId: null,
timezone: null,
- startTime: null,
- endTime: null
},
// 鎵归噺淇敼寮圭獥
batchOpen: false,
props: { multiple: true },
regionList: [],
- // 姝ｅ湪淇敼绗嚑涓�
- editingIndex: null,
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -211,26 +179,17 @@
editOpen: false,
// 杩愮淮鍗曚綅
unitList: [],
- // 杩愮淮鏃跺尯
- timezone: [],
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
pageSize: 10,
pointName: null,
- startTime: null,
- endTime: null,
unitId: null,
status: null,
},
// 琛ㄥ崟鍙傛暟
- form: {},
- // 鎵归噺琛ㄥ崟鍐呭
- formList: [],
- // 涓存椂琛ㄥ崟鏁版嵁
- tempForm: {},
- // 涓存椂琛ㄥ崟鏁版嵁鍒楄〃
- tempFormList: [],
+ form: {
+ },
// 琛ㄥ崟鏍￠獙
rules: {
pointName: [
@@ -284,9 +243,7 @@
handleEditBatch() {
this.batchOpen = true;
},
- removeRegion(item) {
- this.tempFormList = this.tempFormList.filter(data => data !== item)
- },
+
// 鑾峰彇鍖哄幙绾ц仈
getCascader() {
getCascader().then(res => {
@@ -299,33 +256,11 @@
this.deptOptions = res.data;
})
},
- // 鐐逛綅椤逛慨鏀瑰畬鎴�
- editFinishItem(index) {
- this.editingIndex = null;
- let form = this.tempFormList[index];
- form.startTime = form.timezone[0];
- form.endTime = form.timezone[1];
- this.formList[index] = form;
- },
- // 鐐逛綅椤逛慨鏀�
- editPointItem(index) {
- if (this.editingIndex !== index && this.editingIndex !== null) {
- this.$modal.msgWarning("璇峰厛瀹屾垚涓婁竴涓慨鏀�");
- } else {
- this.editingIndex = index;
- this.tempFormList[index] = this.formList[index];
- }
- },
+
// 鏃堕棿閫夋嫨鍙戠敓鍙樺寲
dateChange() {
this.tempForm.startTime = this.tempForm.timezone[0];
this.tempForm.endTime = this.tempForm.timezone[1];
- },
- // 缁х画娣诲姞鐐逛綅
- nextAdd() {
- let item = {}
- // this.formList.push(item);
- this.tempFormList.push(item);
},
getUnitSelect() {
// 杩愮淮鍗曚綅涓嬫媺鍒楄〃
@@ -347,17 +282,11 @@
this.open = false;
this.reset();
},
- updateCancel() {
- this.editOpen = false;
- this.reset();
- },
// 琛ㄥ崟閲嶇疆
reset() {
this.form = {
id: null,
pointName: null,
- startTime: null,
- endTime: null,
unitId: null,
deptId: [],
status: null,
@@ -399,7 +328,6 @@
this.form = response.data;
this.form.pointTag = response.data.pointTags;
this.form.deptId = response.data.deptIds
- this.form.timezone = [this.form.startTime, this.form.endTime]
this.form.category = this.form.category + ''
this.open = true;
this.title = "淇敼杩愮淮鐐逛綅";
diff --git a/src/views/system/score/default/index.vue b/src/views/system/score/default/index.vue
index bb3d5be..f2db340 100644
--- a/src/views/system/score/default/index.vue
+++ b/src/views/system/score/default/index.vue
@@ -44,12 +44,13 @@
<el-table v-loading="loading" :data="auditingList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鑰冩牳鍗曚綅" align="center" prop="unitName" width="180" />
- <el-table-column label="鑰冩牳鍚堝悓" align="center" prop="contractName" width="180" />
- <el-table-column label="鑰冩牳瑙勫垯" align="center" prop="ruleName" width="120" :show-overflow-tooltip="true" />
- <el-table-column label="鑰冩牳鎸囨爣" align="center" prop="num" width="120" />
- <el-table-column label="鑰冩牳鎵ｅ垎" align="center" prop="score" width="120" />
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" />
+ <el-table-column label="鑰冩牳鍗曚綅" align="center" prop="unitName"/>
+ <el-table-column label="鑰冩牳鍚堝悓" align="center" prop="contractName"/>
+ <el-table-column label="鑰冩牳瑙勫垯" align="center" prop="ruleName" :show-overflow-tooltip="true" />
+ <el-table-column label="鎵ｅ噺鏂瑰紡" align="center" prop="deductCategory"/>
+ <el-table-column label="鑰冩牳鎸囨爣" align="center" prop="num"/>
+ <el-table-column label="鑰冩牳鎵ｅ垎" align="center" prop="score"/>
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180px"/>
<el-table-column label="瀹℃牳鐘舵��" align="center" prop="auditingStatus">
<template slot-scope="scope">
<el-tag
@@ -121,7 +122,14 @@
<el-cascader ref="cascader" v-model="form.ruleIdsArray" :options="options" @change="handleChange">
<template slot-scope="{ data }">
<el-tooltip class="item" :disabled="data.label.length < 16 && !data.deductCategory" effect="dark"
- :content="data.label.length < 16 ? data.deductCategory ? data.deductCategory + ' ' + data.calcFraction + (data.calcUnit ? '/' + data.calcUnit : '') : '' : (data.deductCategory ? data.label + ' ' + data.deductCategory + ' ' + data.calcFraction + (data.calcUnit ? '/' + data.calcUnit : '') : data.label)"
+ :content="
+ data.label.length < 16 ?
+ data.deductCategory ?
+ data.deductCategory == '鍒嗘暟涔樹互鏁伴噺' ? '鎵�' + data.calcFraction + '鍒�*鏁伴噺 ' : data.deductCategory == '闄や互鏁伴噺鍚庝箻浠ュ垎鏁�' ? '鎵�' + data.calcFraction + '鍒�/' + data.calcUnit + '灏忔椂' : '鎵�' + data.calcFraction + '鍒�' :
+ '' :
+ (data.deductCategory ?
+ data.label + ' ' + (data.deductCategory == '鍒嗘暟涔樹互鏁伴噺' ? '鎵�' + data.calcFraction + '鍒�*鏁伴噺 ' : data.deductCategory == '闄や互鏁伴噺鍚庝箻浠ュ垎鏁�' ? '鎵�' + data.calcFraction + '鍒�/' + data.calcUnit + '灏忔椂' : '鎵�' + data.calcFraction + '鍒�') :
+ data.label)"
placement="left">
<span>{{ data.label }}</span>
</el-tooltip>
@@ -281,6 +289,7 @@
let item = this.$refs['cascader'].getCheckedNodes()[0].data;
this.calcObj = item;
this.form.contractId = item.contractId;
+ this.form.deductCategory = item.deductCategory == '鍒嗘暟涔樹互鏁伴噺' ? '鎵�' + item.calcFraction + '鍒�*鏁伴噺 ' : item.deductCategory == '闄や互鏁伴噺鍚庝箻浠ュ垎鏁�' ? '鎵�' + item.calcFraction + '鍒�/' + item.calcUnit + '灏忔椂' : '鎵�' + item.calcFraction + '鍒�';
if (item.deductCategory == "鎵ｆ寚瀹氬垎鏁�") {
this.needNum = false;
this.form.score = item.calcFraction;
@@ -399,6 +408,7 @@
this.daterangeAuditingTime = [];
this.daterangeCreateTime = [];
this.resetForm("queryForm");
+ this.queryParams = {};
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
--
Gitblit v1.8.0