From 448ff2dd7df630e781152326dd5c6c04a5e903a1 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: Thu, 21 Jul 2022 15:26:15 +0800
Subject: [PATCH] 修改巡检点的提交校验逻辑
---
src/views/specialWorkSystem/workPlan/workAppointSummary/index.vue | 433 +++++++++++++++++++++++++++++------------------------
1 files changed, 235 insertions(+), 198 deletions(-)
diff --git a/src/views/specialWorkSystem/workPlan/workAppointSummary/index.vue b/src/views/specialWorkSystem/workPlan/workAppointSummary/index.vue
index 29eeb55..7d7d47a 100644
--- a/src/views/specialWorkSystem/workPlan/workAppointSummary/index.vue
+++ b/src/views/specialWorkSystem/workPlan/workAppointSummary/index.vue
@@ -1,74 +1,77 @@
<template>
<div class="home-container">
- <el-row>
- <el-col :span="6">
+ <el-scrollbar height="100%">
+ <el-row class="homeCard">
+ <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>
- </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"></el-col>
- <el-col :span="6">
- <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>
+ </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-row>
- <el-row>
- <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 label="操作">
- <template #default>
- <el-button link type="primary" size="small">操作</el-button>
- </template>
- </el-table-column>
- </el-table>
- </el-row>
- <el-dialog v-model="dialogChartsVisible" title="Shipping address">
+ <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>
+ <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="To"
- start-placeholder="Start date"
- end-placeholder="End date"
+ range-separator="至"
+ start-placeholder="开始日期"
+ end-placeholder="截止日期"
:shortcuts="shortcuts"
size="large"
/>
@@ -77,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"
@@ -88,13 +91,14 @@
</div>
</div>
</el-row>
- <div id="main" style="width: 600px;height:400px;"></div>
+ <div ref="myChart" style="width: 100%;height:400px;"></div>
</el-dialog>
+ </el-scrollbar>
</div>
</template>
<script lang="ts">
- import { toRefs, reactive, defineComponent, ref } from 'vue';
+ import { toRefs, reactive, defineComponent, ref, onMounted } from 'vue';
import { storeToRefs } from 'pinia';
import { initBackEndControlRoutes } from '/@/router/backEnd';
import {useUserInfo} from "/@/stores/userInfo";
@@ -103,6 +107,13 @@
import { TooltipComponent, TooltipComponentOption, GridComponent, GridComponentOption, LegendComponent, LegendComponentOption } from 'echarts/components';
import { BarChart, BarSeriesOption } from 'echarts/charts';
import { CanvasRenderer } from 'echarts/renderers';
+ echarts.use([
+ TooltipComponent,
+ GridComponent,
+ LegendComponent,
+ BarChart,
+ CanvasRenderer
+ ]);
let global: any = {
homeChartOne: null,
homeChartTwo: null,
@@ -192,7 +203,7 @@
const dateRange = ref('')
const shortcuts = [
{
- text: 'Last week',
+ text: '上一周',
value: () => {
const end = new Date()
const start = new Date()
@@ -201,7 +212,7 @@
},
},
{
- text: 'Last month',
+ text: '前一个月',
value: () => {
const end = new Date()
const start = new Date()
@@ -210,7 +221,7 @@
},
},
{
- text: 'Last 3 months',
+ text: '前三个月',
value: () => {
const end = new Date()
const start = new Date()
@@ -286,112 +297,111 @@
const state = reactive<stateType>({
homeOne:[{id:1,name:'基础数据权限管理系统'},{id:2,name:'双重预防系统'},{id:3,name:'系统2'},{id:4,name:'系统3'},{id:5,name:'系统4'}],
});
+ const myChart = ref<HTMLElement>()
+ const myCharts = ref<any>()
+ setTimeout(()=>{
+ type EChartsOption = echarts.ComposeOption<
+ | TooltipComponentOption
+ | GridComponentOption
+ | LegendComponentOption
+ | BarSeriesOption
+ >;
+ myCharts.value = echarts.init(myChart.value!);
+ const option: EChartsOption = {
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ // Use axis to trigger tooltip
+ type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
+ }
+ },
+ legend: {},
+ grid: {
+ left: '3%',
+ right: '3%',
+ bottom: '3%',
+ containLabel: true
+ },
+ xAxis: {
+ type: 'value'
+ },
+ yAxis: {
+ type: 'category',
+ data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+ },
+ series: [
+ {
+ name: 'Direct',
+ type: 'bar',
+ stack: 'total',
+ label: {
+ show: true
+ },
+ emphasis: {
+ focus: 'series'
+ },
+ data: [320, 302, 301, 334, 390, 330, 320]
+ },
+ {
+ name: 'Mail Ad',
+ type: 'bar',
+ stack: 'total',
+ label: {
+ show: true
+ },
+ emphasis: {
+ focus: 'series'
+ },
+ data: [120, 132, 101, 134, 90, 230, 210]
+ },
+ {
+ name: 'Affiliate Ad',
+ type: 'bar',
+ stack: 'total',
+ label: {
+ show: true
+ },
+ emphasis: {
+ focus: 'series'
+ },
+ data: [220, 182, 191, 234, 290, 330, 310]
+ },
+ {
+ name: 'Video Ad',
+ type: 'bar',
+ stack: 'total',
+ label: {
+ show: true
+ },
+ emphasis: {
+ focus: 'series'
+ },
+ data: [150, 212, 201, 154, 190, 330, 410]
+ },
+ {
+ name: 'Search Engine',
+ type: 'bar',
+ stack: 'total',
+ label: {
+ show: true
+ },
+ emphasis: {
+ focus: 'series'
+ },
+ data: [820, 832, 901, 934, 1290, 1330, 1320]
+ }
+ ]
+ };
+ option && myCharts.value.setOption(option);
+ },2000)
// 分布图
- echarts.use([
- TooltipComponent,
- GridComponent,
- LegendComponent,
- BarChart,
- CanvasRenderer
- ]);
+ // onMounted(()=>{
+ // setTimeout(() => {
+ // drawChart()
+ // },1000)
+ // });
- type EChartsOption = echarts.ComposeOption<
- | TooltipComponentOption
- | GridComponentOption
- | LegendComponentOption
- | BarSeriesOption
- >;
-
- const chartDom = document.getElementById('main')!;
- const myChart = echarts.init(chartDom);
- const option: EChartsOption = {
- tooltip: {
- trigger: 'axis',
- axisPointer: {
- // Use axis to trigger tooltip
- type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
- }
- },
- legend: {},
- grid: {
- left: '3%',
- right: '4%',
- bottom: '3%',
- containLabel: true
- },
- xAxis: {
- type: 'value'
- },
- yAxis: {
- type: 'category',
- data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
- },
- series: [
- {
- name: 'Direct',
- type: 'bar',
- stack: 'total',
- label: {
- show: true
- },
- emphasis: {
- focus: 'series'
- },
- data: [320, 302, 301, 334, 390, 330, 320]
- },
- {
- name: 'Mail Ad',
- type: 'bar',
- stack: 'total',
- label: {
- show: true
- },
- emphasis: {
- focus: 'series'
- },
- data: [120, 132, 101, 134, 90, 230, 210]
- },
- {
- name: 'Affiliate Ad',
- type: 'bar',
- stack: 'total',
- label: {
- show: true
- },
- emphasis: {
- focus: 'series'
- },
- data: [220, 182, 191, 234, 290, 330, 310]
- },
- {
- name: 'Video Ad',
- type: 'bar',
- stack: 'total',
- label: {
- show: true
- },
- emphasis: {
- focus: 'series'
- },
- data: [150, 212, 201, 154, 190, 330, 410]
- },
- {
- name: 'Search Engine',
- type: 'bar',
- stack: 'total',
- label: {
- show: true
- },
- emphasis: {
- focus: 'series'
- },
- data: [820, 832, 901, 934, 1290, 1330, 1320]
- }
- ]
- };
-
- option && myChart.setOption(option);
// 折线图
const renderMenu = async (value: string) => {
@@ -411,6 +421,7 @@
departmentName,
departmentOptions,
props,
+ myChart,
handleChange,
...toRefs(state),
};
@@ -421,46 +432,72 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
+ height: 100%;
overflow: hidden;
- padding: 20px 40px;
- .el-col{
+ padding: 20px;
+ .homeCard{
+ width: 100%;
+ padding: 20px;
+ background: #fff;
+ border-radius: 4px;
+ }
+ .el-row{
display: flex;
align-items: center;
- }
- .grid-content{
- 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;
-
- .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;
+ }
}
}
- .el-button--text {
- margin-right: 15px;
+ .main-card{
+ width: 100%;
+ .cardTop{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom: 20px;
+ .mainCardBtn{
+ margin: 0;
+ }
+ }
}
- .el-select {
- width: 300px;
+ .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: 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