diff --git a/client/src/api/record.js b/client/src/api/record.js index dad31d8..5543183 100644 --- a/client/src/api/record.js +++ b/client/src/api/record.js @@ -56,3 +56,9 @@ export function rejectRecord(id, data) { data }) } +export function deleteRecord(id) { + return request({ + url: `/supervision/record/${id}/`, + method: 'delete', + }) +} diff --git a/client/src/api/task.js b/client/src/api/task.js index 0b3ac3a..2988182 100644 --- a/client/src/api/task.js +++ b/client/src/api/task.js @@ -61,4 +61,11 @@ export function gettaskdepts(id) { url: `/supervision/task/${id}/depts/`, method: 'get' }) +} + +export function starttask(id) { + return request({ + url: `/supervision/task/${id}/start/`, + method: 'put' + }) } \ No newline at end of file diff --git a/client/src/layout/components/Sidebar/Logo.vue b/client/src/layout/components/Sidebar/Logo.vue index 6a4ce56..e08dbd6 100644 --- a/client/src/layout/components/Sidebar/Logo.vue +++ b/client/src/layout/components/Sidebar/Logo.vue @@ -23,7 +23,7 @@ export default { }, data() { return { - title: '国检集团检验检测能力共享平台', + title: '检验检测能力共享和质量管理平台', // logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png' logo:'http://testsearch.ctc.ac.cn:8000/media/default/avatar.png' } diff --git a/client/src/styles/index.scss b/client/src/styles/index.scss index 864e341..293a398 100644 --- a/client/src/styles/index.scss +++ b/client/src/styles/index.scss @@ -64,7 +64,13 @@ div:focus { .app-container { padding: 6px; } +body .el-table th.gutter{ + display: table-cell!important; +} +body .el-table colgroup.gutter{ + display: table-cell!important; +} .el-table--medium td, .el-table--medium th { padding: 2px 0; } diff --git a/client/src/views/login/index.vue b/client/src/views/login/index.vue index a1cd997..ea2d2ae 100644 --- a/client/src/views/login/index.vue +++ b/client/src/views/login/index.vue @@ -1,17 +1,10 @@ - - - + + - - - - - 检验检测能力共享和质量管理平台 - - - + 检验检测能力共享和质量管理平台 + - + > + - - - - {{buttonmsg}} - + > + + + {{ buttonmsg }} + - 验证登录 + >验证登录 - - - + > - + > - + 登录 + >登录 @@ -116,8 +123,8 @@ @@ -297,9 +305,9 @@ export default { text-align: center; color: #0174d7; } -.logo{ - width:350px; - height:93px; +.logo { + width: 350px; + height: 93px; } .login-form { @@ -318,13 +326,12 @@ export default { width: 14px; margin-left: 2px; } - } - .show-pwd { - height: 39px; - margin-right: 2px; - } +.show-pwd { + height: 39px; + margin-right: 2px; +} .login-tip { font-size: 13px; text-align: center; @@ -340,13 +347,13 @@ export default { } } .show-pwd { - position: absolute; - right: 10px; - top: 7px; - font-size: 16px; - cursor: pointer; - user-select: none; - } + position: absolute; + right: 10px; + top: 7px; + font-size: 16px; + cursor: pointer; + user-select: none; +} .login-code-img { height: 38px; } diff --git a/client/src/views/supervision/record.vue b/client/src/views/supervision/record.vue index ef8ef86..945ce2f 100644 --- a/client/src/views/supervision/record.vue +++ b/client/src/views/supervision/record.vue @@ -125,21 +125,18 @@ - - {{ scope.row.content_.name }} - - - {{ scope.row.up_date }} - - - {{ - scope.row.up_user_.name - }} - - + {{ scope.row.end_date }} + + {{ scope.row.content_.name }} + + + {{ scope.row.up_user_.name }}/{{ scope.row.up_date }} + {{ scope.row.note }} @@ -157,7 +154,7 @@ {{ scope.row.state }} - {{ + {{ scope.row.state }} {{ @@ -191,17 +188,17 @@ fixed="right" > - 编辑编辑 - 上报上报 - 确认确认 - 驳回驳回 - 查看查看 + 删除 diff --git a/client/src/views/supervision/recorddo.vue b/client/src/views/supervision/recorddo.vue index f211564..f248d02 100644 --- a/client/src/views/supervision/recorddo.vue +++ b/client/src/views/supervision/recorddo.vue @@ -81,11 +81,17 @@ 驳回 + 删除 确认 @@ -117,6 +123,7 @@ import { upRecord, rejectRecord, confirmRecord, + deleteRecord } from "@/api/record"; export default { name: "recorddo", @@ -205,7 +212,20 @@ export default { }); } else if (this.data.action == "view") { this.$emit("handleDo"); + } else if (this.data.action == "delete") { + this.$confirm("确认删除?", "警告", { + type: "error", + }) + .then(async () => { + await deleteRecord(this.record.id); + this.$message.success("成功"); + this.$emit("handleDo"); + }) + .catch((err) => { + console.error(err); + }); } + }, }, }; diff --git a/client/src/views/supervision/task.vue b/client/src/views/supervision/task.vue index 864e2ff..27c97a9 100644 --- a/client/src/views/supervision/task.vue +++ b/client/src/views/supervision/task.vue @@ -46,7 +46,7 @@ - {{scope.row.state}} + {{scope.row.state}} {{scope.row.state}} {{scope.row.state}} diff --git a/client/src/views/supervision/taskdo.vue b/client/src/views/supervision/taskdo.vue index ceb262c..a6abab9 100644 --- a/client/src/views/supervision/taskdo.vue +++ b/client/src/views/supervision/taskdo.vue @@ -66,6 +66,13 @@ size="small" >初始化任务 + 发布任务 @@ -127,7 +134,7 @@ > {{ scope.row.state }} + + {{ scope.row.note }} + - 编辑编辑 - 上报上报 - 确认确认 - 驳回驳回 - 查看查看 + 删除 @@ -297,7 +316,7 @@ > {{ scope.row.state }} {{ scope.row.up_user_.name }}/{{ scope.row.up_date }} + + {{ scope.row.note }} + - + + 有 + {{ + scope.row.files.length + }} + 个文件 + + {{ item.name }} + + - 编辑编辑 - 上报上报 - 确认确认 - 驳回驳回 - 查看查看 + 删除 @@ -433,7 +488,7 @@ }