From f7bd94cf4a3d6ce6b06c2f90413f6798c488481d Mon Sep 17 00:00:00 2001 From: batman <978517621@qq.com> Date: 星期三, 15 三月 2023 10:21:22 +0800 Subject: [PATCH] 修改特殊作业首页 --- src/views/specialWorkSystem/specialIndex/index.vue | 138 +++++++++++++++++++++++++++------------------ 1 files changed, 82 insertions(+), 56 deletions(-) diff --git a/src/views/specialWorkSystem/specialIndex/index.vue b/src/views/specialWorkSystem/specialIndex/index.vue index 0bd442d..93aa95a 100644 --- a/src/views/specialWorkSystem/specialIndex/index.vue +++ b/src/views/specialWorkSystem/specialIndex/index.vue @@ -69,12 +69,12 @@ active-text="作业人" inactive-text="监护人" /> - <el-radio-group v-model="chartSearch4.days" size="small" @change="(value)=>changeTime2(value)"> - <el-radio :label='7' border>近7天</el-radio> - <el-radio :label='30' border>近30天</el-radio> - <el-radio :label='90' border>近90天</el-radio> - <el-radio :label='365' border>近一年</el-radio> - </el-radio-group> + <el-select :teleported="false" v-model="chartSearch4.period" size="small"> + <el-option label="近7天" value="week"/> + <el-option label="近30天" value="month"/> + <el-option label="近90天" value="season"/> + <el-option label="近1年" value="year"/> + </el-select> <el-select :teleported="false" v-model="chartSearch4.workType" size="small"> <el-option v-for="item in workType1" @@ -550,7 +550,7 @@ }); // 页面载入时执行方法 onMounted(() => { - getListByPage(); + // getListByPage(); getAllDepartment(); initZyfb() initSlfx() @@ -623,7 +623,7 @@ textStyle: { // 设置默认的文字颜色 color: state.themeColor, - fontSize: 12 + // fontSize: 12 }, itemStyle: { borderWidth: 0 // 设置图例边框宽度为0 @@ -638,21 +638,29 @@ itemStyle: { borderRadius: 1, borderColor: '#fff', - borderWidth: 2 + borderWidth: 1 }, label: { - show: false, - position: 'center' - }, - emphasis: { - label: { - show: true, - fontSize: 40, - fontWeight: 'bold' - } + show: true, + position: 'outside', + overflow: 'truncate', + borderWidth: 0, + color: state.themeColor }, labelLine: { - show: true + show: true, // 显示指示线 + lineStyle: { + color: '#ccc', + width: 1, + type: 'solid' + } + }, + emphasis: { + itemStyle: { + shadowBlur: 10, + shadowOffsetX: 0, + shadowColor: 'rgba(0, 0, 0, 0.5)' + }, }, data: [ { value: 1048, name: '动火作业' }, @@ -735,7 +743,17 @@ } }, yAxis: { - type: 'value' + splitLine: { + show: true, + lineStyle: { + color: '#fafafa', + width: 1, + type: 'dashed' + } + }, + axisLabel:{ + color: '#ccc' + } }, grid: { top: '8%', @@ -744,7 +762,10 @@ series: [ { data: [150, 230, 224, 218, 135, 147, 230, 224, 218, 135, 147, 260], - type: 'line' + type: 'line', + label:{ + show: true + } } ] } @@ -756,7 +777,7 @@ } // 刷新 const reLoadData = async () => { - getListByPage(); + // getListByPage(); }; // 填写表单 @@ -781,29 +802,29 @@ }; // 分页获取列表 - const getListByPage = async () => { - const dateRange = JSON.parse(JSON.stringify(state.searchDate)) - if(dateRange[1]){dateRange[1] = dateRange[1].replace('00:00:00','23:59:59')} - const data = { pageSize: state.pageSize1, pageIndex: state.pageIndex1, searchParams: { workType: state.searchWord, applyDepId: state.searchDep,applyStartTime: dateRange[0],applyEndTime: dateRange[1]} }; - let res = await workApplyApi().getApplyList(data); - if (res.data.code === '200') { - state.workData = JSON.parse(JSON.stringify(res.data.data)); - state.workData = state.workData.map((item) => { - if (item.operators == null || item.operators == []) { - item.operators = []; - } else { - item.operators = Array.from(item.operators, ({ operatorUname }) => operatorUname); - } - return item; - }); - state.totalSize1 = res.data.total; - } else { - ElMessage({ - type: 'warning', - message: res.data.msg - }); - } - }; + // const getListByPage = async () => { + // const dateRange = JSON.parse(JSON.stringify(state.searchDate)) + // if(dateRange[1]){dateRange[1] = dateRange[1].replace('00:00:00','23:59:59')} + // const data = { pageSize: state.pageSize1, pageIndex: state.pageIndex1, searchParams: { workType: state.searchWord, applyDepId: state.searchDep,applyStartTime: dateRange[0],applyEndTime: dateRange[1]} }; + // let res = await workApplyApi().getApplyList(data); + // if (res.data.code === '200') { + // state.workData = JSON.parse(JSON.stringify(res.data.data)); + // state.workData = state.workData.map((item) => { + // if (item.operators == null || item.operators == []) { + // item.operators = []; + // } else { + // item.operators = Array.from(item.operators, ({ operatorUname }) => operatorUname); + // } + // return item; + // }); + // state.totalSize1 = res.data.total; + // } else { + // ElMessage({ + // type: 'warning', + // message: res.data.msg + // }); + // } + // }; // 表格数据格式化 const toNames = (row, column, cellValue, index) => { @@ -830,7 +851,7 @@ message: '请输入查询关键词' }); } else { - getListByPage(); + // getListByPage(); } }; // 重置搜索 @@ -838,16 +859,16 @@ state.searchWord = null; state.searchDep = null; state.searchDate = [] - getListByPage(); + // getListByPage(); }; const handleSizeChange1 = (val: number) => { state.pageSize1 = val; - getListByPage(); + // getListByPage(); }; const handleCurrentChange1 = (val: number) => { state.pageIndex1 = val; - getListByPage(); + // getListByPage(); }; // 查看记录 @@ -941,7 +962,7 @@ searchRecord, clearSearch, viewRecord, - getListByPage, + // getListByPage, handleSizeChange1, handleCurrentChange1, ...toRefs(state) @@ -1417,13 +1438,18 @@ .full{ position:fixed; - background: #fff; - border-radius: 17px; + background: rgba(0,0,0,.2); + border: 1px solid rgba(54, 252, 252, .6); + border-radius: 17px 1px 1px 17px; box-shadow: 3px 3px 12px rgba(0,0,0,.2); - height: 34px; - line-height: 34px; - top: 0; - right: 20px; + height: 32px; + line-height: 30px; + top: 10px; + right: 2px; + display: flex; + justify-content: center; + backdrop-filter: blur(2px); + z-index: 99999; } .topChart{ .chart-item{ -- Gitblit v1.9.2