From 6b2aefa53eab6a25e4bda5d2192af1045d8b87c2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 27 Apr 2024 17:18:03 +0800
Subject: [PATCH] 校园安全检查
---
src/views/publicSecurity/campusExclusion.vue | 69 ++++++++++++++++++++++
src/views/article/components/deitDiscussion.vue | 9 ++-
src/api/publicSecurity/taskSchoolEven.js | 10 ++
src/views/publicSecurity/nursingSchool.vue | 16 ++++-
src/views/publicSecurity/SchoolCheckManage.vue | 58 ++++++-------------
5 files changed, 111 insertions(+), 51 deletions(-)
diff --git a/src/api/publicSecurity/taskSchoolEven.js b/src/api/publicSecurity/taskSchoolEven.js
index d4a3067..d8d91f9 100644
--- a/src/api/publicSecurity/taskSchoolEven.js
+++ b/src/api/publicSecurity/taskSchoolEven.js
@@ -2,7 +2,7 @@
export const getList = (current, size, params) => {
return request({
- url: '/api/blade-taskSchoolEven/taskSchoolEven/list',
+ url: '/api/blade-taskSchoolEven/taskSchoolEven/page',
method: 'get',
params: {
...params,
@@ -47,4 +47,10 @@
data: row
})
}
-
+export const updateAuditing = (row) => {
+ return request({
+ url: '/api/blade-taskSchoolEven/taskSchoolEven/auditing',
+ method: 'post',
+ data: row
+ })
+}
\ No newline at end of file
diff --git a/src/views/article/components/deitDiscussion.vue b/src/views/article/components/deitDiscussion.vue
index cfa2392..62935bb 100644
--- a/src/views/article/components/deitDiscussion.vue
+++ b/src/views/article/components/deitDiscussion.vue
@@ -32,8 +32,8 @@
<el-dialog title="" append-to-body :visible.sync="popupTableUserShow" width="80%" :before-close="userHandleClose">
<basic-container>
- <avue-crud :data="userData" :page="userPage" :option="userOption" @search-change="searchChange"
- @search-reset="searchReset">
+ <avue-crud :data="userData" :page="userPage" :option="userOption" @current-change="currentChange"
+ @search-change="searchChange" @search-reset="searchReset">
<template slot-scope="{type,size,row }" slot="menuLeft">
<el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
</el-button>
@@ -368,6 +368,9 @@
},
methods: {
+ currentChange(currentPage) {
+ this.userPage.currentPage = currentPage
+ },
addC(number) {
console.log("******************", number)
@@ -686,4 +689,4 @@
}
</script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/publicSecurity/SchoolCheckManage.vue b/src/views/publicSecurity/SchoolCheckManage.vue
index 5cdfe87..974d07c 100644
--- a/src/views/publicSecurity/SchoolCheckManage.vue
+++ b/src/views/publicSecurity/SchoolCheckManage.vue
@@ -31,10 +31,10 @@
v-text="textDispose(row, 'principalPhoneflag', 'principalPhone')">
</el-button>
</template>
- <template slot="menuLeft">
+ <!-- <template slot="menuLeft">
<el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
</el-button>
- </template>
+ </template> -->
</avue-crud>
@@ -87,8 +87,8 @@
<div class="question-item" v-for="(item, index) in tItem.questionList" :key='index' v-show="tItem.isShowQList">
<div class="question-name">
<div class="key">{{ index + 1 }}、{{ item.itemsNameTitle }}</div>
- <div class="value"><el-radio v-model="radio" label="1" disabled>存在</el-radio>
- <el-radio v-model="radio" label="2" disabled>不存在</el-radio>
+ <div class="value"><el-radio v-model="radio" label="1" disabled>是</el-radio>
+ <el-radio v-model="radio" label="2" disabled>否</el-radio>
</div>
</div>
<div class="yh-pic-box">
@@ -258,20 +258,6 @@
overHidden: true,
align: 'center'
}, {
- label: "场所类别",
- prop: "nineType",
- align: 'center',
- dicUrl: "/api/blade-system/dict-biz/tree?code=nineType",
- props: {
- label: "title",
- value: "key",
- },
- type: 'select',
- search: true,
- searchSpan: 4,
- searchLabelWidth: 96,
- align: 'center'
- }, {
label: "所属街道",
prop: "streetName",
span: 24,
@@ -306,7 +292,8 @@
span: 24,
row: true,
searchSpan: 4,
- align: 'center'
+ align: 'center',
+ width: 90,
},
{
label: "场所负责人",
@@ -326,15 +313,15 @@
searchSpan: 4,
align: 'center'
},
- // {
- // width: 110,
- // label: "签名",
- // prop: "signaturePath",
- // type: "upload",
- // listType: "picture-img",
- // span: 24,
- // align: 'center'
- // },
+ {
+ width: 110,
+ label: "工作照片",
+ prop: "workImage",
+ type: "upload",
+ listType: "picture-img",
+ span: 24,
+ align: 'center'
+ },
{
width: 110,
label: "审核状态",
@@ -476,8 +463,8 @@
// 获取问题类型
getPatrolGroupTree() {
getPatrolGroupTree({
- type: 1,
- childType: 1
+ type: 3,
+ childType: 9
}).then(res => {
this.questionTypeList = res.data.data
})
@@ -836,16 +823,7 @@
}
})
}
- data.records.forEach(item => {
- if (item.signaturePath.length > 0) {
- var urls = []
- var names = item.signaturePath.split(",")
- names.forEach(name => {
- urls.push(website.minioUrl + name)
- })
- item.signaturePath = urls.join(",")
- }
- })
+
this.page.total = data.total
this.data = data.records
this.loading = false
diff --git a/src/views/publicSecurity/campusExclusion.vue b/src/views/publicSecurity/campusExclusion.vue
index a4587f6..0fa88e4 100644
--- a/src/views/publicSecurity/campusExclusion.vue
+++ b/src/views/publicSecurity/campusExclusion.vue
@@ -185,6 +185,70 @@
search: true,
align: 'center',
labelWidth: 110,
+ }, {
+ label: '是否问题',
+ align: 'center',
+ prop: 'isProblem',
+ type: 'radio',
+ slot: true,
+ dicData: [{
+ label: '是',
+ value: 1
+ }, {
+ label: '否',
+ value: 2
+ }],
+ width: 90,
+ },
+ {
+ label: '是否处理',
+ align: 'center',
+ prop: 'isHandle',
+ type: 'radio',
+ slot: true,
+ dicData: [{
+ label: '是',
+ value: 1
+ }, {
+ label: '否',
+ value: 2
+ }],
+ width: 90,
+ },
+ {
+ label: '是否上报',
+ align: 'center',
+ prop: 'isReporting',
+ type: 'radio',
+ slot: true,
+ dicData: [{
+ label: '是',
+ value: 1
+ }, {
+ label: '否',
+ value: 2
+ }],
+ width: 90,
+ }, {
+ width: 110,
+ span: 12,
+ label: "场所名称",
+ prop: "placeName",
+ searchSpan: 4,
+ searchLabelWidth: 60,
+ search: true,
+ align: 'center',
+ labelWidth: 110,
+ },
+ {
+ label: "类型",
+ prop: "type",
+ align: 'center',
+ dicUrl: "/api/blade-system/dict-biz/tree?code=xyaqyw",
+ props: {
+ label: "title",
+ value: "key",
+ },
},
{
width: 120,
@@ -230,7 +294,8 @@
prop: "streetName",
align: 'center',
labelWidth: 110,
- }, {
+ },
+ {
width: 156,
parent: false,
searchSpan: 4,
@@ -377,7 +442,7 @@
// 确认提交审核
submitAudit(form) {
let auditForm = {
- confirmFlag: form.status == '1' ? 3 : 4,
+ confirmFlag: form.status == '1' ? 2 : 3,
confirmNotion: form.confirmNotion,
}
updateAuditing(Object.assign(this.auditParams, auditForm)).then(res => {
diff --git a/src/views/publicSecurity/nursingSchool.vue b/src/views/publicSecurity/nursingSchool.vue
index a197100..090a475 100644
--- a/src/views/publicSecurity/nursingSchool.vue
+++ b/src/views/publicSecurity/nursingSchool.vue
@@ -53,15 +53,19 @@
dialogClickModal: false,
header: false,
column: [{
+ overHidden: true,
+ label: "学校名称",
+ prop: "placeName",
+ }, {
// width: 110,
- label: "护学人员",
+ label: "家长姓名",
prop: "name",
search: true,
searchSpan: 4,
searchLabelWidth: 76,
}, {
// width: 110,
- label: "护学人电话",
+ label: "家长手机号",
prop: "phone",
search: true,
searchSpan: 4,
@@ -86,9 +90,12 @@
trigger: "blur",
}, ],
},
-
{
- label: "年级与班级",
+ label: "学生姓名",
+ prop: "gradeAndClass",
+ },
+ {
+ label: "学生班级",
prop: "gradeAndClass",
}, {
label: "护学人员类型",
@@ -115,6 +122,7 @@
label: "纬度",
prop: "latitude",
},
+
{
overHidden: true,
label: "护学地址",
--
Gitblit v1.9.3