From df83e26ddc09dbc9450d70b8a8e704aebef97720 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 16 八月 2022 11:16:28 +0800
Subject: [PATCH] 1.仓库管理看板接口接入
---
src/store/modules/user.js | 2
src/api/dzkb.js | 30 ++
src/views/jcsz/jsqd.vue | 9
src/views/kb/ckgl.vue | 551 ++++++++++++++++++---------------------------
src/views/kb/zhkb.vue | 92 +++++--
src/utils/myEcharts.js | 11
6 files changed, 326 insertions(+), 369 deletions(-)
diff --git a/src/api/dzkb.js b/src/api/dzkb.js
index a2011fb..378f9e3 100644
--- a/src/api/dzkb.js
+++ b/src/api/dzkb.js
@@ -65,3 +65,33 @@
method: 'get'
})
}
+
+// 澶у矝浠撳簱鐪嬫澘,宸︿笂浜у搧寰呭叆搴撳垪琛�
+export function WareHouseTopLeftData() {
+ return request({
+ url: 'KanBanManagerent/WareHouseTopLeftData',
+ method: 'get'
+ })
+}
+
+// 澶у矝浠撳簱鐪嬫澘,宸︿笅浜у搧寰呭叆搴撳垪琛�
+export function WareHouseTopBottomData() {
+ return request({
+ url: 'KanBanManagerent/WareHouseTopBottomData',
+ method: 'get'
+ })
+}
+// 澶у矝浠撳簱鐪嬫澘,鍙充笂鎴愬搧搴撱�佸崐鎴愬搧搴搕op5搴撳瓨鎺掕
+export function WareHouseRightTopData() {
+ return request({
+ url: 'KanBanManagerent/WareHouseRightTopData',
+ method: 'get'
+ })
+}
+// 澶у矝浠撳簱鐪嬫澘,鍙充笅鍘熸枡搴撳簱top5搴撳瓨鎺掕
+export function WareHouseRightBottomData() {
+ return request({
+ url: 'KanBanManagerent/WareHouseRightBottomData',
+ method: 'get'
+ })
+}
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 1e5d1cb..82cc709 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -84,7 +84,7 @@
// get user menu
getMenu({ commit, state }) {
return new Promise((resolve, reject) => {
- LoginMenu({ usertype: 'PC' }).then(res => {
+ LoginMenu({ usertype: 'PC', usercode: getCookie('admin') }).then(res => {
if (res.code === '200') {
commit('SET_NAME', res.Message)
commit('SET_MENU', res.data)
diff --git a/src/utils/myEcharts.js b/src/utils/myEcharts.js
index 45a849a..473374a 100644
--- a/src/utils/myEcharts.js
+++ b/src/utils/myEcharts.js
@@ -350,12 +350,15 @@
}
// 缁煎悎鐪嬫澘鍥�
-export function bar02(val) {
+export function bar02(dataArr,titlenameArr) {
// console.log(val)
// const data = [70, 60, 50, 40, 30]
// const titlename = ['澶栬鍒掍激', '琛ㄩ潰娌规薄', '灏哄', '棰滆壊', '澶у皬']
- const data = val.map(i => i.cont)
- const titlename = val.map(i => i.name)
+ // const data = val.map(i => i.cont)
+ // const titlename = val.map(i => i.name)
+ const data = dataArr
+
+ const titlename = titlenameArr
const valdata = [683, 500, 400, 300, 200]
const myColor = ['#FF0000', '#FF5511', '#FF8800', '#FFBB00', '#FFFF00']
@@ -480,7 +483,7 @@
return option
}
-// 浠撳簱绠＄悊鐪嬫澘鍥�
+// 浠撳簱绠＄悊鐪嬫澘鍥� 锛堝純鐢級
export function bar03(titleText) {
const path = 'path://M214,1079l8-6h16l8,6-8,6H222Z'
const zzx1 = ['800', '900', '700', '300', '500', '800', '700']
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 9138d89..4caa124 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -1023,7 +1023,7 @@
type: ''
}
const { data: res } = await RoleAssociationRight(data)// 鎺ュ彛鑾峰彇鏁版嵁
-
+ // console.log(res, 111)
this.dialogFormRight.rightPCArr = res[0][0].is_delete === '0' ? res[0] : []
this.dialogFormRight.rightAPPArr = res[1][0].is_delete === '0' ? res[1] : []
@@ -1038,12 +1038,13 @@
}
if (this.APPTrue) {
- this.dialogFormRight.rightAPPArr[0].children = this.dialogFormRight.rightAPPArr[0].children.filter(item => item.is_delete === '0')
+ this.dialogFormRight.rightAPPArr[0].children = this.dialogFormRight.rightAPPArr[0].children.filter(item => item.is_delete === '0' || it.is_delete === null)
this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
- item.children = item.children.filter(it => it.is_delete === '0')
+ item.children = item.children.filter(it => it.is_delete === '0' || it.is_delete === null)
+ // item.children = item.children.filter(it => it.is_delete !== '1')
})
}
-
+ // console.log(this.dialogFormRight.rightAPPArr[0], 234)
// 鍒ゆ柇鍝釜鏄珮浜�
let pcIsSelected1 = false
let pcIsSelected2 = false
diff --git a/src/views/kb/ckgl.vue b/src/views/kb/ckgl.vue
index e99ab7f..50337ca 100644
--- a/src/views/kb/ckgl.vue
+++ b/src/views/kb/ckgl.vue
@@ -15,224 +15,207 @@
<div class="kb_left">
<!-- 1-->
<div class="kb_left_top kb_pd10">
- <div class="kb_left_top_block">
+ <div class="kb_left_top_block" style="margin-top: 10px">
<div class="headTitle">浜у搧寰呭叆搴擄細</div>
<div class="content">
<el-table
- :data="tableData"
+ ref="tableDataTopRef"
+ :data="tableDataTop"
style="width: 100%;"
:header-cell-style="headerCellStyle"
:cell-style="cellStyle"
- height="240"
+ height="440"
>
<el-table-column
- prop="xh"
- label="搴忓彿"
- width="53"
+ prop="voucherdate"
+ label="鍗曟嵁鏃ユ湡"
+ width="86"
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.voucherdate.substring(5, 10) }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wo"
+ label="鍗曟嵁缂栧彿"
+ width="165"
/>
<el-table-column
- prop="jgzt"
- label="鍔犲伐鐘舵��"
- width="85"
- />
- <el-table-column
- prop="pfsj"
- label="娲惧彂鏃堕棿"
+ prop="wkshp_name"
+ label="鐢熶骇杞﹂棿"
width="86"
/>
<el-table-column
- prop="xsddh"
+ prop="saleOrderCode"
label="閿�鍞鍗曞彿"
- width="150"
+ width="178"
/>
<el-table-column
- prop="jgdh"
- label="鍔犲伐鍗曞彿"
- width="207"
+ prop="materiel_code"
+ label="浜у搧缂栧彿"
+ width="86"
/>
<el-table-column
- prop="cpmc"
+ prop="materiel_name"
label="浜у搧鍚嶇О"
width="105"
/>
<el-table-column
- prop="gg"
- label="瑙勬牸"
+ prop="specification"
+ label="瑙勬牸鍨嬪彿"
+ width="85"
+ />
+ <el-table-column
+ prop="stck_name"
+ label="棰勫叆浠撳簱"
+ width="100"
+ />
+ <el-table-column
+ prop="quantity"
+ label="鏁伴噺"
width="60"
/>
<el-table-column
- prop="dw"
+ prop="totalStockInQuantity"
+ label="宸插叆搴撴暟閲�"
+ width="105"
+ />
+ <el-table-column
+ prop="uomname"
label="鍗曚綅"
- width="60"
- />
- <el-table-column
- prop="rwsl"
- label="浠诲姟鏁伴噺"
width="90"
/>
<el-table-column
- prop="wgsl"
- label="瀹屽伐鏁伴噺"
- width="90"
- />
- <el-table-column
- prop="blsl"
- label="涓嶈壇鏁伴噺"
- width="90"
- />
- <el-table-column
- prop="wcl"
- label="瀹屾垚鐜�"
- width="70"
- />
- <el-table-column
- prop="yjks"
- label="棰勮寮�濮�"
+ prop="preStartDate"
+ label="棰勮寮�宸�"
width="86"
- />
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.preStartDate.substring(5, 10) }}</div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="yjjs"
- label="棰勮缁撴潫"
+ prop="preFinishDate"
+ label="棰勮瀹屽伐"
width="86"
- />
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.preFinishDate.substring(5, 10) }}</div>
+ </template>
+ </el-table-column>
</el-table>
</div>
</div>
- <div class="kb_left_top_block">
+ <div class="kb_left_top_block" style="margin-top: 25px">
<div class="headTitle">浜у搧寰呭彂璐э細</div>
<div class="content">
<el-table
- :data="tableData"
+ ref="tableDataBottomRef"
+ :data="tableDataBottom"
style="width: 100%;"
:header-cell-style="headerCellStyle"
:cell-style="cellStyle"
- height="240"
+ height="440"
>
<el-table-column
- prop="xh"
- label="搴忓彿"
- width="53"
+ prop="voucherdate"
+ label="鍗曟嵁鏃ユ湡"
+ width="86"
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.voucherdate.substring(5, 10) }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wo"
+ label="鍗曟嵁缂栧彿"
+ width="165"
/>
<el-table-column
- prop="jgzt"
- label="鍔犲伐鐘舵��"
- width="85"
+ prop="customename"
+ label="瀹㈡埛"
+ width="170"
/>
<el-table-column
- prop="pfsj"
- label="娲惧彂鏃堕棿"
+ prop="username"
+ label="涓氬姟鍛�"
+ width="68"
+ />
+ <el-table-column
+ prop="SourceVoucherCode"
+ label="鏉ユ簮鍗曞彿"
+ width="119"
+ />
+ <el-table-column
+ prop="materiel_code"
+ label="浜у搧缂栧彿"
width="86"
/>
<el-table-column
- prop="xsddh"
- label="閿�鍞鍗曞彿"
- width="150"
- />
- <el-table-column
- prop="jgdh"
- label="鍔犲伐鍗曞彿"
- width="207"
- />
- <el-table-column
- prop="cpmc"
+ prop="materiel_name"
label="浜у搧鍚嶇О"
- width="105"
- />
- <el-table-column
- prop="gg"
- label="瑙勬牸"
- width="60"
- />
- <el-table-column
- prop="dw"
- label="鍗曚綅"
- width="60"
- />
- <el-table-column
- prop="rwsl"
- label="浠诲姟鏁伴噺"
- width="90"
- />
- <el-table-column
- prop="wgsl"
- label="瀹屽伐鏁伴噺"
- width="90"
- />
- <el-table-column
- prop="blsl"
- label="涓嶈壇鏁伴噺"
- width="90"
- />
- <el-table-column
- prop="wcl"
- label="瀹屾垚鐜�"
- width="70"
- />
- <el-table-column
- prop="yjks"
- label="棰勮寮�濮�"
width="86"
/>
<el-table-column
- prop="yjjs"
- label="棰勮缁撴潫"
+ prop="specification"
+ label="瑙勬牸鍨嬪彿"
width="86"
/>
+ <el-table-column
+ prop="quantity"
+ label="鏁伴噺"
+ width="60"
+ />
+ <el-table-column
+ prop="saleOutQuantity"
+ label="宸插彂璐ф暟閲�"
+ width="100"
+ />
+ <el-table-column
+ prop="priuserdefnvc1"
+ label="妫�楠屾柟寮�"
+ width="86"
+ />
+ <el-table-column
+ prop="priuserdefnvc2"
+ label="妫�楠屼汉鍛�"
+ width="86"
+ />
+ <el-table-column
+ prop="deliveryDate"
+ label="棰勮浜よ揣鏃ユ湡"
+ width="120"
+ >
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div>{{ row.deliveryDate.substring(5,10) }}</div>-->
+ <!-- </template>-->
+ </el-table-column>
</el-table>
</div>
</div>
</div>
<!-- 2-->
- <div class="kb_left_bottom kb_pd10">
+ <div v-if="false" class="kb_left_bottom kb_pd10">
<div class="kb_left_bottom_content">
<div class="content01">
- <div id="bar03" style="width: 100%;height:100%" />
+ <!-- <div id="bar03" style="width: 100%;height:100%" />-->
</div>
<div class="content01">
- <div id="bar04" style="width: 100%;height:100%" />
+ <!-- <div id="bar04" style="width: 100%;height:100%" />-->
</div>
</div>
</div>
</div>
- <div v-if="false" class="kb_right kb_pd10">
+ <div class="kb_right kb_pd10">
<div class="kb_right_top kb_pd10">
<div class="kb_right_top_content">
- <div class="content_head">搴撳瓨鎺掕锛�</div>
+ <div class="content_head">浜у搧搴撳瓨閲忔帓琛孴op5锛�</div>
<div class="content_body">
- <el-table
- ref="tableDataRank"
- :data="tableDataRank"
- style="width: 100%;"
- :header-cell-style="headerCellStyle"
- :cell-style="cellStyle"
- height="923"
- >
- <el-table-column
- prop="xh"
- label="搴忓彿"
- width="75"
- />
- <el-table-column
- prop="cj"
- label="杞﹂棿"
- width="100"
- />
- <el-table-column
- prop="cx"
- label="浜х嚎"
- width="120"
- />
- <el-table-column
- prop="cp"
- width="138"
- label="浜у搧"
- />
- <el-table-column
- prop="sl"
- label="鏁伴噺"
- width="100"
- />
- </el-table>
+ <div id="bar03" style="width: 100%;height:100%" />
+ </div>
+ <div class="content_head" style="margin-top: 12px">鍘熸枡搴撳瓨閲忔帓琛孴op5锛�</div>
+ <div class="content_body">
+ <div id="bar04" style="width: 100%;height:100%" />
</div>
</div>
</div>
@@ -245,186 +228,22 @@
<script>
import './kbCommon.css'
-import { bar03, loadEcharts } from '@/utils/myEcharts'
+import { bar02, loadEcharts } from '@/utils/myEcharts'
+import {
+ LineSearchBottomLeftData,
+ WareHouseRightBottomData,
+ WareHouseRightTopData,
+ WareHouseTopBottomData,
+ WareHouseTopLeftData
+} from '@/api/dzkb'
export default {
name: 'Index2',
data() {
return {
headTime: '',
- tableData: [
- {
- xh: 1,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 2,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 3,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 4,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 5,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 6,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 7,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 8,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 9,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 10,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- }
- ],
- tableDataRank: [// 鎺掕
- { xh: 'NO.1', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.2', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.3', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.4', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.5', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.6', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.7', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.8', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 }
- ]
-
+ tableDataTop: [],
+ tableDataBottom: []
}
},
@@ -432,16 +251,78 @@
setInterval(this.getNowTime, 1000)
},
mounted() {
+ this.getWareHouseTopLeftData()
+ this.getWareHouseTopBottomData()
this.getEcharts()
},
methods: {
+ // 鑾峰彇宸︿笂table鏁版嵁
+ getWareHouseTopLeftData() {
+ WareHouseTopLeftData().then(res => {
+ this.tableDataTop = res.data
+ })
+
+ const divData = this.$refs.tableDataTopRef.bodyWrapper
+ // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ setInterval(() => {
+ // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+ divData.scrollTop += 1
+ // divData.scrollTop += divData.scrollHeight / this.tableData.length
+ // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+ if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+ // 閲嶇疆table璺濈椤堕儴璺濈
+ divData.scrollTop = 0
+ WareHouseTopLeftData().then(res => {
+ this.tableDataTop = res.data
+ })
+ }
+ }, this.tableDataTop.length <= 10 ? 1000 * 6 : 100)
+ },
+ // 鑾峰彇宸︿笅table鏁版嵁
+ getWareHouseTopBottomData() {
+ WareHouseTopBottomData().then(res => {
+ this.tableDataBottom = res.data
+ })
+
+ const divData = this.$refs.tableDataBottomRef.bodyWrapper
+ // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ setInterval(() => {
+ // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+ divData.scrollTop += 1
+ // divData.scrollTop += divData.scrollHeight / this.tableData.length
+ // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+ if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+ // 閲嶇疆table璺濈椤堕儴璺濈
+ divData.scrollTop = 0
+ WareHouseTopBottomData().then(res => {
+ this.tableDataBottom = res.data
+ })
+ }
+ }, this.tableDataBottom.length <= 10 ? 1000 * 6 : 100)
+ },
// 鑾峰彇echarts
getEcharts() {
- loadEcharts('bar03', bar03('浜у搧搴撳瓨閲忔帓琛孴op5'))
- loadEcharts('bar04', bar03('鍘熸枡搴撳瓨閲忔帓琛孴op5'))
- },
+ WareHouseRightTopData().then(res => {
+ loadEcharts('bar03', bar02(res.data.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
+ })
+ WareHouseRightBottomData().then(res => {
+ loadEcharts('bar04', bar02(res.data.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
+ })
+
+ setInterval(() => {
+ WareHouseRightTopData().then(res => {
+ loadEcharts('bar03', bar02(res.data.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
+ })
+ }, 1000 * 15)
+
+ setInterval(() => {
+ WareHouseRightBottomData().then(res => {
+ loadEcharts('bar04', bar02(res.data.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
+ })
+ }, 1000 * 15)
+ },
// 鑾峰彇褰撳墠鏃堕棿
getNowTime() {
const dt = new Date()
@@ -483,7 +364,7 @@
<style scoped lang="scss">
$kbBorderColor: #09d8f2;
-$kbBackgroundColor: rgba(30, 33, 46,0.6);
+$kbBackgroundColor: rgba(30, 33, 46, 0.6);
.kb_content {
display: flex;
@@ -499,18 +380,18 @@
padding-left: 5px;
.kb_left_top {
- height: 595px;
+ height: 920px;
display: flex;
flex-direction: column;
- justify-content: space-around;
+ justify-content: flex-start;
.kb_left_top_block {
width: 100%;
- height: 267px;
+ height: 460px;
display: flex;
flex-direction: column;
- .headTitle{
+ .headTitle {
//line-height: 54px;
//border-bottom: 1px solid rgba(255, 255, 255, 0.6);
//text-align: center;
@@ -523,7 +404,7 @@
}
- .content{
+ .content {
border: 1px solid $kbBorderColor;
}
}
@@ -536,13 +417,13 @@
.kb_left_bottom_content {
height: 360px;
display: flex;
- justify-content:space-between ;
+ justify-content: space-between;
- .content01{
+ .content01 {
width: 48%;
height: 100%;
border: 1px solid $kbBorderColor;
- background-color:$kbBackgroundColor ;
+ background-color: $kbBackgroundColor;
border-radius: 5px;
}
}
@@ -554,7 +435,7 @@
height: 100%;
.kb_right_top {
- height: 964px;
+ height: 972px;
width: 100%;
.kb_right_top_content {
@@ -571,7 +452,10 @@
}
.content_body {
+ height: 442px;
border: 1px solid $kbBorderColor;
+ background-color: $kbBackgroundColor;
+
}
}
}
@@ -587,6 +471,7 @@
/* width: 0;瀹藉害涓�0鏆楄棌 */
width: 0;
}
+
::v-deep .el-table::before {
height: 0;
}
diff --git a/src/views/kb/zhkb.vue b/src/views/kb/zhkb.vue
index 2e1b1f3..9f1f921 100644
--- a/src/views/kb/zhkb.vue
+++ b/src/views/kb/zhkb.vue
@@ -27,7 +27,10 @@
<div class="kb_block01 kb_pd10">
<div>
<div>浜х嚎鍚嶇О:{{ lineContent01.linename }}</div>
- <div class="kb_mt10">浜х嚎鎬婚噺:{{ lineContent01.children!==undefined?lineContent01.lineworkcont:'' }}</div>
+ <div class="kb_mt10">浜х嚎鎬婚噺:{{
+ lineContent01.children !== undefined ? lineContent01.lineworkcont : ''
+ }}
+ </div>
</div>
<div>
<!-- <div>{{ lineContent01.linename }}</div>-->
@@ -36,10 +39,16 @@
</div>
<div class="kb_block02 kb_pd10">
<div>
- <div>閿�鍞崟鍙�:{{ lineContent01.children!==undefined?lineContent01.children.saleordercode:'' }}</div>
- <div class="kb_mt5">鍔犲伐鍗曞彿:{{ lineContent01.children!==undefined?lineContent01.children.workcode:'' }}</div>
- <div class="kb_mt5">浜у搧鍚嶇О:{{ lineContent01.children!==undefined?lineContent01.children.partname:'' }}</div>
- <div class="kb_mt5">浠诲姟鏁伴噺:{{ lineContent01.children!==undefined?parseFloat(lineContent01.children.qty):'' }}</div>
+ <div>閿�鍞崟鍙�:{{ lineContent01.children !== undefined ? lineContent01.children.saleordercode : '' }}</div>
+ <div class="kb_mt5">
+ 鍔犲伐鍗曞彿:{{ lineContent01.children !== undefined ? lineContent01.children.workcode : '' }}
+ </div>
+ <div class="kb_mt5">
+ 浜у搧鍚嶇О:{{ lineContent01.children !== undefined ? lineContent01.children.partname : '' }}
+ </div>
+ <div class="kb_mt5">
+ 浠诲姟鏁伴噺:{{ lineContent01.children !== undefined ? parseFloat(lineContent01.children.qty) : '' }}
+ </div>
</div>
<div v-if="lineContent01.children!==undefined">
<!-- <div>{{ lineContent01.children.saleordercode }}</div>-->
@@ -110,7 +119,10 @@
<div class="kb_block01 kb_pd10">
<div>
<div>浜х嚎鍚嶇О:{{ lineContent02.linename }}</div>
- <div class="kb_mt10">浜х嚎鎬婚噺:{{ lineContent02.children!==undefined?lineContent02.lineworkcont:'' }}</div>
+ <div class="kb_mt10">浜х嚎鎬婚噺:{{
+ lineContent02.children !== undefined ? lineContent02.lineworkcont : ''
+ }}
+ </div>
</div>
<div>
<!-- <div>{{ lineContent02.linename }}</div>-->
@@ -119,10 +131,16 @@
</div>
<div class="kb_block02 kb_pd10">
<div>
- <div>閿�鍞崟鍙�:{{ lineContent02.children!==undefined?lineContent02.children.saleordercode:'' }}</div>
- <div class="kb_mt5">鍔犲伐鍗曞彿:{{ lineContent02.children!==undefined?lineContent02.children.workcode:'' }}</div>
- <div class="kb_mt5">浜у搧鍚嶇О:{{ lineContent02.children!==undefined?lineContent02.children.partname:'' }}</div>
- <div class="kb_mt5">浠诲姟鏁伴噺:{{ lineContent02.children!==undefined?parseFloat(lineContent02.children.qty):'' }}</div>
+ <div>閿�鍞崟鍙�:{{ lineContent02.children !== undefined ? lineContent02.children.saleordercode : '' }}</div>
+ <div class="kb_mt5">
+ 鍔犲伐鍗曞彿:{{ lineContent02.children !== undefined ? lineContent02.children.workcode : '' }}
+ </div>
+ <div class="kb_mt5">
+ 浜у搧鍚嶇О:{{ lineContent02.children !== undefined ? lineContent02.children.partname : '' }}
+ </div>
+ <div class="kb_mt5">
+ 浠诲姟鏁伴噺:{{ lineContent02.children !== undefined ? parseFloat(lineContent02.children.qty) : '' }}
+ </div>
</div>
<div v-if="lineContent02.children!==undefined">
<!-- <div>{{ lineContent02.children.saleordercode }}</div>-->
@@ -192,7 +210,10 @@
<div class="kb_block01 kb_pd10">
<div>
<div>浜х嚎鍚嶇О:{{ lineContent03.linename }}</div>
- <div class="kb_mt10">浜х嚎鎬婚噺:{{ lineContent03.children!==undefined?lineContent03.lineworkcont:'' }}</div>
+ <div class="kb_mt10">浜х嚎鎬婚噺:{{
+ lineContent03.children !== undefined ? lineContent03.lineworkcont : ''
+ }}
+ </div>
</div>
<div>
<!-- <div>{{ lineContent03.linename }}</div>-->
@@ -201,10 +222,16 @@
</div>
<div class="kb_block02 kb_pd10">
<div>
- <div>閿�鍞崟鍙�:{{ lineContent03.children!==undefined?lineContent03.children.saleordercode:'' }}</div>
- <div class="kb_mt5">鍔犲伐鍗曞彿:{{ lineContent03.children!==undefined?lineContent03.children.workcode:'' }}</div>
- <div class="kb_mt5">浜у搧鍚嶇О:{{ lineContent03.children!==undefined?lineContent03.children.partname:'' }}</div>
- <div class="kb_mt5">浠诲姟鏁伴噺:{{ lineContent03.children!==undefined?parseFloat(lineContent03.children.qty):'' }}</div>
+ <div>閿�鍞崟鍙�:{{ lineContent03.children !== undefined ? lineContent03.children.saleordercode : '' }}</div>
+ <div class="kb_mt5">
+ 鍔犲伐鍗曞彿:{{ lineContent03.children !== undefined ? lineContent03.children.workcode : '' }}
+ </div>
+ <div class="kb_mt5">
+ 浜у搧鍚嶇О:{{ lineContent03.children !== undefined ? lineContent03.children.partname : '' }}
+ </div>
+ <div class="kb_mt5">
+ 浠诲姟鏁伴噺:{{ lineContent03.children !== undefined ? parseFloat(lineContent03.children.qty) : '' }}
+ </div>
</div>
<div v-if="lineContent03.children!==undefined">
<!-- <div>{{ lineContent03.children.saleordercode }}</div>-->
@@ -274,7 +301,10 @@
<div class="kb_block01 kb_pd10">
<div>
<div>浜х嚎鍚嶇О:{{ lineContent04.linename }}</div>
- <div class="kb_mt10">浜х嚎鎬婚噺:{{ lineContent04.children!==undefined?lineContent04.lineworkcont:'' }}</div>
+ <div class="kb_mt10">浜х嚎鎬婚噺:{{
+ lineContent04.children !== undefined ? lineContent04.lineworkcont : ''
+ }}
+ </div>
</div>
<div>
<!-- <div>{{ lineContent04.linename }}</div>-->
@@ -283,10 +313,16 @@
</div>
<div class="kb_block02 kb_pd10">
<div>
- <div>閿�鍞崟鍙�:{{ lineContent04.children!==undefined?lineContent04.children.saleordercode:'' }}</div>
- <div class="kb_mt5">鍔犲伐鍗曞彿:{{ lineContent04.children!==undefined?lineContent04.children.workcode:'' }}</div>
- <div class="kb_mt5">浜у搧鍚嶇О:{{ lineContent04.children!==undefined?lineContent04.children.partname:'' }}</div>
- <div class="kb_mt5">浠诲姟鏁伴噺:{{ lineContent04.children!==undefined?parseFloat(lineContent04.children.qty):'' }}</div>
+ <div>閿�鍞崟鍙�:{{ lineContent04.children !== undefined ? lineContent04.children.saleordercode : '' }}</div>
+ <div class="kb_mt5">
+ 鍔犲伐鍗曞彿:{{ lineContent04.children !== undefined ? lineContent04.children.workcode : '' }}
+ </div>
+ <div class="kb_mt5">
+ 浜у搧鍚嶇О:{{ lineContent04.children !== undefined ? lineContent04.children.partname : '' }}
+ </div>
+ <div class="kb_mt5">
+ 浠诲姟鏁伴噺:{{ lineContent04.children !== undefined ? parseFloat(lineContent04.children.qty) : '' }}
+ </div>
</div>
<div v-if="lineContent04.children!==undefined">
<!-- <div>{{ lineContent04.children.saleordercode }}</div>-->
@@ -821,12 +857,12 @@
// 鑾峰彇echarts
getEcharts() {
LineSearchBottomRightData().then(res => {
- loadEcharts('bar02', bar02(res.data))
+ loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
})
setInterval(() => {
LineSearchBottomRightData().then(res => {
- loadEcharts('bar02', bar02(res.data))
+ loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
})
}, 1000 * 15)
},
@@ -873,7 +909,7 @@
<style scoped lang="scss">
//$kbBorderColor: #3A0088;
$kbBorderColor: #09d8f2;
-$kbBackgroundColor: rgba(30, 33, 46,0.6);
+$kbBackgroundColor: rgba(30, 33, 46, 0.6);
.kb_content {
display: flex;
position: relative;
@@ -940,7 +976,7 @@
display: flex;
align-items: center;
border-right: 1px solid $kbBorderColor;
- background-color:$kbBackgroundColor;
+ background-color: $kbBackgroundColor;
}
.kb_block03 {
@@ -1092,18 +1128,20 @@
.kb_right_bottom {
height: 481px;
margin-top: 8px;
- .kb_right_bottom_content_title{
+
+ .kb_right_bottom_content_title {
color: #00ffff;
- font-size: 18px;
+ font-size: 18px;
margin-bottom: 10px;
margin-top: -10px;
}
+
.kb_right_bottom_content {
border: 1px solid $kbBorderColor;
height: 440px;
width: 100%;
border-radius: 5px;
- background-color:$kbBackgroundColor;
+ background-color: $kbBackgroundColor;
//height: 100%;
}
}
--
Gitblit v1.9.3