试运行页面修改

This commit is contained in:
cdf
2024-06-05 14:34:23 +08:00
parent 6aa15c75d9
commit 9b77d100ae
13 changed files with 170 additions and 58 deletions

View File

@@ -1,9 +1,7 @@
import { defineStore } from 'pinia' import { defineStore } from 'pinia'
import { DICT_DATA } from '@/stores/constant/cacheKey' import { DICT_DATA } from '@/stores/constant/cacheKey'
import type { DictData, BasicDictData } from '@/stores/interface/index' import type { DictData } from '@/stores/interface/index'
import { reactive } from 'vue' import { reactive } from 'vue'
import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
import { log } from 'console'
export const useDictData = defineStore( export const useDictData = defineStore(
'dictData', 'dictData',
@@ -28,10 +26,20 @@ export const useDictData = defineStore(
return list.length == 0 ? state.areaTree : list return list.length == 0 ? state.areaTree : list
} }
const statusSelect = () => {
return [
{ name: '审批中', id: 1 },
{ name: '审批通过', id: 2 },
{ name: '审批不通过', id: 3 },
{ name: '已取消', id: 4 }
]
}
return { return {
state, state,
getBasicData, getBasicData,
areaSelect areaSelect,
statusSelect
} }
}, },
{ {

View File

@@ -1,5 +1,17 @@
<template> <template>
<TableHeader area datePicker ref="TableHeaderRef"> <TableHeader area datePicker ref="TableHeaderRef">
<template #select>
<el-form-item label="审核状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
<el-option
v-for="item in statusSelect"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</template>
<template #operation> <template #operation>
<el-button icon="el-icon-Plus" type="primary" @click="add">新增计划</el-button> <el-button icon="el-icon-Plus" type="primary" @click="add">新增计划</el-button>
<!-- <el-button icon="el-icon-Download" type="primary" @click="exportFn">导出</el-button> --> <!-- <el-button icon="el-icon-Download" type="primary" @click="exportFn">导出</el-button> -->

View File

@@ -1,5 +1,17 @@
<template> <template>
<TableHeader area datePicker ref='TableHeaderRef'> <TableHeader area datePicker ref='TableHeaderRef'>
<template v-slot:select>
<el-form-item label="审核状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
<el-option
v-for="item in statusSelect"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</template>
<template #operation> <template #operation>
<!-- <el-button icon="el-icon-Download" type="primary" @click="exportFn">导出</el-button> --> <!-- <el-button icon="el-icon-Download" type="primary" @click="exportFn">导出</el-button> -->
</template> </template>
@@ -27,6 +39,9 @@ import { getUserByRoleType } from '@/api/user-boot/user'
const { push } = useRouter() const { push } = useRouter()
const tableRef = ref() const tableRef = ref()
import { useDictData } from '@/stores/dictData'
const dictData = useDictData()
const statusSelect = dictData.statusSelect()
const planTestRef = ref() const planTestRef = ref()
const TableHeaderRef = ref() const TableHeaderRef = ref()

View File

@@ -16,6 +16,11 @@ import { onMounted, reactive, ref, provide } from 'vue'
import planManage from './components/planManage.vue' import planManage from './components/planManage.vue'
import testManage from './components/testManage.vue' import testManage from './components/testManage.vue'
import { mainHeight } from '@/utils/layout' import { mainHeight } from '@/utils/layout'
import { useDictData } from '@/stores/dictData'
const dictData = useDictData()
const statusSelect = dictData.statusSelect()
defineOptions({ defineOptions({
name: 'supervision/harmonicmanagement' name: 'supervision/harmonicmanagement'
}) })

View File

@@ -15,6 +15,17 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="审核状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
<el-option
v-for="item in statusSelect"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</template> </template>
<template #operation> <template #operation>
<!-- <el-button icon='el-icon-Download' type='primary'>导出</el-button> --> <!-- <el-button icon='el-icon-Download' type='primary'>导出</el-button> -->
@@ -47,6 +58,7 @@ import { getUserReportById } from '@/api/supervision-boot/userReport/form'
import BpmUserReportDetail from '../../components/undocumented/detail.vue' import BpmUserReportDetail from '../../components/undocumented/detail.vue'
const dictData = useDictData() const dictData = useDictData()
const areaOptionList = dictData.getBasicData('jibei_area') const areaOptionList = dictData.getBasicData('jibei_area')
const statusSelect = dictData.statusSelect()
const { push } = useRouter() const { push } = useRouter()
const TableHeaderRef = ref() const TableHeaderRef = ref()

View File

@@ -14,6 +14,17 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="审核状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
<el-option
v-for="item in statusSelect"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</template> </template>
<template #operation> <template #operation>
<!-- <el-button icon="el-icon-Plus" type="primary" @click="addList">新增</el-button> --> <!-- <el-button icon="el-icon-Plus" type="primary" @click="addList">新增</el-button> -->
@@ -51,6 +62,7 @@ const { push, options, currentRoute } = useRouter()
const TableHeaderRef = ref() const TableHeaderRef = ref()
const tableRef = ref() const tableRef = ref()
const areaOptionList = dictData.getBasicData('jibei_area') const areaOptionList = dictData.getBasicData('jibei_area')
const statusSelect = dictData.statusSelect()
const addRef = ref() const addRef = ref()
const AuditRef = ref() const AuditRef = ref()
const ruleFormRef = ref() const ruleFormRef = ref()

View File

@@ -2,21 +2,18 @@
<template> <template>
<div class="default-main"> <div class="default-main">
<TableHeader area datePicker ref="TableHeaderRef"> <TableHeader area datePicker ref="TableHeaderRef">
<!-- <template #select> <template #select>
<el-form-item label="用户名称"> <el-form-item label="审核状态">
<el-input v-model="tableStore.table.params.searchValue" clearable></el-input> <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
</el-form-item> <el-option
<el-form-item label="所属地市"> v-for="item in statusSelect"
<el-select v-model="tableStore.table.params.loadType" clearable placeholder="请选择所属地市"> :key="item.id"
<el-option :label="item.name"
v-for="item in areaOptionList" :value="item.id"
:key="item.id" ></el-option>
:label="item.name" </el-select>
:value="item.id" </el-form-item>
></el-option> </template>
</el-select>
</el-form-item>
</template> -->
<template #operation> <template #operation>
<el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button> <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button>
<!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> --> <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
@@ -42,6 +39,10 @@ import TableHeader from '@/components/table/header/index.vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { getLoadTypeUserList } from '@/api/process-boot/interference' import { getLoadTypeUserList } from '@/api/process-boot/interference'
import { useDictData } from '@/stores/dictData' import { useDictData } from '@/stores/dictData'
const dictData = useDictData()
const statusSelect = dictData.statusSelect()
import addForm from './components/addForm.vue' import addForm from './components/addForm.vue'
import effectProblem from './components/effectProblem/index.vue' import effectProblem from './components/effectProblem/index.vue'
import { planDetailsAudit, sendAlarm } from '@/api/supervision-boot/plan/index' import { planDetailsAudit, sendAlarm } from '@/api/supervision-boot/plan/index'
@@ -55,7 +56,7 @@ defineOptions({
}) })
const flag = ref(false) const flag = ref(false)
// const layout = mainHeight(120) as any // const layout = mainHeight(120) as any
const dictData = useDictData()
const { push, options, currentRoute } = useRouter() const { push, options, currentRoute } = useRouter()
const router = useRouter() // 路由对象 const router = useRouter() // 路由对象
const TableHeaderRef = ref() const TableHeaderRef = ref()

View File

@@ -3,6 +3,16 @@
<div class='default-main'> <div class='default-main'>
<TableHeader date-picker> <TableHeader date-picker>
<template v-slot:select> <template v-slot:select>
<el-form-item label="审核状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
<el-option
v-for="item in statusSelect"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</template> </template>
<template #operation> <template #operation>
<el-button icon='el-icon-Plus' type='primary' @click='add'>新增</el-button> <el-button icon='el-icon-Plus' type='primary' @click='add'>新增</el-button>
@@ -25,6 +35,11 @@ import MonitorQuitPopup from '@/views/pqs/supervise/retire/monitorQuitPopup.vue'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { ElMessageBox } from 'element-plus/es' import { ElMessageBox } from 'element-plus/es'
import { cancelQuitRunningDevice } from '@/api/supervision-boot/device/quitRunningDev' import { cancelQuitRunningDevice } from '@/api/supervision-boot/device/quitRunningDev'
import { useDictData } from '@/stores/dictData'
const dictData = useDictData()
const statusSelect = dictData.statusSelect()
import { useAdminInfo } from '@/stores/adminInfo' import { useAdminInfo } from '@/stores/adminInfo'
//获取登陆用户姓名和部门 //获取登陆用户姓名和部门
const adminInfo = useAdminInfo() const adminInfo = useAdminInfo()

