From 72f13e697d40c8fffc7aa0197fec4509bbe41569 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期一, 06 五月 2024 11:36:10 +0800
Subject: [PATCH] Merge branch 'master' into dev-threejs
---
src/views/system/contract/score/index.vue | 0
src/api/platform/check-score.js | 7
src/views/system/check/result/detail/detail.vue | 209 ++++--------
src/views/system/work-order/threshold/index.vue | 2
src/views/system/check/rule/index.vue | 0
src/views/system/data-manage/equipment/index.vue | 0
src/views/system/check/result/detail/index.vue | 99 ++++
src/views/system/check/template/index.vue | 8
src/views/system/monitor/video/index.vue | 0
src/views/system/point/region/index.vue | 0
src/views/system/monitor/face/index.vue | 0
src/views/system/data-manage/vehicle-data-monitor/index.vue | 0
src/views/system/monitor/car/index.vue | 0
src/router/index.js | 55 ---
src/views/system/monitor/platform/index.vue | 0
src/views/system/work-order/index.vue | 16
/dev/null | 454 --------------------------
src/views/system/monitor/recovery/index.vue | 0
src/views/system/work-order/distribute/index.vue | 4
src/views/system/contract/contract-result/index.vue | 2
src/api/platform/contract-result.js | 51 ++
src/views/system/check/result/index.vue | 37 -
src/api/platform/check-template.js | 9
src/views/system/contract/contract/index.vue | 8
src/views/system/contract/report/index.vue | 0
src/views/system/report/index.vue | 4
26 files changed, 243 insertions(+), 722 deletions(-)
diff --git a/src/api/platform/check-result.js b/src/api/platform/check-result.js
deleted file mode 100644
index 23b723b..0000000
--- a/src/api/platform/check-result.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import request from '@/utils/request'
-
-// 鏌ヨ鑰冩牳缁撴灉鍒楄〃
-export function listCheckResult(query) {
- return request({
- 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({
- url: '/check/result/' + id,
- method: 'get'
- })
-}
-
-// 鏂板鑰冩牳缁撴灉
-export function addCheckResult(data) {
- return request({
- url: '/check/result',
- method: 'post',
- data: data
- })
-}
-
-// 淇敼鑰冩牳缁撴灉
-export function updateCheckResult(data) {
- return request({
- url: '/check/result',
- method: 'put',
- data: data
- })
-}
-
-// 鍒犻櫎鑰冩牳缁撴灉
-export function delCheckResult(id) {
- return request({
- url: '/check/result/' + id,
- method: 'delete'
- })
-}
-
-// 鍙戝竷鑰冩牳缁撴灉
-export function publishCheckResult(id) {
- return request({
- url: '/check/result/publish/' + id,
- method: 'put'
- })
-}
-
-// 鎻愪氦浜哄伐鍒嗘暟
-export function manualScore(data) {
- return request({
- url: '/check/result/manual-score',
- method: 'post',
- data: data
- })
-}
diff --git a/src/api/platform/check-score.js b/src/api/platform/check-score.js
index e368106..98d0929 100644
--- a/src/api/platform/check-score.js
+++ b/src/api/platform/check-score.js
@@ -18,10 +18,11 @@
}
// 鏌ヨ鑰冩牳绉垎鏄庣粏璇︾粏
-export function getScoreIndex(id) {
+export function getScoreIndex(query) {
return request({
- url: '/check/score/detail/' + id,
- method: 'get'
+ url: '/check/score/detail/index',
+ method: 'get',
+ params: query
})
}
diff --git a/src/api/platform/check-template.js b/src/api/platform/check-template.js
index 95daedf..e8f4fdb 100644
--- a/src/api/platform/check-template.js
+++ b/src/api/platform/check-template.js
@@ -42,7 +42,14 @@
data: data
})
}
-
+// 淇敼鑰冩牳妯℃澘鏉冮噸
+export function updateWeight(data) {
+ return request({
+ url: '/check/template/weight',
+ method: 'put',
+ data: data
+ })
+}
// 鍒犻櫎鑰冩牳妯℃澘
export function delCheckTemplate(id) {
return request({
diff --git a/src/api/platform/contract-result.js b/src/api/platform/contract-result.js
index dc5c077..046393a 100644
--- a/src/api/platform/contract-result.js
+++ b/src/api/platform/contract-result.js
@@ -1,24 +1,32 @@
import request from '@/utils/request'
-// 鏌ヨ鍚堝悓鑰冩牳缁撴灉鍒楄〃
-export function listResult(query) {
+// 鏌ヨ鑰冩牳缁撴灉鍒楄〃
+export function listCheckResult(query) {
return request({
- url: '/contract/result/list',
- method: 'get',
- params: query
+ url: '/contract/result/list?pageNum=' + query.pageNum + '&pageSize=' + query.pageSize,
+ method: 'post',
+ data: query
})
}
-// 鏌ヨ鍚堝悓鑰冩牳缁撴灉璇︾粏
-export function getResult(id) {
+// 鏌ヨ鑰冩牳缁撴灉璇︽儏
+export function resultRecord(id) {
+ return request({
+ url: '/contract/result/record/list?resultId=' + id,
+ method: 'get'
+ })
+}
+
+// 鏌ヨ鑰冩牳缁撴灉璇︾粏
+export function getCheckResult(id) {
return request({
url: '/contract/result/' + id,
method: 'get'
})
}
-// 鏂板鍚堝悓鑰冩牳缁撴灉
-export function addResult(data) {
+// 鏂板鑰冩牳缁撴灉
+export function addCheckResult(data) {
return request({
url: '/contract/result',
method: 'post',
@@ -26,8 +34,8 @@
})
}
-// 淇敼鍚堝悓鑰冩牳缁撴灉
-export function updateResult(data) {
+// 淇敼鑰冩牳缁撴灉
+export function updateCheckResult(data) {
return request({
url: '/contract/result',
method: 'put',
@@ -35,10 +43,27 @@
})
}
-// 鍒犻櫎鍚堝悓鑰冩牳缁撴灉
-export function delResult(id) {
+// 鍒犻櫎鑰冩牳缁撴灉
+export function delCheckResult(id) {
return request({
url: '/contract/result/' + id,
method: 'delete'
})
}
+
+// 鍙戝竷鑰冩牳缁撴灉
+export function publishCheckResult(id) {
+ return request({
+ url: '/contract/result/publish/' + id,
+ method: 'put'
+ })
+}
+
+// 鎻愪氦浜哄伐鍒嗘暟
+export function manualScore(data) {
+ return request({
+ url: '/contract/result/manual-score',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/router/index.js b/src/router/index.js
index b9f2252..eeb0275 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -47,61 +47,6 @@
hidden: true
},
{
- path: '/car/vehicle-data-monitor',
- component: Layout,
- hidden: true,
- children: [
- {
- path: 'index',
- name: 'vehicle-data-monitor',
- component: () => import('@/views/system/vehicle-data-monitor/index'),
- meta: { title: '杞﹁締杩囧崱鍙ｆ暟鎹竴鑷存��', activeMenu: '/system/vehicle-data-monitor' }
- }
- ]
- },
- {
- path: '/car/equipment',
- component: Layout,
- hidden: true,
- children: [
- {
- path: 'index',
- name: 'equipment',
- component: () => import('@/views/system/equipment/index'),
- meta: { title: '璧勪骇绠＄悊', activeMenu: '/system/equipment' }
- }
- ]
- },
- {
- path: '/check-result/contract',
- component: Layout,
- hidden: true,
- children: [
- {
- path: 'detail',
- name: 'check-result-contract',
- component: () => import('@/views/system/result/default/detail'),
- meta: { title: '鍚堝悓缁撴灉璇︽儏', activeMenu: '/system/check-result/contract' }
- }
- ]
- },
- {
- path: '/check-result/city',
- component: Layout,
- hidden: true,
- children: [
-
- ]
- },
- {
- path: '/check-result/province',
- component: Layout,
- hidden: true,
- children: [
-
- ]
- },
- {
path: '/register',
component: () => import('@/views/register'),
hidden: true
diff --git a/src/views/system/calculate/duty/index.vue b/src/views/system/calculate/duty/index.vue
deleted file mode 100644
index 6c7a22e..0000000
--- a/src/views/system/calculate/duty/index.vue
+++ /dev/null
@@ -1,263 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="杩濈害鍚�" prop="examineId">
- <el-input v-model="queryParams.examineId" placeholder="璇疯緭鍏ヨ繚绾﹀悕" clearable @keyup.enter.native="handleQuery" />
- </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>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
- @click="handleUpdate">淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
- @click="handleDelete">鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="scoreList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="杩愮淮鑰冩牳鍚�" align="center" prop="examineName" />
- <el-table-column label="鑰冩牳瀵硅薄" align="center" prop="unitName" />
- <el-table-column label="鍒嗗��" align="center" prop="score" />
- <el-table-column label="杩愮淮鑰冩牳瑙勫垯" align="center" prop="scoreCategory">
- <template slot-scope="scope">
- <div v-if="scope.row.scoreCategory === 1">瑙嗛鍦ㄧ嚎鐜�</div>
- <div v-else-if="scope.row.scoreCategory === 2">瀛樺偍鏁呴殰</div>
- <div v-else-if="scope.row.scoreCategory === 4">涓�鏈轰竴妗�24灏忔椂鏈慨澶�</div>
- <div v-else-if="scope.row.scoreCategory === 5">鏃堕挓涓嶅悓姝�24灏忔椂鏈慨澶�</div>
- </template>
- </el-table-column>
- <el-table-column label="鍒涘缓浜�" align="center" prop="createBy" />
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">淇敼</el-button>
- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
- @pagination="getList" />
-
- <!-- 娣诲姞鎴栦慨鏀硅繚绾﹁鍒嗗璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="鍒嗗��" prop="score">
- <el-input v-model="form.score" placeholder="璇疯緭鍏ュ垎鍊�" />
- </el-form-item>
- <el-form-item label="鍗曚綅鍚�" prop="unitId">
- <el-select v-model="form.unitId" 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="examineId">
- <el-select v-model="form.examineId" placeholder="璇烽�夋嫨">
- <el-option v-for="item in examineList" :key="item.id" :label="item.value" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="绉垎绫诲瀷" prop="scoreCategory">
- <el-select v-model="form.scoreCategory" placeholder="璇烽�夋嫨">
- <el-option v-for="item in scoreCategoryList" :key="item.id" :label="item.value" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import { listScore, getScore, delScore, addScore, updateScore } from "@/api/platform/contract-score";
-import { unitSelect } from "@/api/platform/unit";
-import { publishSelect } from "@/api/platform/contract-publish";
-
-export default {
- name: "Score",
- dicts: ['platform_operate_category'],
- data() {
- return {
- operateCategoryList: [
- { id: 2, value: '浜哄伐鎵撳垎' },
- { id: 1, value: '绯荤粺鎵撳垎' },
- ],
- scoreCategoryList: [
- { id: 2, value: '瀛樺偍鏁呴殰' },
- { id: 1, value: '瑙嗛鍦ㄧ嚎鐜�' },
- { id: 3, value: '淇濋殰宸ヤ綔' },
- ],
-
- unitList: [],
- examineList: [],
- // 閬僵灞�
- loading: true,
- // 閫変腑鏁扮粍
- ids: [],
- // 闈炲崟涓鐢�
- single: true,
- // 闈炲涓鐢�
- multiple: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 鎬绘潯鏁�
- total: 0,
- // 杩濈害璁″垎琛ㄦ牸鏁版嵁
- scoreList: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- score: null,
- unitId: 2,
- examineId: null,
- operateCategory: null,
- scoreCategory: null,
- },
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
- }
- };
- },
- created() {
- this.getList();
- this.selectUnit();
- this.selectExamine();
- },
- methods: {
- // 杩愮淮鍏徃涓嬫媺鏁版嵁
- selectUnit() {
- unitSelect().then(res => {
- this.unitList = res.data;
- })
- },
- // 杩濈害涓嬫媺鏁版嵁
- selectExamine() {
- publishSelect().then(res => {
- this.examineList = res.data;
- })
- },
- /** 鏌ヨ杩濈害璁″垎鍒楄〃 */
- getList() {
- this.loading = true;
- listScore(this.queryParams).then(response => {
- this.scoreList = response.rows;
- this.total = response.total;
- this.loading = false;
- });
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false;
- this.reset();
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- id: null,
- score: null,
- unitId: null,
- examineId: null,
- operateCategory: null,
- scoreCategory: null,
- createTime: null,
- createBy: null
- };
- this.resetForm("form");
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.resetForm("queryForm");
- this.handleQuery();
- },
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id)
- this.single = selection.length !== 1
- this.multiple = !selection.length
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞杩濈害璁″垎";
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- const id = row.id || this.ids
- getScore(id).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼杩濈害璁″垎";
- });
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updateScore(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addScore(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎杩濈害璁″垎缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
- return delScore(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => { });
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('platform/score/export', {
- ...this.queryParams
- }, `score_${new Date().getTime()}.xlsx`)
- }
- }
-};
-</script>
diff --git a/src/views/system/calculate/record/index.vue b/src/views/system/calculate/record/index.vue
deleted file mode 100644
index a48404b..0000000
--- a/src/views/system/calculate/record/index.vue
+++ /dev/null
@@ -1,315 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="鍗曚綅鍚�" prop="checkUnitId">
- <el-select v-model="form.unitId" 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="date" >
- <el-date-picker clearable
- v-model="queryParams.date"
- 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>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['system:record:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- >鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- >瀵煎嚭</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鏍哥畻璁板綍鏃ユ湡" align="center" prop="date" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鏍哥畻瑙勫垯" align="center" prop="ruleId">
- <template slot-scope="scope">
- <div v-if="scope.row.ruleId == 1">鎴愰兘x杩愮淮鑰冩牳缁撴灉搴旂敤瑙勫垯</div>
- </template>
- </el-table-column>
- <el-table-column label="鍗曚綅鍚�" align="center" prop="unitId" >
- <template slot-scope="scope">
- <div v-if="scope.row.unitId == 2">鎴愰兘x杩愮淮</div>
- </template>
- </el-table-column>
- <!-- <el-table-column label="鎬绘湇鍔¤垂" align="center" prop="totalAmount" /> -->
- <!-- <el-table-column label="鎵ｅ噺鏈嶅姟璐�" align="center" prop="deductAmount" /> -->
- <el-table-column label="鑰冩牳鍒嗘暟" align="center" prop="score" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
-
- <!-- 娣诲姞鎴栦慨鏀规牳绠楄褰曞璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="100px">
- <el-form-item label="鏍哥畻瀵硅薄" prop="checkUnitId">
- <el-select v-model="form.unitId" 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="ruleId">
- <el-select v-model="form.ruleId" placeholder="璇烽�夋嫨">
- <el-option label="鎴愰兘x杩愮淮鑰冩牳缁撴灉搴旂敤瑙勫垯" value="1">鎴愰兘x杩愮淮鑰冩牳缁撴灉搴旂敤瑙勫垯</el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鏍哥畻璁板綍鏃ユ湡" prop="date" >
- <el-date-picker clearable
- v-model="form.date"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鏍哥畻璁板綍鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- <!-- <el-form-item label="鎬绘湇鍔¤垂" prop="totalAmount">
- <el-input v-model="form.totalAmount" placeholder="璇疯緭鍏ユ�绘湇鍔¤垂" />
- </el-form-item> -->
- <!-- <el-form-item label="鎵ｅ噺鏈嶅姟璐�" prop="deductAmount">
- <el-input v-model="form.deductAmount" placeholder="璇疯緭鍏ユ墸鍑忔湇鍔¤垂" />
- </el-form-item> -->
- <el-form-item label="鑰冩牳鍒嗘暟" prop="score">
- <el-input v-model="form.score" placeholder="璇疯緭鍏ヨ�冩牳鍒嗘暟" />
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import { getCalculateRecords, getCalculateRecordById,deleteCalculateRecordByIds, addCalculateRecord, editCalculateRecord } from "@/api/platform/calculate-record";
-import {unitSelect} from "@/api/platform/unit";
-export default {
- name: "Record",
- data() {
- return {
- // 閬僵灞�
- loading: true,
- // 閫変腑鏁扮粍
- ids: [],
- // 闈炲崟涓鐢�
- single: true,
- // 闈炲涓鐢�
- multiple: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 鎬绘潯鏁�
- total: 0,
- // 鏍哥畻璁板綍琛ㄦ牸鏁版嵁
- recordList: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- date: null,
- ruleId: null,
- unitId: null,
- totalAmount: null,
- deductAmount: null,
- score: null
- },
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
- id: [
- { required: true, message: "$comment涓嶈兘涓虹┖", trigger: "blur" }
- ],
- }
- };
- },
- created() {
- this.getList();
- this.selectUnit();
- },
- methods: {
- // 杩愮淮鍏徃涓嬫媺鏁版嵁
- selectUnit() {
- unitSelect().then(res => {
- this.unitList = res.data;
- })
- },
- /** 鏌ヨ鏍哥畻璁板綍鍒楄〃 */
- getList() {
- this.loading = true;
- getCalculateRecords(this.queryParams).then(response => {
- this.recordList = response.rows;
- this.total = response.total;
- this.loading = false;
- });
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false;
- this.reset();
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- id: null,
- date: null,
- ruleId: null,
- unitId: null,
- totalAmount: null,
- deductAmount: null,
- score: null
- };
- this.resetForm("form");
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.resetForm("queryForm");
- this.handleQuery();
- },
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
- this.multiple = !selection.length
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞鏍哥畻璁板綍";
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- const id = row.id || this.ids
- getCalculateRecordById(id).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼鏍哥畻璁板綍";
- });
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- editCalculateRecord(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addCalculateRecord(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鏍哥畻璁板綍缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return deleteCalculateRecordByIds(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('system/record/export', {
- ...this.queryParams
- }, `record_${new Date().getTime()}.xlsx`)
- }
- }
-};
-</script>
diff --git a/src/views/system/calculate/rule/index.vue b/src/views/system/calculate/rule/index.vue
deleted file mode 100644
index 812141a..0000000
--- a/src/views/system/calculate/rule/index.vue
+++ /dev/null
@@ -1,265 +0,0 @@
-<template>
- <div class="app-container">
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="info"
- plain
- icon="el-icon-sort"
- size="mini"
- @click="toggleExpandAll"
- >灞曞紑/鎶樺彔</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table
- v-if="refreshTable"
- v-loading="loading"
- :data="ruleList"
- row-key="id"
- :default-expand-all="isExpandAll"
- :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
- >
- <el-table-column label="瑙勫垯鍚嶇О" prop="name" />
- <el-table-column label="鍗曚綅" align="center" prop="unitId" >
- <template slot-scope="scope">
- <div v-if="scope.row.unitId == 2">鎴愰兘x杩愮淮</div>
- </template>
- </el-table-column>
- <el-table-column label="鎵ｅ垎绯绘暟" align="center" prop="value" />
- <el-table-column label="瑙勫垯鎻忚堪" align="center" prop="description" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['calculate:rule:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-plus"
- @click="handleAdd(scope.row)"
- v-hasPermi="['calculate:rule:add']"
- >鏂板</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['calculate:rule:remove']"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <!-- 娣诲姞鎴栦慨鏀规牳绠楄鍒欏璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="瑙勫垯鍚�" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏�" />
- </el-form-item>
- <el-form-item label="妯℃澘鍚�" prop="templateId">
- <el-input v-model="form.templateId" placeholder="璇疯緭鍏�" />
- </el-form-item>
- <el-form-item label="鐖惰鍒�" prop="parentId">
- <treeselect v-model="form.parentId" :options="ruleOptions" :normalizer="normalizer" placeholder="璇烽�夋嫨" />
- </el-form-item>
- <el-form-item label="鑰冩牳瀵硅薄" prop="unitId">
- <el-input v-model="form.unitId" placeholder="璇疯緭鍏ュ崟浣峣d" />
- </el-form-item>
- <el-form-item label="鎵ｅ垎绯绘暟" prop="value">
- <el-input v-model="form.value" placeholder="璇疯緭鍏ユ墸鍒嗙郴鏁�" />
- </el-form-item>
- <el-form-item label="瑙勫垯鎻忚堪" prop="description">
- <el-input v-model="form.description" placeholder="璇疯緭鍏ヨ鍒欐弿杩�" />
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import { listRule, getRule, delRule, addRule, updateRule } from "@/api/platform/calculate-rule";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
- name: "Rule",
- components: {
- Treeselect
- },
- data() {
- return {
- // 閬僵灞�
- loading: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 鏍哥畻瑙勫垯琛ㄦ牸鏁版嵁
- ruleList: [],
- // 鏍哥畻瑙勫垯鏍戦�夐」
- ruleOptions: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- // 鏄惁灞曞紑锛岄粯璁ゅ叏閮ㄥ睍寮�
- isExpandAll: true,
- // 閲嶆柊娓叉煋琛ㄦ牸鐘舵��
- refreshTable: true,
- // 鏌ヨ鍙傛暟
- queryParams: {
- name: null,
- templateId: null,
- parentId: null,
- unitId: null,
- value: null,
- description: null
- },
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
- }
- };
- },
- created() {
- this.getList();
- },
- methods: {
- /** 鏌ヨ鏍哥畻瑙勫垯鍒楄〃 */
- getList() {
- this.loading = true;
- listRule(this.queryParams).then(response => {
- this.ruleList = this.handleTree(response.data, "id", "parentId");
- this.loading = false;
- });
- },
- /** 杞崲鏍哥畻瑙勫垯鏁版嵁缁撴瀯 */
- normalizer(node) {
- if (node.children && !node.children.length) {
- delete node.children;
- }
- return {
- id: node.id,
- label: node.name,
- children: node.children
- };
- },
- /** 鏌ヨ鏍哥畻瑙勫垯涓嬫媺鏍戠粨鏋� */
- getTreeselect() {
- listRule().then(response => {
- this.ruleOptions = [];
- const data = { id: 0, name: '椤剁骇鑺傜偣', children: [] };
- data.children = this.handleTree(response.data, "id", "parentId");
- this.ruleOptions.push(data);
- });
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false;
- this.reset();
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- id: null,
- name: null,
- templateId: null,
- parentId: null,
- unitId: null,
- value: null,
- description: null
- };
- this.resetForm("form");
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.resetForm("queryForm");
- this.handleQuery();
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd(row) {
- this.reset();
- this.getTreeselect();
- if (row != null && row.id) {
- this.form.parentId = row.id;
- } else {
- this.form.parentId = 0;
- }
- this.open = true;
- this.title = "娣诲姞鏍哥畻瑙勫垯";
- },
- /** 灞曞紑/鎶樺彔鎿嶄綔 */
- toggleExpandAll() {
- this.refreshTable = false;
- this.isExpandAll = !this.isExpandAll;
- this.$nextTick(() => {
- this.refreshTable = true;
- });
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- this.getTreeselect();
- if (row != null) {
- this.form.parentId = row.id;
- }
- getRule(row.id).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼鏍哥畻瑙勫垯";
- });
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updateRule(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addRule(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- this.$modal.confirm('鏄惁纭鍒犻櫎鏍哥畻瑙勫垯缂栧彿涓�"' + row.id + '"鐨勬暟鎹」锛�').then(function() {
- return delRule(row.id);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- }
- }
-};
-</script>
diff --git a/src/views/system/result/detail/detail.vue b/src/views/system/check/result/detail/detail.vue
similarity index 62%
rename from src/views/system/result/detail/detail.vue
rename to src/views/system/check/result/detail/detail.vue
index a6ff943..05adf88 100644
--- a/src/views/system/result/detail/detail.vue
+++ b/src/views/system/check/result/detail/detail.vue
@@ -1,15 +1,15 @@
<template>
<div class="app-container">
- <el-page-header @back="goBack" content="璇︽儏椤甸潰">
+ <el-page-header @back="goBack()" content="璇︽儏椤甸潰">
</el-page-header>
<el-container>
<el-main>
<h2>鑰冩牳瑙勫垯</h2>
<el-table v-loading="loading" :data="checkRuleList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="瑙勫垯鍚嶇О" align="center" prop="checkRuleName" />
- <el-table-column label="瑙勫垯鏉冮噸" align="center" prop="weight" />
+ <el-table-column type="selection" width="55" align="center"/>
+ <el-table-column label="瑙勫垯鍚嶇О" align="center" prop="checkRuleName"/>
+ <el-table-column label="瑙勫垯鏉冮噸" align="center" prop="weight"/>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -17,38 +17,43 @@
type="text"
icon="el-icon-edit"
@click="handleRuleUpdate(scope.row)"
- >淇敼</el-button>
+ >淇敼
+ </el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getRuleList"
- />
</el-main>
</el-container>
<el-container>
<el-main>
<h2>鑰冩牳鎴愮哗</h2>
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
+ <el-row :gutter="10" class="mb5">
+ <el-col :span="1.5" style="margin-right: 20px">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
- >瀵煎嚭</el-button>
+ >瀵煎嚭
+ </el-button>
</el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getRuleList"></right-toolbar>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+ <el-form-item label="鑰冩牳鏃ユ湡" prop="name">
+ <el-date-picker v-model="date" format="yyyy-MM" value-format="yyyy-MM" type="month" placeholder="閫夋嫨鏃ユ湡"
+ @change="dateChange">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ </el-form-item>
+ </el-form>
+
</el-row>
- <el-table v-loading="loading" :data="dataMap" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" :data="dataMap" @selection-change="handleSelectionChange">
<el-table-column label="鑰冩牳鏃ユ湡" align="center" prop="create_time" width="120px" fixed>
<template slot-scope="scope">
<span>{{ scope.row.create_time.split('T')[0] }}</span>
@@ -64,23 +69,23 @@
:key="item.ruleName"
:label="item.ruleName"
align="center"
- width = "120px"
+ width="180px"
>
<template slot-scope="scope">
<span>{{ scope.row[item.ruleIndex] }}</span>
</template>
</el-table-column>
</template>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" fixed="right">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleIndexUpdate(scope.row,scope.index)"
- >淇敼</el-button>
- </template>
- </el-table-column>
+ <!-- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" fixed="right">-->
+ <!-- <template slot-scope="scope">-->
+ <!-- <el-button-->
+ <!-- size="mini"-->
+ <!-- type="text"-->
+ <!-- icon="el-icon-edit"-->
+ <!-- @click="handleIndexUpdate(scope.row,scope.index)"-->
+ <!-- >淇敼</el-button>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
</el-table>
</el-main>
</el-container>
@@ -92,7 +97,7 @@
<el-input v-model="ruleForm.checkRuleName" placeholder="璇疯緭鍏ヨ鍒欏悕绉�" disabled/>
</el-form-item>
<el-form-item label="瑙勫垯鏉冮噸" prop="weight">
- <el-input-number v-model="ruleForm.weight" :precision="1" placeholder="璇疯緭鍏ヨ鍒欐潈閲�" />
+ <el-input-number v-model="ruleForm.weight" :precision="1" :step="0.1" placeholder="璇疯緭鍏ヨ鍒欐潈閲�"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -105,16 +110,12 @@
<el-dialog :title="title" :visible.sync="indexOpen" width="600px" append-to-body>
<el-form ref="form" :model="indexForm" :rules="rules" label-width="150px">
<el-form-item label="鑰冩牳鏃ユ湡" prop="create_time">
- <el-input v-model="ruleForm.create_time" placeholder="璇疯緭鍏ヨ鍒欏悕绉�" disabled>
-
+ <el-input v-model="formattedCreateTime" placeholder="" disabled>
</el-input>
</el-form-item>
-<!-- <el-form-item label="鑰冩牳瀵硅薄" prop="checkRuleName">-->
-<!-- <el-input v-model="ruleForm.checkRuleName" placeholder="璇疯緭鍏ヨ鍒欏悕绉�" disabled/>-->
-<!-- </el-form-item>-->
<div v-for="item in tableData" :key="item.ruleIndex">
<el-form-item :label="item.ruleName" :prop="item.ruleIndex">
- <el-input-number v-model="indexForm[item.ruleIndex]" :precision="4" placeholder="璇疯緭鍏ユ寚鏍�"></el-input-number>
+ <el-input-number v-model="indexForm[item.ruleIndex]" :precision="4" :step="0.1" placeholder="璇疯緭鍏ユ寚鏍�"></el-input-number>
</el-form-item>
</div>
</el-form>
@@ -127,9 +128,10 @@
</template>
<script>
-import { listCheckResult, getCheckResult, delCheckResult, addCheckResult, updateCheckResult,manualScore, publishCheckResult } from "@/api/platform/check-result";
-import { listScore, getScoreIndex, delScore, addScore, updateScore } from "@/api/platform/check-score";
-import { areaSelect } from '@/api/system/dept'
+
+import {listScore, getScoreIndex, delScore, addScore, updateScore} from "@/api/platform/check-score";
+import {updateWeight} from "@/api/platform/check-template";
+import {areaSelect} from '@/api/system/dept'
export default {
name: "CheckResult",
@@ -137,9 +139,11 @@
data() {
return {
id: null,
+ examineCategory: null,
+ date: '',
examineTag: null,
deptId: null,
- areaList:[],
+ areaList: [],
tableData: [],
dataMap: [],
manualScoreOpen: false,
@@ -173,15 +177,22 @@
//璇锋眰鍙傛暟
queryParams: {
id: null,
+ date: null,
},
// 琛ㄥ崟鏍￠獙
rules: {}
};
},
+ computed: {
+ formattedCreateTime() {
+ // 濡傛灉 create_time 瀛樺湪锛屽垯杩斿洖鏃ユ湡閮ㄥ垎锛屽惁鍒欒繑鍥炵┖瀛楃涓�
+ return this.indexForm.create_time ? this.indexForm.create_time.split('T')[0] : '';
+ },
+ },
created() {
//鑰冩牳鎴愮哗璇︽儏璺宠浆鍙傛暟鎺ユ敹
- if(this.$route.query.id){
- this.id = this.$route.query.id
+ if (this.$route.query.id) {
+ this.queryParams.id = this.$route.query.id
}
// 鑰冩牳绉垎鍒楄〃
this.getList();
@@ -191,7 +202,7 @@
/** 鏌ヨ鑰冩牳璁″垎鍒楄〃 */
getList() {
this.loading = true;
- getScoreIndex(this.id).then(response => {
+ getScoreIndex(this.queryParams).then(response => {
this.checkRuleList = response.data.checkRuleList;
this.dataMap = response.data.scoreMap.dataMap;
this.tableData = response.data.scoreMap.tableData
@@ -211,8 +222,7 @@
checkRuleName: null,
weight: null,
};
- this.indexForm = {
- };
+ this.indexForm = {};
this.resetForm(formName);
},
translateDeptId(deptId) {
@@ -225,29 +235,23 @@
this.areaList = res.data;
})
},
- cancelManualScore() {
- this.manualScoreForm = {};
- this.manualScoreTitle = "";
- this.manualScoreOpen = false;
+ /** 杩斿洖鎸夐挳 */
+ goBack() {
+ const obj = { path: "/examine/detail", query: { index: this.$route.query.deptId, examineTag: this.$route.query.examineTag, pageNum: this.$route.query.pageNum } };
+ this.$tab.closeOpenPage(obj);
},
- submitManualScore() {
- if (! this.manualScoreForm.manualScore) {
- this.$modal.msgWarning("璇峰～鍐欏垎鏁�");
- return
+ // 鍏抽棴褰撳墠tab椤电锛屾墦寮�鏂伴〉绛�
+ closeOpenPage(obj) {
+ store.dispatch("tagsView/delView", router.currentRoute);
+ if (obj !== undefined) {
+ return router.push(obj);
}
- manualScore(this.manualScoreForm).then(res => {
- this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
- this.cancelManualScore();
- this.getList();
- })
},
- handleSetManualScore(row) {
- this.manualScoreForm.id = row.id;
- this.manualScoreForm.manualScore = parseInt(row.manualScore);
- this.manualScoreTitle = row.checkUnitName + '浜哄伐鎵撳垎'
- this.manualScoreOpen = true;
+ dateChange() {
+ this.queryParams.date = this.date;
+ console.log(this.queryParams);
+ this.getList();
},
-
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.getList();
@@ -261,7 +265,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
+ this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 鏂板鎸夐挳鎿嶄綔 */
@@ -288,37 +292,21 @@
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
- if (this.form.id != null) {
- updateCheckResult(this.form).then(response => {
+ if (this.ruleForm.id != null) {
+ updateWeight(this.ruleForm).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addCheckResult(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
+ this.ruleOpen = false;
this.getList();
});
}
}
});
},
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鑰冩牳缁撴灉缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delCheckResult(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- this.download('system/checkResult/export', {
+ this.download('/check/score/export', {
...this.queryParams
- }, `checkResult_${new Date().getTime()}.xlsx`)
+ }, `鑰冩牳鎸囨爣_${new Date().getTime()}.xlsx`)
},
handleSelect(key, keyPath) {
console.log(key, keyPath);
@@ -328,57 +316,6 @@
</script>
<style scoped>
-.line {
- display: flex;
- flex-direction: row;
- justify-content: flex-start;
- align-items: center;
-}
-
-.line-right {
- width: 50px;
-}
-.input{
- width: 200px;
-}
-
-.input-w {
- margin-left: 5px;
- width: 70px;
-}
-.row-warp {
- display: flex;
- flex-direction: column;
- justify-content: center;
- text-align: center;
- border: solid 1px gray;
- /*padding: 3px;*/
-}
-.row {
- display: flex;
- flex-direction: row;
- justify-content: center;
- align-items: center;
- border-bottom: solid 1px gray;
- padding: 3px;
-}
-.row:last-of-type {
- border-bottom: none;
-}
-.row-left {
- flex: 2;
- border-right: solid 1px gray;
-}
-.row-right {
- flex: 4;
- display: flex;
- flex-direction: row;
- justify-content: center;
-}
-.header-container {
- display: flex;
- align-items: center; /* 鍨傜洿灞呬腑 */
-}
.header-container h2 {
margin-right: 10px; /* 鏍规嵁闇�瑕佽皟鏁存爣棰樺拰鑿滃崟涔嬮棿鐨勯棿璺� */
diff --git a/src/views/system/result/detail/index1.vue b/src/views/system/check/result/detail/index.vue
similarity index 72%
rename from src/views/system/result/detail/index1.vue
rename to src/views/system/check/result/detail/index.vue
index 72c3c32..d9326e2 100644
--- a/src/views/system/result/detail/index1.vue
+++ b/src/views/system/check/result/detail/index.vue
@@ -50,18 +50,33 @@
<el-table-column label="鍒嗘暟" prop="score" align="center">
</el-table-column>
<el-table-column label="鐘舵��" prop="publish" align="center">
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button size="small" type="text" v-show="scope.row.publish != 1">纭鍙戝竷</el-button>
- <el-button size="small" type="text" v-show="scope.row.publish == 1">鍙栨秷鍙戝竷</el-button>
- <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row.id)">璇︾粏</el-button>
+ <dict-tag :options="dict.type.platform_is_publish" :value="scope.row.publish" />
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center">
+ <template slot-scope="scope">
+ <div style="display: flex;justify-content: center;">
+ <el-button size="small" type="text" @click="handlePublish(scope.row)" v-if="scope.row.publish === 'UNPUBLISHED'" >纭鍙戝竷</el-button>
+ <el-button size="small" type="text" @click="handlePublish(scope.row)" v-if="scope.row.publish === 'PUBLISHED'">鍙栨秷鍙戝竷</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-view"
+ @click="handleDetail(scope.row.id)"
+ >璇︾粏</el-button>
+ </div>
</template>
</el-table-column>
</el-table>
- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
- @pagination="getList" />
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="queryParamsList.pageNum"
+ :limit.sync="queryParamsList.pageSize"
+ @pagination="getList"
+ />
</div>
@@ -76,11 +91,15 @@
let observer = null;
export default {
name: 'index',
- dicts: ['platform_examine_use', 'platform_examine_category'],
+ dicts: ['platform_examine_category','platform_is_publish'],
data() {
return {
activeIndex: '0',
areaList: [],
+ province: {
+ id: [],
+ publish: null,
+ },
date: '',
dateRange: '',
// 鎬绘潯鏁�
@@ -91,9 +110,15 @@
deptId: null,
examineTag: 0
},
+ queryParamsList: {
+ pageNum: 1,
+ pageSize: 10,
+ deptId: null,
+ examineTag:0
+ },
tableData: [],
- loading: false,
tableLoading: false,
+ loading: false,
searchForm: {
time: null,
}
@@ -104,12 +129,16 @@
console.log(this.$route.query.index)
if (this.$route.query.index) {
this.queryParams.deptId = this.$route.query.index
+ this.queryParamsList.deptId = this.$route.query.index
}
const date = new Date();
const year = date.getFullYear();
const month = (date.getMonth() + 1) >= 10 ? date.getMonth() + 1 : '0' + (date.getMonth() + 1);
this.date = year + '-' + month;
this.queryParams.date = this.date;
+ this.queryParams.examineTag =this.$route.query.examineTag;
+ this.queryParamsList.examineTag =this.$route.query.examineTag;
+ this.activeIndex = this.$route.query.examineTag;
this.areaSelect();
this.getList(this.$route.query.index);
},
@@ -117,6 +146,37 @@
},
methods: {
+ //鍙戝竷
+ handlePublish(row) {
+ const getExamineCategoryText = category => {
+ switch (category) {
+ case 1: return '瑙嗛鑰冩牳';
+ case 2: return '杞﹁締鑰冩牳';
+ case 3: return '浜鸿劯鑰冩牳';
+ default: return '鏈煡';
+ }
+ };
+
+ const year = row.createTime.substr(0, 4);
+ const month = (parseInt(row.createTime.substr(5, 2), 10)).toString();
+ const day = (parseInt(row.createTime.substr(8, 2), 10)).toString();
+ const formattedCreateTime = year + '骞�' + month + '鏈�' + day + '鏃�';
+
+ let text = row.publish === 'UNPUBLISHED' ? '鍙戝竷' : '鍙栨秷鍙戝竷';
+ this.province.id = [row.id]
+ this.province.publish = text === "鍙戝竷" ? "PUBLISHED" : "UNPUBLISHED";
+ this.$modal.confirm('纭瑕�' + text + "" + getExamineCategoryText(row.examineCategory) + "" + formattedCreateTime + '鐨勮�冩牳鎴愮哗鍚楋紵')
+ .then(() => {
+ return publishScore(this.province);
+ })
+ .then(() => {
+ this.getList();
+ this.$modal.msgSuccess(text + "鎴愬姛");
+ })
+ .catch(() => {
+ // 閿欒澶勭悊閫昏緫
+ });
+ },
// 鍖哄煙涓嬫媺鏁版嵁
areaSelect() {
areaSelect().then(res => {
@@ -131,8 +191,9 @@
handleSelect(key) {
this.activeIndex = key;
this.queryParams.examineTag = key;
+ this.queryParamsList.examineTag = key;
this.getChart(this.queryParams.deptId);
- this.getList(this.queryParams.deptId);
+ this.getList(this.queryParamsList.deptId);
},
/** 鏌ヨ鑰冩牳妯℃澘鍒楄〃 */
getChart(deptId) {
@@ -146,7 +207,7 @@
/** 鏌ヨ鑰冩牳妯℃澘鍒楄〃 */
getList() {
this.tableLoading = true;
- detailScore(this.queryParams).then(response => {
+ detailScore(this.queryParamsList).then(response => {
this.tableData = response.rows;
this.total = response.total;
this.tableLoading = false;
@@ -160,9 +221,11 @@
},
handleDetail(id) {
this.$router.push({
- path: '/examine/detail/detail',
+ path: '/check/detail/detail',
query: {
id: id,
+ examineTag: this.activeIndex,
+ deptId: this.queryParamsList.deptId
}
})
},
@@ -196,7 +259,7 @@
series: [
{
name: '杞﹁締鑰冩牳',
- data: this.filterData(dataList, 0),
+ data: this.filterData(dataList, 2),
type: 'line',
itemStyle: {
color: 'rgba(62, 144, 247, 1)'
@@ -204,7 +267,7 @@
},
{
name: '浜鸿劯鑰冩牳',
- data: this.filterData(dataList, 1),
+ data: this.filterData(dataList, 3),
type: 'line',
itemStyle: {
color: 'rgba(85, 192, 191, 1)'
@@ -212,7 +275,7 @@
},
{
name: '瑙嗛鑰冩牳',
- data: this.filterData(dataList, 2),
+ data: this.filterData(dataList, 1),
type: 'line',
itemStyle: {
color: 'rgba(255, 165, 0, 1)'
@@ -252,6 +315,10 @@
},
getAllDay() {
+ // const date = new Date();
+ // const year = date.getFullYear();
+ // const month = (date.getMonth() + 1) >= 10 ? date.getMonth() + 1 : '0' + (date.getMonth() + 1);
+ // this.date = year + '-' + month;
const currentDate = this.date.split('-');
const currentYear = currentDate[0];
const currentMonth = currentDate[1];
@@ -282,8 +349,8 @@
dateChange() {
this.queryParams.date = this.date;
+ console.log(this.queryParams);
this.getChart(this.queryParams.deptId);
- this.getList(this.queryParams.deptId);
}
},
diff --git a/src/views/system/result/index.vue b/src/views/system/check/result/index.vue
similarity index 91%
rename from src/views/system/result/index.vue
rename to src/views/system/check/result/index.vue
index c08c57f..090956a 100644
--- a/src/views/system/result/index.vue
+++ b/src/views/system/check/result/index.vue
@@ -3,8 +3,8 @@
<div>
<el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
style="margin-bottom: 10px">
- <el-menu-item index="1">鐪佸巺鑰冩牳</el-menu-item>
- <el-menu-item index="2">甯傚眬鑰冩牳</el-menu-item>
+ <el-menu-item index="0">鐪佸巺鑰冩牳</el-menu-item>
+ <el-menu-item index="1">甯傚眬鑰冩牳</el-menu-item>
</el-menu>
</div>
@@ -13,10 +13,6 @@
<div class="card-content">
<div class="title-container">
<h1>鑰冩牳鎴愮哗</h1>
- <div class="select-container">
- <el-date-picker v-model="date" type="date" placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
- </div>
</div>
<div class="echart-container">
<div id="barChart" ref="barChart"></div>
@@ -39,9 +35,9 @@
</div>
<div v-for="(score, scoreIndex) in city" :key="scoreIndex">
<div class="score-item">
- <div v-if="score.examineCategory == 0">杞﹁締锛�</div>
- <div v-else-if="score.examineCategory == 1">浜鸿劯锛�</div>
- <div v-else-if="score.examineCategory == 2">瑙嗛锛�</div>
+ <div v-if="score.examineCategory == 2">杞﹁締锛�</div>
+ <div v-else-if="score.examineCategory == 3">浜鸿劯锛�</div>
+ <div v-else-if="score.examineCategory == 1">瑙嗛锛�</div>
<div class="score">{{ score.score }}</div>
</div>
</div>
@@ -77,8 +73,7 @@
},
checkScoreList: [],
areaList: [],
- activeIndex: '1',
- activeIndex2: '2',
+ activeIndex: '0',
date: '',
company: '',
dataList: {
@@ -95,6 +90,7 @@
}
},
created() {
+ this.queryParams.examineTag = this.activeIndex
this.getList();
this.areaSelect();
},
@@ -105,9 +101,10 @@
methods: {
jumpDetail(index) {
this.$router.push({
- path: '/examine/detail',
+ path: '/check/detail',
query: {
- index: index
+ index: index,
+ examineTag: this.activeIndex
}
})
},
@@ -176,9 +173,9 @@
}
});
const nameArray = mapData.map(item => item.name);
- const data1 = this.filterData(mapData, 0);
- const data2 = this.filterData(mapData, 1);
- const data3 = this.filterData(mapData, 2);
+ const data1 = this.filterData(mapData, 1);
+ const data2 = this.filterData(mapData, 2);
+ const data3 = this.filterData(mapData, 3);
const option = {
grid: {
left: 0,
@@ -277,16 +274,12 @@
/** 瀵艰埅鍒囨崲 */
handleSelect(key) {
this.activeIndex = key; // 鏇存柊褰撳墠婵�娲荤殑鑿滃崟椤�
+ this.queryParams.examineTag = key;
this.getList();
},
/** 鏌ヨ鑰冩牳鎴愮哗鍒楄〃 */
getList() {
this.loading = true;
- if (this.activeIndex === '1') {
- this.queryParams.examineTag = '0'; // 鐪佸巺鑰冩牳
- } else if (this.activeIndex === '2') {
- this.queryParams.examineTag = '1'; // 鍖哄煙鑰冩牳
- }
// 鑾峰彇褰撳墠鏃ユ湡
const today = new Date();
@@ -310,7 +303,7 @@
const cityName = this.translateDeptId(parseInt(city[0].deptId));
this.province.publish = text === "鍙戝竷" ? "PUBLISHED" : "UNPUBLISHED";
this.province.id = city.map(city => city.id);
- this.$modal.confirm('鏄惁纭' + text + '鑰冩牳鍚嶄负"' + cityName + '"鐨勬暟鎹」锛�')
+ this.$modal.confirm('鏄惁纭' + text + '鑰冩牳鍚嶄负"' + cityName + '"鐨勬垚缁╋紵')
.then(() => {
return publishScore(this.province);
})
diff --git a/src/views/system/rule/index.vue b/src/views/system/check/rule/index.vue
similarity index 100%
rename from src/views/system/rule/index.vue
rename to src/views/system/check/rule/index.vue
diff --git a/src/views/system/template/index.vue b/src/views/system/check/template/index.vue
similarity index 99%
rename from src/views/system/template/index.vue
rename to src/views/system/check/template/index.vue
index f6a88db..48e1648 100644
--- a/src/views/system/template/index.vue
+++ b/src/views/system/check/template/index.vue
@@ -223,7 +223,7 @@
<script>
import { listCheckTemplate, getCheckTemplate, delCheckTemplate, addCheckTemplate, updateCheckTemplate,copyCheckTemplate } from "@/api/platform/check-template";
import { areaSelect } from '@/api/system/dept'
-import { listCheckRule } from "../../../api/platform/check-rule";
+import { listCheckRule } from "../../../../api/platform/check-rule";
export default {
name: "CheckTemplate",
@@ -314,11 +314,11 @@
const faceRules = this.ruleList['faceRules']; // 浜鸿劯鐩稿叧鐨勮鍒欓泦鍚�
// 浣跨敤鏉′欢璇彞鏉ラ�夋嫨瑙勫垯鍒楄〃
- if (ruleListKey == 0) {
+ if (ruleListKey == 2) {
return carRules;
- } else if (ruleListKey == 1) {
+ } else if (ruleListKey == 3) {
return faceRules;
- } else if (ruleListKey == 2) {
+ } else if (ruleListKey == 1) {
return videoRules;
} else {
// 榛樿杩斿洖涓�涓┖鏁扮粍鎴栧閫夋柟妗�
diff --git a/src/views/system/calculate/order/index.vue b/src/views/system/contract/contract-result/index.vue
similarity index 99%
rename from src/views/system/calculate/order/index.vue
rename to src/views/system/contract/contract-result/index.vue
index 9aa6437..77e0c5e 100644
--- a/src/views/system/calculate/order/index.vue
+++ b/src/views/system/contract/contract-result/index.vue
@@ -164,7 +164,7 @@
</template>
<script>
-import { resultRecord, listCheckResult, getCheckResult, delCheckResult, addCheckResult, updateCheckResult,manualScore, publishCheckResult } from "@/api/platform/check-result";
+import { resultRecord, listCheckResult, getCheckResult, delCheckResult, addCheckResult, updateCheckResult,manualScore, publishCheckResult } from "@/api/platform/contract-result";
import { unitSelect } from "@/api/platform/unit";
export default {
diff --git a/src/views/system/contract/index.vue b/src/views/system/contract/contract/index.vue
similarity index 97%
rename from src/views/system/contract/index.vue
rename to src/views/system/contract/contract/index.vue
index 8a0d0e7..1c095bd 100644
--- a/src/views/system/contract/index.vue
+++ b/src/views/system/contract/contract/index.vue
@@ -140,10 +140,10 @@
<script>
import { listContract, getContract, updateContract } from "@/api/platform/contract";
-import { getRuleListByContractId } from "../../../api/platform/calculate-rule";
-import { getMoneyRulesByContractId } from "../../../api/platform/calculate-money-rule";
-import { unitSelect } from "../../../api/platform/unit";
-import { deptSelect } from "../../../api/system/dept";
+import { getRuleListByContractId } from "../../../../api/platform/calculate-rule";
+import { getMoneyRulesByContractId } from "../../../../api/platform/calculate-money-rule";
+import { unitSelect } from "../../../../api/platform/unit";
+import { deptSelect } from "../../../../api/system/dept";
import { getToken } from "@/utils/auth";
import { ImagePreview } from "@/components/ImagePreview";
diff --git a/src/views/system/calculate/report/index.vue b/src/views/system/contract/report/index.vue
similarity index 100%
rename from src/views/system/calculate/report/index.vue
rename to src/views/system/contract/report/index.vue
diff --git a/src/views/system/score/default/index.vue b/src/views/system/contract/score/index.vue
similarity index 100%
rename from src/views/system/score/default/index.vue
rename to src/views/system/contract/score/index.vue
diff --git a/src/views/system/equipment/index.vue b/src/views/system/data-manage/equipment/index.vue
similarity index 100%
rename from src/views/system/equipment/index.vue
rename to src/views/system/data-manage/equipment/index.vue
diff --git a/src/views/system/vehicle-data-monitor/index.vue b/src/views/system/data-manage/vehicle-data-monitor/index.vue
similarity index 100%
rename from src/views/system/vehicle-data-monitor/index.vue
rename to src/views/system/data-manage/vehicle-data-monitor/index.vue
diff --git a/src/views/system/car/index.vue b/src/views/system/monitor/car/index.vue
similarity index 100%
rename from src/views/system/car/index.vue
rename to src/views/system/monitor/car/index.vue
diff --git a/src/views/system/face/index.vue b/src/views/system/monitor/face/index.vue
similarity index 100%
rename from src/views/system/face/index.vue
rename to src/views/system/monitor/face/index.vue
diff --git a/src/views/system/platform/index.vue b/src/views/system/monitor/platform/index.vue
similarity index 100%
rename from src/views/system/platform/index.vue
rename to src/views/system/monitor/platform/index.vue
diff --git a/src/views/system/recovery/index.vue b/src/views/system/monitor/recovery/index.vue
similarity index 100%
rename from src/views/system/recovery/index.vue
rename to src/views/system/monitor/recovery/index.vue
diff --git a/src/views/system/video/index.vue b/src/views/system/monitor/video/index.vue
similarity index 100%
rename from src/views/system/video/index.vue
rename to src/views/system/monitor/video/index.vue
diff --git a/src/views/system/region/index.vue b/src/views/system/point/region/index.vue
similarity index 100%
rename from src/views/system/region/index.vue
rename to src/views/system/point/region/index.vue
diff --git a/src/views/system/publish/city/index.vue b/src/views/system/publish/city/index.vue
deleted file mode 100644
index f5368ee..0000000
--- a/src/views/system/publish/city/index.vue
+++ /dev/null
@@ -1,497 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="鑰冩牳鍚�" prop="examineName">
- <el-input
- v-model="queryParams.examineName"
- placeholder="璇疯緭鍏ヨ�冩牳鍚�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鑰冩牳鑼冨洿" prop="examineRange">
- <el-select
- v-model="queryParams.examineRange"
- placeholder="鑰冩牳鑼冨洿"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.platform_examine_range"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鑰冩牳棰戠巼" prop="frequency">
- <el-select
- v-model="queryParams.frequency"
- placeholder="鑰冩牳棰戠巼"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.platform_examine_frequency"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
-
- <el-form-item label="鑰冩牳鐘舵��" prop="state">
- <el-select
- v-model="queryParams.state"
- placeholder="鑰冩牳鐘舵��"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.sys_normal_disable"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </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>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- >鍒犻櫎</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="publishList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鑰冩牳鍚�" align="center" prop="examineName" />
- <el-table-column label="鑰冩牳鑼冨洿" align="center" prop="examineRange" >
- <template slot-scope="scope">
- <dict-tag :options="dict.type.platform_examine_range" :value="scope.row.examineRange"/>
- </template>
- </el-table-column>
- <el-table-column label="鑰冩牳棰戠巼" align="center" prop="frequency">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.platform_examine_frequency" :value="scope.row.frequency"/>
- </template>
- </el-table-column>
- <el-table-column label="鎶ヨ鍒嗘暟闃堝��" align="center" prop="alarmScore" />
- <el-form-item label="鎶ヨ鍒嗘暟闃堝��" prop="alarmScore">
- <el-input v-model="form.alarmScore" placeholder="璇疯緭鍏ュ垎鏁�" />
- </el-form-item>
- <el-table-column label="鑰冩牳鐘舵��" align="center" prop="state">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.state"/>
- </template>
- </el-table-column>
- <el-table-column label="淇敼浜�" align="center" prop="updateUserName" />
- <el-table-column label="淇敼鏃堕棿" align="center" prop="updateTime" width="170px" />
- <el-table-column label="瀹℃牳鐘舵��" align="center" prop="auditState">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.platform_audit_state" :value="scope.row.auditState"/>
- </template>
- </el-table-column>
- <el-table-column label="瀹℃牳浜�" align="center" prop="auditUser" />
- <el-table-column label="瀹℃牳鏃堕棿" align="center" prop="auditTime" width="170px"/>
- <el-table-column label="瀹℃牳鎰忚" align="center" prop="auditDescription" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-s-check"
- @click="handleAudit(scope.row)"
- v-hasPermi="['examine:publish:audit']"
- >瀹℃牳</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
- <div>
- <!-- 娣诲姞鎴栦慨鏀硅�冩牳鍙戝竷瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="100px">
- <el-form-item label="鑰冩牳鍚�" prop="examineName">
- <el-input v-model="form.examineName" placeholder="璇疯緭鍏ヨ�冩牳鍚�" />
- </el-form-item>
-
- <el-form-item label="鑰冩牳妯℃澘" prop="templateId">
- <el-select v-model="form.templateId" placeholder="鑰冩牳妯℃澘">
- <el-option
- v-for="item in templateList"
- :key="item.id"
- :label="item.value"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鑰冩牳鑼冨洿" prop="examineRange">
- <el-select
- v-model="form.examineRange"
- placeholder="鑰冩牳鑼冨洿"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.platform_examine_range"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鑰冩牳棰戠巼">
- <el-select
- v-model="form.frequency"
- placeholder="鑰冩牳棰戠巼"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.platform_examine_frequency"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎶ヨ鍒嗘暟闃堝��" prop="alarmScore">
- <el-input v-model="form.alarmScore" placeholder="璇疯緭鍏ュ垎鏁�" style="width: 170px"/>
- </el-form-item>
- <el-form-item label="鑰冩牳鐘舵��" prop="state">
- <el-select
- v-model="form.state"
- placeholder="鑰冩牳鐘舵��"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.sys_normal_disable"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎻忚堪" prop="description">
- <el-input v-model="form.description" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
-
- <!-- 瀹℃牳鑰冩牳鍙戝竷瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="auditOpen" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="100px">
- <el-form-item label="鑰冩牳鍚�" prop="examineName">
- <el-input v-model="form.examineName" placeholder="璇疯緭鍏ヨ�冩牳鍚�" disabled/>
- </el-form-item>
- <el-form-item label="鑰冩牳妯℃澘" prop="templateId">
- <el-select v-model="form.templateId" placeholder="鑰冩牳妯℃澘" disabled>
- <el-option
- v-for="item in templateList"
- :key="item.id"
- :label="item.value"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鑰冩牳鑼冨洿" prop="examineRange" >
- <el-select
- v-model="form.examineRange"
- placeholder="鑰冩牳鑼冨洿"
- clearable
- style="width: 170px"
- disabled
- >
- <el-option
- v-for="dict in dict.type.platform_examine_range"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- />
- </el-select>
- </el-form-item>
-
- <el-form-item label="鑰冩牳棰戠巼" prop="frequency" >
- <el-select
- v-model="form.frequency"
- placeholder="鑰冩牳棰戠巼"
- clearable
- style="width: 170px"
- disabled
- >
- <el-option
- v-for="dict in dict.type.platform_examine_frequency"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎶ヨ鍒嗘暟闃堝��" prop="alarmScore">
- <el-input v-model="form.alarmScore" placeholder="璇疯緭鍏ュ垎鏁�" style="width: 170px" disabled/>
- </el-form-item>
- <el-form-item label="鑰冩牳鐘舵��" prop="state">
- <el-select
- v-model="form.state"
- placeholder="鑰冩牳鐘舵��"
- clearable
- style="width: 170px"
- disabled
- >
- <el-option
- v-for="dict in dict.type.sys_normal_disable"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎻忚堪" prop="description">
- <el-input v-model="form.description" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" disabled/>
- </el-form-item>
- <el-form-item label="瀹℃牳缁撴灉" prop="auditState" >
- <el-radio-group v-model="form.auditState">
- <el-radio :label="1">閫氳繃</el-radio>
- <el-radio :label="2">椹冲洖</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="瀹℃牳璇存槑" prop="auditDescription" >
- <el-input v-model="form.auditDescription" type="textarea" show-word-limit maxlength="100" />
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- </div>
- </div>
-</template>
-
-<script>
-import { listPublish, getPublish, delPublish, addPublish, updatePublish } from "@/api/platform/check-publish";
-import { templateSelect } from "@/api/platform/check-template";
-export default {
- name: "Publish",
- dicts: ['sys_normal_disable','platform_examine_range','platform_examine_frequency','platform_audit_state'],
- data() {
- return {
- // 閬僵灞�
- loading: true,
- // 閫変腑鏁扮粍
- ids: [],
- // 闈炲崟涓鐢�
- single: true,
- // 闈炲涓鐢�
- multiple: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 鎬绘潯鏁�
- total: 0,
- // 鑰冩牳鍙戝竷琛ㄦ牸鏁版嵁
- publishList: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- auditOpen: false,
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- examineName: null,
- frequency: null,
- state: null,
- examineRange: null,
- },
- // 鑰冩牳妯℃澘
- templateList: [],
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
- }
- };
- },
- created() {
- this.getList();
- this.getTemplateSelect();
- },
- methods: {
- /** 鑰冩牳妯℃澘涓嬫媺鍒楄〃 */
- getTemplateSelect() {
- templateSelect().then((res) => {
- this.templateList = res.data;
- })
- },
- /** 鏌ヨ鑰冩牳鍙戝竷鍒楄〃 */
- getList() {
- this.loading = true;
- listPublish(this.queryParams).then(response => {
- this.publishList = response.rows;
- this.total = response.total;
- this.loading = false;
- });
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false;
- this.auditOpen = false;
- this.reset();
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- examineName: null,
- templateId: null,
- examineRange: null,
- frequency: null,
- state: null,
- createTime: null,
- createUser: null,
- updateTime: null,
- updateUser: null,
- description: null
- };
- this.resetForm("form");
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.resetForm("queryForm");
- this.handleQuery();
- },
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
- this.multiple = !selection.length
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞鑰冩牳鍙戝竷";
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- const id = row.id || this.ids
- getPublish(id).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼鑰冩牳鍙戝竷";
- });
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleAudit(row) {
- this.reset();
- const id = row.id || this.ids
- getPublish(id).then(response => {
- this.form = response.data;
- this.auditOpen = true;
- this.title = "瀹℃牳鑰冩牳鍙戝竷";
- });
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updatePublish(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.auditOpen = false;
- this.getList();
- });
- } else {
- addPublish(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.auditOpen = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鑰冩牳鍙戝竷缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delPublish(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('system/publish/export', {
- ...this.queryParams
- }, `publish_${new Date().getTime()}.xlsx`)
- }
- }
-};
-</script>
diff --git a/src/views/system/publish/default/index.vue b/src/views/system/publish/default/index.vue
deleted file mode 100644
index eef8be0..0000000
--- a/src/views/system/publish/default/index.vue
+++ /dev/null
@@ -1,497 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="鑰冩牳鍚�" prop="examineName">
- <el-input
- v-model="queryParams.examineName"
- placeholder="璇疯緭鍏ヨ�冩牳鍚�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鑰冩牳鑼冨洿" prop="examineRange">
- <el-select
- v-model="queryParams.examineRange"
- placeholder="鑰冩牳鑼冨洿"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.platform_examine_range"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鑰冩牳棰戠巼" prop="frequency">
- <el-select
- v-model="queryParams.frequency"
- placeholder="鑰冩牳棰戠巼"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.platform_examine_frequency"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
-
- <el-form-item label="鑰冩牳鐘舵��" prop="state">
- <el-select
- v-model="queryParams.state"
- placeholder="鑰冩牳鐘舵��"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.sys_normal_disable"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </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>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- >鍒犻櫎</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="publishList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鑰冩牳鍚�" align="center" prop="examineName" />
- <el-table-column label="鑰冩牳鑼冨洿" align="center" prop="examineRange" >
- <template slot-scope="scope">
- <dict-tag :options="dict.type.platform_examine_range" :value="scope.row.examineRange"/>
- </template>
- </el-table-column>
- <el-table-column label="鑰冩牳棰戠巼" align="center" prop="frequency">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.platform_examine_frequency" :value="scope.row.frequency"/>
- </template>
- </el-table-column>
- <el-table-column label="鎶ヨ鍒嗘暟闃堝��" align="center" prop="alarmScore" />
- <el-form-item label="鎶ヨ鍒嗘暟闃堝��" prop="alarmScore">
- <el-input v-model="form.alarmScore" placeholder="璇疯緭鍏ュ垎鏁�" />
- </el-form-item>
- <el-table-column label="鑰冩牳鐘舵��" align="center" prop="state">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.state"/>
- </template>
- </el-table-column>
- <el-table-column label="淇敼浜�" align="center" prop="updateUserName" />
- <el-table-column label="淇敼鏃堕棿" align="center" prop="updateTime" width="170px" />
- <el-table-column label="瀹℃牳鐘舵��" align="center" prop="auditState">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.platform_audit_state" :value="scope.row.auditState"/>
- </template>
- </el-table-column>
- <el-table-column label="瀹℃牳浜�" align="center" prop="auditUser" />
- <el-table-column label="瀹℃牳鏃堕棿" align="center" prop="auditTime" width="170px"/>
- <el-table-column label="瀹℃牳鎰忚" align="center" prop="auditDescription" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-s-check"
- @click="handleAudit(scope.row)"
- v-hasPermi="['examine:publish:audit']"
- >瀹℃牳</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
- <div>
- <!-- 娣诲姞鎴栦慨鏀硅�冩牳鍙戝竷瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="100px">
- <el-form-item label="鑰冩牳鍚�" prop="examineName">
- <el-input v-model="form.examineName" placeholder="璇疯緭鍏ヨ�冩牳鍚�" />
- </el-form-item>
-
- <el-form-item label="鑰冩牳妯℃澘" prop="templateId">
- <el-select v-model="form.templateId" placeholder="鑰冩牳妯℃澘">
- <el-option
- v-for="item in templateList"
- :key="item.id"
- :label="item.value"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鑰冩牳鑼冨洿" prop="examineRange">
- <el-select
- v-model="form.examineRange"
- placeholder="鑰冩牳鑼冨洿"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.platform_examine_range"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鑰冩牳棰戠巼">
- <el-select
- v-model="form.frequency"
- placeholder="鑰冩牳棰戠巼"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.platform_examine_frequency"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎶ヨ鍒嗘暟闃堝��" prop="alarmScore">
- <el-input v-model="form.alarmScore" placeholder="璇疯緭鍏ュ垎鏁�" style="width: 170px"/>
- </el-form-item>
- <el-form-item label="鑰冩牳鐘舵��" prop="state">
- <el-select
- v-model="form.state"
- placeholder="鑰冩牳鐘舵��"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.sys_normal_disable"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎻忚堪" prop="description">
- <el-input v-model="form.description" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
-
- <!-- 瀹℃牳鑰冩牳鍙戝竷瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="auditOpen" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="100px">
- <el-form-item label="鑰冩牳鍚�" prop="examineName">
- <el-input v-model="form.examineName" placeholder="璇疯緭鍏ヨ�冩牳鍚�" disabled/>
- </el-form-item>
- <el-form-item label="鑰冩牳妯℃澘" prop="templateId">
- <el-select v-model="form.templateId" placeholder="鑰冩牳妯℃澘" disabled>
- <el-option
- v-for="item in templateList"
- :key="item.id"
- :label="item.value"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鑰冩牳鑼冨洿" prop="examineRange" >
- <el-select
- v-model="form.examineRange"
- placeholder="鑰冩牳鑼冨洿"
- clearable
- style="width: 170px"
- disabled
- >
- <el-option
- v-for="dict in dict.type.platform_examine_range"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- />
- </el-select>
- </el-form-item>
-
- <el-form-item label="鑰冩牳棰戠巼" prop="frequency" >
- <el-select
- v-model="form.frequency"
- placeholder="鑰冩牳棰戠巼"
- clearable
- style="width: 170px"
- disabled
- >
- <el-option
- v-for="dict in dict.type.platform_examine_frequency"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎶ヨ鍒嗘暟闃堝��" prop="alarmScore">
- <el-input v-model="form.alarmScore" placeholder="璇疯緭鍏ュ垎鏁�" style="width: 170px" disabled/>
- </el-form-item>
- <el-form-item label="鑰冩牳鐘舵��" prop="state">
- <el-select
- v-model="form.state"
- placeholder="鑰冩牳鐘舵��"
- clearable
- style="width: 170px"
- disabled
- >
- <el-option
- v-for="dict in dict.type.sys_normal_disable"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎻忚堪" prop="description">
- <el-input v-model="form.description" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" disabled/>
- </el-form-item>
- <el-form-item label="瀹℃牳缁撴灉" prop="auditState" >
- <el-radio-group v-model="form.auditState">
- <el-radio :label="1">閫氳繃</el-radio>
- <el-radio :label="2">椹冲洖</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="瀹℃牳璇存槑" prop="auditDescription" >
- <el-input v-model="form.auditDescription" type="textarea" show-word-limit maxlength="100" />
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- </div>
- </div>
-</template>
-
-<script>
-import { listPublish, getPublish, delPublish, addPublish, updatePublish } from "@/api/platform/contract-publish";
-import { templateSelect } from "@/api/platform/check-template";
-export default {
- name: "Publish",
- dicts: ['sys_normal_disable','platform_examine_range','platform_examine_frequency','platform_audit_state'],
- data() {
- return {
- // 閬僵灞�
- loading: true,
- // 閫変腑鏁扮粍
- ids: [],
- // 闈炲崟涓鐢�
- single: true,
- // 闈炲涓鐢�
- multiple: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 鎬绘潯鏁�
- total: 0,
- // 鑰冩牳鍙戝竷琛ㄦ牸鏁版嵁
- publishList: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- auditOpen: false,
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- examineName: null,
- frequency: null,
- state: null,
- examineRange: null,
- },
- // 鑰冩牳妯℃澘
- templateList: [],
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
- }
- };
- },
- created() {
- this.getList();
- this.getTemplateSelect();
- },
- methods: {
- /** 鑰冩牳妯℃澘涓嬫媺鍒楄〃 */
- getTemplateSelect() {
- templateSelect().then((res) => {
- this.templateList = res.data;
- })
- },
- /** 鏌ヨ鑰冩牳鍙戝竷鍒楄〃 */
- getList() {
- this.loading = true;
- listPublish(this.queryParams).then(response => {
- this.publishList = response.rows;
- this.total = response.total;
- this.loading = false;
- });
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false;
- this.auditOpen = false;
- this.reset();
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- examineName: null,
- templateId: null,
- examineRange: null,
- frequency: null,
- state: null,
- createTime: null,
- createUser: null,
- updateTime: null,
- updateUser: null,
- description: null
- };
- this.resetForm("form");
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.resetForm("queryForm");
- this.handleQuery();
- },
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
- this.multiple = !selection.length
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞鑰冩牳鍙戝竷";
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- const id = row.id || this.ids
- getPublish(id).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼鑰冩牳鍙戝竷";
- });
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleAudit(row) {
- this.reset();
- const id = row.id || this.ids
- getPublish(id).then(response => {
- this.form = response.data;
- this.auditOpen = true;
- this.title = "瀹℃牳鑰冩牳鍙戝竷";
- });
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updatePublish(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.auditOpen = false;
- this.getList();
- });
- } else {
- addPublish(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.auditOpen = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鑰冩牳鍙戝竷缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delPublish(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('system/publish/export', {
- ...this.queryParams
- }, `publish_${new Date().getTime()}.xlsx`)
- }
- }
-};
-</script>
diff --git a/src/views/system/publish/province/index.vue b/src/views/system/publish/province/index.vue
deleted file mode 100644
index f5368ee..0000000
--- a/src/views/system/publish/province/index.vue
+++ /dev/null
@@ -1,497 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="鑰冩牳鍚�" prop="examineName">
- <el-input
- v-model="queryParams.examineName"
- placeholder="璇疯緭鍏ヨ�冩牳鍚�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鑰冩牳鑼冨洿" prop="examineRange">
- <el-select
- v-model="queryParams.examineRange"
- placeholder="鑰冩牳鑼冨洿"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.platform_examine_range"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鑰冩牳棰戠巼" prop="frequency">
- <el-select
- v-model="queryParams.frequency"
- placeholder="鑰冩牳棰戠巼"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.platform_examine_frequency"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
-
- <el-form-item label="鑰冩牳鐘舵��" prop="state">
- <el-select
- v-model="queryParams.state"
- placeholder="鑰冩牳鐘舵��"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.sys_normal_disable"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </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>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- >鍒犻櫎</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="publishList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鑰冩牳鍚�" align="center" prop="examineName" />
- <el-table-column label="鑰冩牳鑼冨洿" align="center" prop="examineRange" >
- <template slot-scope="scope">
- <dict-tag :options="dict.type.platform_examine_range" :value="scope.row.examineRange"/>
- </template>
- </el-table-column>
- <el-table-column label="鑰冩牳棰戠巼" align="center" prop="frequency">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.platform_examine_frequency" :value="scope.row.frequency"/>
- </template>
- </el-table-column>
- <el-table-column label="鎶ヨ鍒嗘暟闃堝��" align="center" prop="alarmScore" />
- <el-form-item label="鎶ヨ鍒嗘暟闃堝��" prop="alarmScore">
- <el-input v-model="form.alarmScore" placeholder="璇疯緭鍏ュ垎鏁�" />
- </el-form-item>
- <el-table-column label="鑰冩牳鐘舵��" align="center" prop="state">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.state"/>
- </template>
- </el-table-column>
- <el-table-column label="淇敼浜�" align="center" prop="updateUserName" />
- <el-table-column label="淇敼鏃堕棿" align="center" prop="updateTime" width="170px" />
- <el-table-column label="瀹℃牳鐘舵��" align="center" prop="auditState">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.platform_audit_state" :value="scope.row.auditState"/>
- </template>
- </el-table-column>
- <el-table-column label="瀹℃牳浜�" align="center" prop="auditUser" />
- <el-table-column label="瀹℃牳鏃堕棿" align="center" prop="auditTime" width="170px"/>
- <el-table-column label="瀹℃牳鎰忚" align="center" prop="auditDescription" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-s-check"
- @click="handleAudit(scope.row)"
- v-hasPermi="['examine:publish:audit']"
- >瀹℃牳</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
- <div>
- <!-- 娣诲姞鎴栦慨鏀硅�冩牳鍙戝竷瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="100px">
- <el-form-item label="鑰冩牳鍚�" prop="examineName">
- <el-input v-model="form.examineName" placeholder="璇疯緭鍏ヨ�冩牳鍚�" />
- </el-form-item>
-
- <el-form-item label="鑰冩牳妯℃澘" prop="templateId">
- <el-select v-model="form.templateId" placeholder="鑰冩牳妯℃澘">
- <el-option
- v-for="item in templateList"
- :key="item.id"
- :label="item.value"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鑰冩牳鑼冨洿" prop="examineRange">
- <el-select
- v-model="form.examineRange"
- placeholder="鑰冩牳鑼冨洿"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.platform_examine_range"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鑰冩牳棰戠巼">
- <el-select
- v-model="form.frequency"
- placeholder="鑰冩牳棰戠巼"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.platform_examine_frequency"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎶ヨ鍒嗘暟闃堝��" prop="alarmScore">
- <el-input v-model="form.alarmScore" placeholder="璇疯緭鍏ュ垎鏁�" style="width: 170px"/>
- </el-form-item>
- <el-form-item label="鑰冩牳鐘舵��" prop="state">
- <el-select
- v-model="form.state"
- placeholder="鑰冩牳鐘舵��"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.sys_normal_disable"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎻忚堪" prop="description">
- <el-input v-model="form.description" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
-
- <!-- 瀹℃牳鑰冩牳鍙戝竷瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="auditOpen" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="100px">
- <el-form-item label="鑰冩牳鍚�" prop="examineName">
- <el-input v-model="form.examineName" placeholder="璇疯緭鍏ヨ�冩牳鍚�" disabled/>
- </el-form-item>
- <el-form-item label="鑰冩牳妯℃澘" prop="templateId">
- <el-select v-model="form.templateId" placeholder="鑰冩牳妯℃澘" disabled>
- <el-option
- v-for="item in templateList"
- :key="item.id"
- :label="item.value"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鑰冩牳鑼冨洿" prop="examineRange" >
- <el-select
- v-model="form.examineRange"
- placeholder="鑰冩牳鑼冨洿"
- clearable
- style="width: 170px"
- disabled
- >
- <el-option
- v-for="dict in dict.type.platform_examine_range"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- />
- </el-select>
- </el-form-item>
-
- <el-form-item label="鑰冩牳棰戠巼" prop="frequency" >
- <el-select
- v-model="form.frequency"
- placeholder="鑰冩牳棰戠巼"
- clearable
- style="width: 170px"
- disabled
- >
- <el-option
- v-for="dict in dict.type.platform_examine_frequency"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎶ヨ鍒嗘暟闃堝��" prop="alarmScore">
- <el-input v-model="form.alarmScore" placeholder="璇疯緭鍏ュ垎鏁�" style="width: 170px" disabled/>
- </el-form-item>
- <el-form-item label="鑰冩牳鐘舵��" prop="state">
- <el-select
- v-model="form.state"
- placeholder="鑰冩牳鐘舵��"
- clearable
- style="width: 170px"
- disabled
- >
- <el-option
- v-for="dict in dict.type.sys_normal_disable"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎻忚堪" prop="description">
- <el-input v-model="form.description" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" disabled/>
- </el-form-item>
- <el-form-item label="瀹℃牳缁撴灉" prop="auditState" >
- <el-radio-group v-model="form.auditState">
- <el-radio :label="1">閫氳繃</el-radio>
- <el-radio :label="2">椹冲洖</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="瀹℃牳璇存槑" prop="auditDescription" >
- <el-input v-model="form.auditDescription" type="textarea" show-word-limit maxlength="100" />
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- </div>
- </div>
-</template>
-
-<script>
-import { listPublish, getPublish, delPublish, addPublish, updatePublish } from "@/api/platform/check-publish";
-import { templateSelect } from "@/api/platform/check-template";
-export default {
- name: "Publish",
- dicts: ['sys_normal_disable','platform_examine_range','platform_examine_frequency','platform_audit_state'],
- data() {
- return {
- // 閬僵灞�
- loading: true,
- // 閫変腑鏁扮粍
- ids: [],
- // 闈炲崟涓鐢�
- single: true,
- // 闈炲涓鐢�
- multiple: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 鎬绘潯鏁�
- total: 0,
- // 鑰冩牳鍙戝竷琛ㄦ牸鏁版嵁
- publishList: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- auditOpen: false,
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- examineName: null,
- frequency: null,
- state: null,
- examineRange: null,
- },
- // 鑰冩牳妯℃澘
- templateList: [],
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
- }
- };
- },
- created() {
- this.getList();
- this.getTemplateSelect();
- },
- methods: {
- /** 鑰冩牳妯℃澘涓嬫媺鍒楄〃 */
- getTemplateSelect() {
- templateSelect().then((res) => {
- this.templateList = res.data;
- })
- },
- /** 鏌ヨ鑰冩牳鍙戝竷鍒楄〃 */
- getList() {
- this.loading = true;
- listPublish(this.queryParams).then(response => {
- this.publishList = response.rows;
- this.total = response.total;
- this.loading = false;
- });
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false;
- this.auditOpen = false;
- this.reset();
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- examineName: null,
- templateId: null,
- examineRange: null,
- frequency: null,
- state: null,
- createTime: null,
- createUser: null,
- updateTime: null,
- updateUser: null,
- description: null
- };
- this.resetForm("form");
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.resetForm("queryForm");
- this.handleQuery();
- },
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
- this.multiple = !selection.length
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞鑰冩牳鍙戝竷";
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- const id = row.id || this.ids
- getPublish(id).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼鑰冩牳鍙戝竷";
- });
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleAudit(row) {
- this.reset();
- const id = row.id || this.ids
- getPublish(id).then(response => {
- this.form = response.data;
- this.auditOpen = true;
- this.title = "瀹℃牳鑰冩牳鍙戝竷";
- });
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updatePublish(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.auditOpen = false;
- this.getList();
- });
- } else {
- addPublish(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.auditOpen = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鑰冩牳鍙戝竷缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delPublish(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('system/publish/export', {
- ...this.queryParams
- }, `publish_${new Date().getTime()}.xlsx`)
- }
- }
-};
-</script>
diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index 3c0a06c..8ca0331 100644
--- a/src/views/system/report/index.vue
+++ b/src/views/system/report/index.vue
@@ -177,7 +177,7 @@
<el-date-picker v-model="auditingForm.endCreateTime" disabled />
</el-form-item>
<el-form-item label="鎶ュ鍐呭">
- <el-input type="textarea" v-html="auditingForm.reportContent" disabled />
+ <span v-html="auditingForm.reportContent"></span>
</el-form-item>
<el-form-item label="涓婃姤鏉愭枡">
<el-link
@@ -344,7 +344,7 @@
this.queryParams["endAuditingTime"] = this.daterangeAuditingTime[1];
}
listReport(this.queryParams).then(response => {
- this.reportList = response.data;
+ this.reportList = response.data.records;
this.total = response.total;
this.loading = false;
});
diff --git a/src/views/system/result/default/detail.vue b/src/views/system/result/default/detail.vue
deleted file mode 100644
index f0f8a47..0000000
--- a/src/views/system/result/default/detail.vue
+++ /dev/null
@@ -1,685 +0,0 @@
-<template>
- <div class="app-container">
- <el-page-header @back="goBack" content="璇︽儏椤甸潰">
- </el-page-header>
- <el-container>
- <el-main style="padding-top: 0px">
- <h2>鑰冩牳鍒嗘暟鏄庣粏</h2>
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleScoreUpdate"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- >鍒犻櫎</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getScoreList"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="scoreList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鑰冩牳鍚�" align="center" prop="examineName" />
- <el-table-column label="鑰冩牳绫诲瀷" align="center" prop="examineCategory">
- <template slot-scope="scope">
- <div v-if="scope.row.examineCategory == 1">鐪佸巺鑰冩牳</div>
- <div v-else-if="scope.row.examineCategory == 2">甯傚眬鑰冩牳</div>
- <div v-else-if="scope.row.examineCategory == 3">鍚堝悓鑰冩牳</div>
- </template>
- </el-table-column>
- <el-table-column label="鑰冩牳瀵硅薄" align="center" prop="unitName">
- <template slot-scope="scope">
- <div v-if="scope.row.unitName ==='鎴愰兘x杩愮淮' ">鎴愰兘x杩愮淮</div>
- <div v-else>鑷祦浜曞尯</div>
- </template>
- </el-table-column>
- <el-table-column label="鍒嗗��" align="center" prop="score" />
- <el-table-column label="鑰冩牳瑙勫垯" align="center" prop="ruleCategory">
- <template slot-scope="scope">
- <div v-if="scope.row.ruleCategory == 1">瑙嗛鍦ㄧ嚎鐜�</div>
- <div v-else-if="scope.row.ruleCategory == 2">瀛樺偍鏁呴殰</div>
- <div v-else-if="scope.row.ruleCategory == 3">瑙嗗浘搴撳鎺ョǔ瀹氭��</div>
- <div v-else-if="scope.row.ruleCategory == 4">涓�鏈轰竴妗�24灏忔椂鏈慨澶�</div>
- <div v-else-if="scope.row.ruleCategory == 5">鏃堕挓涓嶅悓姝�24灏忔椂鏈慨澶�</div>
- </template>
- </el-table-column>
- <el-table-column label="鍒涘缓浜�" align="center" prop="createBy" />
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleScoreUpdate(scope.row)"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleScoreDelete(scope.row)"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- </el-main>
- </el-container>
- <el-container>
- <el-main>
- <h2>鑰冩牳瑙勫垯</h2>
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleRuleUpdate"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- >鍒犻櫎</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getRuleList"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="ruleList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="瑙勫垯鍚嶇О" align="center" prop="ruleName" />
- <el-table-column label="杩愮淮鍏徃" align="center" prop="companyName" >
- {{'鎴愰兘x杩愮淮鍏徃'}}
- </el-table-column>
- <el-table-column label="瑙勫垯鎻忚堪" align="center" prop="ruleDesc" />
- <el-table-column label="瑙勫垯鐘舵��" align="center" prop="ruleStatus" />
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- v-if="scope.row.ruleStatus === '鏈惎鐢�'"
- size="mini"
- type="text"
- icon="el-icon-zoom-in"
- @click="handleUse(scope.row.id, true)"
- >鍚敤</el-button>
- <el-button
- v-else
- size="mini"
- type="text"
- icon="el-icon-zoom-in"
- @click="handleUse(scope.row.id, false)"
- >鍋滅敤</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-zoom-in"
- @click="handleRuleDetail(scope.row)"
- >璇︽儏</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleRuleUpdate(scope.row)"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
- </el-main>
- </el-container>
- <el-container>
- <el-main>
- <h2>鑰冩牳鎴愮哗</h2>
- <el-descriptions class="margin-top" :column="3" border>
- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-user"></i>
- 鑰冩牳瀵硅薄
- </template>
- {{detail.checkUnitName}}
- </el-descriptions-item>
- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-s-management"></i>
- 鑰冩牳鍚嶇О
- </template>
- {{detail.examineName}}
- </el-descriptions-item>
- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-full-screen"></i>
- 鑰冩牳鑼冨洿
- </template>
- <el-tag size="small">{{detail.examineRange === 1 ? '鍒嗗眬鑰冩牳' : '甯傚眬鑰冩牳'}}</el-tag>
- </el-descriptions-item>
- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-timer"></i>
- 鑰冩牳棰戠巼
- </template>
- <el-tag size="small">{{detail.frequency === 1 ? '鏈堝害鑰冩牳' : '瀛ｅ害鑰冩牳'}}</el-tag>
- </el-descriptions-item>
- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-medal"></i>
- 缁煎悎鍒嗘暟
- </template>
- <el-tag type="danger" size="small">{{detail.checkScore}}</el-tag>
- </el-descriptions-item>
- </el-descriptions>
- <el-table
- :data="tableData"
- show-summary
- >
- <el-table-column
- prop="name"
- label="瑙勫垯鍚�"
- min-width="500"
- >
- </el-table-column>
- <el-table-column
- prop="content"
- label="鎸囨爣"
- min-width="500">
- </el-table-column>
- <el-table-column
- prop="score"
- label="寰楀垎"
- min-width="500">
- </el-table-column>
- </el-table>
- </el-main>
- </el-container>
-
- <el-dialog :title="manualScoreTitle" :visible.sync="manualScoreOpen" width="500px" append-to-body>
- <el-input v-model="manualScoreForm.manualScore" type="number" placeholder="璇蜂负璇ュ崟浣嶆墦鍒�"/>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitManualScore">纭� 瀹�</el-button>
- <el-button @click="cancelManualScore">鍙� 娑�</el-button>
- </div>
- </el-dialog>
-
- <!-- 娣诲姞鎴栦慨鏀硅繚绾﹁鍒欏璇濇 -->
- <el-dialog :title="title" :visible.sync="ruleOpen" width="50%" append-to-body>
- <el-form ref="form" :model="ruleForm" :rules="rules" label-width="80px">
- <el-form-item label="瑙勫垯鍚嶇О" prop="ruleName">
- <el-input class="input" v-model="ruleForm.ruleName" placeholder="璇疯緭鍏ヨ鍒欏悕绉�" />
- </el-form-item>
- <el-form-item label="杩愮淮鍏徃" prop="companyName">
- <el-input class="input" :value ="companyName" placeholder="璇疯緭鍏ヨ繍缁村叕鍙稿悕绉�"></el-input>
- </el-form-item>
- <el-form-item label="瑙勫垯鎻忚堪" prop="ruleDesc">
- <el-input class="input" v-model="ruleForm.ruleDesc" placeholder="璇疯緭鍏ヨ鍒欐弿杩�" />
- </el-form-item>
- <el-form-item label="瑙勫垯璁剧疆">
- <div >
- <div class="line">
- <div class="line-left">鏃堕挓鍚屾锛堣秴杩嚶�3绉掍负涓嶅悎鏍硷級24灏忔椂鍐呮湭淇鐨勶細鎵ｉ櫎鐩稿叧闀滃ご鏁伴噺*</div>
- <div class="line-right"><el-input v-model="jsonRule.overTime" type="text"/></div>鍒�
- </div>
- <div class="line">
- <div class="line-left">OSD鏍囪瘑涓嶆弧瓒炽�奊AT 751-2008 瑙嗛鍥惧儚鏂囧瓧鏍囨敞瑙勮寖銆嬶紝24灏忔椂鍐呮湭淇鐨勶細鏍囨墸闄ょ浉鍏抽暅澶存暟閲�*</div>
- <div class="line-right"><el-input v-model="jsonRule.failNum" type="text"/></div>鍒�
- </div>
- <div class="line">
- <div class="line-left">鐢ㄦ埛鎶芥锛屼竴鏈轰竴妗ｆ暟鎹」涓嶅悎鏍硷紙鎻愪緵铏氬亣鏁版嵁鎴栭敊璇暟鎹负涓嶅悎鏍硷級锛�24灏忔椂鍐呮湭淇鐨勶細鎵ｉ櫎鐩稿叧闀滃ご鏁伴噺*</div>
- <div class="line-right"><el-input v-model="jsonRule.failNum" type="text"/></div>鍒�
- </div>
- </div>
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
-
- <!-- 瑙勫垯璇︽儏 -->
- <el-dialog title="瑙勫垯璇︽儏" :visible.sync="ruleDetailOpen" width="50%" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="瑙勫垯鍚嶇О" prop="ruleName">
- <el-input class="input" disabled v-model="form.ruleName" placeholder="璇疯緭鍏ヨ鍒欏悕绉�" />
- </el-form-item>
- <el-form-item label="杩愮淮鍏徃" prop="companyName">
- <el-input class="input" disabled :value ="companyName" placeholder="璇疯緭鍏ヨ繍缁村叕鍙稿悕绉�"></el-input>
- </el-form-item>
- <el-form-item label="瑙勫垯鎻忚堪" prop="ruleDesc">
- <el-input class="input" disabled v-model="form.ruleDesc" placeholder="璇疯緭鍏ヨ鍒欐弿杩�" />
- </el-form-item>
- <el-form-item label="瑙勫垯璁剧疆">
- <div >
- <div class="line">
- <div class="line-left">鏃堕挓鍚屾锛堣秴杩嚶�3绉掍负涓嶅悎鏍硷級24灏忔椂鍐呮湭淇鐨勶細鎵ｉ櫎鐩稿叧闀滃ご鏁伴噺*</div>
- <div class="line-right"><el-input disabled v-model="jsonRule.overTime" type="text"/></div>鍒�
- </div>
- <div class="line">
- <div class="line-left">OSD鏍囪瘑涓嶆弧瓒炽�奊AT 751-2008 瑙嗛鍥惧儚鏂囧瓧鏍囨敞瑙勮寖銆嬶紝24灏忔椂鍐呮湭淇鐨勶細鏍囨墸闄ょ浉鍏抽暅澶存暟閲�*</div>
- <div class="line-right"><el-input disabled v-model="jsonRule.failNum" type="text"/></div>鍒�
- </div>
- <div class="line">
- <div class="line-left">鐢ㄦ埛鎶芥锛屼竴鏈轰竴妗ｆ暟鎹」涓嶅悎鏍硷紙鎻愪緵铏氬亣鏁版嵁鎴栭敊璇暟鎹负涓嶅悎鏍硷級锛�24灏忔椂鍐呮湭淇鐨勶細鎵ｉ櫎鐩稿叧闀滃ご鏁伴噺*</div>
- <div class="line-right"><el-input disabled v-model="jsonRule.failNum" type="text"/></div>鍒�
- </div>
- </div>
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button @click="cancel">鍏抽棴</el-button>
- </div>
- </el-dialog>
-
- <!-- 娣诲姞鎴栦慨鏀硅�冩牳璁″垎瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="scoreOpen" width="500px" append-to-body>
- <el-form ref="form" :model="scoreForm" :rules="rules" label-width="80px">
- <el-form-item label="鍒嗗��" prop="score">
- <el-input v-model="scoreForm.score" placeholder="璇疯緭鍏ュ垎鍊�" />
- </el-form-item>
- <el-form-item label="鑰冩牳鍚�" prop="examineId">
- <el-select v-model="scoreForm.examineId" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in examineList"
- :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="scoreForm.unitId" 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="ruleCategory">
- <el-select v-model="scoreForm.ruleCategory" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in ruleCategoryList"
- :key="item.id"
- :label="item.value"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
-
- </div>
-</template>
-
-<script>
-import { listCheckResult, getCheckResult, delCheckResult, addCheckResult, updateCheckResult,manualScore, publishCheckResult } from "@/api/platform/contract-result";
-import { listRule, getRule, delRule, addRule, updateRule, setRule } from "@/api/platform/calculate-rule";
-import { listScore, getScore, delScore, addScore, updateScore } from "@/api/platform/contract-score";
-
-import {unitSelect} from "../../../../api/platform/unit";
-import {publishSelect} from "../../../../api/platform/check-publish";
-export default {
- name: "CheckResult",
- data() {
- return {
- companyName: "鎴愰兘x杩愮淮鍏徃",
- detailTitle: '',
- detailOpen: false,
- detail:{
- },
- examineList: [],
- unitList: [],
- ruleCategoryList: [
- { id: 1, value: '瑙嗛鍦ㄧ嚎鐜�' },
- { id: 2, value: '瀛樺偍鏁呴殰' },
- { id: 3, value: '瑙嗗浘搴撳鎺ョǔ瀹氭��' },
- { id: 4, value: '涓�鏈轰竴妗�24灏忔椂鏈慨澶�' },
- { id: 5, value: '鏃堕挓涓嶅悓姝�24灏忔椂鏈慨澶�' },
- ],
- 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'
- }],
- manualScoreOpen: false,
- manualScoreForm: {},
- manualScoreTitle: '',
- // 閬僵灞�
- loading: true,
- // 閫変腑鏁扮粍
- ids: [],
- // 闈炲崟涓鐢�
- single: true,
- // 闈炲涓鐢�
- multiple: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 鎬绘潯鏁�
- total: 0,
- // 鑰冩牳缁撴灉琛ㄦ牸鏁版嵁
- checkResultList: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- scoreOpen: false,
- ruleOpen: false,
- ruleDetailOpen: false,
- // 閫昏緫鍒犻櫎鏃堕棿鑼冨洿
- daterangeCheckTime: [],
- // 琛ㄥ崟鍙傛暟
- form: {},
- scoreForm: {},
- ruleForm: {},
- jsonRule: {},
- // 鑰冩牳瑙勫垯鍒楄〃
- ruleList: [],
- // 鑰冩牳璁″垎琛ㄦ牸鏁版嵁
- scoreList: [],
- //杩濈害瑙勫垯璇锋眰鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- ruleName: null,
- ruleStatus: null,
- createTime: null,
- },
- //鑰冩牳鍒嗘暟璇锋眰鍙傛暟
- scoreQueryParams: {
- pageNum: 1,
- pageSize: 10,
- examineCategory: 3,
- },
- // 琛ㄥ崟鏍￠獙
- rules: {
- }
- };
- },
- created() {
- //鑰冩牳鎴愮哗璇︽儏璺宠浆鍙傛暟鎺ユ敹
- if(this.$route.query.detail){
- this.detail = this.$route.query.detail
- console.log(this.$route.query.detail,"detail------------")
- }
- // 杩濈害瑙勫垯鍒楄〃
- this.getRuleList();
- // 鑰冩牳绉垎鍒楄〃
- this.getScoreList();
- this.selectUnit();
- this.selectExamine();
- },
- methods: {
- goBack() {
- console.log('go back');
- },
- // 杩愮淮鍏徃涓嬫媺鏁版嵁
- selectUnit() {
- unitSelect().then(res => {
- this.unitList = res.data;
- })
- },
- // 鑰冩牳涓嬫媺鏁版嵁
- selectExamine() {
- publishSelect().then(res => {
- this.examineList = res.data;
- })
- },
- /** 鏌ヨ鑰冩牳璁″垎鍒楄〃 */
- getScoreList() {
- this.loading = true;
- listScore(this.scoreQueryParams).then(response => {
- this.scoreList = response.rows;
- this.loading = false;
- });
- },
- /** 鏌ヨ杩濈害瑙勫垯鍒楄〃 */
- getRuleList() {
- this.loading = true;
- if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
- this.queryParams["start"] = this.daterangeCreateTime[0];
- this.queryParams["end"] = this.daterangeCreateTime[1];
- }
- listRule(this.queryParams).then(response => {
- this.ruleList = response.data;
- this.loading = false;
- });
- },
- frequencyFormatter(row) {
- if (row.frequency === "1") {
- return "鏈堝害鑰冩牳"
- }
- if (row.frequency === "2") {
- return "瀛ｅ害鑰冩牳"
- }
- },
- examineRangeFormatter(row) {
- if (row.examineRange === "1") {
- return "鍒嗗眬鑰冩牳"
- }
- if (row.examineRange === "2") {
- return "甯傚眬鑰冩牳"
- }
- },
- /** 鏌ヨ鑰冩牳缁撴灉鍒楄〃 */
- getCheckResult() {
- this.loading = true;
- getCheckResult(id).then(response => {
- this.detail = response.data;
- this.loading = false;
- });
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.scoreOpen = false;
- this.ruleOpen = false;
- this.ruleDetailOpen = false;
- this.ruleDetailOpen = false;
- this.reset();
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- id: null,
- checkUnitId: null,
- checkPublishId: null,
- checkScore: null,
- systemScore: null,
- manualScore: null,
- checkTime: null,
- createTime: null,
- updateTime: null,
- deleted: null
- };
- this.resetForm("form");
- },
- cancelManualScore() {
- this.manualScoreForm = {};
- this.manualScoreTitle = "";
- this.manualScoreOpen = false;
- },
- submitManualScore() {
- if (! this.manualScoreForm.manualScore) {
- this.$modal.msgWarning("璇峰～鍐欏垎鏁�");
- return
- }
- manualScore(this.manualScoreForm).then(res => {
- this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
- this.cancelManualScore();
- this.getList();
- })
- },
- handleSetManualScore(row) {
- this.manualScoreForm.id = row.id;
- this.manualScoreForm.manualScore = parseInt(row.manualScore);
- this.manualScoreTitle = row.checkUnitName + '浜哄伐鎵撳垎'
- this.manualScoreOpen = true;
- },
-
- handlePublish(row) {
- let text = row.publish == 1 ? '鍙栨秷鍙戝竷' : '鍙戝竷';
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭' + text + '鑰冩牳缁撴灉缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return publishCheckResult(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess(text + "鎴愬姛");
- }).catch(() => {});
-
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.daterangeCheckTime = [];
- this.resetForm("queryForm");
- this.handleQuery();
- },
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
- this.multiple = !selection.length
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞鑰冩牳缁撴灉";
- },
- /** 淇敼绉垎鎸夐挳鎿嶄綔 */
- handleScoreUpdate(row) {
- this.reset();
- const id = row.id || this.ids
- getScore(id).then(response => {
- this.scoreForm = response.data;
- this.scoreOpen = true;
- this.title = "淇敼鑰冩牳璁″垎";
- });
- },
- /** 淇敼瑙勫垯鎸夐挳鎿嶄綔 */
- handleRuleUpdate(row) {
- this.reset();
- const id = row.id || this.ids
- getRule(id).then(response => {
- this.ruleForm = response.data;
- this.jsonRule = JSON.parse(this.ruleForm.ruleDetail)
- this.ruleOpen = true;
- this.title = "淇敼杩濈害瑙勫垯";
- });
- },
- // 璇︽儏鎸夐挳
- handleRuleDetail(row) {
- this.ruleDetailOpen = true;
- this.form = row;
- this.jsonRule = JSON.parse(this.form.ruleDetail);
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updateCheckResult(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addCheckResult(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鑰冩牳缁撴灉缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delCheckResult(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('system/checkResult/export', {
- ...this.queryParams
- }, `checkResult_${new Date().getTime()}.xlsx`)
- }
- }
-};
-</script>
-<style scoped>
-
-.line {
- display: flex;
- flex-direction: row;
- justify-content: flex-start;
- align-items: center;
-}
-
-.line-right {
- width: 50px;
-}
-.input{
- width: 200px;
-}
-</style>
diff --git a/src/views/system/result/default/index.vue b/src/views/system/result/default/index.vue
deleted file mode 100644
index ba5be21..0000000
--- a/src/views/system/result/default/index.vue
+++ /dev/null
@@ -1,438 +0,0 @@
-<template>
- <div class="app-container">
-
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="鑰冩牳瀵硅薄" prop="checkUnitId">
- <el-input
- v-model="queryParams.checkUnitName"
- placeholder="璇疯緭鍏ヨ�冩牳瀵硅薄"
- clearable
- @clear="handleQuery"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鑰冩牳棰戠巼" prop="frequency">
- <el-select v-model="queryParams.frequency" clearable @clear="handleQuery" placeholder="鑰冩牳棰戠巼">
- <el-option
- label="鏈堝害鑰冩牳"
- value="1">
- </el-option>
- <el-option
- label="瀛ｅ害鑰冩牳"
- value="2">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鑰冩牳鑼冨洿" prop="examineRange">
- <el-select v-model="queryParams.examineRange" clearable @clear="handleQuery" placeholder="鑰冩牳鑼冨洿">
- <el-option
- label="甯傚眬鑰冩牳"
- value="2">
- </el-option>
- <el-option
- label="鍒嗗眬鑰冩牳"
- value="1">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鑰冩牳鏃堕棿">
- <el-date-picker
- v-model="daterangeCheckTime"
- style="width: 240px"
- value-format="yyyy-MM-dd HH:mm:ss"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-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>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- >鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- >瀵煎嚭</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-card class="box-card" v-for="(item) in checkResultList">
- <div slot="header" class="clearfix">
- <span>{{ item.checkUnitName }}</span>
-
- <el-button style="float: right; padding: 3px 0" type="text" @click="handleDetail(item)">璇︽儏</el-button>
- </div>
- <div class="text item">鑰冩牳<span class="time">{{ item.examineName }}</span></div>
- <div class="text item">鑰冩牳棰戠巼<span class="time">{{ "瀛ｅ害鑰冩牳" }}</span></div>
- <div class="text item">鑰冩牳鍒嗘暟<span class="time">{{ item.checkScore }}</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>
-
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
- <el-dialog :title="manualScoreTitle" :visible.sync="manualScoreOpen" width="500px" append-to-body>
- <el-input v-model="manualScoreForm.manualScore" type="number" placeholder="璇蜂负璇ュ崟浣嶆墦鍒�"/>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitManualScore">纭� 瀹�</el-button>
- <el-button @click="cancelManualScore">鍙� 娑�</el-button>
- </div>
- </el-dialog>
-
- <el-dialog :title="detailTitle" :visible.sync="detailOpen" width="700px" append-to-body>
- <el-descriptions class="margin-top" :column="3" border>
- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-user"></i>
- 鑰冩牳瀵硅薄
- </template>
- {{detail.checkUnitName}}
- </el-descriptions-item>
- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-s-management"></i>
- 鑰冩牳鍚嶇О
- </template>
- {{detail.examineName}}
- </el-descriptions-item>
- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-full-screen"></i>
- 鑰冩牳鑼冨洿
- </template>
- <el-tag size="small">{{detail.examineRange === 1 ? '鍒嗗眬鑰冩牳' : '甯傚眬鑰冩牳'}}</el-tag>
- </el-descriptions-item>
- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-timer"></i>
- 鑰冩牳棰戠巼
- </template>
- <el-tag size="small">{{detail.frequency === 1 ? '鏈堝害鑰冩牳' : '瀛ｅ害鑰冩牳'}}</el-tag>
- </el-descriptions-item>
- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-medal"></i>
- 缁煎悎鍒嗘暟
- </template>
- <el-tag type="danger" size="small">{{detail.checkScore}}</el-tag>
- </el-descriptions-item>
- </el-descriptions>
- <el-table
- :data="tableData"
- show-summary
- style="width: 100%">
- <el-table-column
- prop="name"
- label="瑙勫垯鍚�"
- width="180">
- </el-table-column>
- <el-table-column
- prop="content"
- label="鎸囨爣"
- width="180">
- </el-table-column>
- <el-table-column
- prop="score"
- label="寰楀垎">
- </el-table-column>
- </el-table>
- </el-dialog>
-
- <!-- 娣诲姞鎴栦慨鏀硅�冩牳缁撴灉瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import { listCheckResult, getCheckResult, delCheckResult, addCheckResult, updateCheckResult,manualScore, publishCheckResult } from "@/api/platform/contract-result";
-
-export default {
- name: "CheckResult",
- data() {
- return {
- detailTitle: '',
- detailOpen: false,
- 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'
- }],
- manualScoreOpen: false,
- manualScoreForm: {},
- manualScoreTitle: '',
- // 閬僵灞�
- loading: true,
- // 閫変腑鏁扮粍
- ids: [],
- // 闈炲崟涓鐢�
- single: true,
- // 闈炲涓鐢�
- multiple: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 鎬绘潯鏁�
- total: 0,
- // 鑰冩牳缁撴灉琛ㄦ牸鏁版嵁
- checkResultList: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- // 閫昏緫鍒犻櫎鏃堕棿鑼冨洿
- daterangeCheckTime: [],
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- checkUnitId: null,
- checkTime: null,
- },
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
- }
- };
- },
- created() {
- this.getList();
- },
- 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 "甯傚眬鑰冩牳"
- }
- },
- /** 鏌ヨ鑰冩牳缁撴灉鍒楄〃 */
- getList() {
- this.loading = true;
- if (null != this.daterangeCheckTime && '' != this.daterangeCheckTime) {
- this.queryParams["start"] = this.daterangeCheckTime[0];
- this.queryParams["end"] = this.daterangeCheckTime[1];
- }
- listCheckResult(this.queryParams).then(response => {
- this.checkResultList = response.data;
- this.total = response.total;
- this.loading = false;
- });
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false;
- this.reset();
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- id: null,
- checkUnitId: null,
- checkPublishId: null,
- checkScore: null,
- systemScore: null,
- manualScore: null,
- checkTime: null,
- createTime: null,
- updateTime: null,
- deleted: null
- };
- this.resetForm("form");
- },
- cancelManualScore() {
- this.manualScoreForm = {};
- this.manualScoreTitle = "";
- this.manualScoreOpen = false;
- },
- submitManualScore() {
- if (! this.manualScoreForm.manualScore) {
- this.$modal.msgWarning("璇峰～鍐欏垎鏁�");
- return
- }
- manualScore(this.manualScoreForm).then(res => {
- this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
- this.cancelManualScore();
- this.getList();
- })
- },
- handleSetManualScore(row) {
- this.manualScoreForm.id = row.id;
- this.manualScoreForm.manualScore = parseInt(row.manualScore);
- this.manualScoreTitle = row.checkUnitName + '浜哄伐鎵撳垎'
- this.manualScoreOpen = true;
- },
- handleDetail(item) {
- this.detail = item;
- this.detail.carOnlineRate = '97%';
- console.log(this.detail,"detail")
- this.$router.push({
- path: '/check-result/contract/detail',
- query: {
- detail: this.detail
- }
- })
- },
- handlePublish(row) {
- let text = row.publish == 1 ? '鍙栨秷鍙戝竷' : '鍙戝竷';
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭' + text + '鑰冩牳缁撴灉缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return publishCheckResult(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess(text + "鎴愬姛");
- }).catch(() => {});
-
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.daterangeCheckTime = [];
- this.resetForm("queryForm");
- this.handleQuery();
- },
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
- this.multiple = !selection.length
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞鑰冩牳缁撴灉";
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- const id = row.id || this.ids
- getCheckResult(id).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼鑰冩牳缁撴灉";
- });
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updateCheckResult(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addCheckResult(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鑰冩牳缁撴灉缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delCheckResult(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('system/checkResult/export', {
- ...this.queryParams
- }, `checkResult_${new Date().getTime()}.xlsx`)
- }
- }
-};
-</script>
-<style>
- .text {
- font-size: 14px;
- }
- .time {
- font-size: 13px;
- color: #999;
- margin-left: 10px;
- }
- .item {
- margin-bottom: 18px;
- }
- .clearfix:before,
- .clearfix:after {
- display: table;
- content: "";
- }
- .clearfix:after {
- clear: both
- }
- .box-card {
- width: 480px;
- }
-</style>
diff --git a/src/views/system/result/detail/index.vue b/src/views/system/result/detail/index.vue
deleted file mode 100644
index 54eeb5a..0000000
--- a/src/views/system/result/detail/index.vue
+++ /dev/null
@@ -1,286 +0,0 @@
-<template>
- <div style="display: flex;flex-direction: row; padding: 15px">
- <div id="left">
- <div>
- <div>
- <div style="display: flex;flex-direction: row;">
- <div class="now-item">
- <div class="box now">
- <div class="title">
- 瑙嗛
- </div>
- <div>
- 98
- </div>
- </div>
- </div>
- <div class="now-item">
- <div class="box now">
- <div class="title">
- 浜鸿劯
- </div>
- <div>
- 98
- </div>
- </div>
- </div>
- <div class="now-item">
- <div class="box now">
- <div class="title">
- 鐩戞帶
- </div>
- <div>
- 98
- </div>
- </div>
- </div>
- <div style="justify-content: center;align-items: center;display: flex;width: 80px">
- <i class="el-icon-caret-left">鏈湀</i>
- </div>
-
- </div>
- </div>
- </div>
-
- <div style="margin-top: 20px">
- <div style="display: flex;flex-direction: row;">
- <div class="now-item">
- <div class="box">
- <div class="title">
- 瑙嗛
- </div>
- <div>
- 98
- </div>
- </div>
- </div>
- <div class="now-item">
- <div class="box">
- <div class="title">
- 浜鸿劯
- </div>
- <div>
- 98
- </div>
- </div>
- </div>
- <div class="now-item">
- <div class="box">
- <div class="title">
- 鐩戞帶
- </div>
- <div>
- 98
- </div>
- </div>
- </div>
- <div style="justify-content: center;align-items: center;display: flex;width: 80px">
- <i class="el-icon-caret-left">24.<span style="font-size: large">3</span></i>
- </div>
- </div>
- </div>
- <div style="margin-top: 20px">
- <div style="display: flex;flex-direction: row;">
- <div class="now-item">
- <div class="box">
- <div class="title">
- 瑙嗛
- </div>
- <div>
- 98
- </div>
- </div>
- </div>
- <div class="now-item">
- <div class="box">
- <div class="title">
- 浜鸿劯
- </div>
- <div>
- 98
- </div>
- </div>
- </div>
- <div class="now-item">
- <div class="box">
- <div class="title">
- 鐩戞帶
- </div>
- <div>
- 98
- </div>
- </div>
- </div>
- <div style="justify-content: center;align-items: center;display: flex;width: 80px">
- <i class="el-icon-caret-left">24.<span style="font-size: large">2</span></i>
- </div>
- </div>
- </div>
- <div style="margin-top: 20px">
- <div style="display: flex;flex-direction: row;">
- <div class="now-item">
- <div class="box">
- <div class="title">
- 瑙嗛
- </div>
- <div>
- 98
- </div>
- </div>
- </div>
- <div class="now-item">
- <div class="box">
- <div class="title">
- 浜鸿劯
- </div>
- <div>
- 98
- </div>
- </div>
- </div>
- <div class="now-item">
- <div class="box">
- <div class="title">
- 鐩戞帶
- </div>
- <div>
- 98
- </div>
- </div>
- </div>
- <div style="justify-content: center;align-items: center;display: flex;width: 80px">
- <i class="el-icon-caret-left">24.<span style="font-size: large">1</span></i>
- </div>
- </div>
- </div>
- <div style="margin-top: 20px">
- <div style="display: flex;flex-direction: row;">
- <div class="now-item">
- <div class="box">
- <div class="title">
- 瑙嗛
- </div>
- <div>
- 98
- </div>
- </div>
- </div>
- <div class="now-item">
- <div class="box">
- <div class="title">
- 浜鸿劯
- </div>
- <div>
- 98
- </div>
- </div>
- </div>
- <div class="now-item">
- <div class="box">
- <div class="title">
- 鐩戞帶
- </div>
- <div>
- 98
- </div>
- </div>
- </div>
- <div style="justify-content: center;align-items: center;display: flex;width: 80px">
- <i class="el-icon-caret-left">23.<span style="font-size: large">12</span></i>
- </div>
- </div>
- </div>
- </div>
- <div id="right">
- <div style="margin-top: 120px; display: flex;flex-direction: column; justify-content: center; align-items: center">
- <div style="width: 210px; margin-bottom: 15px">
- <el-switch
- v-model="searchForm.type"
- active-text="甯傚眬"
- inactive-text="鐪佸巺">
- </el-switch>
- </div>
- <div style="width: 210px; margin-bottom: 15px">
- <el-date-picker
- clearable
- v-model="searchForm.startTime"
- type="month"
- placeholder="寮�濮嬫椂闂�">
- </el-date-picker>
- </div>
- <div style="width: 210px; margin-bottom: 15px">
- <el-date-picker
- clearable
- v-model="searchForm.endTime"
- type="month"
- placeholder="缁撴潫鏃堕棿">
- </el-date-picker>
- </div>
-
- </div>
- </div>
- </div>
-</template>
-
-<script>
-export default {
- name: 'index',
- data() {
- return {
- searchForm: {
-
- }
- }
- }
-}
-</script>
-
-<style scoped>
-.now-item {
- flex: 1;
- display: flex;
- justify-content: center;
- align-items: center;
-}
-.now {
- background-color: #42b983;
- height: 80px !important;
-}
-.box {
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- box-shadow: 0 2px 6px hsla(0, 0%, 7%, .1);
- border-radius: 10px;
- width: 240px;
- height: 50px;
-}
-.box:hover{
- cursor: pointer;
-}
-.month {
- margin-top: 20px;
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
-}
-.title {
- font-size: larger;
-}
-.item {
- flex: 1;
-}
-#left {
- flex: 5;
-}
-#right {
- flex: 1.5;
- height: 100%;
- overflow: hidden;
- display: flex;
- justify-content: center;
- align-items: center;
-}
-</style>
diff --git a/src/views/system/rule/default/index.vue b/src/views/system/rule/default/index.vue
deleted file mode 100644
index a7f6741..0000000
--- a/src/views/system/rule/default/index.vue
+++ /dev/null
@@ -1,316 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="瑙勫垯鍚嶇О" prop="ruleName">
- <el-input
- v-model="queryParams.ruleName"
- placeholder="璇疯緭鍏ヨ鍒欏悕绉�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鎵ｅ噺鏂瑰紡" prop="deductCategory">
- <el-select v-model="queryParams.deductCategory" placeholder="璇烽�夋嫨鎵ｅ噺鏂瑰紡" clearable>
- <el-option
- v-for="dict in dict.type.platform_deduct_category"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="瑙勫垯鐘舵��" prop="ruleStatus">
- <el-select v-model="queryParams.ruleStatus" placeholder="璇烽�夋嫨瑙勫垯鐘舵��" clearable>
- <el-option
- v-for="dict in dict.type.sys_normal_disable"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </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>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['system:rule:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="info"
- plain
- icon="el-icon-sort"
- size="mini"
- @click="toggleExpandAll"
- >灞曞紑/鎶樺彔</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table
- v-if="refreshTable"
- v-loading="loading"
- :data="ruleList"
- row-key="id"
- :default-expand-all="isExpandAll"
- :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
- >
- <el-table-column label="瑙勫垯鍚嶇О" prop="ruleName" />
- <el-table-column label="鎵ｅ噺鏂瑰紡" align="center" prop="deductCategory">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.platform_deduct_category" :value="scope.row.deductCategory"/>
- </template>
- </el-table-column>
- <el-table-column label="瑙勫垯鎻忚堪" align="center" prop="ruleDesc" />
- <el-table-column label="瑙勫垯鐘舵��" align="center" prop="ruleStatus">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.ruleStatus"/>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:rule:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-plus"
- @click="handleAdd(scope.row)"
- v-hasPermi="['system:rule:add']"
- >鏂板</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:rule:remove']"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <!-- 娣诲姞鎴栦慨鏀硅繚绾﹁鍒欏璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="瑙勫垯鍚嶇О" prop="ruleName">
- <el-input v-model="form.ruleName" placeholder="璇疯緭鍏ヨ鍒欏悕绉�" />
- </el-form-item>
- <el-form-item label="鎵ｅ噺鏂瑰紡" prop="deductCategory">
- <el-select v-model="form.deductCategory" placeholder="璇烽�夋嫨鎵ｅ噺鏂瑰紡">
- <el-option
- v-for="dict in dict.type.platform_deduct_category"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="瑙勫垯鎻忚堪" prop="ruleDesc">
- <el-input v-model="form.ruleDesc" placeholder="璇疯緭鍏ヨ鍒欐弿杩�" />
- </el-form-item>
- <el-form-item label="瑙勫垯鐘舵��" prop="ruleStatus">
- <el-radio-group v-model="form.ruleStatus">
- <el-radio
- v-for="dict in dict.type.sys_normal_disable"
- :key="dict.value"
- :label="dict.value"
- >{{dict.label}}</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import { listRule, getRule, delRule, addRule, updateRule } from "@/api/platform/calculate-rule";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
- name: "Rule",
- dicts: ['platform_deduct_category', 'sys_normal_disable'],
- components: {
- Treeselect
- },
- data() {
- return {
- // 閬僵灞�
- loading: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 杩濈害瑙勫垯琛ㄦ牸鏁版嵁
- ruleList: [],
- // 杩濈害瑙勫垯鏍戦�夐」
- ruleOptions: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- // 鏄惁灞曞紑锛岄粯璁ゅ叏閮ㄥ睍寮�
- isExpandAll: true,
- // 閲嶆柊娓叉煋琛ㄦ牸鐘舵��
- refreshTable: true,
- // 鏌ヨ鍙傛暟
- queryParams: {
- ruleName: null,
- deductCategory: null,
- ruleStatus: null,
- },
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
- ruleName: [
- { required: true, message: "瑙勫垯鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
- ],
- }
- };
- },
- created() {
- this.getList();
- },
- methods: {
- /** 鏌ヨ杩濈害瑙勫垯鍒楄〃 */
- getList() {
- this.loading = true;
- listRule(this.queryParams).then(response => {
- this.ruleList = this.handleTree(response.data, "id", "parentId");
- this.loading = false;
- });
- },
- /** 杞崲杩濈害瑙勫垯鏁版嵁缁撴瀯 */
- normalizer(node) {
- if (node.children && !node.children.length) {
- delete node.children;
- }
- return {
- id: node.id,
- label: node.ruleName,
- children: node.children
- };
- },
- /** 鏌ヨ杩濈害瑙勫垯涓嬫媺鏍戠粨鏋� */
- getTreeselect() {
- listRule().then(response => {
- this.ruleOptions = [];
- const data = { id: 0, ruleName: '椤剁骇鑺傜偣', children: [] };
- data.children = this.handleTree(response.data, "id", "parentId");
- this.ruleOptions.push(data);
- });
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false;
- this.reset();
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- id: null,
- ruleName: null,
- parentId: null,
- deductCategory: null,
- deductWay: null,
- ruleDesc: null,
- ruleStatus: null,
- createTime: null,
- updateTime: null,
- deleted: null
- };
- this.resetForm("form");
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.resetForm("queryForm");
- this.handleQuery();
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd(row) {
- this.reset();
- this.getTreeselect();
- if (row != null && row.id) {
- this.form.parentId = row.id;
- } else {
- this.form.parentId = 0;
- }
- this.open = true;
- this.title = "娣诲姞杩濈害瑙勫垯";
- },
- /** 灞曞紑/鎶樺彔鎿嶄綔 */
- toggleExpandAll() {
- this.refreshTable = false;
- this.isExpandAll = !this.isExpandAll;
- this.$nextTick(() => {
- this.refreshTable = true;
- });
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- this.getTreeselect();
- if (row != null) {
- this.form.parentId = row.id;
- }
- getRule(row.id).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼杩濈害瑙勫垯";
- });
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updateRule(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addRule(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- this.$modal.confirm('鏄惁纭鍒犻櫎杩濈害瑙勫垯缂栧彿涓�"' + row.id + '"鐨勬暟鎹」锛�').then(function() {
- return delRule(row.id);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- }
- }
-};
-</script>
diff --git a/src/views/system/template/default/index.vue b/src/views/system/template/default/index.vue
deleted file mode 100644
index 01773b0..0000000
--- a/src/views/system/template/default/index.vue
+++ /dev/null
@@ -1,454 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="鐘舵��" prop="status">
- <el-input
- v-model="queryParams.status"
- placeholder="璇疯緭鍏ョ姸鎬�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鑰冩牳瀵硅薄" prop="unitName">
- <el-input
- v-model="queryParams.status"
- placeholder="璇疯緭鍏ヨ�冩牳瀵硅薄"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
- <el-date-picker
- v-model="daterangeCreateTime"
- style="width: 240px"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-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>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['platform:template:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- v-hasPermi="['platform:template:edit']"
- @click="handleUpdate"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- v-hasPermi="['platform:template:remove']"
- @click="handleDelete"
- >鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- v-hasPermi="['platform:template:export']"
- @click="handleExport"
- >瀵煎嚭</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="checkTemplateList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="妯℃澘鍚嶇О" align="center" prop="templateName" width="220px"/>
- <el-table-column label="鑰冩牳绫诲瀷" align="center" prop="examineCategory" />
- <el-table-column label="鑰冩牳瀵硅薄" align="center" prop="unitId" width="400px" >
- <template slot-scope="scope">
- <div v-if="scope.row.unitId === 2">鎴愰兘x杩愮淮</div>
- <div v-else-if="scope.row.unitId === 3">瀵岄『鍘�,鑽ｅ幙,楂樻柊鍖�,鑷祦浜曞尯,璐′簳鍖�,澶у畨鍖�,娌挎哗鍖�</div>
- </template>
- </el-table-column>
- <el-table-column label="鐘舵��" align="center" prop="status" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['platform:template:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['platform:template:remove']"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
-
- <!-- 娣诲姞鎴栦慨鏀硅�冩牳妯℃澘瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="妯℃澘鍚嶇О" prop="templateName">
- <el-input v-model="form.templateName" placeholder="璇疯緭鍏ユā鏉垮悕绉�" />
- </el-form-item>
- <el-form-item label="鑰冩牳绫诲瀷" prop="examineCategory">
- <el-select v-model="form.examineCategory" placeholder="璇烽�夋嫨鑰冩牳绫诲瀷">
- <el-option label="鐪佸巺鑰冩牳" value="鐪佸巺鑰冩牳"/>
- <el-option label="鍖哄幙鑰冩牳" value="鍖哄幙鑰冩牳"/>
- <el-option label="杩愮淮鑰冩牳" value="鍏徃鑰冩牳"/>
- </el-select>
- </el-form-item>
- <el-form-item label="鑰冩牳瀵硅薄" prop="unitName">
- <div class="block">
- <span class="demonstration"></span>
- <el-cascader
- v-model="value"
- :options="options"
- :props = "props"
- @change="handleChange"></el-cascader>
- </div>
-
- </el-form-item>
- <el-form-item label="鑰冩牳瑙勫垯" prop="tempRuleFormList">
- <div class="row-warp">
- <div class="row" v-for="(form) in tempRuleFormList">
- <div class="row-left">
- <div>瑙勫垯</div>
- <div class="margin-5">
- <el-select v-model="form.ruleId" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in ruleList"
- :key="item.id"
- :label="item.value"
- :value="item.id">
- </el-option>
- </el-select>
- </div>
- </div>
- <div class="row-right">
- <div>鎵ｅ垎绯绘暟</div>
- <div class="margin-5">
- <el-input type="number" v-model="form.weight"/>
- </div>
- </div>
- <div class="item-op">
- <el-button @click="removeRule(form)" type="danger" icon="el-icon-delete" circle></el-button>
- </div>
- </div>
- <div style="margin-top: 25px">
- <el-button type="success" @click="nextAdd" size="mini" plain>娣诲姞</el-button>
- </div>
- </div>
- </el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-radio v-model="form.status" label="use">鍚敤</el-radio>
- <el-radio v-model="form.status" label="stop">鍋滅敤</el-radio>
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import { listTemplate, getTemplate, delTemplate, addTemplate, updateTemplate } from "@/api/platform/default-template";
-// import { ruleSelect } from '@/api/platform/calculate-rule'
-import { unitSelect } from '@/api/platform/unit'
-
-export default {
- name: "CheckTemplate",
- data() {
- return {
- props: { multiple: true },
- value: [],
- options: [{
- value: 'city',
- label: '鍖哄幙',
- children: [{
- value: 'fushun',
- label: '瀵岄『鍘�',
- }, {
- value: 'rong',
- label: '鑽ｅ幙',
- },{
- value: 'gaoxin',
- label: '楂樻柊鍖�',
- },{
- value: 'ziliujing',
- label: '鑷祦浜曞尯',
- },{
- value: 'gongjing',
- label: '璐′簳鍖�',
- },{
- value: 'daan',
- label: '澶у畨鍖�',
- },{
- value: 'yantan',
- label: '娌挎哗鍖�',
- },
- ]
- }, {
- value: 'company',
- label: '鍏徃',
- children: [{
- value: 'yunwei',
- label: '鎴愰兘x杩愮淮',
- }, {
- value: 'yunwei2',
- label: '鑷础x杩愮淮',
- }, ]
- },
- ],
- ruleList: [],
- unitList: [],
- // 涓存椂瑙勫垯琛ㄥ崟
- tempRuleForm: {},
- // 涓存椂瑙勫垯琛ㄥ崟鍒楄〃
- tempRuleFormList: [{"ruleId": null, "adjustCoefficient": null}],
- // 鏈�缁�
- ruleFormList: [],
- // 閬僵灞�
- loading: true,
- // 閫変腑鏁扮粍
- ids: [],
- // 闈炲崟涓鐢�
- single: true,
- // 闈炲涓鐢�
- multiple: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 鎬绘潯鏁�
- total: 0,
- // 鑰冩牳妯℃澘琛ㄦ牸鏁版嵁
- checkTemplateList: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- // 鐘舵�佹椂闂磋寖鍥�
- daterangeCreateTime: [],
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- status: null,
- createTime: null,
- },
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
- templateName: [
- { required: true, message: "妯℃澘鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
- ],
- }
- };
- },
- created() {
- this.getList();
- this.selectCheckRule();
- this.selectUnit();
- },
- methods: {
- handleChange(value) {
- console.log(value);
- },
- removeRule(form) {
- console.log(form)
- this.ruleFormList = this.ruleFormList.filter(item => item !== form);
- this.tempRuleFormList = this.tempRuleFormList.filter(item => item !== form)
- },
- nextAdd() {
- // if (this.tempRuleFormList.length === 0) {
- // this.tempRuleFormList.push({"ruleId": null, "weight": null})
- // } else {
- // this.ruleFormList.push(this.tempRuleForm);
- // this.tempRuleFormList.push(this.tempRuleForm);
- // this.tempRuleForm = {};
- // }
- this.tempRuleFormList.push({"ruleId": null, "weight": null})
- },
- // 鑰冩牳瑙勫垯涓嬫媺鏁版嵁
- // selectCheckRule() {
- // ruleSelect().then(res => {
- // this.ruleList = res.data;
- // })
- // },
- // 杩愮淮鍏徃涓嬫媺鏁版嵁
- selectUnit() {
- unitSelect().then(res => {
- this.unitList = res.data;
- })
- },
- /** 鏌ヨ鑰冩牳妯℃澘鍒楄〃 */
- getList() {
- this.loading = true;
- if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
- this.queryParams["start"] = this.daterangeCreateTime[0];
- this.queryParams["end"] = this.daterangeCreateTime[1];
- }
- listTemplate(this.queryParams).then(response => {
- this.checkTemplateList = response.data;
- this.total = response.total;
- this.loading = false;
- });
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false;
- this.reset();
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- id: null,
- adjustCoefficient: null,
- adjustWay: null,
- status: null,
- createTime: null,
- updateTime: null,
- deleted: null
- };
- this.resetForm("form");
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.daterangeCreateTime = [];
- this.resetForm("queryForm");
- this.handleQuery();
- },
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
- this.multiple = !selection.length
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞鑰冩牳妯℃澘";
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- const id = row.id || this.ids
- getTemplate(id).then(response => {
- this.form = response.data;
- this.tempRuleFormList = this.form.ruleFormList;
- this.ruleFormList = this.form.ruleFormList;
- this.open = true;
- this.title = "淇敼鑰冩牳妯℃澘";
- });
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- this.form.ruleFormList = this.tempRuleFormList;
- if (this.form.id != null) {
- updateTemplate(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.tempRuleFormList = [];
- this.form = {};
- this.getList();
- });
- } else {
- addTemplate(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鑰冩牳妯℃澘缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delTemplate(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('system/checkTemplate/export', {
- ...this.queryParams
- }, `checkTemplate_${new Date().getTime()}.xlsx`)
- }
- }
-};
-</script>
-
-<style scoped>
-.margin-5 {
- margin-left: 5px;
-}
-.row-warp {
- display: flex;
- flex-direction: column;
-}
-.row {
- display: flex;
- flex-direction: row;
- align-items: center;
- justify-content: center;
- margin: 5px 0;
-}
-.row-left {
- flex: 1;
- display: flex;
- flex-direction: row;
-}
-.row-right {
- flex: 1;
- display: flex;
- flex-direction: row;
-}
-</style>
diff --git a/src/views/system/work-order/distribute/index.vue b/src/views/system/work-order/distribute/index.vue
index 142e0dc..dce8735 100644
--- a/src/views/system/work-order/distribute/index.vue
+++ b/src/views/system/work-order/distribute/index.vue
@@ -202,7 +202,7 @@
queryParams: {
unitId: null,
pageNum: 1,
- pageSize: 20,
+ pageSize: 10,
},
// 鎬绘潯鏁�
total: 0,
@@ -266,7 +266,7 @@
this.loading = true;
this.selectUnit();
distributeWorkOrder(this.queryParams).then(res => {
- this.workOrderList = res.data;
+ this.workOrderList = res.data.records;
this.total = res.total;
this.loading = false;
})
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index 401bf4b..14f07aa 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -44,12 +44,12 @@
</el-form>
<el-row :gutter="20">
- <el-col :xl="6" :lg="8" :md="12" :sm="24" v-for="item in workOrderList" :key="item" style="margin-bottom: 20px;">
+ <el-col :xl="6" :lg="8" :md="12" :sm="24" v-for="item in workOrderList" :key="item.id" style="margin-bottom: 20px;">
<el-card :body-style="{ padding: '0px',display: 'flex' }">
<el-image :preview-src-list="['https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357']" fit="cover" src="https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357" class="image"/>
<div style="padding-right: 10px;padding-top: 10px;">
<el-row>
- <el-col :span="24" class="time">鏁呴殰绫诲瀷锛�<el-tag size="small" type="danger">甯傛斂鏂藉伐</el-tag></el-col>
+ <el-col :span="24" class="time">鏁呴殰绫诲瀷锛�<el-tag size="small" type="danger">{{ item.errorType }}</el-tag></el-col>
</el-row>
<el-row class="work-order-item">
<el-col class="time" :span="24">杩愮淮浜哄憳锛歿{ item.ywPeopleName }}</el-col>
@@ -141,10 +141,10 @@
<el-input v-model="auditingForm.ywPeopleName" disabled />
</el-form-item>
<el-form-item label="鐜板満鎯呭喌" v-if="auditingForm.condition">
- <el-input type="textarea" v-html="auditingForm.condition" disabled />
+ <span v-html="auditingForm.condition"></span>
</el-form-item>
<el-form-item label="浣愯瘉鏉愭枡" v-if="auditingForm.proofMaterials">
- <el-link v-for="item in auditingForm.proofMaterials != null ? auditingForm.proofMaterials.split(',') : auditingForm.proofMaterials" :underline="false" :key="item" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1) }}</el-link>
+ <el-link v-for="item in auditingForm.proofMaterials != null ? auditingForm.proofMaterials.split(',') : auditingForm.proofMaterials" :underline="false" :key="item.id" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1) }}</el-link>
</el-form-item>
<el-form-item label="瀹℃牳缁撴灉" prop="auditingResult">
<el-radio v-model="auditingForm.auditingResult" label="AUDITING_SUCCESS">閫氳繃</el-radio>
@@ -212,7 +212,7 @@
</el-step>
<el-step title="杩愮淮澶勭悊">
<template slot="description">
- <div class="y-item" v-for="(item, index) in ywHandleList">
+ <div class="y-item" v-for="(item, index) in ywHandleList" :key="index">
<div class="y-item-1">
<div class="flow-item-x">
鐜板満鎯呭喌锛�
@@ -237,7 +237,7 @@
</el-step>
<el-step title="缁撴灉瀹℃牳">
<template slot="description">
- <div class="y-item" v-for="(item, index) in ywAuditingList">
+ <div class="y-item" v-for="(item, index) in ywAuditingList" :key="index">
<div class="y-item-1">
<div class="flow-item-x">
瀹℃牳缁撴灉锛�<el-tag :type="item.result == '瀹℃牳閫氳繃' ? 'success' : 'danger'" size="small">{{ item.result }}</el-tag>
@@ -538,8 +538,8 @@
getList() {
this.loading = true;
this.queryParams.params = {};
- this.queryParams["start"] = this.daterangeYwHandleTime[0];
- this.queryParams["end"] = this.daterangeYwHandleTime[1];
+ this.queryParams["start"] = this.daterangeYwHandleTime ? this.daterangeYwHandleTime[0] : null;
+ this.queryParams["end"] = this.daterangeYwHandleTime ? this.daterangeYwHandleTime[1] : null;
if (this.queryParams["status"] == "") { this.queryParams["status"] = "DISTRIBUTED"; }
listWorkOrder(this.queryParams).then(response => {
this.workOrderList = response.data;
diff --git a/src/views/system/threshold/index.vue b/src/views/system/work-order/threshold/index.vue
similarity index 99%
rename from src/views/system/threshold/index.vue
rename to src/views/system/work-order/threshold/index.vue
index 3a2d583..ddbbc4e 100644
--- a/src/views/system/threshold/index.vue
+++ b/src/views/system/work-order/threshold/index.vue
@@ -162,7 +162,7 @@
<script>
import { listThreshold, getThreshold, editVideo } from '@/api/platform/threshold'
-import { editCar, editFace, getCar, getFace, getVideo } from '../../../api/platform/threshold'
+import { editCar, editFace, getCar, getFace, getVideo } from '../../../../api/platform/threshold'
export default {
dicts: ['image_qualify', 'video_qualify'],
--
Gitblit v1.8.0