Skip to content

Q
qsh-wc
Commit 40da75e2 authored by sven's avatar sven
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 7d35fd73 afb107af
Show whitespace changes
Inline Side-by-side
Showing with 565 additions and 553 deletions
web/src/view/qshPartol/qshPartol.vue
View file @ 40da75e2
......@@ -3,11 +3,13 @@
<div class="gva-search-box">
<el-form :inline="true" :model="searchInfo" class="demo-form-inline">
<el-form-item label="工单标题">
<el-input v-model="searchInfo.title" placeholder="搜索条件" />
<el-input v-model="searchInfo.title" placeholder="搜索条件"/>
</el-form-item>
<el-form-item label="巡检类型" prop="type">
<el-select v-model="searchInfo.type" clearable placeholder="请选择" @clear="()=>{searchInfo.type=undefined}">
<el-option v-for="(item,key) in partol_typeOptions" :key="key" :label="item.label" :value="item.value" />
<el-select v-model="searchInfo.type" clearable placeholder="请选择"
@clear="()=>{searchInfo.type=undefined}">
<el-option v-for="(item,key) in partol_typeOptions" :key="key" :label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item>
......@@ -26,7 +28,9 @@
<el-button size="small" type="primary" @click="onDelete">确定</el-button>
</div>
<template #reference>
<el-button icon="delete" size="small" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="deleteVisible = true">删除</el-button>
<el-button icon="delete" size="small" style="margin-left: 10px;"
:disabled="!multipleSelection.length" @click="deleteVisible = true">删除
</el-button>
</template>
</el-popover>
</div>
......@@ -39,25 +43,26 @@
row-key="ID"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" />
<el-table-column align="left" label="日期" width="180">
<template #default="scope">{{ formatDate(scope.row.CreatedAt) }}</template>
</el-table-column>
<el-table-column align="left" label="巡检内容" prop="content" width="120" />
<el-table-column align="left" label="异常描述" prop="description" width="120" />
<el-table-column align="left" label="巡检图片多个逗号分隔" prop="image" width="120" />
<el-table-column align="left" label="巡视人" prop="partolName" width="120" />
<el-table-column align="left" label="工单标题" prop="title" width="120" />
<el-table-column align="left" label="巡检公厕" prop="toiletId" width="120" />
<el-table-column align="left" label="巡检类型" prop="type" width="120">
<el-table-column type="selection" width="55"/>
<el-table-column align="left" label="工单标题" prop="title" min-width="180"/>
<el-table-column align="left" label="巡检类型" prop="type" min-width="120">
<template #default="scope">
{{ filterDict(scope.row.type,partol_typeOptions) }}
</template>
</el-table-column>
<el-table-column align="left" label="按钮组">
<el-table-column align="left" label="异常描述" prop="description" min-width="180"/>
<el-table-column align="left" label="巡视人" prop="partolName" min-width="120"/>
<el-table-column align="left" label="巡检公厕" prop="toiletId" min-width="120"/>
<el-table-column align="left" label="创建时间" min-width="180">
<template #default="scope">{{ formatDate(scope.row.CreatedAt) }}</template>
</el-table-column>
<el-table-column align="left" fixed="right" label="操作" min-width="120">
<template #default="scope">
<el-button type="primary" link icon="edit" size="small" class="table-button" @click="updateQshPartolFunc(scope.row)">变更</el-button>
<el-button type="primary" link icon="delete" size="small" @click="deleteRow(scope.row)">删除</el-button>
<el-button type="primary" link icon="edit" size="small" class="table-button"
@click="updateQshPartolFunc(scope.row)">变更
</el-button>
<el-button type="primary" link icon="delete" size="small" @click="deleteRow(scope.row)">删除
</el-button>
</template>
</el-table-column>
</el-table>
......@@ -76,26 +81,27 @@
<el-dialog v-model="dialogFormVisible" :before-close="closeDialog" title="弹窗操作">
<el-form :model="formData" label-position="right" label-width="80px">
<el-form-item label="巡检内容:">
<el-input v-model="formData.content" clearable placeholder="请输入" />
<el-input v-model="formData.content" clearable placeholder="请输入"/>
</el-form-item>
<el-form-item label="异常描述:">
<el-input v-model="formData.description" clearable placeholder="请输入" />
<el-input v-model="formData.description" clearable placeholder="请输入"/>
</el-form-item>
<el-form-item label="巡检图片多个逗号分隔:">
<el-input v-model="formData.image" clearable placeholder="请输入" />
<el-input v-model="formData.image" clearable placeholder="请输入"/>
</el-form-item>
<el-form-item label="巡视人:">
<el-input v-model="formData.partolName" clearable placeholder="请输入" />
<el-input v-model="formData.partolName" clearable placeholder="请输入"/>
</el-form-item>
<el-form-item label="工单标题:">
<el-input v-model="formData.title" clearable placeholder="请输入" />
<el-input v-model="formData.title" clearable placeholder="请输入"/>
</el-form-item>
<el-form-item label="巡检公厕:">
<el-input v-model.number="formData.toiletId" clearable placeholder="请输入" />
<el-input v-model.number="formData.toiletId" clearable placeholder="请输入"/>
</el-form-item>
<el-form-item label="巡检类型:">
<el-select v-model="formData.type" placeholder="请选择" style="width:100%" clearable>
<el-option v-for="(item,key) in partol_typeOptions" :key="key" :label="item.label" :value="item.value" />
<el-option v-for="(item,key) in partol_typeOptions" :key="key" :label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-form>
......@@ -110,29 +116,29 @@
</template>
<script>
export default {
export default {
name: 'QshPartol'
}
}
</script>
<script setup>
import {
import {
createQshPartol,
deleteQshPartol,
deleteQshPartolByIds,
updateQshPartol,
findQshPartol,
getQshPartolList
} from '@/api/qshPartol'
} from '@/api/qshPartol'
// 全量引入格式化工具 请按需保留
import { getDictFunc, formatDate, formatBoolean, filterDict } from '@/utils/format'
import { ElMessage, ElMessageBox } from 'element-plus'
import { ref } from 'vue'
// 全量引入格式化工具 请按需保留
import {getDictFunc, formatDate, formatBoolean, filterDict} from '@/utils/format'
import {ElMessage, ElMessageBox} from 'element-plus'
import {ref} from 'vue'
// 自动化生成的字典（可能为空）以及字段
const partol_typeOptions = ref([])
const formData = ref({
// 自动化生成的字典（可能为空）以及字段
const partol_typeOptions = ref([])
const formData = ref({
content: '',
description: '',
image: '',
......@@ -142,70 +148,70 @@ const formData = ref({
type: undefined,
})
// =========== 表格控制部分 ===========
const page = ref(1)
const total = ref(0)
const pageSize = ref(10)
const tableData = ref([])
const searchInfo = ref({})
// =========== 表格控制部分 ===========
const page = ref(1)
const total = ref(0)
const pageSize = ref(10)
const tableData = ref([])
const searchInfo = ref({})
// 重置
const onReset = () => {
// 重置
const onReset = () => {
searchInfo.value = {}
}
}
// 搜索
const onSubmit = () => {
// 搜索
const onSubmit = () => {
page.value = 1
pageSize.value = 10
getTableData()
}
}
// 分页
const handleSizeChange = (val) => {
// 分页
const handleSizeChange = (val) => {
pageSize.value = val
getTableData()
}
}
// 修改页面容量
const handleCurrentChange = (val) => {
// 修改页面容量
const handleCurrentChange = (val) => {
page.value = val
getTableData()
}
}
// 查询
const getTableData = async() => {
const table = await getQshPartolList({ page: page.value, pageSize: pageSize.value, ...searchInfo.value })
// 查询
const getTableData = async () => {
const table = await getQshPartolList({page: page.value, pageSize: pageSize.value, ...searchInfo.value})
if (table.code === 0) {
tableData.value = table.data.list
total.value = table.data.total
page.value = table.data.page
pageSize.value = table.data.pageSize
}
}
}
getTableData()
getTableData()
// ============== 表格控制部分结束 ===============
// ============== 表格控制部分结束 ===============
// 获取需要的字典 可能为空 按需保留
const setOptions = async () =>{
// 获取需要的字典 可能为空 按需保留
const setOptions = async () => {
partol_typeOptions.value = await getDictFunc('partol_type')
}
}
// 获取需要的字典 可能为空 按需保留
setOptions()
// 获取需要的字典 可能为空 按需保留
setOptions()
// 多选数据
const multipleSelection = ref([])
// 多选
const handleSelectionChange = (val) => {
// 多选数据
const multipleSelection = ref([])
// 多选
const handleSelectionChange = (val) => {
multipleSelection.value = val
}
}
// 删除行
const deleteRow = (row) => {
// 删除行
const deleteRow = (row) => {
ElMessageBox.confirm('确定要删除吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
......@@ -216,11 +222,11 @@ const deleteRow = (row) => {
}
// 批量删除控制标记
const deleteVisible = ref(false)
// 批量删除控制标记
const deleteVisible = ref(false)
// 多选删除
const onDelete = async() => {
// 多选删除
const onDelete = async () => {
const ids = []
if (multipleSelection.value.length === 0) {
ElMessage({
......@@ -233,7 +239,7 @@ const onDelete = async() => {
multipleSelection.value.map(item => {
ids.push(item.ID)
})
const res = await deleteQshPartolByIds({ ids })
const res = await deleteQshPartolByIds({ids})
if (res.code === 0) {
ElMessage({
type: 'success',
......@@ -247,23 +253,23 @@ const onDelete = async() => {
}
}
// 行为控制标记（弹窗内部需要增还是改）
const type = ref('')
// 行为控制标记（弹窗内部需要增还是改）
const type = ref('')
// 更新行
const updateQshPartolFunc = async(row) => {
const res = await findQshPartol({ ID: row.ID })
// 更新行
const updateQshPartolFunc = async (row) => {
const res = await findQshPartol({ID: row.ID})
type.value = 'update'
if (res.code === 0) {
formData.value = res.data.reqshPartol
dialogFormVisible.value = true
}
}
}
// 删除行
const deleteQshPartolFunc = async (row) => {
const res = await deleteQshPartol({ ID: row.ID })
// 删除行
const deleteQshPartolFunc = async (row) => {
const res = await deleteQshPartol({ID: row.ID})
if (res.code === 0) {
ElMessage({
type: 'success',
......@@ -274,19 +280,19 @@ const deleteQshPartolFunc = async (row) => {
}
getTableData()
}
}
}
// 弹窗控制标记
const dialogFormVisible = ref(false)
// 弹窗控制标记
const dialogFormVisible = ref(false)
// 打开弹窗
const openDialog = () => {
// 打开弹窗
const openDialog = () => {
type.value = 'create'
dialogFormVisible.value = true
}
}
// 关闭弹窗
const closeDialog = () => {
// 关闭弹窗
const closeDialog = () => {
dialogFormVisible.value = false
formData.value = {
content: '',
......@@ -297,9 +303,9 @@ const closeDialog = () => {
toiletId: 0,
type: undefined,
}
}
// 弹窗确定
const enterDialog = async () => {
}
// 弹窗确定
const enterDialog = async () => {
let res
switch (type.value) {
case 'create':
......@@ -320,7 +326,7 @@ const enterDialog = async () => {
closeDialog()
getTableData()
}
}
}
</script>
<style>
......
web/src/view/qshToilet/qshToilet.vue
View file @ 40da75e2
......@@ -3,11 +3,13 @@
<div class="gva-search-box">
<el-form :inline="true" :model="searchInfo" class="demo-form-inline">
<el-form-item label="点位名称">
<el-input v-model="searchInfo.name" placeholder="搜索条件" />
<el-input v-model="searchInfo.name" placeholder="搜索条件"/>
</el-form-item>
<el-form-item label="公厕类型" prop="type">
<el-select v-model="searchInfo.type" clearable placeholder="请选择" @clear="()=>{searchInfo.type=undefined}">
<el-option v-for="(item,key) in typeOptions" :key="key" :label="item.label" :value="item.value" />
<el-select v-model="searchInfo.type" clearable placeholder="请选择"
@clear="()=>{searchInfo.type=undefined}">
<el-option v-for="(item,key) in typeOptions" :key="key" :label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item>
......@@ -26,40 +28,45 @@
<el-button size="small" type="primary" @click="onDelete">确定</el-button>
</div>
<template #reference>
<el-button icon="delete" size="small" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="deleteVisible = true">删除</el-button>
<el-button icon="delete" size="small" style="margin-left: 10px;"
:disabled="!multipleSelection.length" @click="deleteVisible = true">删除
</el-button>
</template>
</el-popover>
</div>
<el-table
ref="multipleTable"
style="width: 100%"
style="flex:1"
height="100%"
tooltip-effect="dark"
:data="tableData"
row-key="ID"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" />
<el-table-column align="left" label="日期" width="180">
<template #default="scope">{{ formatDate(scope.row.CreatedAt) }}</template>
</el-table-column>
<el-table-column align="left" label="公厕地址" prop="address" width="120" />
<el-table-column align="left" label="点位图片" prop="image" width="120" />
<el-table-column align="left" label="纬度" prop="lat" width="120" />
<el-table-column align="left" label="经度" prop="lng" width="120" />
<el-table-column align="left" label="管理人员" prop="manager" width="120" />
<el-table-column align="left" label="管理员联系电话" prop="managerPhone" width="120" />
<el-table-column align="left" label="监控信息" prop="monitor" width="120" />
<el-table-column align="left" label="点位名称" prop="name" width="120" />
<el-table-column align="left" label="展示图片" prop="showImage" width="120" />
<el-table-column align="left" label="公厕类型" prop="type" width="120">
<el-table-column type="selection" width="55"/>
<el-table-column align="left" label="点位名称" prop="name" min-width="180"/>
<el-table-column align="left" label="公厕地址" prop="address" min-width="180"/>
<el-table-column align="left" label="公厕类型" prop="type" min-width="120">
<template #default="scope">
{{ filterDict(scope.row.type,typeOptions) }}
</template>
</el-table-column>
<el-table-column align="left" label="按钮组">
<el-table-column align="left" label="纬度" prop="lat" min-width="120"/>
<el-table-column align="left" label="经度" prop="lng" min-width="120"/>
<el-table-column align="left" label="管理人员" prop="manager" min-width="120"/>
<el-table-column align="left" label="管理员联系电话" prop="managerPhone" min-width="140"/>
<el-table-column align="left" label="监控信息" prop="monitor" min-width="120"/>
<el-table-column align="left" label="创建时间" min-width="180">
<template #default="scope">{{ formatDate(scope.row.CreatedAt) }}</template>
</el-table-column>
<el-table-column align="left" fixed="right" label="操作" min-width="120">
<template #default="scope">
<el-button type="primary" link icon="edit" size="small" class="table-button" @click="updateQshToiletFunc(scope.row)">变更</el-button>
<el-button type="primary" link icon="delete" size="small" @click="deleteRow(scope.row)">删除</el-button>
<el-button type="primary" link icon="edit" size="small" class="table-button"
@click="updateQshToiletFunc(scope.row)">变更
</el-button>
<el-button type="primary" link icon="delete" size="small" @click="deleteRow(scope.row)">删除
</el-button>
</template>
</el-table-column>
</el-table>
......@@ -78,35 +85,36 @@
<el-dialog v-model="dialogFormVisible" :before-close="closeDialog" title="弹窗操作">
<el-form :model="formData" label-position="right" label-width="80px">
<el-form-item label="公厕地址:">
<el-input v-model="formData.address" clearable placeholder="请输入" />
<el-input v-model="formData.address" clearable placeholder="请输入"/>
</el-form-item>
<el-form-item label="点位图片:">
<el-input v-model="formData.image" clearable placeholder="请输入" />
<el-input v-model="formData.image" clearable placeholder="请输入"/>
</el-form-item>
<el-form-item label="纬度:">
<el-input v-model="formData.lat" clearable placeholder="请输入" />
<el-input v-model="formData.lat" clearable placeholder="请输入"/>
</el-form-item>
<el-form-item label="经度:">
<el-input v-model="formData.lng" clearable placeholder="请输入" />
<el-input v-model="formData.lng" clearable placeholder="请输入"/>
</el-form-item>
<el-form-item label="管理人员:">
<el-input v-model="formData.manager" clearable placeholder="请输入" />
<el-input v-model="formData.manager" clearable placeholder="请输入"/>
</el-form-item>
<el-form-item label="管理员联系电话:">
<el-input v-model="formData.managerPhone" clearable placeholder="请输入" />
<el-input v-model="formData.managerPhone" clearable placeholder="请输入"/>
</el-form-item>
<el-form-item label="监控信息:">
<el-input v-model="formData.monitor" clearable placeholder="请输入" />
<el-input v-model="formData.monitor" clearable placeholder="请输入"/>
</el-form-item>
<el-form-item label="点位名称:">
<el-input v-model="formData.name" clearable placeholder="请输入" />
<el-input v-model="formData.name" clearable placeholder="请输入"/>
</el-form-item>
<el-form-item label="展示图片:">
<el-input v-model="formData.showImage" clearable placeholder="请输入" />
<el-input v-model="formData.showImage" clearable placeholder="请输入"/>
</el-form-item>
<el-form-item label="公厕类型:">
<el-select v-model="formData.type" placeholder="请选择" style="width:100%" clearable>
<el-option v-for="(item,key) in typeOptions" :key="key" :label="item.label" :value="item.value" />
<el-option v-for="(item,key) in typeOptions" :key="key" :label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-form>
......@@ -121,29 +129,29 @@
</template>
<script>
export default {
export default {
name: 'QshToilet'
}
}
</script>
<script setup>
import {
import {
createQshToilet,
deleteQshToilet,
deleteQshToiletByIds,
updateQshToilet,
findQshToilet,
getQshToiletList
} from '@/api/qshToilet'
} from '@/api/qshToilet'
// 全量引入格式化工具 请按需保留
import { getDictFunc, formatDate, formatBoolean, filterDict } from '@/utils/format'
import { ElMessage, ElMessageBox } from 'element-plus'
import { ref } from 'vue'
// 全量引入格式化工具 请按需保留
import {getDictFunc, formatDate, formatBoolean, filterDict} from '@/utils/format'
import {ElMessage, ElMessageBox} from 'element-plus'
import {ref} from 'vue'
// 自动化生成的字典（可能为空）以及字段
const typeOptions = ref([])
const formData = ref({
// 自动化生成的字典（可能为空）以及字段
const typeOptions = ref([])
const formData = ref({
address: '',
image: '',
lat: '',
......@@ -156,70 +164,70 @@ const formData = ref({
type: undefined,
})
// =========== 表格控制部分 ===========
const page = ref(1)
const total = ref(0)
const pageSize = ref(10)
const tableData = ref([])
const searchInfo = ref({})
// =========== 表格控制部分 ===========
const page = ref(1)
const total = ref(0)
const pageSize = ref(10)
const tableData = ref([])
const searchInfo = ref({})
// 重置
const onReset = () => {
// 重置
const onReset = () => {
searchInfo.value = {}
}
}
// 搜索
const onSubmit = () => {
// 搜索
const onSubmit = () => {
page.value = 1
pageSize.value = 10
getTableData()
}
}
// 分页
const handleSizeChange = (val) => {
// 分页
const handleSizeChange = (val) => {
pageSize.value = val
getTableData()
}
}
// 修改页面容量
const handleCurrentChange = (val) => {
// 修改页面容量
const handleCurrentChange = (val) => {
page.value = val
getTableData()
}
}
// 查询
const getTableData = async() => {
const table = await getQshToiletList({ page: page.value, pageSize: pageSize.value, ...searchInfo.value })
// 查询
const getTableData = async () => {
const table = await getQshToiletList({page: page.value, pageSize: pageSize.value, ...searchInfo.value})
if (table.code === 0) {
tableData.value = table.data.list
total.value = table.data.total
page.value = table.data.page
pageSize.value = table.data.pageSize
}
}
}
getTableData()
getTableData()
// ============== 表格控制部分结束 ===============
// ============== 表格控制部分结束 ===============
// 获取需要的字典 可能为空 按需保留
const setOptions = async () =>{
// 获取需要的字典 可能为空 按需保留
const setOptions = async () => {
typeOptions.value = await getDictFunc('type')
}
}
// 获取需要的字典 可能为空 按需保留
setOptions()
// 获取需要的字典 可能为空 按需保留
setOptions()
// 多选数据
const multipleSelection = ref([])
// 多选
const handleSelectionChange = (val) => {
// 多选数据
const multipleSelection = ref([])
// 多选
const handleSelectionChange = (val) => {
multipleSelection.value = val
}
}
// 删除行
const deleteRow = (row) => {
// 删除行
const deleteRow = (row) => {
ElMessageBox.confirm('确定要删除吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
......@@ -230,11 +238,11 @@ const deleteRow = (row) => {
}
// 批量删除控制标记
const deleteVisible = ref(false)
// 批量删除控制标记
const deleteVisible = ref(false)
// 多选删除
const onDelete = async() => {
// 多选删除
const onDelete = async () => {
const ids = []
if (multipleSelection.value.length === 0) {
ElMessage({
......@@ -247,7 +255,7 @@ const onDelete = async() => {
multipleSelection.value.map(item => {
ids.push(item.ID)
})
const res = await deleteQshToiletByIds({ ids })
const res = await deleteQshToiletByIds({ids})
if (res.code === 0) {
ElMessage({
type: 'success',
......@@ -261,23 +269,23 @@ const onDelete = async() => {
}
}
// 行为控制标记（弹窗内部需要增还是改）
const type = ref('')
// 行为控制标记（弹窗内部需要增还是改）
const type = ref('')
// 更新行
const updateQshToiletFunc = async(row) => {
const res = await findQshToilet({ ID: row.ID })
// 更新行
const updateQshToiletFunc = async (row) => {
const res = await findQshToilet({ID: row.ID})
type.value = 'update'
if (res.code === 0) {
formData.value = res.data.reqshToilet
dialogFormVisible.value = true
}
}
}
// 删除行
const deleteQshToiletFunc = async (row) => {
const res = await deleteQshToilet({ ID: row.ID })
// 删除行
const deleteQshToiletFunc = async (row) => {
const res = await deleteQshToilet({ID: row.ID})
if (res.code === 0) {
ElMessage({
type: 'success',
......@@ -288,19 +296,19 @@ const deleteQshToiletFunc = async (row) => {
}
getTableData()
}
}
}
// 弹窗控制标记
const dialogFormVisible = ref(false)
// 弹窗控制标记
const dialogFormVisible = ref(false)
// 打开弹窗
const openDialog = () => {
// 打开弹窗
const openDialog = () => {
type.value = 'create'
dialogFormVisible.value = true
}
}
// 关闭弹窗
const closeDialog = () => {
// 关闭弹窗
const closeDialog = () => {
dialogFormVisible.value = false
formData.value = {
address: '',
......@@ -314,9 +322,9 @@ const closeDialog = () => {
showImage: '',
type: undefined,
}
}
// 弹窗确定
const enterDialog = async () => {
}
// 弹窗确定
const enterDialog = async () => {
let res
switch (type.value) {
case 'create':
......@@ -337,7 +345,7 @@ const enterDialog = async () => {
closeDialog()
getTableData()
}
}
}
</script>
<style>
......
web/src/view/routerHolder.vue
View file @ 40da75e2
<!-- 此路由可作为父类路由通用路由页面使用 如需自定义父类路由页面 请参考 @/view/superAdmin/index.vue -->
<template>
<div>
<router-view v-slot="{ Component }">
<transition mode="out-in" name="el-fade-in-linear">
<keep-alive :include="routerStore.keepAliveRouters">
......@@ -8,7 +7,6 @@
</keep-alive>
</transition>
</router-view>
</div>
</template>
<script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment