From be17b7971f263369fd78b1f257f05f6a4c18a6c6 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期五, 15 七月 2022 09:06:49 +0800
Subject: [PATCH] 添加修改页面
---
src/views/specialWorkSystem/workPlan/workReservation/index.vue | 206 +++---
/dev/null | 214 -------
src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/reportTypeSetting/index.vue | 16
src/views/generalShiftManagement/index.vue | 395 +++++++++++++
src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/approveLinkSetting/index.vue | 352 +++++++++++
src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/approveTypeSetting/index.vue | 351 +++++++++++
src/views/specialWorkSystem/workPlan/workAppointSummary/index.vue | 209 +++---
src/views/specialWorkSystem/workBasicManagementSetting/securityMeasuresManagement/index.vue | 19
8 files changed, 1,338 insertions(+), 424 deletions(-)
diff --git a/src/views/generalShiftManagement/index.vue b/src/views/generalShiftManagement/index.vue
new file mode 100644
index 0000000..4bdac98
--- /dev/null
+++ b/src/views/generalShiftManagement/index.vue
@@ -0,0 +1,395 @@
+<template>
+ <div class="home-container">
+ <el-scrollbar height="100%">
+ <div class="homeCard">
+ <div class="main-card">
+ <el-row class="cardTop">
+ <el-col :span="12" class="mainCardBtn">
+ <el-button type="primary" :icon="Plus" size="default" @click="dialogAddRecord=true">新建排班方案</el-button>
+<!-- <el-button type="warning" :icon="Edit" size="default" plain>修改</el-button>-->
+ <el-button type="danger" :icon="Delete" size="default" plain>删除</el-button>
+ </el-col>
+ <el-button type="primary" :icon="Refresh" size="default"/>
+ </el-row>
+ <el-table
+ ref="multipleTableRef"
+ :data="tableData"
+ style="width: 100%"
+ :header-cell-style="{background: '#fafafa'}"
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column type="selection" width="55" />
+ <el-table-column type="index" label="序号" width="80" />
+ <el-table-column property="name" label="名称" width="200" sortable/>
+ <el-table-column property="shiftType" label="排班类型" width="200" sortable/>
+ <el-table-column property="createTime" label="创建时间" width="180" />
+<!-- <el-table-column property="checkType" label="检查类型"/>-->
+<!-- <el-table-column property="checkContent" label="检查内容" sortable/>-->
+<!-- <el-table-column property="judgement" label="参考判断"/>-->
+<!-- <el-table-column property="sort" label="排序" sortable/>-->
+<!-- <el-table-column property="remark" label="备注"/>-->
+<!-- <el-table-column property="updater" label="更新人"/>-->
+ <el-table-column property="updateTime" label="更新时间" sortable/>
+ <el-table-column fixed="right" label="操作" align="center" width="250">
+ <template #default="scope">
+ <el-button link type="primary" size="small" :icon="View" @click="viewRecord(scope.row)">查看</el-button>
+ <el-button link type="primary" size="small" :icon="Edit" @click="editRecord(scope.$index ,scope.row)">修改</el-button>
+ <el-button link type="danger" size="small" :icon="Delete" @click="deleteRecord(scope.$index)">删除</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <div class="pageBtn">
+ <el-pagination
+ v-model:currentPage="currentPage"
+ v-model:page-size="pageSize"
+ :page-sizes="[10, 15]"
+ small=false
+ background
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="100"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
+ </div>
+ </div>
+ </el-scrollbar>
+ <el-dialog v-model="dialogDetails" title="排班方案">
+ <el-form :model="details" label-width="120px">
+ <el-form-item label="方案名称">
+ <el-input
+ v-model="details.name"
+ readonly
+ />
+ </el-form-item>
+ <el-form-item label="双休节假日">
+ <el-input
+ v-model="details.holiday"
+ readonly
+ />
+ </el-form-item>
+ <el-form-item label="排班类型">
+ <el-input
+ v-model="details.shiftType"
+ readonly
+ />
+ </el-form-item>
+ <el-form-item v-for="(item,index) in details.timeList" :key="index" :label="index == 0?'上班时间段':item.day + '天后倒'">
+ <el-input
+ v-model="item.timeRange"
+ readonly
+ />
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="dialogDetails = false" size="default">确认</el-button>
+ </el-form-item>
+ </el-form>
+ </el-dialog>
+ <el-dialog v-model="dialogAddRecord" title="排班方案编辑" @close="closeAdd">
+ <el-form :model="addRecord" label-width="120px" ref="addRef" :rules="addRules">
+ <el-form-item label="方案名称" prop="name">
+ <el-input
+ v-model="addRecord.name"
+ >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="双休节假日" prop="holiday">
+ <el-select v-model="addRecord.holiday">
+ <el-option label="休假" value="休假" />
+ <el-option label="不休假" value="不休假" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="排班类型" prop="checkType">
+ <el-select v-model="addRecord.shiftType">
+ <el-option label="循环班" value="循环班" />
+ <el-option label="常白班" value="常白班" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查内容" prop="checkContent">
+ <el-input
+ v-model="addRecord.checkContent"
+ type="textarea"
+ >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="参考判断" prop="judgement">
+ <el-radio-group v-model="addRecord.judgement">
+ <el-radio label="Y" size="large">Y</el-radio>
+ <el-radio label="N" size="large">N</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="排序值" prop="sort">
+ <el-input-number v-model="addRecord.sort" :min="1" :max="100" @change="handleChange" />
+ </el-form-item>
+ <el-form-item label="备注">
+ <el-input v-model="addRecord.remark" type="textarea"/>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="warning" @click="dialogAddRecord = false" size="default" plain>取消</el-button>
+ <el-button type="primary" @click="confirmAddRecord(addRef)" size="default">确认</el-button>
+ </el-form-item>
+ </el-form>
+ </el-dialog>
+ <el-dialog v-model="deleteDialog" title="提示" width="30%" center @close="indexClear">
+ <span>您确定要删除该条记录吗？</span>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="deleteDialog = false" size="default">取消</el-button>
+ <el-button type="primary" @click="conFirmDelete" size="default">确认</el-button>
+ </span>
+ </template>
+ </el-dialog>
+ </div>
+</template>
+
+<script lang="ts" setup>
+ import { toRefs, reactive, ref } from 'vue';
+ import { storeToRefs } from 'pinia';
+ import { initBackEndControlRoutes } from '/@/router/backEnd';
+ import {useUserInfo} from "/@/stores/userInfo";
+ import { Session } from '/@/utils/storage';
+ import { Edit, View, Plus, Delete, Refresh, Search, Upload } from '@element-plus/icons-vue'
+ import { ElTable } from 'element-plus'
+ import { FormInstance, FormRules } from 'element-plus'
+ let global: any = {
+ homeChartOne: null,
+ homeChartTwo: null,
+ homeCharThree: null,
+ dispose: [null, '', undefined],
+ };
+
+ interface stateType {
+ homeOne: Array <type>
+ }
+ interface type {
+
+ }
+ // export default defineComponent({
+ // name: 'workCheckinRecord',
+ // setup() {
+ const userInfo = useUserInfo()
+ const { userInfos } = storeToRefs(userInfo);
+ const state = reactive<stateType>({});
+ const currentPage = ref(1)
+ const pageSize = ref(10)
+ const chosenIndex = ref(-1)
+ const handleSizeChange = (val: number) => {
+ console.log(`${val} items per page`)
+ }
+ const handleCurrentChange = (val: number) => {
+ console.log(`current page: ${val}`)
+ }
+ const tableData = reactive(
+ [
+ {
+ name: '三班两倒',
+ holiday: '不休假',
+ shiftType: '循环班',
+ timeList:[
+ {
+ timeRange: '15:20 - 18:00'
+ },
+ {
+ day: 1,
+ timeRange: '15:20 - 18:00'
+ },
+ {
+ day: 1,
+ timeRange: '20:20 - 06:00'
+ }
+ ]
+ },
+ {
+ name: '四班三倒',
+ holiday: '不休假',
+ shiftType: '循环班',
+ timeList:[
+ {
+ timeRange: '15:20 - 18:00'
+ },
+ {
+ day: 2,
+ timeRange: '15:20 - 18:00'
+ },
+ {
+ day: 1,
+ timeRange: '20:20 - 06:00'
+ },
+ {
+ day: 1,
+ timeRange: '08:30 - 18:00'
+ }
+ ]
+ }
+ ]
+ )
+ const addRef = ref<FormInstance>()
+ const timeForm = {
+ hour12: false,
+ year: 'numeric',
+ month: '2-digit',
+ day: '2-digit',
+ hour: '2-digit',
+ minute: '2-digit',
+ second: '2-digit'
+ }
+ const addRules = reactive<FormRules>({
+ jobType:[{required: true, message: '该内容不能为空',trigger:'blur'}],
+ type:[{required: true, message: '该内容不能为空',trigger:'blur'}],
+ checkType:[{required: true, message: '该内容不能为空',trigger:'blur'}],
+ checkContent:[{required: true, message: '该内容不能为空',trigger:'blur'}],
+ judgement:[{required: true, message: '该内容不能为空',trigger:'blur'}],
+ sort:[{required: true, message: '该内容不能为空',trigger:'blur'}]
+ })
+ const dialogDetails = ref(false)
+ const dialogAddRecord = ref(false)
+ const deleteDialog = ref(false)
+ const addRecord = ref({})
+ const details = ref({})
+ const viewRecord = (row) =>{
+ details.value = JSON.parse(JSON.stringify(row))
+ dialogDetails.value = true
+ }
+ const deleteRecord = (index) =>{
+ chosenIndex.value = index
+ deleteDialog.value = true
+ }
+ const conFirmDelete = ()=> {
+ tableData.splice(chosenIndex.value,1)
+ deleteDialog.value = false
+ }
+ const confirmAddRecord = async (formEl: FormInstance | undefined) =>{
+ if (!formEl) return
+ await formEl.validate((valid, fields) => {
+ if (valid) {
+ if(chosenIndex.value == -1){
+ addRecord.value.updateTime = new Date().toLocaleString('zh', timeForm).replace(/\//g,'-')
+ tableData.push(addRecord.value)
+ }else{
+ addRecord.value.updateTime = new Date().toLocaleString('zh', timeForm).replace(/\//g,'-')
+ tableData[chosenIndex.value] = addRecord.value
+ }
+ dialogAddRecord.value =false
+ } else {
+ console.log('error submit!', fields)
+ }
+ })
+
+ }
+ const closeAdd =()=>{
+ addRecord.value={}
+ chosenIndex.value = -1
+ }
+ const indexClear = ()=>{
+ chosenIndex.value = -1
+ }
+ const editRecord =(index, row)=>{
+ dialogAddRecord.value = true
+ chosenIndex.value = index
+ addRecord.value = JSON.parse(JSON.stringify(row))
+ }
+ // 折线图
+ const renderMenu = async (value: string) => {
+ Session.set('projectId',value)
+ userInfos.value.projectId = value
+ await initBackEndControlRoutes();
+ };
+ // return {
+ // renderMenu,
+ // multipleTableRef,
+ // tableData,
+ // currentPage,
+ // pageSize,
+ // dialogDetails,
+ // details,
+ // deleteDialog,
+ // dialogAddRecord,
+ // viewRecord,
+ // deleteRecord,
+ // handleSizeChange,
+ // handleCurrentChange,
+ // Plus,
+ // Edit,
+ // Delete,
+ // Search,
+ // Download,
+ // handleSelectionChange,
+ // Refresh,
+ // ...toRefs(state),
+ // };
+ // },
+ // });
+</script>
+
+<style scoped lang="scss">
+ $homeNavLengh: 8;
+ .home-container {
+ height: 100%;
+ overflow: hidden;
+ padding: 20px;
+ .homeCard{
+ width: 100%;
+ padding: 20px;
+ background: #fff;
+ border-radius: 4px;
+ }
+ .el-row{
+ display: flex;
+ align-items: center;
+ margin-bottom: 20px;
+ &:last-child {
+ margin-bottom: 0;
+ }
+ .grid-content{
+ align-items: center;
+ min-height: 36px;
+ }
+
+ .topInfo {
+ display: flex;
+ align-items: center;
+ font-size: 16px;
+ font-weight: bold;
+
+ &>div{
+ white-space: nowrap;
+ margin-right: 20px;
+ }
+ }
+ }
+ .main-card{
+ width: 100%;
+ .cardTop{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom: 20px;
+ .mainCardBtn{
+ margin: 0;
+ }
+ }
+ }
+ .pageBtn{
+ display: flex;
+ align-items: center;
+ justify-content: right;
+ margin-top: 20px;
+
+ .demo-pagination-block + .demo-pagination-block {
+ margin-top: 10px;
+ }
+ .demo-pagination-block .demonstration {
+ margin-bottom: 16px;
+ }
+ }
+ }
+ .el-input{
+ width: 100% !important;
+ }
+ .el-date-editor::v-deep{
+ width: 100%;
+ }
+ .el-select{
+ width: 100%;
+ }
+</style>
diff --git a/src/views/specialWorkSystem/approveProcessManagement/addApproveProcess/index.vue b/src/views/specialWorkSystem/approveProcessManagement/addApproveProcess/index.vue
deleted file mode 100644
index 92a7ccc..0000000
--- a/src/views/specialWorkSystem/approveProcessManagement/addApproveProcess/index.vue
+++ /dev/null
@@ -1,214 +0,0 @@
-<template>
- <div class="home-container">
- <el-scrollbar height="100%">
- <div class="homeCard">
- <el-row>
- <el-button type="primary" size="large" @click="addApprove">新建审批环节</el-button>
- </el-row>
- <el-row>
- <el-table :data="tableData" border style="width: 100%">
- <el-table-column type="index" label="编号" width="100"/>
- <el-table-column prop="step" label="环节名称"/>
- <el-table-column prop="type" label="审核类型" width="180"/>
- <el-table-column prop="createTime" label="创建时间" width="180" />
- <el-table-column prop="editor" label="最新编辑人" width="180" />
- <el-table-column prop="editeTime" label="最新编辑时间" width="180" />
- <el-table-column fixed="right" label="操作" align="center" width="180">
- <template #default="scope">
- <el-button link type="primary" size="small" @click="editeRow(scope.$index,scope.row)">编辑</el-button>
- <el-button link type="danger" size="small" @click="deleteRow(scope.$index)">删除</el-button>
- </template>
- </el-table-column>
- </el-table>
- </el-row>
- </div>
- <el-dialog v-model="dialogAddForm" title="新建审批环节" @close="dialogColse">
- <el-form :model="reportForm" label-width="120px" ref="ruleFormRef" :rules="rules">
- <el-form-item label="环节名称" prop="step">
- <el-select v-model="reportForm.step" placeholder="选择环节名称">
- <el-option label="作业负责人审批" value="作业负责人审批" />
- <el-option label="作业负责人审批2" value="作业负责人审批2" />
- <el-option label="作业负责人审批3" value="作业负责人审批3" />
- </el-select>
- </el-form-item>
- <el-form-item label="审核类型" prop="type">
- <el-select v-model="reportForm.type" placeholder="选择审核类型">
- <el-option label="上报审批意见" value="上报审批意见" />
- <el-option label="上报气体检测数据" value="上报气体检测数据" />
- <el-option label="上报安全措施确认" value="上报安全措施确认" />
- </el-select>
- </el-form-item>
- <el-form-item label="最新编辑人">
- <el-input v-model="reportForm.editor" />
- </el-form-item>
- <el-form-item>
- <el-button type="primary" @click="onSubmitAddForm(ruleFormRef)" size="default">确认</el-button>
- <el-button size="default" @click="dialogAddForm = false">取消</el-button>
- </el-form-item>
- </el-form>
- </el-dialog>
- </el-scrollbar>
- </div>
-</template>
-
-<script lang="ts">
- import { toRefs, reactive, defineComponent, ref } from 'vue';
- import { storeToRefs } from 'pinia';
- import { initBackEndControlRoutes } from '/@/router/backEnd';
- import {useUserInfo} from "/@/stores/userInfo";
- import { Session } from '/@/utils/storage';
- import type { FormInstance, FormRules } from 'element-plus'
-
- let global: any = {
- homeChartOne: null,
- homeChartTwo: null,
- homeCharThree: null,
- dispose: [null, '', undefined],
- };
-
- interface stateType {
- homeOne: Array <type>
- }
- interface type {
-
- }
- interface User {
- step: string,
- type: string,
- createTime: string
- }
- export default defineComponent({
- name: 'reportTypeSetting',
- setup() {
- const userInfo = useUserInfo()
- const { userInfos } = storeToRefs(userInfo);
- const state = reactive<stateType>({});
- const tableData = reactive([
- {
- step: '作业负责人审批',
- type: '',
- createTime: '',
- editor: '',
- editeTime: ''
- },
- {
- step: '作业负责人审批',
- type: '',
- createTime: '',
- editor: '',
- editeTime: ''
- },
- {
- step: '作业负责人审批',
- type: '',
- createTime: '',
- editor: '',
- editeTime: ''
- }
- ]);
- const dialogAddForm = ref(false);
- const rowIndex = ref(-1)
- const reportForm = ref({
- step: '',
- type: '',
- createTime: '',
- editor: '',
- editeTime: ''
- })
- const addApprove = ()=>{
- dialogAddForm.value = true
- };
- const ruleFormRef = ref<FormInstance>()
- const rules = reactive<FormRules>({
- step:[{required: true, message: '该内容不能为空',trigger:'blur'}],
- type:[{required: true, message: '该内容不能为空',trigger:'blur'}]
- })
- const onSubmitAddForm = async (formEl: FormInstance | undefined) => {
- if (!formEl) return
- await formEl.validate((valid, fields) => {
- if (valid) {
- if(rowIndex.value == -1){
- reportForm.value.createTime = new Date().toLocaleString()
- reportForm.value.editeTime = new Date().toLocaleString()
- tableData.push(reportForm.value)
- }else{
- tableData[rowIndex.value] = reportForm.value
- }
-
- // reportForm.value = {
- // step: '',
- // type: '',
- // createTime: '',
- // editor: '',
- // editeTime: ''
- // }
- dialogAddForm.value = false
- } else {
- console.log('error submit!', fields)
- }
- })
- }
- const editeRow = (index: number, row: User) =>{
- dialogAddForm.value = true
- rowIndex.value = index
- reportForm.value = JSON.parse(JSON.stringify(row))
- reportForm.value.editeTime = new Date().toLocaleString()
- }
- const deleteRow = (index)=>{
- tableData.splice( index,1)
- }
- const dialogColse = () =>{
- reportForm.value = {
- step: '',
- type: '',
- createTime: '',
- editor: '',
- editeTime: ''
- }
- rowIndex.value = -1
- }
- // 折线图
- const renderMenu = async (value: string) => {
- Session.set('projectId',value)
- userInfos.value.projectId = value
- await initBackEndControlRoutes();
- };
- return {
- renderMenu,
- tableData,
- dialogAddForm,
- reportForm,
- ruleFormRef,
- rules,
- rowIndex,
- dialogColse,
- editeRow,
- deleteRow,
- addApprove,
- onSubmitAddForm,
- ...toRefs(state),
- };
- },
- });
-</script>
-
-<style scoped lang="scss">
- $homeNavLengh: 8;
- .home-container {
- overflow: hidden;
- padding: 20px;
- height: 100%;
- .homeCard{
- width: 100%;
- padding: 20px;
- background: #fff;
- border-radius: 4px;
- }
- .el-row{
- margin-bottom: 20px;
- }
- .el-row:last-child {
- margin-bottom: 0;
- }
- }
-</style>
diff --git a/src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/approveLinkSetting/index.vue b/src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/approveLinkSetting/index.vue
new file mode 100644
index 0000000..f1b1bbc
--- /dev/null
+++ b/src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/approveLinkSetting/index.vue
@@ -0,0 +1,352 @@
+<template>
+ <div class="home-container">
+ <el-scrollbar height="100%">
+ <div class="homeCard">
+ <div class="main-card">
+ <el-row class="cardTop">
+ <el-col :span="12" class="mainCardBtn">
+ <el-button type="primary" :icon="Plus" size="default" @click="dialogAddRecord=true">新建审批环节</el-button>
+<!-- <el-button type="warning" :icon="Edit" size="default" plain>修改</el-button>-->
+ <el-button type="danger" :icon="Delete" size="default" plain>删除</el-button>
+ </el-col>
+ <el-button type="primary" :icon="Refresh" size="default"/>
+ </el-row>
+ <el-table
+ ref="multipleTableRef"
+ :data="tableData"
+ style="width: 100%"
+ :header-cell-style="{background: '#fafafa'}"
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column type="selection" width="55" />
+ <el-table-column type="index" width="80" label="序号"/>
+ <el-table-column property="processName" label="环节名称" width="200" sortable/>
+ <el-table-column property="approveType" label="审核类型" width="200" sortable/>
+ <el-table-column property="creater" label="创建人" width="180" />
+ <el-table-column property="createTime" label="创建时间" sortable/>
+ <el-table-column property="updater" label="最后更新人"/>
+ <el-table-column property="updateTime" label="最后更新时间" sortable/>
+ <el-table-column fixed="right" label="操作" align="center" width="250">
+ <template #default="scope">
+ <el-button link type="primary" size="small" :icon="View" @click="viewRecord(scope.row)">查看</el-button>
+ <el-button link type="primary" size="small" :icon="Edit" @click="editRecord(scope.$index ,scope.row)">修改</el-button>
+ <el-button link type="danger" size="small" :icon="Delete" @click="deleteRecord(scope.$index)">删除</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <div class="pageBtn">
+ <el-pagination
+ v-model:currentPage="currentPage"
+ v-model:page-size="pageSize"
+ :page-sizes="[10, 15]"
+ small=false
+ background
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="100"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
+ </div>
+ </div>
+ </el-scrollbar>
+ <el-dialog v-model="dialogDetails" title="审批环节">
+ <el-form :model="details" label-width="120px">
+ <el-form-item label="环节名称">
+ <el-input
+ v-model="details.processName"
+ readonly
+ />
+ </el-form-item>
+ <el-form-item label="审批类型">
+ <el-input
+ v-model="details.approveType"
+ readonly
+ />
+ </el-form-item>
+ <el-form-item label="创建人">
+ <el-input
+ v-model="details.creater"
+ readonly
+ />
+ </el-form-item>
+ <el-form-item label="创建时间">
+ <el-input
+ v-model="details.createTime"
+ readonly
+ />
+ </el-form-item>
+ <el-form-item label="最后更新人">
+ <el-input
+ v-model="details.updater"
+ readonly
+ />
+ </el-form-item>
+ <el-form-item label="最后更新时间">
+ <el-input v-model="details.updateTime" readonly/>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="dialogDetails = false" size="default">确认</el-button>
+ </el-form-item>
+ </el-form>
+ </el-dialog>
+ <el-dialog v-model="dialogAddRecord" title="审批环节编辑" @close="closeAdd">
+ <el-form :model="addRecord" label-width="120px" ref="addRef" :rules="addRules">
+ <el-form-item label="环节名称">
+ <el-input v-model="addRecord.processName"/>
+ </el-form-item>
+ <el-form-item label="审批类型" prop="approveType">
+ <el-select v-model="addRecord.approveType">
+ <el-option label="上报审批意见" value="上报审批意见" />
+ <el-option label="上报气体监测数据" value="上报气体监测数据" />
+ <el-option label="上报安全措施确认" value="上报安全措施确认" />
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="warning" @click="dialogAddRecord = false" size="default" plain>取消</el-button>
+ <el-button type="primary" @click="confirmAddRecord(addRef)" size="default">确认</el-button>
+ </el-form-item>
+ </el-form>
+ </el-dialog>
+ <el-dialog v-model="deleteDialog" title="提示" width="30%" center @close="indexClear">
+ <span>您确定要删除该条记录吗？</span>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="deleteDialog = false" size="default">取消</el-button>
+ <el-button type="primary" @click="conFirmDelete" size="default">确认</el-button>
+ </span>
+ </template>
+ </el-dialog>
+ </div>
+</template>
+
+<script lang="ts" setup>
+ import { toRefs, reactive, ref } from 'vue';
+ import { storeToRefs } from 'pinia';
+ import { initBackEndControlRoutes } from '/@/router/backEnd';
+ import {useUserInfo} from "/@/stores/userInfo";
+ import { Session } from '/@/utils/storage';
+ import { Edit, View, Plus, Delete, Refresh, Search, Download } from '@element-plus/icons-vue'
+ import { ElTable } from 'element-plus'
+ import { FormInstance, FormRules } from 'element-plus'
+ let global: any = {
+ homeChartOne: null,
+ homeChartTwo: null,
+ homeCharThree: null,
+ dispose: [null, '', undefined],
+ };
+
+ interface stateType {
+ homeOne: Array <type>
+ }
+ interface type {
+
+ }
+ // export default defineComponent({
+ // name: 'workCheckinRecord',
+ // setup() {
+ const userInfo = useUserInfo()
+ const { userInfos } = storeToRefs(userInfo);
+ const state = reactive<stateType>({});
+ const currentPage = ref(1)
+ const pageSize = ref(10)
+ const chosenIndex = ref(-1)
+ const handleSizeChange = (val: number) => {
+ console.log(`${val} items per page`)
+ }
+ const handleCurrentChange = (val: number) => {
+ console.log(`current page: ${val}`)
+ }
+ const tableData = reactive(
+ [
+ {
+ processName: '作业负责人审批',
+ approveType: '上报审批意见',
+ creater: '李四',
+ createTime: '2021-04-22 15:21:31',
+ updater: '吴海涛',
+ updateTime: '2022-04-22 15:21:31',
+ },
+ {
+ processName: '作业负责人审批',
+ approveType: '上报气体检测数据',
+ creater: '李四',
+ createTime: '2021-04-22 15:21:31',
+ updater: '吴海涛',
+ updateTime: '2022-04-22 15:21:31',
+ },
+ ]
+ )
+ const timeForm = {
+ hour12: false,
+ year: 'numeric',
+ month: '2-digit',
+ day: '2-digit',
+ hour: '2-digit',
+ minute: '2-digit',
+ second: '2-digit'
+ }
+ const addRef = ref<FormInstance>()
+ const addRules = reactive<FormRules>({
+ processName:[{required: true, message: '该内容不能为空',trigger:'blur'}],
+ approveType:[{required: true, message: '该内容不能为空',trigger:'blur'}]
+ })
+ const dialogDetails = ref(false)
+ const dialogAddRecord = ref(false)
+ const deleteDialog = ref(false)
+ const addRecord = ref({})
+ const details = ref({})
+ const viewRecord = (row) =>{
+ details.value = JSON.parse(JSON.stringify(row))
+ dialogDetails.value = true
+ }
+ const deleteRecord = (index) =>{
+ chosenIndex.value = index
+ deleteDialog.value = true
+ }
+ const conFirmDelete = ()=> {
+ tableData.splice(chosenIndex.value,1)
+ deleteDialog.value = false
+ }
+ const confirmAddRecord = async (formEl: FormInstance | undefined) =>{
+ if (!formEl) return
+ await formEl.validate((valid, fields) => {
+ if (valid) {
+ if(chosenIndex.value == -1){
+ addRecord.value.createTime = new Date().toLocaleString('zh', timeForm).replace(/\//g,'-')
+ addRecord.value.updateTime = new Date().toLocaleString('zh', timeForm).replace(/\//g,'-')
+ tableData.push(addRecord.value)
+ }else{
+ addRecord.value.updateTime = new Date().toLocaleString('zh', timeForm).replace(/\//g,'-')
+ tableData[chosenIndex.value] = addRecord.value
+ }
+ dialogAddRecord.value =false
+ } else {
+ console.log('error submit!', fields)
+ }
+ })
+
+ }
+ const closeAdd =()=>{
+ addRecord.value={}
+ chosenIndex.value = -1
+ }
+ const indexClear = ()=>{
+ chosenIndex.value = -1
+ }
+ const editRecord =(index, row)=>{
+ dialogAddRecord.value = true
+ chosenIndex.value = index
+ addRecord.value = JSON.parse(JSON.stringify(row))
+ }
+ // 折线图
+ const renderMenu = async (value: string) => {
+ Session.set('projectId',value)
+ userInfos.value.projectId = value
+ await initBackEndControlRoutes();
+ };
+ // return {
+ // renderMenu,
+ // multipleTableRef,
+ // tableData,
+ // currentPage,
+ // pageSize,
+ // dialogDetails,
+ // details,
+ // deleteDialog,
+ // dialogAddRecord,
+ // viewRecord,
+ // deleteRecord,
+ // handleSizeChange,
+ // handleCurrentChange,
+ // Plus,
+ // Edit,
+ // Delete,
+ // Search,
+ // Download,
+ // handleSelectionChange,
+ // Refresh,
+ // ...toRefs(state),
+ // };
+ // },
+ // });
+</script>
+
+<style scoped lang="scss">
+ $homeNavLengh: 8;
+ .home-container {
+ height: 100%;
+ overflow: hidden;
+ padding: 20px;
+ .homeCard{
+ width: 100%;
+ padding: 20px;
+ background: #fff;
+ border-radius: 4px;
+ }
+ .el-row{
+ display: flex;
+ align-items: center;
+ margin-bottom: 20px;
+ &:last-child {
+ margin-bottom: 0;
+ }
+ .grid-content{
+ align-items: center;
+ min-height: 36px;
+ }
+
+ .topInfo {
+ display: flex;
+ align-items: center;
+ font-size: 16px;
+ font-weight: bold;
+
+ &>div{
+ white-space: nowrap;
+ margin-right: 20px;
+ }
+ }
+ }
+ .mainPages{
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ }
+ .main-card{
+ width: 100%;
+ .cardTop{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom: 20px;
+ .mainCardBtn{
+ margin: 0;
+ }
+ }
+ }
+ .pageBtn{
+ display: flex;
+ align-items: center;
+ justify-content: right;
+ margin-top: 20px;
+
+ .demo-pagination-block + .demo-pagination-block {
+ margin-top: 10px;
+ }
+ .demo-pagination-block .demonstration {
+ margin-bottom: 16px;
+ }
+ }
+ }
+ .el-input{
+ width: 100% !important;
+ }
+ .el-date-editor::v-deep{
+ width: 100%;
+ }
+ .el-select{
+ width: 100%;
+ }
+</style>
diff --git a/src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/approveTypeSetting/index.vue b/src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/approveTypeSetting/index.vue
new file mode 100644
index 0000000..5253274
--- /dev/null
+++ b/src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/approveTypeSetting/index.vue
@@ -0,0 +1,351 @@
+<template>
+ <div class="home-container">
+ <el-scrollbar height="100%">
+ <el-row class="homeCard">
+ <el-col :span="8">
+ <div class="grid-content topInfo">
+ <el-input v-model="searchWord" placeholder="审批类型名称"></el-input>
+ <el-button type="primary">查询</el-button>
+ <el-button plain>重置</el-button>
+ </div>
+ </el-col>
+ </el-row>
+ <div class="homeCard">
+ <div class="main-card">
+ <el-row class="cardTop">
+ <el-col :span="12" class="mainCardBtn">
+ <el-button type="primary" :icon="Plus" size="default" @click="dialogAddRecord=true">新建</el-button>
+<!-- <el-button type="warning" :icon="Edit" size="default" plain>修改</el-button>-->
+ <el-button type="danger" :icon="Delete" size="default" plain>删除</el-button>
+ </el-col>
+ <el-button type="primary" :icon="Refresh" size="default"/>
+ </el-row>
+ <el-table
+ ref="multipleTableRef"
+ :data="tableData"
+ style="width: 100%"
+ :header-cell-style="{background: '#fafafa'}"
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column type="selection" width="55" />
+ <el-table-column type="index" width="80" label="序号"/>
+ <el-table-column property="approveType" label="审批类型名称" width="200" sortable/>
+ <el-table-column property="creater" label="创建人" width="180" />
+ <el-table-column property="createTime" label="创建时间" sortable/>
+ <el-table-column property="updater" label="最后更新人"/>
+ <el-table-column property="updateTime" label="最后更新时间" sortable/>
+ <el-table-column fixed="right" label="操作" align="center" width="250">
+ <template #default="scope">
+ <el-button link type="primary" size="small" :icon="View" @click="viewRecord(scope.row)">查看</el-button>
+ <el-button link type="primary" size="small" :icon="Edit" @click="editRecord(scope.$index ,scope.row)">修改</el-button>
+ <el-button link type="danger" size="small" :icon="Delete" @click="deleteRecord(scope.$index)">删除</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <div class="pageBtn">
+ <el-pagination
+ v-model:currentPage="currentPage"
+ v-model:page-size="pageSize"
+ :page-sizes="[10, 15]"
+ small=false
+ background
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="100"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
+ </div>
+ </div>
+ </el-scrollbar>
+ <el-dialog v-model="dialogDetails" title="审批类型">
+ <el-form :model="details" label-width="120px">
+ <el-form-item label="审批类型名称">
+ <el-input
+ v-model="details.approveType"
+ readonly
+ />
+ </el-form-item>
+ <el-form-item label="创建人">
+ <el-input
+ v-model="details.creater"
+ readonly
+ />
+ </el-form-item>
+ <el-form-item label="创建时间">
+ <el-input
+ v-model="details.createTime"
+ readonly
+ />
+ </el-form-item>
+ <el-form-item label="最后更新人">
+ <el-input
+ v-model="details.updater"
+ readonly
+ />
+ </el-form-item>
+ <el-form-item label="最后更新时间">
+ <el-input v-model="details.updateTime" readonly/>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="dialogDetails = false" size="default">确认</el-button>
+ </el-form-item>
+ </el-form>
+ </el-dialog>
+ <el-dialog v-model="dialogAddRecord" title="审批类型编辑" @close="closeAdd">
+ <el-form :model="addRecord" label-width="120px" ref="addRef" :rules="addRules">
+ <el-form-item label="审批类型名称" prop="approveType">
+ <el-select v-model="addRecord.approveType">
+ <el-option label="单人审批" value="单人审批" />
+ <el-option label="多人同时审批" value="多人同时审批" />
+ <el-option label="多人单个审批" value="多人单个审批" />
+ </el-select>
+ </el-form-item>
+<!-- <el-form-item label="审批类型标识">-->
+<!-- <el-input v-model="addRecord.remark"/>-->
+<!-- </el-form-item>-->
+ <el-form-item>
+ <el-button type="warning" @click="dialogAddRecord = false" size="default" plain>取消</el-button>
+ <el-button type="primary" @click="confirmAddRecord(addRef)" size="default">确认</el-button>
+ </el-form-item>
+ </el-form>
+ </el-dialog>
+ <el-dialog v-model="deleteDialog" title="提示" width="30%" center @close="indexClear">
+ <span>您确定要删除该条记录吗？</span>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="deleteDialog = false" size="default">取消</el-button>
+ <el-button type="primary" @click="conFirmDelete" size="default">确认</el-button>
+ </span>
+ </template>
+ </el-dialog>
+ </div>
+</template>
+
+<script lang="ts" setup>
+ import { toRefs, reactive, ref } from 'vue';
+ import { storeToRefs } from 'pinia';
+ import { initBackEndControlRoutes } from '/@/router/backEnd';
+ import {useUserInfo} from "/@/stores/userInfo";
+ import { Session } from '/@/utils/storage';
+ import { Edit, View, Plus, Delete, Refresh, Search, Download } from '@element-plus/icons-vue'
+ import { ElTable } from 'element-plus'
+ import { FormInstance, FormRules } from 'element-plus'
+ let global: any = {
+ homeChartOne: null,
+ homeChartTwo: null,
+ homeCharThree: null,
+ dispose: [null, '', undefined],
+ };
+
+ interface stateType {
+ homeOne: Array <type>
+ }
+ interface type {
+
+ }
+ // export default defineComponent({
+ // name: 'workCheckinRecord',
+ // setup() {
+ const userInfo = useUserInfo()
+ const { userInfos } = storeToRefs(userInfo);
+ const state = reactive<stateType>({});
+ const currentPage = ref(1)
+ const pageSize = ref(10)
+ const chosenIndex = ref(-1)
+ const handleSizeChange = (val: number) => {
+ console.log(`${val} items per page`)
+ }
+ const handleCurrentChange = (val: number) => {
+ console.log(`current page: ${val}`)
+ }
+ const tableData = reactive(
+ [
+ {
+ approveType: '单人审批',
+ creater: '李四',
+ createTime: '2021-04-22 15:21:31',
+ updater: '吴海涛',
+ updateTime: '2022-04-22 15:21:31',
+ },
+ {
+ approveType: '多人同时审批',
+ creater: '李四',
+ createTime: '2021-04-22 15:21:31',
+ updater: '吴海涛',
+ updateTime: '2022-04-22 15:21:31',
+ },
+ ]
+ )
+ const timeForm = {
+ hour12: false,
+ year: 'numeric',
+ month: '2-digit',
+ day: '2-digit',
+ hour: '2-digit',
+ minute: '2-digit',
+ second: '2-digit'
+ }
+ const addRef = ref<FormInstance>()
+ const addRules = reactive<FormRules>({
+ approveType:[{required: true, message: '该内容不能为空',trigger:'blur'}],
+ })
+ const dialogDetails = ref(false)
+ const dialogAddRecord = ref(false)
+ const deleteDialog = ref(false)
+ const addRecord = ref({})
+ const details = ref({})
+ const viewRecord = (row) =>{
+ details.value = JSON.parse(JSON.stringify(row))
+ dialogDetails.value = true
+ }
+ const deleteRecord = (index) =>{
+ chosenIndex.value = index
+ deleteDialog.value = true
+ }
+ const conFirmDelete = ()=> {
+ tableData.splice(chosenIndex.value,1)
+ deleteDialog.value = false
+ }
+ const confirmAddRecord = async (formEl: FormInstance | undefined) =>{
+ if (!formEl) return
+ await formEl.validate((valid, fields) => {
+ if (valid) {
+ if(chosenIndex.value == -1){
+ addRecord.value.createTime = new Date().toLocaleString('zh', timeForm).replace(/\//g,'-')
+ addRecord.value.updateTime = new Date().toLocaleString('zh', timeForm).replace(/\//g,'-')
+ tableData.push(addRecord.value)
+ }else{
+ addRecord.value.updateTime = new Date().toLocaleString('zh', timeForm).replace(/\//g,'-')
+ tableData[chosenIndex.value] = addRecord.value
+ }
+ dialogAddRecord.value =false
+ } else {
+ console.log('error submit!', fields)
+ }
+ })
+
+ }
+ const closeAdd =()=>{
+ addRecord.value={}
+ chosenIndex.value = -1
+ }
+ const indexClear = ()=>{
+ chosenIndex.value = -1
+ }
+ const editRecord =(index, row)=>{
+ dialogAddRecord.value = true
+ chosenIndex.value = index
+ addRecord.value = JSON.parse(JSON.stringify(row))
+ }
+ // 折线图
+ const renderMenu = async (value: string) => {
+ Session.set('projectId',value)
+ userInfos.value.projectId = value
+ await initBackEndControlRoutes();
+ };
+ // return {
+ // renderMenu,
+ // multipleTableRef,
+ // tableData,
+ // currentPage,
+ // pageSize,
+ // dialogDetails,
+ // details,
+ // deleteDialog,
+ // dialogAddRecord,
+ // viewRecord,
+ // deleteRecord,
+ // handleSizeChange,
+ // handleCurrentChange,
+ // Plus,
+ // Edit,
+ // Delete,
+ // Search,
+ // Download,
+ // handleSelectionChange,
+ // Refresh,
+ // ...toRefs(state),
+ // };
+ // },
+ // });
+</script>
+
+<style scoped lang="scss">
+ $homeNavLengh: 8;
+ .home-container {
+ height: 100%;
+ overflow: hidden;
+ padding: 20px;
+ .homeCard{
+ width: 100%;
+ padding: 20px;
+ background: #fff;
+ border-radius: 4px;
+ }
+ .el-row{
+ display: flex;
+ align-items: center;
+ margin-bottom: 20px;
+ &:last-child {
+ margin-bottom: 0;
+ }
+ .grid-content{
+ align-items: center;
+ min-height: 36px;
+ }
+
+ .topInfo {
+ display: flex;
+ align-items: center;
+ font-size: 16px;
+ font-weight: bold;
+
+ &>div{
+ white-space: nowrap;
+ margin-right: 20px;
+ }
+ }
+ }
+ .mainPages{
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ }
+ .main-card{
+ width: 100%;
+ .cardTop{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom: 20px;
+ .mainCardBtn{
+ margin: 0;
+ }
+ }
+ }
+ .pageBtn{
+ display: flex;
+ align-items: center;
+ justify-content: right;
+ margin-top: 20px;
+
+ .demo-pagination-block + .demo-pagination-block {
+ margin-top: 10px;
+ }
+ .demo-pagination-block .demonstration {
+ margin-bottom: 16px;
+ }
+ }
+ }
+ .el-input{
+ width: 100% !important;
+ }
+ .el-date-editor::v-deep{
+ width: 100%;
+ }
+ .el-select{
+ width: 100%;
+ }
+</style>
diff --git a/src/views/specialWorkSystem/approveProcessManagement/reportTypeSetting/index.vue b/src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/reportTypeSetting/index.vue
similarity index 92%
rename from src/views/specialWorkSystem/approveProcessManagement/reportTypeSetting/index.vue
rename to src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/reportTypeSetting/index.vue
index c7b94d6..676466b 100644
--- a/src/views/specialWorkSystem/approveProcessManagement/reportTypeSetting/index.vue
+++ b/src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/reportTypeSetting/index.vue
@@ -114,6 +114,15 @@
editor: '',
editeTime: ''
})
+ const timeForm = {
+ hour12: false,
+ year: 'numeric',
+ month: '2-digit',
+ day: '2-digit',
+ hour: '2-digit',
+ minute: '2-digit',
+ second: '2-digit'
+ }
const addReport = ()=>{
dialogAddForm.value = true
};
@@ -128,8 +137,8 @@
await formEl.validate((valid, fields) => {
if (valid) {
if(rowIndex.value == -1){
- reportForm.value.createTime = new Date().toLocaleString()
- reportForm.value.editeTime = new Date().toLocaleString()
+ reportForm.value.createTime = new Date().toLocaleString('zh', timeForm).replace(/\//g,'-')
+ reportForm.value.editeTime = new Date().toLocaleString('zh', timeForm).replace(/\//g,'-')
tableData.push(reportForm.value)
}else{
tableData[rowIndex.value] = reportForm.value
@@ -144,7 +153,7 @@
dialogAddForm.value = true
rowIndex.value = index
reportForm.value = JSON.parse(JSON.stringify(row))
- reportForm.value.editeTime = new Date().toLocaleString()
+ reportForm.value.editeTime = new Date().toLocaleString('zh', timeForm).replace(/\//g,'-')
}
const deleteRow = (index)=>{
tableData.splice( index,1)
@@ -172,6 +181,7 @@
reportForm,
ruleFormRef,
addRules,
+ timeForm,
dialogColse,
editeRow,
deleteRow,
diff --git a/src/views/specialWorkSystem/workBasicManagementSetting/securityMeasuresManagement/index.vue b/src/views/specialWorkSystem/workBasicManagementSetting/securityMeasuresManagement/index.vue
index 7e48122..5c3c5a4 100644
--- a/src/views/specialWorkSystem/workBasicManagementSetting/securityMeasuresManagement/index.vue
+++ b/src/views/specialWorkSystem/workBasicManagementSetting/securityMeasuresManagement/index.vue
@@ -238,6 +238,15 @@
]
)
const addRef = ref<FormInstance>()
+ const timeForm = {
+ hour12: false,
+ year: 'numeric',
+ month: '2-digit',
+ day: '2-digit',
+ hour: '2-digit',
+ minute: '2-digit',
+ second: '2-digit'
+ }
const addRules = reactive<FormRules>({
jobType:[{required: true, message: '该内容不能为空',trigger:'blur'}],
type:[{required: true, message: '该内容不能为空',trigger:'blur'}],
@@ -268,10 +277,10 @@
await formEl.validate((valid, fields) => {
if (valid) {
if(chosenIndex.value == -1){
- addRecord.value.updateTime = new Date().toLocaleString()
+ addRecord.value.updateTime = new Date().toLocaleString('zh', timeForm).replace(/\//g,'-')
tableData.push(addRecord.value)
}else{
- addRecord.value.updateTime = new Date().toLocaleString()
+ addRecord.value.updateTime = new Date().toLocaleString('zh', timeForm).replace(/\//g,'-')
tableData[chosenIndex.value] = addRecord.value
}
dialogAddRecord.value =false
@@ -361,12 +370,6 @@
margin-right: 20px;
}
}
- }
- .mainPages{
- height: 100%;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
}
.main-card{
width: 100%;
diff --git a/src/views/specialWorkSystem/workPlan/workAppointSummary/index.vue b/src/views/specialWorkSystem/workPlan/workAppointSummary/index.vue
index 566ee7f..7d7d47a 100644
--- a/src/views/specialWorkSystem/workPlan/workAppointSummary/index.vue
+++ b/src/views/specialWorkSystem/workPlan/workAppointSummary/index.vue
@@ -2,77 +2,76 @@
<div class="home-container">
<el-scrollbar height="100%">
<el-row class="homeCard">
-<!-- <div class="homeCard">-->
- <el-col :span="6">
+ <el-col :span="12">
<div class="grid-content topInfo">
- <div>预约时间：</div>
- <div class="block">
- <el-date-picker
- v-model="searchTime"
- type="date"
- placeholder=""
- size="large"
+ <el-date-picker
+ v-model="searchTime"
+ type="datetime"
+ placeholder="预约时间"
+ size="large"
+ style="width: 100%;white-space: nowrap;margin-right: 20px"
+ />
+ <el-select v-model="typeValue" placeholder="请选择预约类型" style="width: 100%">
+ <el-option
+ v-for="item in reserveOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
/>
- </div>
+ </el-select>
+ <el-button type="primary">查询历史</el-button>
+ <el-button plain>重置</el-button>
+ <el-button type="primary" @click="dialogChartsVisible = true">查看统计图表</el-button>
</div>
</el-col>
- <el-col :span="6">
- <div class="grid-content topInfo">
- <div>预约类型：</div>
- <div>
- <el-select v-model="typeValue" class="m-2" placeholder="Select" size="large">
- <el-option
- v-for="item in reserveOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </div>
- </div>
- </el-col>
- <el-col :span="12" class="topBtns">
- <div class="grid-content topInfo">
- <div style="margin-right: 20px"><el-button type="primary" plain>查询历史</el-button></div>
- <div><el-button type="primary" @click="dialogChartsVisible = true">查看统计图表</el-button></div>
- </div>
- </el-col>
-<!-- </div>-->
</el-row>
- <el-row>
- <div class="homeCard">
- <el-table :data="tableData" border style="width: 100%">
- <el-table-column prop="id" label="编号" width="180" />
- <el-table-column prop="time" label="预约时间" width="180" />
- <el-table-column prop="department" label="预约部门" />
- <el-table-column prop="dirtyWork" label="动土作业" width="180" />
- <el-table-column prop="fireWork" label="动火作业" width="180" />
- <el-table-column prop="hangWork" label="吊装作业" />
- <el-table-column prop="spaceWork" label="受限空间作业" width="180" />
- <el-table-column prop="cut" label="断路" width="180" />
- <el-table-column prop="high" label="高处" />
- <el-table-column prop="block" label="盲板抽堵" width="180" />
- <el-table-column prop="tempUse" label="临时用电" width="180" />
- <el-table-column fixed="right" label="操作" align="center" width="180">
- <template #default>
- <el-button link type="primary" size="small">操作</el-button>
- </template>
- </el-table-column>
- </el-table>
+ <div class="homeCard">
+ <div class="main-card">
+ <el-table :data="tableData" border style="width: 100%" :header-cell-style="{background: '#fafafa'}">
+ <el-table-column prop="id" label="编号" width="180" />
+ <el-table-column prop="time" label="预约时间" width="180" />
+ <el-table-column prop="department" label="预约部门" />
+ <el-table-column prop="dirtyWork" label="动土作业" width="180" />
+ <el-table-column prop="fireWork" label="动火作业" width="180" />
+ <el-table-column prop="hangWork" label="吊装作业" />
+ <el-table-column prop="spaceWork" label="受限空间作业" width="180" />
+ <el-table-column prop="cut" label="断路" width="180" />
+ <el-table-column prop="high" label="高处" />
+ <el-table-column prop="block" label="盲板抽堵" width="180" />
+ <el-table-column prop="tempUse" label="临时用电" width="180" />
+ <el-table-column fixed="right" label="操作" align="center" width="180">
+ <template #default>
+ <el-button link type="primary" size="small">操作</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
</div>
- </el-row>
+ <div class="pageBtn">
+ <el-pagination
+ v-model:currentPage="currentPage"
+ v-model:page-size="pageSize"
+ :page-sizes="[10, 15]"
+ small=false
+ background
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="100"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
+ </div>
+ </div>
<el-dialog v-model="dialogChartsVisible" title="统计图表">
<el-row>
<div class="grid-content">
- <div>日期查询：</div>
+ <div style="margin-bottom: 10px">日期查询：</div>
<div class="block">
<el-date-picker
v-model="dateRange"
type="daterange"
unlink-panels
range-separator="至"
- start-placeholder="Start date"
- end-placeholder="End date"
+ start-placeholder="开始日期"
+ end-placeholder="截止日期"
:shortcuts="shortcuts"
size="large"
/>
@@ -81,7 +80,7 @@
</el-row>
<el-row>
<div class="grid-content">
- <div>部门查询：</div>
+ <div style="margin-bottom: 10px">部门查询：</div>
<div>
<el-cascader
v-model="departmentName"
@@ -204,7 +203,7 @@
const dateRange = ref('')
const shortcuts = [
{
- text: 'Last week',
+ text: '上一周',
value: () => {
const end = new Date()
const start = new Date()
@@ -213,7 +212,7 @@
},
},
{
- text: 'Last month',
+ text: '前一个月',
value: () => {
const end = new Date()
const start = new Date()
@@ -222,7 +221,7 @@
},
},
{
- text: 'Last 3 months',
+ text: '前三个月',
value: () => {
const end = new Date()
const start = new Date()
@@ -436,61 +435,69 @@
height: 100%;
overflow: hidden;
padding: 20px;
- .el-row{
- margin-bottom: 20px;
- }
- .el-row:last-child {
- margin-bottom: 0;
- }
.homeCard{
width: 100%;
- display: flex;
- align-items: center;
padding: 20px;
background: #fff;
border-radius: 4px;
}
-
- .grid-content{
+ .el-row{
display: flex;
align-items: center;
- min-height: 36px;
- }
+ margin-bottom: 20px;
+ &:last-child {
+ margin-bottom: 0;
+ }
+ .grid-content{
+ align-items: center;
+ min-height: 36px;
+ }
- .topInfo{
- display: flex;
- align-items: center;
- font-size: 16px;
- font-weight: bold;
-
- .demo-datetime-picker {
+ .topInfo {
display: flex;
- width: 100%;
- padding: 0;
- flex-wrap: wrap;
- }
- .demo-datetime-picker .block {
- padding: 30px 0;
- text-align: center;
- border-right: solid 1px var(--el-border-color);
- flex: 1;
+ align-items: center;
+ font-size: 16px;
+ font-weight: bold;
+
+ &>div{
+ white-space: nowrap;
+ margin-right: 20px;
+ }
}
}
- .topBtns{
+ .main-card{
+ width: 100%;
+ .cardTop{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom: 20px;
+ .mainCardBtn{
+ margin: 0;
+ }
+ }
+ }
+ .pageBtn{
display: flex;
+ align-items: center;
justify-content: right;
+ margin-top: 20px;
+
+ .demo-pagination-block + .demo-pagination-block {
+ margin-top: 10px;
+ }
+ .demo-pagination-block .demonstration {
+ margin-bottom: 16px;
+ }
}
- .el-button--text {
- margin-right: 15px;
- }
- .el-select {
- width: 300px;
- }
- .el-input {
- width: 300px;
- }
- .dialog-footer button:first-child {
- margin-right: 10px;
- }
+ }
+ .el-input{
+ width: 100% !important;
+ }
+ .el-date-editor::v-deep{
+ width: 100%;
+ }
+ .el-select{
+ width: 100%;
}
</style>
diff --git a/src/views/specialWorkSystem/workPlan/workReservation/index.vue b/src/views/specialWorkSystem/workPlan/workReservation/index.vue
index 8546f9f..392884d 100644
--- a/src/views/specialWorkSystem/workPlan/workReservation/index.vue
+++ b/src/views/specialWorkSystem/workPlan/workReservation/index.vue
@@ -2,71 +2,69 @@
<div class="home-container">
<el-scrollbar height="100%">
<el-row class="homeCard">
-<!-- <div class="homeCard">-->
- <el-col :span="6">
+ <el-col :span="16">
<div class="grid-content topInfo">
- <div>当前所属部门：</div>
- <div>电工部</div>
- </div>
- </el-col>
- <el-col :span="6">
- <div class="grid-content topInfo">
- <div>预约时间：</div>
- <div class="block">
- <el-date-picker
- v-model="searchTime"
- type="date"
- placeholder=""
- size="large"
+ <div>当前所属部门：<span>电工部</span></div>
+ <el-date-picker
+ v-model="searchTime"
+ type="datetime"
+ placeholder="预约时间"
+ size="large"
+ style="width: 100%;white-space: nowrap;margin-right: 20px"
+ />
+ <el-select v-model="typeValue" placeholder="请选择预约类型" style="width: 100%">
+ <el-option
+ v-for="item in reserveOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
/>
- </div>
+ </el-select>
+ <el-button type="primary">查询</el-button>
+ <el-button plain>重置</el-button>
</div>
</el-col>
- <el-col :span="6">
- <div class="grid-content topInfo">
- <div>预约类型：</div>
- <div>
- <el-select v-model="typeValue" class="m-2" placeholder="Select" size="large">
- <el-option
- v-for="item in reserveOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </div>
- </div>
- </el-col>
- <el-col :span="6" class="topBtns">
- <div class="grid-content topInfo">
- <div style="margin-right: 20px"><el-button type="primary" plain>查询历史</el-button></div>
- <div><el-button type="success" @click="dialogFormVisible = true">新增预约</el-button></div>
- </div>
- </el-col>
-<!-- </div>-->
</el-row>
- <el-row>
- <div class="homeCard">
- <el-table :data="tableData" border style="width: 100%">
- <el-table-column prop="id" label="编号" width="120" />
- <el-table-column prop="time" label="预约时间" width="150" />
- <el-table-column prop="department" label="预约部门" width="180" />
- <el-table-column prop="dirtyWork" label="动土作业" width="100" />
- <el-table-column prop="fireWork" label="动火作业" width="100" />
- <el-table-column prop="hangWork" label="吊装作业" width="100" />
- <el-table-column prop="spaceWork" label="受限空间作业"/>
- <el-table-column prop="cut" label="断路"/>
- <el-table-column prop="high" label="高处" />
- <el-table-column prop="block" label="盲板抽堵"/>
- <el-table-column prop="tempUse" label="临时用电"/>
- <el-table-column fixed="right" label="操作" align="center" width="180">
- <template #default>
- <el-button link type="primary" size="small">操作</el-button>
- </template>
- </el-table-column>
- </el-table>
+ <div class="homeCard">
+ <div class="main-card">
+ <el-row class="cardTop">
+ <el-col :span="12" class="mainCardBtn">
+ <el-button type="primary" :icon="Plus" size="default" @click="dialogFormVisible = true">新增预约</el-button>
+ </el-col>
+ </el-row>
+ <el-table :data="tableData" border style="width: 100%" :header-cell-style="{background: '#fafafa'}">
+ <el-table-column prop="id" label="编号" width="120" />
+ <el-table-column prop="time" label="预约时间" width="150" />
+ <el-table-column prop="department" label="预约部门" width="180" />
+ <el-table-column prop="dirtyWork" label="动土作业" width="100" />
+ <el-table-column prop="fireWork" label="动火作业" width="100" />
+ <el-table-column prop="hangWork" label="吊装作业" width="100" />
+ <el-table-column prop="spaceWork" label="受限空间作业"/>
+ <el-table-column prop="cut" label="断路"/>
+ <el-table-column prop="high" label="高处" />
+ <el-table-column prop="block" label="盲板抽堵"/>
+ <el-table-column prop="tempUse" label="临时用电"/>
+ <el-table-column fixed="right" label="操作" align="center" width="180">
+ <template #default>
+ <el-button link type="primary" size="small">操作</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
</div>
- </el-row>
+ <div class="pageBtn">
+ <el-pagination
+ v-model:currentPage="currentPage"
+ v-model:page-size="pageSize"
+ :page-sizes="[10, 15]"
+ small=false
+ background
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="100"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
+ </div>
+ </div>
<el-dialog v-model="dialogFormVisible" title="新增预约">
<el-form :model="reservationForm">
<el-form-item label="我的当前部门" :label-width="formLabelWidth">
@@ -107,6 +105,7 @@
import { initBackEndControlRoutes } from '/@/router/backEnd';
import {useUserInfo} from "/@/stores/userInfo";
import { Session } from '/@/utils/storage';
+ import { Edit, View, Plus, Delete, Refresh, Search, Upload } from '@element-plus/icons-vue'
let global: any = {
homeChartOne: null,
homeChartTwo: null,
@@ -213,6 +212,7 @@
typeValue,
reserveOptions,
tableData,
+ Plus,
dialogFormVisible,
formLabelWidth,
reservationForm,
@@ -228,59 +228,69 @@
height: 100%;
overflow: hidden;
padding: 20px;
- .el-row{
- margin-bottom: 20px;
- }
- .el-row:last-of-type {
- margin-bottom: 0;
- }
.homeCard{
width: 100%;
- display: flex;
- align-items: center;
padding: 20px;
background: #fff;
border-radius: 4px;
}
- .grid-content{
- align-items: center;
- min-height: 36px;
- }
-
- .topInfo{
+ .el-row{
display: flex;
align-items: center;
- font-size: 16px;
- font-weight: bold;
+ margin-bottom: 20px;
+ &:last-child {
+ margin-bottom: 0;
+ }
+ .grid-content{
+ align-items: center;
+ min-height: 36px;
+ }
- .demo-datetime-picker {
+ .topInfo {
display: flex;
- width: 100%;
- padding: 0;
- flex-wrap: wrap;
- }
- .demo-datetime-picker .block {
- padding: 30px 0;
- text-align: center;
- border-right: solid 1px var(--el-border-color);
- flex: 1;
+ align-items: center;
+ font-size: 16px;
+ font-weight: bold;
+
+ &>div{
+ white-space: nowrap;
+ margin-right: 20px;
+ }
}
}
- .topBtns{
+ .main-card{
+ width: 100%;
+ .cardTop{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom: 20px;
+ .mainCardBtn{
+ margin: 0;
+ }
+ }
+ }
+ .pageBtn{
display: flex;
+ align-items: center;
justify-content: right;
+ margin-top: 20px;
+
+ .demo-pagination-block + .demo-pagination-block {
+ margin-top: 10px;
+ }
+ .demo-pagination-block .demonstration {
+ margin-bottom: 16px;
+ }
}
- .el-button--text {
- margin-right: 15px;
- }
- .el-select {
- width: 300px;
- }
- .el-input {
- width: 300px;
- }
- .dialog-footer button:first-child {
- margin-right: 10px;
- }
+ }
+ .el-input{
+ width: 100% !important;
+ }
+ .el-date-editor::v-deep{
+ width: 100%;
+ }
+ .el-select{
+ width: 100%;
}
</style>
--
Gitblit v1.9.2