From ecc1f3b4ca5e9d29376f8cc128280f519a8b6cd8 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Mon, 09 Jan 2023 17:28:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs
---
src/views/home/components/rightContainer.vue | 91 +++++++++++++--------------------------------
1 files changed, 27 insertions(+), 64 deletions(-)
diff --git a/src/views/home/components/rightContainer.vue b/src/views/home/components/rightContainer.vue
index a1e8568..16e1626 100644
--- a/src/views/home/components/rightContainer.vue
+++ b/src/views/home/components/rightContainer.vue
@@ -6,15 +6,10 @@
<div>值班信息(当日)</div>
</div>
<div class="table-box">
- <el-table
- size="small"
- :height="tableHeight"
- :data="schedulingList"
- style="width: 100%"
+ <el-table size="small" :height="tableHeight" :data="schedulingList" style="width: 100%"
:header-cell-style="{ 'text-align': 'center' }"
:cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }"
- :row-class-name="tableRowClassName"
- >
+ :row-class-name="tableRowClassName">
<el-table-column prop="station" label="岗位"></el-table-column>
<el-table-column prop="name" label="姓名"></el-table-column>
<el-table-column prop="contact" label="联系方式"></el-table-column>
@@ -23,19 +18,10 @@
</div>
<svg class="border-svg">
- <use
- stroke-width="2"
- xlink:href="#border-box-8-path-974b4d7cfafa444396861ca1d1173c8c"
- mask="url(#border-box-8-mask-974b4d7cfafa444396861ca1d1173c8c)"
- stroke="#4fd2dd"
- >
- <animate
- attributeName="stroke-dasharray"
- from="0, 1442"
- to="1442, 0"
- dur="8s"
- repeatCount="indefinite"
- />
+ <use stroke-width="2" xlink:href="#border-box-8-path-974b4d7cfafa444396861ca1d1173c8c"
+ mask="url(#border-box-8-mask-974b4d7cfafa444396861ca1d1173c8c)" stroke="#4fd2dd">
+ <animate attributeName="stroke-dasharray" from="0, 1442" to="1442, 0" dur="8s"
+ repeatCount="indefinite" />
</use>
</svg>
</div>
@@ -45,37 +31,19 @@
<div class="title">
案件统计
<div class="timer">
- <el-date-picker
- :clearable="false"
- v-model="eventTime"
- type="daterange"
- align="right"
- unlink-panels
- range-separator="至"
- start-placeholder="开始日期"
- end-placeholder="结束日期"
- @change="caseTimeChange"
- :picker-options="pickerOptions"
- ></el-date-picker>
+ <el-date-picker :clearable="false" v-model="eventTime" type="daterange" align="right"
+ unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+ @change="caseTimeChange" :picker-options="pickerOptions"></el-date-picker>
</div>
</div>
<div id="EventChangeEcharts" class="echarts-box"></div>
</div>
<svg class="border-svg">
- <use
- stroke-width="2"
- xlink:href="#border-box-8-path-974b4d7cfafa444396861ca1d1173c8c"
- mask="url(#border-box-8-mask-974b4d7cfafa444396861ca1d1173c8c)"
- stroke="#4fd2dd"
- >
- <animate
- attributeName="stroke-dasharray"
- from="0, 1442"
- to="1442, 0"
- dur="8s"
- repeatCount="indefinite"
- />
+ <use stroke-width="2" xlink:href="#border-box-8-path-974b4d7cfafa444396861ca1d1173c8c"
+ mask="url(#border-box-8-mask-974b4d7cfafa444396861ca1d1173c8c)" stroke="#4fd2dd">
+ <animate attributeName="stroke-dasharray" from="0, 1442" to="1442, 0" dur="8s"
+ repeatCount="indefinite" />
</use>
</svg>
</div>
@@ -121,19 +89,10 @@
</div>
<svg class="border-svg">
- <use
- stroke-width="2"
- xlink:href="#border-box-8-path-974b4d7cfafa444396861ca1d1173c8c"
- mask="url(#border-box-8-mask-974b4d7cfafa444396861ca1d1173c8c)"
- stroke="#4fd2dd"
- >
- <animate
- attributeName="stroke-dasharray"
- from="0, 1442"
- to="1442, 0"
- dur="8s"
- repeatCount="indefinite"
- />
+ <use stroke-width="2" xlink:href="#border-box-8-path-974b4d7cfafa444396861ca1d1173c8c"
+ mask="url(#border-box-8-mask-974b4d7cfafa444396861ca1d1173c8c)" stroke="#4fd2dd">
+ <animate attributeName="stroke-dasharray" from="0, 1442" to="1442, 0" dur="8s"
+ repeatCount="indefinite" />
</use>
</svg>
</div>
@@ -438,11 +397,15 @@
// 获取案件统计值
getCaseAll (start, end) {
const caseAll = getCaseAll(start, end).then(res => {
- return res.data.reduce((previous, current) => {
- previous.xData.push(current.days)
- previous.yData.push(current.cout)
- return previous
- }, { xData: [], yData: [] })
+ if (res.data.length > 0) {
+ return res.data.reduce((previous, current) => {
+ previous.xData.push(current.days)
+ previous.yData.push(current.cout)
+ return previous
+ }, { xData: [], yData: [] })
+ } else {
+ return { xData: [], yData: [] }
+ }
})
return caseAll
@@ -881,7 +844,7 @@
background: $sub-tab-bg-color;
cursor: pointer;
- & > div {
+ &>div {
height: 26px;
line-height: 26px;
}
--
Gitblit v1.9.3