From fce42ace6a03256bdf29dfbb7a37e3a4b1d3f088 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Mon, 26 Jun 2023 20:26:17 +0800
Subject: [PATCH] 首页值班合并判断茅家岭
---
src/views/home/components/rightContainer.vue | 94 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 76 insertions(+), 18 deletions(-)
diff --git a/src/views/home/components/rightContainer.vue b/src/views/home/components/rightContainer.vue
index f81b5e1..2f25dbb 100644
--- a/src/views/home/components/rightContainer.vue
+++ b/src/views/home/components/rightContainer.vue
@@ -6,13 +6,33 @@
<div>值班信息(当日)</div>
</div>
- <div class="duty-information-box">
+ <div class="duty-information-box" v-show="!showMJL">
<div v-for="item in schedulingList" :key="item.id">
<div>
<span>{{ item.type }}</span>
</div>
<div>
<span>{{ item.person }}</span>
+ </div>
+ </div>
+ <div v-if="schedulingList.length == 0" class="no-zb-data">暂无值班数据</div>
+ </div>
+
+ <div class="duty-information-box" v-show="showMJL">
+ <div>
+ <div>
+ <span>值班</span>
+ </div>
+ <div>
+ <span>徐星逸，任圣日，娄永攀，蔡善龙，陈小强，刘开勇，梅祥，吕镇，付建冬</span>
+ </div>
+ </div>
+ <div>
+ <div>
+ <span>副班、巡逻</span>
+ </div>
+ <div>
+ <span>章正椿，夏文翔，叶江明，黄俊龙，苏茯林，王顺祥</span>
</div>
</div>
<div v-if="schedulingList.length == 0" class="no-zb-data">暂无值班数据</div>
@@ -202,6 +222,7 @@
schedulingList: [],
schedulingDeptList: [1, 2, 3, 4, 5, 6, 1, 2, 3, 4, 5, 6],
policeStaionID: "",
+ showMJL: false,
originTitle: ['值班', '副班、巡逻'],
transTitle: [{ label: '人员', width: '28%', align: 'center' }, { label: '人员', width: '', align: 'left' },],
caseInfoType: 0
@@ -283,25 +304,62 @@
getSchedulingList () {
this.schedulingLoading = true
-
- const params = {
- sameday: 1,
- isPage: 1
- }
-
- getSchedulingList(params).then((res) => {
- this.schedulingList = res.data.data
- })
-
- setTimeout(() => {
+ if (this.userInfo.dept_id == "1596020515064381442") {
this.schedulingNoDataText = ' '
- this.schedulingLoading = false
- if (!this.schedulingList.length) {
- setTimeout(() => {
- this.schedulingNoDataText = '暂无值班数据'
- }, 200)
+ const data = [
+ {
+ person:
+ "徐星逸，任圣日，娄永攀，蔡善龙，陈小强，刘开勇，梅祥，吕镇，付建冬",
+ patrol: "章正椿，夏文翔，叶江明，黄俊龙，苏茯林，王顺祥",
+ }
+ ]
+
+ const matrixData = data.map((row) => {
+ let arr = []
+ for (let key in row) {
+ arr.push(row[key])
+ }
+ return arr
+ })
+ setTimeout(() => {
+ this.schedulingList = matrixData[0].map((col, i) => {
+ return [this.originTitle[i], ...matrixData.map((row) => {
+ return row[i]
+ })]
+ })
+ this.schedulingLoading = false
+ }, 1000)
+
+ this.$nextTick(() => {
+ this.tableHeight =
+ this.$refs.Container.offsetHeight -
+ this.$refs.caseBox.offsetHeight -
+ this.$refs.crowdBox.offsetHeight -
+ this.$refs.alertBoxTitle.offsetHeight
+ })
+
+ this.showMJL = true
+ } else {
+ const params = {
+ sameday: 1,
+ isPage: 1
}
- }, 500)
+
+ this.showMJL = false
+ getSchedulingList(params).then((res) => {
+ this.schedulingList = res.data.data
+ })
+
+ setTimeout(() => {
+ this.schedulingNoDataText = ' '
+ this.schedulingLoading = false
+ if (!this.schedulingList.length) {
+ setTimeout(() => {
+ this.schedulingNoDataText = '暂无值班数据'
+ }, 200)
+ }
+ }, 500)
+ }
},
echartsResize () {
--
Gitblit v1.9.3