View File

@@ -3,13 +3,16 @@
<div class="default-main"> <div class="default-main">
<TableHeader date-picker> <TableHeader date-picker>
<template v-slot:select> <template v-slot:select>
<!-- <el-form-item label='任务名称'>--> <el-form-item label="审核状态">
<!-- <el-input--> <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
<!-- v-model='tableStore.table.params.searchValue'--> <el-option
<!-- clearable--> v-for="item in statusSelect"
<!-- placeholder='请输入任务名称'--> :key="item.id"
<!-- />--> :label="item.name"
<!-- </el-form-item>--> :value="item.id"
></el-option>
</el-select>
</el-form-item>
</template> </template>
<template #operation> <template #operation>
<el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button> <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
@@ -33,6 +36,10 @@ import { ElMessage } from 'element-plus'
import { ElMessageBox } from 'element-plus/es' import { ElMessageBox } from 'element-plus/es'
import { cancelQuitRunningDevice } from '@/api/supervision-boot/device/quitRunningDev' import { cancelQuitRunningDevice } from '@/api/supervision-boot/device/quitRunningDev'
import { useAdminInfo } from '@/stores/adminInfo' import { useAdminInfo } from '@/stores/adminInfo'
import { useDictData } from '@/stores/dictData'
const dictData = useDictData()
const statusSelect = dictData.statusSelect()
//获取登陆用户姓名和部门 //获取登陆用户姓名和部门
const adminInfo = useAdminInfo() const adminInfo = useAdminInfo()
defineOptions({ defineOptions({

View File

@@ -1,21 +1,18 @@
<!---终端入网检测--> <!---终端入网检测-->
<template> <template>
<TableHeader area datePicker ref="TableHeaderRef"> <TableHeader area datePicker ref="TableHeaderRef">
<!-- <template #select> <template #select>
<el-form-item label="用户名称"> <el-form-item label="审核状态">
<el-input v-model="tableStore.table.params.searchValue" clearable></el-input> <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
</el-form-item> <el-option
<el-form-item label="所属地市"> v-for="item in statusSelect"
<el-select v-model="tableStore.table.params.loadType" clearable placeholder="请选择所属地市"> :key="item.id"
<el-option :label="item.name"
v-for="item in areaOptionList" :value="item.id"
:key="item.id" ></el-option>
:label="item.name" </el-select>
:value="item.id" </el-form-item>
></el-option> </template>
</el-select>
</el-form-item>
</template> -->
<template #operation> <template #operation>
<!-- <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button> --> <!-- <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button> -->
<!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> --> <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
@@ -47,6 +44,8 @@ const flag = ref(false)
const TableHeaderRef = ref() const TableHeaderRef = ref()
const tableRef = ref() const tableRef = ref()
const areaOptionList = dictData.getBasicData('jibei_area') const areaOptionList = dictData.getBasicData('jibei_area')
const statusSelect = dictData.statusSelect()
const ruleFormRef = ref() const ruleFormRef = ref()
const show: any = ref(false) const show: any = ref(false)
const fileList = ref([]) const fileList = ref([])

View File

@@ -1,21 +1,18 @@
<!---终端入网检测--> <!---终端入网检测-->
<template> <template>
<TableHeader area datePicker ref="TableHeaderRef"> <TableHeader area datePicker ref="TableHeaderRef">
<!-- <template #select> <template #select>
<el-form-item label="用户名称"> <el-form-item label="审核状态">
<el-input v-model="tableStore.table.params.searchValue" clearable></el-input> <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
</el-form-item> <el-option
<el-form-item label="所属地市"> v-for="item in statusSelect"
<el-select v-model="tableStore.table.params.loadType" clearable placeholder="请选择所属地市"> :key="item.id"
<el-option :label="item.name"
v-for="item in areaOptionList" :value="item.id"
:key="item.id" ></el-option>
:label="item.name" </el-select>
:value="item.id" </el-form-item>
></el-option> </template>
</el-select>
</el-form-item>
</template> -->
<template #operation> <template #operation>
<el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button> <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button>
<!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> --> <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
@@ -47,6 +44,8 @@ const flag = ref(false)
const TableHeaderRef = ref() const TableHeaderRef = ref()
const tableRef = ref() const tableRef = ref()
const areaOptionList = dictData.getBasicData('jibei_area') const areaOptionList = dictData.getBasicData('jibei_area')
const statusSelect = dictData.statusSelect()
const ruleFormRef = ref() const ruleFormRef = ref()
const show: any = ref(false) const show: any = ref(false)
const fileList = ref([]) const fileList = ref([])

View File

@@ -1,6 +1,18 @@
<!---终端入网检测--> <!---终端入网检测-->
<template> <template>
<TableHeader area datePicker ref="TableHeaderRef"> <TableHeader area datePicker ref="TableHeaderRef">
<template #select>
<el-form-item label="审核状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
<el-option
v-for="item in statusSelect"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</template>
<template #operation> <template #operation>
<el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button> <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button>
<!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> --> <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
@@ -32,6 +44,7 @@ const { push, options, currentRoute } = useRouter()
const TableHeaderRef = ref() const TableHeaderRef = ref()
const tableRef = ref() const tableRef = ref()
const areaOptionList = dictData.getBasicData('jibei_area') const areaOptionList = dictData.getBasicData('jibei_area')
const statusSelect = dictData.statusSelect()
const ruleFormRef = ref() const ruleFormRef = ref()
const show: any = ref(false) const show: any = ref(false)
const fileList = ref([]) const fileList = ref([])

View File

@@ -2,7 +2,18 @@
<template> <template>
<div class="default-main"> <div class="default-main">
<TableHeader area datePicker ref='TableHeaderRef'> <TableHeader area datePicker ref='TableHeaderRef'>
<template #select>
<el-form-item label="审核状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
<el-option
v-for="item in statusSelect"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</template>
<template #operation> <template #operation>
<el-button icon='el-icon-Plus' type='primary' @click='startRunTest'>试运行</el-button> <el-button icon='el-icon-Plus' type='primary' @click='startRunTest'>试运行</el-button>
</template> </template>
@@ -45,7 +56,10 @@ import { ElMessage, ElMessageBox } from 'element-plus'
import { addRunTest } from '@/api/supervision-boot/lineRunTest' import { addRunTest } from '@/api/supervision-boot/lineRunTest'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
const dictData = useDictData() const dictData = useDictData()
const statusSelect = dictData.statusSelect()
const { push } = useRouter() const { push } = useRouter()
const TableHeaderRef = ref() const TableHeaderRef = ref()