From 49b1409c6886034321042f9e7e19d119f1fe3901 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 07 十月 2022 09:01:40 +0800
Subject: [PATCH] 1.看板新增监测网络是否在线事件
---
src/views/kb/bzcj.vue | 77 +++++++-
src/views/kb/zpcj.vue | 77 +++++++-
src/views/scgl/scdd.vue | 2
src/views/scgl/gd.vue | 1
src/views/scgl/gdplgb.vue | 2
src/styles/global.css | 7
src/views/kb/cgdd.vue | 65 ++++++-
src/views/kb/ckgl.vue | 68 +++++++-
src/views/xtsz/bmgz.vue | 14 +
src/views/kb/dccj.vue | 77 +++++++-
src/views/kb/zhkb.vue | 75 +++++++-
11 files changed, 382 insertions(+), 83 deletions(-)
diff --git a/src/styles/global.css b/src/styles/global.css
index 4f8e246..f407cab 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -105,6 +105,13 @@
white-space: nowrap;
}
+.osloading {
+ font-size: 26px !important;
+}
+
+.el-loading-text {
+ font-size: 26px !important;
+}
/*
瀹氫箟婊氬姩鏉￠珮瀹藉強鑳屾櫙
diff --git a/src/views/kb/bzcj.vue b/src/views/kb/bzcj.vue
index d1d1072..9e0a854 100644
--- a/src/views/kb/bzcj.vue
+++ b/src/views/kb/bzcj.vue
@@ -3,7 +3,7 @@
<div class="kb_dashboard">
<div class="kb_header">
<div class="flex_c_c kb_header_text">
- 鍖呰杞﹂棿鐪嬫澘
+ 杞﹂棿缁煎悎鐪嬫澘
</div>
<div class="kb_headerPic" />
<div class="kb_headTime">
@@ -22,7 +22,8 @@
<div class="kb_left_top_title01 kb_title_text">
<!-- <div class="PG01" />-->
<!-- <svg-icon icon-class="sccx" />-->
- 浜х嚎鍔犲伐涓换鍔� <div style="margin-left: 30px">{{ number1 }} 鍗�</div>
+ 浜х嚎鍔犲伐涓换鍔�
+ <div style="margin-left: 30px">{{ number1 }} 鍗�</div>
</div>
<div class="kb_left_top kb_pd10">
@@ -101,7 +102,9 @@
<!-- 2-->
<div class="kb_left_bottom kb_pd10">
<div class="kb_left_bottom_content">
- <div class="content_head kb_title_text">浜х嚎鍔犲伐浠诲姟 <div style="margin-left: 30px">{{ number2 }} 鍗�</div></div>
+ <div class="content_head kb_title_text">浜х嚎鍔犲伐浠诲姟
+ <div style="margin-left: 30px">{{ number2 }} 鍗�</div>
+ </div>
<div class="content_body">
<el-table
ref="tableData"
@@ -319,6 +322,9 @@
},
data() {
return {
+
+ onLine: navigator.onLine, // 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
+
headTime: '',
lineContent: [],
@@ -335,8 +341,14 @@
number2: '',
MarqueeTipsContent: '', // 鍏憡
- speed: 100// 鍏憡鎾斁鐨勯�熷害
+ speed: 100, // 鍏憡鎾斁鐨勯�熷害
+ MarqueeTipsTask: null,
+ ShopSearchTask: null,
+ ShopSearchLineTask: null,
+ TableDataRollTask: null,
+ TableDataRankRollTask: null,
+ EchartsTask: null
}
},
@@ -344,9 +356,46 @@
setInterval(this.getNowTime, 1000)
},
mounted() {
- this.getValue()
+ // 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
+ window.addEventListener('online', this.updateOnlineStatus)
+ window.addEventListener('offline', this.updateOnlineStatus)
+ this.updateOnlineStatus({ type: this.onLine ? 'online' : 'offline', isFirst: true })
+ },
+ beforeDestroy() {
+ window.removeEventListener('online', this.updateOnlineStatus)
+ window.removeEventListener('offline', this.updateOnlineStatus)
},
methods: {
+ // 鏇存柊缃戠粶鐘舵��
+ updateOnlineStatus(e) {
+ if (e.isFirst) {
+ this.getValue()// 鑾峰彇鍊�
+ } else {
+ const loading = this.$loading({
+ lock: true,
+ text: '鏂綉浜嗭紝姝ｅ湪鎷煎懡鑱旂綉涓紝璇锋鏌ョ綉缁滄槸鍚︽甯�...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ const { type } = e
+ this.onLine = type === 'online'
+ if (this.onLine) {
+ this.getValue()
+ loading.close()
+ this.$message.success('缃戠粶杩炴帴鎴愬姛锛�')
+ } else {
+ clearInterval(this.MarqueeTipsTask)
+ clearInterval(this.ShopSearchTask)
+ clearInterval(this.ShopSearchLineTask)
+ clearInterval(this.TableDataRollTask)
+ clearInterval(this.TableDataRankRollTask)
+ clearInterval(this.EchartsTask)
+ this.$message.error('缃戠粶鎺夌嚎锛岃鍏虫敞缃戠粶鐘舵�侊紒')
+ }
+ }
+ },
+ // 鑾峰彇鍊�
async getValue() {
// await this.getShopSearch()
await this.getShopSearchLine()
@@ -367,7 +416,7 @@
this.MarqueeTipsContent = contentAll
this.speed = this.MarqueeTipsContent.length / 10
- setInterval(() => {
+ this.MarqueeTipsTask = setInterval(() => {
WkspReportNotice({ shopcode: this.ShopArr.join(',') }).then(res1 => {
let contentAll = ''
res1.data.forEach(item => {
@@ -390,7 +439,7 @@
})
}
setInterval(() => {
- ShopSearch().then(res1 => {
+ this.ShopSearchTask = ShopSearch().then(res1 => {
if (res1.code === '200') {
this.ShopArr = []
res1.data.forEach(item => {
@@ -413,7 +462,7 @@
})
let start = 0
- const task = setInterval(() => {
+ this.ShopSearchLineTask = setInterval(() => {
if (Math.floor(start / 3) === count && count !== 0) {
start = 0
LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
@@ -425,7 +474,7 @@
this.number1 = this.lineContent.length
})
} else if (count === 0) {
- clearInterval(task)
+ clearInterval(this.ShopSearchLineTask)
this.getShopSearchLine()
}
this.lineContent3 = this.lineContent.slice(start, start + 3)
@@ -441,7 +490,7 @@
const divData = this.$refs.tableData.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- const task = setInterval(() => {
+ this.TableDataRollTask = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
divData.scrollTop += 1
// divData.scrollTop += divData.scrollHeight / this.tableData.length
@@ -453,7 +502,7 @@
this.tableData = res.data
this.number2 = this.tableData.length
if (this.tableData.length > 10) {
- clearInterval(task)
+ clearInterval(this.TableDataRollTask)
this.getTableDataRoll()
}
})
@@ -468,7 +517,7 @@
const divData = this.$refs.tableDataRank.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- const task = setInterval(() => {
+ this.TableDataRankRollTask = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
// divData.scrollTop += divData.scrollHeight / this.tableDataRank.length
divData.scrollTop += 1
@@ -480,7 +529,7 @@
this.tableDataRank = res.data
if (this.tableDataRank.length > 9) {
- clearInterval(task)
+ clearInterval(this.TableDataRankRollTask)
this.getTableDataRankRoll()
}
})
@@ -494,7 +543,7 @@
loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
})
- setInterval(() => {
+ this.EchartsTask = setInterval(() => {
LineSearchBottomRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
})
diff --git a/src/views/kb/cgdd.vue b/src/views/kb/cgdd.vue
index 1e59553..ddae73d 100644
--- a/src/views/kb/cgdd.vue
+++ b/src/views/kb/cgdd.vue
@@ -263,6 +263,8 @@
},
data() {
return {
+ onLine: navigator.onLine, // 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
+
headTime: '',
purchaseLeftTopData: [],
@@ -272,8 +274,11 @@
number1: '',
MarqueeTipsContent: '', // 鍏憡
- speed: 100// 鍏憡鎾斁鐨勯�熷害
+ speed: 100, // 鍏憡鎾斁鐨勯�熷害
+ PurchaseLeftTop: null,
+ PurchaseLeftBottom: null,
+ PurchaseRight: null
}
},
@@ -281,13 +286,49 @@
setInterval(this.getNowTime, 1000)
},
mounted() {
- this.getPurchaseLeftTop()
- this.getPurchaseLeftBottom()
- this.getPurchaseRight()
-
- this.getMarqueeTipsContent()
+ window.addEventListener('online', this.updateOnlineStatus)
+ window.addEventListener('offline', this.updateOnlineStatus)
+ this.updateOnlineStatus({ type: this.onLine ? 'online' : 'offline', isFirst: true })
+ },
+ beforeDestroy() {
+ window.removeEventListener('online', this.updateOnlineStatus)
+ window.removeEventListener('offline', this.updateOnlineStatus)
},
methods: {
+ // 鏇存柊缃戠粶鐘舵��
+ updateOnlineStatus(e) {
+ if (e.isFirst) {
+ this.getPurchaseLeftTop()
+ this.getPurchaseLeftBottom()
+ this.getPurchaseRight()
+
+ // this.getMarqueeTipsContent()
+ } else {
+ const loading = this.$loading({
+ lock: true,
+ text: '鏂綉浜嗭紝姝ｅ湪鎷煎懡鑱旂綉涓紝璇锋鏌ョ綉缁滄槸鍚︽甯�...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ const { type } = e
+ this.onLine = type === 'online'
+ if (this.onLine) {
+ this.getPurchaseLeftTop()
+ this.getPurchaseLeftBottom()
+ this.getPurchaseRight()
+ // this.getMarqueeTipsContent()
+ loading.close()
+ this.$message.success('缃戠粶杩炴帴鎴愬姛锛�')
+ } else {
+ clearInterval(this.PurchaseLeftTop)
+ clearInterval(this.PurchaseLeftBottom)
+ clearInterval(this.PurchaseRight)
+ this.$message.error('缃戠粶鎺夌嚎锛岃鍏虫敞缃戠粶鐘舵�侊紒')
+ }
+ }
+ },
+
// 鑾峰彇鍏憡
getMarqueeTipsContent() {
// this.MarqueeTipsContent = '鍚勪綅鍛樺伐浠細鏍规嵁涓婄骇鐨勯�氱煡锛岀粨鍚堟垜浼佸疄闄呮儏鍐碉紝鐜板皢20xx骞寸殑鍏冩棪鏀惧亣閫氱煡濡備笅锛氫竴銆�1鏈�1鏃ヨ嚦1鏈�3鏃ユ斁鍋囪皟浼戯紝鍏�3澶┿��1鏈�4鏃ユ寮忎笂鐝�備簩銆佽妭鍋囨棩鏈熼棿锛屽悇鐝粍瑕佷弗鏍艰惤瀹炰笂绾х殑閲嶈鎸囩ず绮剧锛屾寜鐓т笂绾х殑鍏蜂綋瑕佹眰锛岃鐪熸姄濂借惤瀹炶妭鏃ユ湡闂村�肩彮澶囧嫟宸ヤ綔锛岀‘淇濊妭鏃ユ湡闂翠紒涓氬悇椤瑰伐浣滄甯歌繍杞�倄x浼佷笟20xx骞�12鏈�28鏃�'
@@ -300,13 +341,12 @@
this.purchaseLeftTopData = res.data[0]
// console.log(this.purchaseLeftTopData)
})
- setInterval(() => {
+ this.PurchaseLeftTop = setInterval(() => {
PurchaseLeftTop().then(res => {
this.purchaseLeftTopData = res.data[0]
})
}, 1000 * 6)
},
-
getPurchaseLeftBottom() {
PurchaseLeftBottom().then(res => {
this.tableData = res.data
@@ -314,7 +354,7 @@
const divData = this.$refs.tableData.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- const task = setInterval(() => {
+ this.PurchaseLeftBottom = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
divData.scrollTop += 1
// 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
@@ -325,7 +365,7 @@
this.tableData = res.data
this.number1 = this.tableData.length
if (this.tableData.length > 14) {
- clearInterval(task)
+ clearInterval(this.PurchaseLeftBottom)
this.getPurchaseLeftBottom()
}
})
@@ -333,13 +373,12 @@
}, this.tableData.length <= 14 ? 1000 * 3 : 100)
})
},
-
getPurchaseRight() {
PurchaseRight().then(res => {
this.tableDataRank = res.data
const divData = this.$refs.tableDataRank.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- const task = setInterval(() => {
+ this.PurchaseRight = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
divData.scrollTop += 1
// 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
@@ -349,7 +388,7 @@
PurchaseRight().then(res => {
this.tableDataRank = res.data
if (this.tableDataRank.length > 21) {
- clearInterval(task)
+ clearInterval(this.PurchaseRight)
this.getPurchaseRight()
}
})
diff --git a/src/views/kb/ckgl.vue b/src/views/kb/ckgl.vue
index 91121aa..dc0064d 100644
--- a/src/views/kb/ckgl.vue
+++ b/src/views/kb/ckgl.vue
@@ -327,6 +327,8 @@
},
data() {
return {
+ onLine: navigator.onLine, // 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
+
headTime: '',
tableDataTop: [],
tableDataBottom: [],
@@ -335,7 +337,13 @@
number2: '',
MarqueeTipsContent: '', // 鍏憡
- speed: 100// 鍏憡鎾斁鐨勯�熷害
+ speed: 100, // 鍏憡鎾斁鐨勯�熷害
+
+ tableTopTask: null,
+ tableBottomTask: null,
+ echartsRightTop: null,
+ echartsRightBottom: null
+
}
},
@@ -343,13 +351,48 @@
setInterval(this.getNowTime, 1000)
},
mounted() {
- this.getWareHouseTopLeftData()
- this.getWareHouseTopBottomData()
- this.getEcharts()
-
- this.getMarqueeTipsContent()
+ window.addEventListener('online', this.updateOnlineStatus)
+ window.addEventListener('offline', this.updateOnlineStatus)
+ this.updateOnlineStatus({ type: this.onLine ? 'online' : 'offline', isFirst: true })
+ },
+ beforeDestroy() {
+ window.removeEventListener('online', this.updateOnlineStatus)
+ window.removeEventListener('offline', this.updateOnlineStatus)
},
methods: {
+ // 鏇存柊缃戠粶鐘舵��
+ updateOnlineStatus(e) {
+ if (e.isFirst) {
+ this.getWareHouseTopLeftData()
+ this.getWareHouseTopBottomData()
+ this.getEcharts()
+ // this.getMarqueeTipsContent()
+ } else {
+ const loading = this.$loading({
+ lock: true,
+ text: '鏂綉浜嗭紝姝ｅ湪鎷煎懡鑱旂綉涓紝璇锋鏌ョ綉缁滄槸鍚︽甯�...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ const { type } = e
+ this.onLine = type === 'online'
+ if (this.onLine) {
+ this.getWareHouseTopLeftData()
+ this.getWareHouseTopBottomData()
+ this.getEcharts()
+ loading.close()
+ this.$message.success('缃戠粶杩炴帴鎴愬姛锛�')
+ } else {
+ clearInterval(this.tableTopTask)
+ clearInterval(this.tableBottomTask)
+ clearInterval(this.echartsRightTop)
+ clearInterval(this.echartsRightBottom)
+ this.$message.error('缃戠粶鎺夌嚎锛岃鍏虫敞缃戠粶鐘舵�侊紒')
+ }
+ }
+ },
+
// 鑾峰彇鍏憡
getMarqueeTipsContent() {
// this.MarqueeTipsContent = '鍚勪綅鍛樺伐浠細鏍规嵁涓婄骇鐨勯�氱煡锛岀粨鍚堟垜浼佸疄闄呮儏鍐碉紝鐜板皢20xx骞寸殑鍏冩棪鏀惧亣閫氱煡濡備笅锛氫竴銆�1鏈�1鏃ヨ嚦1鏈�3鏃ユ斁鍋囪皟浼戯紝鍏�3澶┿��1鏈�4鏃ユ寮忎笂鐝�備簩銆佽妭鍋囨棩鏈熼棿锛屽悇鐝粍瑕佷弗鏍艰惤瀹炰笂绾х殑閲嶈鎸囩ず绮剧锛屾寜鐓т笂绾х殑鍏蜂綋瑕佹眰锛岃鐪熸姄濂借惤瀹炶妭鏃ユ湡闂村�肩彮澶囧嫟宸ヤ綔锛岀‘淇濊妭鏃ユ湡闂翠紒涓氬悇椤瑰伐浣滄甯歌繍杞�倄x浼佷笟20xx骞�12鏈�28鏃�'
@@ -364,7 +407,7 @@
this.number1 = this.tableDataTop.length
const divData = this.$refs.tableDataTopRef.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- const task = setInterval(() => {
+ this.tableTopTask = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
divData.scrollTop += 1
// divData.scrollTop += divData.scrollHeight / this.tableData.length
@@ -376,7 +419,7 @@
this.tableDataTop = res.data
this.number1 = this.tableDataTop.length
if (this.tableDataTop.length > 9) {
- clearInterval(task)
+ clearInterval(this.tableTopTask)
this.getWareHouseTopLeftData()
}
})
@@ -391,7 +434,8 @@
this.number2 = this.tableDataBottom.length
const divData = this.$refs.tableDataBottomRef.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- const task = setInterval(() => {
+ // const task = setInterval(() => {
+ this.tableBottomTask = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
divData.scrollTop += 1
// divData.scrollTop += divData.scrollHeight / this.tableData.length
@@ -403,7 +447,7 @@
this.tableDataBottom = res.data
this.number2 = this.tableDataBottom.length
if (this.tableDataBottom.length > 10) {
- clearInterval(task)
+ clearInterval(this.tableBottomTask)
this.getWareHouseTopBottomData()
}
})
@@ -422,13 +466,13 @@
loadEcharts('bar04', bar02(res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.CanuseBaseQuantity), res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.materiel_name)))
})
- setInterval(() => {
+ this.echartsRightTop = setInterval(() => {
WareHouseRightTopData().then(res => {
loadEcharts('bar03', bar02(res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.CanuseBaseQuantity), res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.materiel_name)))
})
}, 1000 * 15)
- setInterval(() => {
+ this.echartsRightBottom = setInterval(() => {
WareHouseRightBottomData().then(res => {
loadEcharts('bar04', bar02(res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.CanuseBaseQuantity), res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.materiel_name)))
})
diff --git a/src/views/kb/dccj.vue b/src/views/kb/dccj.vue
index 059445e..d61d182 100644
--- a/src/views/kb/dccj.vue
+++ b/src/views/kb/dccj.vue
@@ -3,7 +3,7 @@
<div class="kb_dashboard">
<div class="kb_header">
<div class="flex_c_c kb_header_text">
- 鐢垫睜杞﹂棿鐪嬫澘
+ 杞﹂棿缁煎悎鐪嬫澘
</div>
<div class="kb_headerPic" />
<div class="kb_headTime">
@@ -22,7 +22,8 @@
<div class="kb_left_top_title01 kb_title_text">
<!-- <div class="PG01" />-->
<!-- <svg-icon icon-class="sccx" />-->
- 浜х嚎鍔犲伐涓换鍔� <div style="margin-left: 30px">{{ number1 }} 鍗�</div>
+ 浜х嚎鍔犲伐涓换鍔�
+ <div style="margin-left: 30px">{{ number1 }} 鍗�</div>
</div>
<div class="kb_left_top kb_pd10">
@@ -101,7 +102,9 @@
<!-- 2-->
<div class="kb_left_bottom kb_pd10">
<div class="kb_left_bottom_content">
- <div class="content_head kb_title_text">浜х嚎鍔犲伐浠诲姟 <div style="margin-left: 30px">{{ number2 }} 鍗�</div></div>
+ <div class="content_head kb_title_text">浜х嚎鍔犲伐浠诲姟
+ <div style="margin-left: 30px">{{ number2 }} 鍗�</div>
+ </div>
<div class="content_body">
<el-table
ref="tableData"
@@ -319,6 +322,9 @@
},
data() {
return {
+
+ onLine: navigator.onLine, // 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
+
headTime: '',
lineContent: [],
@@ -335,8 +341,14 @@
number2: '',
MarqueeTipsContent: '', // 鍏憡
- speed: 100// 鍏憡鎾斁鐨勯�熷害
+ speed: 100, // 鍏憡鎾斁鐨勯�熷害
+ MarqueeTipsTask: null,
+ ShopSearchTask: null,
+ ShopSearchLineTask: null,
+ TableDataRollTask: null,
+ TableDataRankRollTask: null,
+ EchartsTask: null
}
},
@@ -344,9 +356,46 @@
setInterval(this.getNowTime, 1000)
},
mounted() {
- this.getValue()
+ // 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
+ window.addEventListener('online', this.updateOnlineStatus)
+ window.addEventListener('offline', this.updateOnlineStatus)
+ this.updateOnlineStatus({ type: this.onLine ? 'online' : 'offline', isFirst: true })
+ },
+ beforeDestroy() {
+ window.removeEventListener('online', this.updateOnlineStatus)
+ window.removeEventListener('offline', this.updateOnlineStatus)
},
methods: {
+ // 鏇存柊缃戠粶鐘舵��
+ updateOnlineStatus(e) {
+ if (e.isFirst) {
+ this.getValue()// 鑾峰彇鍊�
+ } else {
+ const loading = this.$loading({
+ lock: true,
+ text: '鏂綉浜嗭紝姝ｅ湪鎷煎懡鑱旂綉涓紝璇锋鏌ョ綉缁滄槸鍚︽甯�...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ const { type } = e
+ this.onLine = type === 'online'
+ if (this.onLine) {
+ this.getValue()
+ loading.close()
+ this.$message.success('缃戠粶杩炴帴鎴愬姛锛�')
+ } else {
+ clearInterval(this.MarqueeTipsTask)
+ clearInterval(this.ShopSearchTask)
+ clearInterval(this.ShopSearchLineTask)
+ clearInterval(this.TableDataRollTask)
+ clearInterval(this.TableDataRankRollTask)
+ clearInterval(this.EchartsTask)
+ this.$message.error('缃戠粶鎺夌嚎锛岃鍏虫敞缃戠粶鐘舵�侊紒')
+ }
+ }
+ },
+ // 鑾峰彇鍊�
async getValue() {
// await this.getShopSearch()
await this.getShopSearchLine()
@@ -367,7 +416,7 @@
this.MarqueeTipsContent = contentAll
this.speed = this.MarqueeTipsContent.length / 10
- setInterval(() => {
+ this.MarqueeTipsTask = setInterval(() => {
WkspReportNotice({ shopcode: this.ShopArr.join(',') }).then(res1 => {
let contentAll = ''
res1.data.forEach(item => {
@@ -390,7 +439,7 @@
})
}
setInterval(() => {
- ShopSearch().then(res1 => {
+ this.ShopSearchTask = ShopSearch().then(res1 => {
if (res1.code === '200') {
this.ShopArr = []
res1.data.forEach(item => {
@@ -413,7 +462,7 @@
})
let start = 0
- const task = setInterval(() => {
+ this.ShopSearchLineTask = setInterval(() => {
if (Math.floor(start / 3) === count && count !== 0) {
start = 0
LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
@@ -425,7 +474,7 @@
this.number1 = this.lineContent.length
})
} else if (count === 0) {
- clearInterval(task)
+ clearInterval(this.ShopSearchLineTask)
this.getShopSearchLine()
}
this.lineContent3 = this.lineContent.slice(start, start + 3)
@@ -441,7 +490,7 @@
const divData = this.$refs.tableData.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- const task = setInterval(() => {
+ this.TableDataRollTask = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
divData.scrollTop += 1
// divData.scrollTop += divData.scrollHeight / this.tableData.length
@@ -453,7 +502,7 @@
this.tableData = res.data
this.number2 = this.tableData.length
if (this.tableData.length > 10) {
- clearInterval(task)
+ clearInterval(this.TableDataRollTask)
this.getTableDataRoll()
}
})
@@ -468,7 +517,7 @@
const divData = this.$refs.tableDataRank.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- const task = setInterval(() => {
+ this.TableDataRankRollTask = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
// divData.scrollTop += divData.scrollHeight / this.tableDataRank.length
divData.scrollTop += 1
@@ -480,7 +529,7 @@
this.tableDataRank = res.data
if (this.tableDataRank.length > 9) {
- clearInterval(task)
+ clearInterval(this.TableDataRankRollTask)
this.getTableDataRankRoll()
}
})
@@ -494,7 +543,7 @@
loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
})
- setInterval(() => {
+ this.EchartsTask = setInterval(() => {
LineSearchBottomRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
})
diff --git a/src/views/kb/zhkb.vue b/src/views/kb/zhkb.vue
index e281a69..dd93c2e 100644
--- a/src/views/kb/zhkb.vue
+++ b/src/views/kb/zhkb.vue
@@ -22,7 +22,8 @@
<div class="kb_left_top_title01 kb_title_text">
<!-- <div class="PG01" />-->
<!-- <svg-icon icon-class="sccx" />-->
- 浜х嚎鍔犲伐涓换鍔� <div style="margin-left: 30px">{{ number1 }} 鍗�</div>
+ 浜х嚎鍔犲伐涓换鍔�
+ <div style="margin-left: 30px">{{ number1 }} 鍗�</div>
</div>
<div class="kb_left_top kb_pd10">
@@ -101,7 +102,9 @@
<!-- 2-->
<div class="kb_left_bottom kb_pd10">
<div class="kb_left_bottom_content">
- <div class="content_head kb_title_text">浜х嚎鍔犲伐浠诲姟 <div style="margin-left: 30px">{{ number2 }} 鍗�</div></div>
+ <div class="content_head kb_title_text">浜х嚎鍔犲伐浠诲姟
+ <div style="margin-left: 30px">{{ number2 }} 鍗�</div>
+ </div>
<div class="content_body">
<el-table
ref="tableData"
@@ -319,6 +322,9 @@
},
data() {
return {
+
+ onLine: navigator.onLine, // 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
+
headTime: '',
lineContent: [],
@@ -335,8 +341,14 @@
number2: '',
MarqueeTipsContent: '', // 鍏憡
- speed: 100// 鍏憡鎾斁鐨勯�熷害
+ speed: 100, // 鍏憡鎾斁鐨勯�熷害
+ MarqueeTipsTask: null,
+ ShopSearchTask: null,
+ ShopSearchLineTask: null,
+ TableDataRollTask: null,
+ TableDataRankRollTask: null,
+ EchartsTask: null
}
},
@@ -344,9 +356,46 @@
setInterval(this.getNowTime, 1000)
},
mounted() {
- this.getValue()
+ // 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
+ window.addEventListener('online', this.updateOnlineStatus)
+ window.addEventListener('offline', this.updateOnlineStatus)
+ this.updateOnlineStatus({ type: this.onLine ? 'online' : 'offline', isFirst: true })
+ },
+ beforeDestroy() {
+ window.removeEventListener('online', this.updateOnlineStatus)
+ window.removeEventListener('offline', this.updateOnlineStatus)
},
methods: {
+ // 鏇存柊缃戠粶鐘舵��
+ updateOnlineStatus(e) {
+ if (e.isFirst) {
+ this.getValue()// 鑾峰彇鍊�
+ } else {
+ const loading = this.$loading({
+ lock: true,
+ text: '鏂綉浜嗭紝姝ｅ湪鎷煎懡鑱旂綉涓紝璇锋鏌ョ綉缁滄槸鍚︽甯�...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ const { type } = e
+ this.onLine = type === 'online'
+ if (this.onLine) {
+ this.getValue()
+ loading.close()
+ this.$message.success('缃戠粶杩炴帴鎴愬姛锛�')
+ } else {
+ clearInterval(this.MarqueeTipsTask)
+ clearInterval(this.ShopSearchTask)
+ clearInterval(this.ShopSearchLineTask)
+ clearInterval(this.TableDataRollTask)
+ clearInterval(this.TableDataRankRollTask)
+ clearInterval(this.EchartsTask)
+ this.$message.error('缃戠粶鎺夌嚎锛岃鍏虫敞缃戠粶鐘舵�侊紒')
+ }
+ }
+ },
+ // 鑾峰彇鍊�
async getValue() {
await this.getShopSearch()
await this.getShopSearchLine()
@@ -367,7 +416,7 @@
this.MarqueeTipsContent = contentAll
this.speed = this.MarqueeTipsContent.length / 10
- setInterval(() => {
+ this.MarqueeTipsTask = setInterval(() => {
WkspReportNotice({ shopcode: this.ShopArr.join(',') }).then(res1 => {
let contentAll = ''
res1.data.forEach(item => {
@@ -390,7 +439,7 @@
})
}
setInterval(() => {
- ShopSearch().then(res1 => {
+ this.ShopSearchTask = ShopSearch().then(res1 => {
if (res1.code === '200') {
this.ShopArr = []
res1.data.forEach(item => {
@@ -413,7 +462,7 @@
})
let start = 0
- const task = setInterval(() => {
+ this.ShopSearchLineTask = setInterval(() => {
if (Math.floor(start / 3) === count && count !== 0) {
start = 0
LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
@@ -425,7 +474,7 @@
this.number1 = this.lineContent.length
})
} else if (count === 0) {
- clearInterval(task)
+ clearInterval(this.ShopSearchLineTask)
this.getShopSearchLine()
}
this.lineContent3 = this.lineContent.slice(start, start + 3)
@@ -441,7 +490,7 @@
const divData = this.$refs.tableData.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- const task = setInterval(() => {
+ this.TableDataRollTask = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
divData.scrollTop += 1
// divData.scrollTop += divData.scrollHeight / this.tableData.length
@@ -453,7 +502,7 @@
this.tableData = res.data
this.number2 = this.tableData.length
if (this.tableData.length > 10) {
- clearInterval(task)
+ clearInterval(this.TableDataRollTask)
this.getTableDataRoll()
}
})
@@ -468,7 +517,7 @@
const divData = this.$refs.tableDataRank.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- const task = setInterval(() => {
+ this.TableDataRankRollTask = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
// divData.scrollTop += divData.scrollHeight / this.tableDataRank.length
divData.scrollTop += 1
@@ -480,7 +529,7 @@
this.tableDataRank = res.data
if (this.tableDataRank.length > 9) {
- clearInterval(task)
+ clearInterval(this.TableDataRankRollTask)
this.getTableDataRankRoll()
}
})
@@ -494,7 +543,7 @@
loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
})
- setInterval(() => {
+ this.EchartsTask = setInterval(() => {
LineSearchBottomRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
})
diff --git a/src/views/kb/zpcj.vue b/src/views/kb/zpcj.vue
index 6d03c4e..4ba6d3f 100644
--- a/src/views/kb/zpcj.vue
+++ b/src/views/kb/zpcj.vue
@@ -3,7 +3,7 @@
<div class="kb_dashboard">
<div class="kb_header">
<div class="flex_c_c kb_header_text">
- 瑁呴厤杞﹂棿鐪嬫澘
+ 杞﹂棿缁煎悎鐪嬫澘
</div>
<div class="kb_headerPic" />
<div class="kb_headTime">
@@ -22,7 +22,8 @@
<div class="kb_left_top_title01 kb_title_text">
<!-- <div class="PG01" />-->
<!-- <svg-icon icon-class="sccx" />-->
- 浜х嚎鍔犲伐涓换鍔� <div style="margin-left: 30px">{{ number1 }} 鍗�</div>
+ 浜х嚎鍔犲伐涓换鍔�
+ <div style="margin-left: 30px">{{ number1 }} 鍗�</div>
</div>
<div class="kb_left_top kb_pd10">
@@ -101,7 +102,9 @@
<!-- 2-->
<div class="kb_left_bottom kb_pd10">
<div class="kb_left_bottom_content">
- <div class="content_head kb_title_text">浜х嚎鍔犲伐浠诲姟 <div style="margin-left: 30px">{{ number2 }} 鍗�</div></div>
+ <div class="content_head kb_title_text">浜х嚎鍔犲伐浠诲姟
+ <div style="margin-left: 30px">{{ number2 }} 鍗�</div>
+ </div>
<div class="content_body">
<el-table
ref="tableData"
@@ -319,6 +322,9 @@
},
data() {
return {
+
+ onLine: navigator.onLine, // 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
+
headTime: '',
lineContent: [],
@@ -335,8 +341,14 @@
number2: '',
MarqueeTipsContent: '', // 鍏憡
- speed: 100// 鍏憡鎾斁鐨勯�熷害
+ speed: 100, // 鍏憡鎾斁鐨勯�熷害
+ MarqueeTipsTask: null,
+ ShopSearchTask: null,
+ ShopSearchLineTask: null,
+ TableDataRollTask: null,
+ TableDataRankRollTask: null,
+ EchartsTask: null
}
},
@@ -344,9 +356,46 @@
setInterval(this.getNowTime, 1000)
},
mounted() {
- this.getValue()
+ // 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
+ window.addEventListener('online', this.updateOnlineStatus)
+ window.addEventListener('offline', this.updateOnlineStatus)
+ this.updateOnlineStatus({ type: this.onLine ? 'online' : 'offline', isFirst: true })
+ },
+ beforeDestroy() {
+ window.removeEventListener('online', this.updateOnlineStatus)
+ window.removeEventListener('offline', this.updateOnlineStatus)
},
methods: {
+ // 鏇存柊缃戠粶鐘舵��
+ updateOnlineStatus(e) {
+ if (e.isFirst) {
+ this.getValue()// 鑾峰彇鍊�
+ } else {
+ const loading = this.$loading({
+ lock: true,
+ text: '鏂綉浜嗭紝姝ｅ湪鎷煎懡鑱旂綉涓紝璇锋鏌ョ綉缁滄槸鍚︽甯�...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ const { type } = e
+ this.onLine = type === 'online'
+ if (this.onLine) {
+ this.getValue()
+ loading.close()
+ this.$message.success('缃戠粶杩炴帴鎴愬姛锛�')
+ } else {
+ clearInterval(this.MarqueeTipsTask)
+ clearInterval(this.ShopSearchTask)
+ clearInterval(this.ShopSearchLineTask)
+ clearInterval(this.TableDataRollTask)
+ clearInterval(this.TableDataRankRollTask)
+ clearInterval(this.EchartsTask)
+ this.$message.error('缃戠粶鎺夌嚎锛岃鍏虫敞缃戠粶鐘舵�侊紒')
+ }
+ }
+ },
+ // 鑾峰彇鍊�
async getValue() {
// await this.getShopSearch()
await this.getShopSearchLine()
@@ -367,7 +416,7 @@
this.MarqueeTipsContent = contentAll
this.speed = this.MarqueeTipsContent.length / 10
- setInterval(() => {
+ this.MarqueeTipsTask = setInterval(() => {
WkspReportNotice({ shopcode: this.ShopArr.join(',') }).then(res1 => {
let contentAll = ''
res1.data.forEach(item => {
@@ -390,7 +439,7 @@
})
}
setInterval(() => {
- ShopSearch().then(res1 => {
+ this.ShopSearchTask = ShopSearch().then(res1 => {
if (res1.code === '200') {
this.ShopArr = []
res1.data.forEach(item => {
@@ -413,7 +462,7 @@
})
let start = 0
- const task = setInterval(() => {
+ this.ShopSearchLineTask = setInterval(() => {
if (Math.floor(start / 3) === count && count !== 0) {
start = 0
LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
@@ -425,7 +474,7 @@
this.number1 = this.lineContent.length
})
} else if (count === 0) {
- clearInterval(task)
+ clearInterval(this.ShopSearchLineTask)
this.getShopSearchLine()
}
this.lineContent3 = this.lineContent.slice(start, start + 3)
@@ -441,7 +490,7 @@
const divData = this.$refs.tableData.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- const task = setInterval(() => {
+ this.TableDataRollTask = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
divData.scrollTop += 1
// divData.scrollTop += divData.scrollHeight / this.tableData.length
@@ -453,7 +502,7 @@
this.tableData = res.data
this.number2 = this.tableData.length
if (this.tableData.length > 10) {
- clearInterval(task)
+ clearInterval(this.TableDataRollTask)
this.getTableDataRoll()
}
})
@@ -468,7 +517,7 @@
const divData = this.$refs.tableDataRank.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- const task = setInterval(() => {
+ this.TableDataRankRollTask = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
// divData.scrollTop += divData.scrollHeight / this.tableDataRank.length
divData.scrollTop += 1
@@ -480,7 +529,7 @@
this.tableDataRank = res.data
if (this.tableDataRank.length > 9) {
- clearInterval(task)
+ clearInterval(this.TableDataRankRollTask)
this.getTableDataRankRoll()
}
})
@@ -494,7 +543,7 @@
loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
})
- setInterval(() => {
+ this.EchartsTask = setInterval(() => {
LineSearchBottomRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
})
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index a132a69..3cfd626 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -205,6 +205,7 @@
prop="partname"
min-width="150"
label="浜у搧鍚嶇О"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
diff --git a/src/views/scgl/gdplgb.vue b/src/views/scgl/gdplgb.vue
index 9cedb07..dcc9176 100644
--- a/src/views/scgl/gdplgb.vue
+++ b/src/views/scgl/gdplgb.vue
@@ -162,12 +162,14 @@
prop="partname"
min-width="150"
label="浜у搧鍚嶇О"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="partspec"
label="浜у搧瑙勬牸"
sortable="custom"
+ show-tooltip-when-overflow
width="110"
>
<template slot-scope="{row}">
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index c6c1ced..36bd953 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -189,11 +189,13 @@
label="浜у搧鍚嶇О"
sortable="custom"
min-width="150"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="partspec"
label="浜у搧瑙勬牸"
sortable="custom"
+ show-tooltip-when-overflow
min-width="110"
>
<template slot-scope="{row}">
diff --git a/src/views/xtsz/bmgz.vue b/src/views/xtsz/bmgz.vue
index aa61950..09c1303 100644
--- a/src/views/xtsz/bmgz.vue
+++ b/src/views/xtsz/bmgz.vue
@@ -5,12 +5,12 @@
<el-form
ref="form"
:model="form"
- label-width="80px"
+ label-width="100px"
inline
style="display: flex;justify-content: space-between"
>
- <div class="elForm">
- <el-form-item label="缂栫爜鍚嶇О" style=" display: flex;">
+ <div class="elForm" style="justify-content: flex-start">
+ <el-form-item label="缂栫爜鍚嶇О" label-width="70px" style=" display: flex;">
<el-input v-model="form.rightname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鍥哄畾瀛楃" style=" display: flex;">
@@ -33,6 +33,9 @@
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
</el-form>
+ <div
+ class="bodyTopFormExpand"
+ />
</div>
<div style="margin-left: 10px;display: flex">
@@ -75,6 +78,11 @@
sortable="custom"
/>
<el-table-column
+ prop="Type"
+ label="绫诲瀷"
+ sortable="custom"
+ />
+ <el-table-column
prop="prefix"
label="鍥哄畾瀛楃"
sortable="custom"
--
Gitblit v1.9.3