From ad973219e4c7d5d49df8b4b82c271aa24ec94236 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 07 八月 2024 17:00:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/home/examine/index.vue | 96 ++++++------------------------------------------
src/views/home/data-table/index.vue | 7 +--
src/api/platform/home.js | 8 ++++
3 files changed, 22 insertions(+), 89 deletions(-)
diff --git a/src/api/platform/home.js b/src/api/platform/home.js
index 77485e9..3f6b747 100644
--- a/src/api/platform/home.js
+++ b/src/api/platform/home.js
@@ -42,6 +42,14 @@
})
}
+// 鑰冩牳棰勮
+export function checkScore() {
+ return request({
+ url: '/home/checkScore',
+ method: 'get'
+ })
+}
+
// 鏍哥畻鎶ヨ〃
export function calculate() {
return request({
diff --git a/src/views/home/data-table/index.vue b/src/views/home/data-table/index.vue
index c96a215..c567654 100644
--- a/src/views/home/data-table/index.vue
+++ b/src/views/home/data-table/index.vue
@@ -14,6 +14,8 @@
<el-table :data="tableData" height="400">
<el-table-column prop="pointName" label="鐐逛綅淇℃伅" align="center" show-overflow-tooltip>
</el-table-column>
+ <el-table-column prop="remark" label="杩愮淮鍗曚綅" align="center" show-overflow-tooltip>
+ </el-table-column>
<el-table-column prop="startTime" label="杩愮淮寮�濮嬫椂闂�" align="center">
</el-table-column>
<el-table-column prop="endTime" label="杩愮淮鎴鏃堕棿" align="center">
@@ -21,11 +23,6 @@
<el-table-column prop="status" label="鐘舵��" align="center">
<template slot-scope="scope">
<el-tag type="warning" disable-transitions v-if="scope.row.status">{{ scope.row.status }}</el-tag>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center">
- <template slot-scope="scope">
- <el-button size="mini">缂栬緫</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/src/views/home/examine/index.vue b/src/views/home/examine/index.vue
index e088803..14fed79 100644
--- a/src/views/home/examine/index.vue
+++ b/src/views/home/examine/index.vue
@@ -12,22 +12,15 @@
</div>
<el-table :data="tableData" height="400">
- <el-table-column prop="date" label="璀︽姤鏃堕棿" align="center">
+ <el-table-column prop="createTime" label="璀︽姤鏃堕棿" align="center">
</el-table-column>
- <el-table-column prop="name" label="鍏徃鍚嶇О" align="center">
+ <el-table-column prop="area" label="鍖哄煙" align="center">
</el-table-column>
- <el-table-column prop="rule" label="鑰冩牳瑙勫垯" align="center">
+ <el-table-column prop="examineTag" label="鑰冩牳鏍囩" align="center">
</el-table-column>
- <el-table-column prop="date" label="鐘舵��" align="center">
- <template slot-scope="scope">
- <el-tag type="danger"
- disable-transitions>棰勮</el-tag>
- </template>
+ <el-table-column prop="templateName" label="妯℃澘" align="center">
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center">
- <template slot-scope="scope">
- <el-button size="mini">璇︽儏</el-button>
- </template>
+ <el-table-column prop="score" label="鍒嗘暟" align="center">
</el-table-column>
</el-table>
</div>
@@ -36,83 +29,18 @@
</template>
<script>
+import { checkScore } from "@/api/platform/home";
export default {
name: 'DataTable',
data() {
return {
- tableData: [
- {
- date: '2024.02.28 15:14:01',
- name: '杩愮淮鍏徃鍚嶇О1',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- rule: '杞﹁締鑰冩牳',
- num: 111,
- },
- {
- date: '2024.02.28 15:14:01',
- name: '杩愮淮鍏徃鍚嶇О1',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- rule: '鐐逛綅鑰冩牳',
- num: 111,
- },
- {
- date: '2024.02.28 15:14:01',
- name: '杩愮淮鍏徃鍚嶇О1',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- rule: '杞﹁締鑰冩牳',
- num: 111,
- },
- {
- date: '2024.02.28 15:14:01',
- name: '杩愮淮鍏徃鍚嶇О1',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- rule: '鐐逛綅鑰冩牳',
- num: 111,
- },
- {
- date: '2024.02.28 15:14:01',
- name: '杩愮淮鍏徃鍚嶇О1',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- rule: '杞﹁締鑰冩牳',
- num: 111,
- },
- {
- date: '2024.02.28 15:14:01',
- name: '杩愮淮鍏徃鍚嶇О1',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- rule: '杞﹁締鑰冩牳',
- num: 111,
- },
- {
- date: '2024.02.28 15:14:01',
- name: '杩愮淮鍏徃鍚嶇О1',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- rule: '鐐逛綅鑰冩牳',
- num: 111,
- },
- {
- date: '2024.02.28 15:14:01',
- name: '杩愮淮鍏徃鍚嶇О1',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- rule: '鐐逛綅鑰冩牳',
- num: 111,
- },
- {
- date: '2024.02.28 15:14:01',
- name: '杩愮淮鍏徃鍚嶇О1',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- rule: '杞﹁締鑰冩牳',
- num: 111,
- },
- {
- date: '2024.02.28 15:14:01',
- name: '杩愮淮鍏徃鍚嶇О1',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- rule: '鐐逛綅鑰冩牳',
- num: 111,
- },
- ]
+ tableData: []
}
+ },
+ mounted() {
+ checkScore().then(res => {
+ this.tableData = res.data;
+ })
}
}
</script>
--
Gitblit v1.8.0