From 1751adf783d2c7203b86c0f02f5f737277ca9192 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 09 五月 2024 14:34:50 +0800
Subject: [PATCH] 1.仓库看板递交
---
src/views/kanbanManager/ckgl.vue | 659 ++++++++++++++--------------------------------
src/views/qualityManager/processCheckItem.vue | 38 +-
src/main.js | 3
src/api/kanbanManager.js | 32 ++
package.json | 1
src/views/kanbanManager/cj.vue | 14
src/views/kanbanManager/zhkb.vue | 6
src/views/systemSetting/dataImport.vue | 2
src/utils/myEcharts.js | 41 +-
9 files changed, 294 insertions(+), 502 deletions(-)
diff --git a/package.json b/package.json
index e68cccf..aea3149 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
"test:ci": "npm run lint && npm run test:unit"
},
"dependencies": {
+ "@jiaminghi/data-view": "^2.10.0",
"@microsoft/signalr": "^7.0.9",
"array-to-tree": "^3.3.2",
"axios": "0.18.1",
diff --git a/src/api/kanbanManager.js b/src/api/kanbanManager.js
index 33786f3..6bc4411 100644
--- a/src/api/kanbanManager.js
+++ b/src/api/kanbanManager.js
@@ -53,3 +53,35 @@
params: data
})
}
+
+// 浠撳簱鐪嬫澘宸︿笂,閲囪喘寰呭叆搴�
+export function ProcureOutsourcLeftTop() {
+ return request({
+ url: 'KanBanManagerent/ProcureOutsourcLeftTop',
+ method: 'get'
+ })
+}
+
+// 浠撳簱鐪嬫澘宸︿笅,閿�鍞緟鍙戣揣
+export function ProductConsignmentLeftBottom() {
+ return request({
+ url: 'KanBanManagerent/ProductConsignmentLeftBottom',
+ method: 'get'
+ })
+}
+
+// 浠撳簱鐪嬫澘鍙充笂,杩戜竴鍛ㄩ噰璐緟鍏ュ簱鐗╂枡鎺掕TOP5
+export function ProcureOutsourcRightTop() {
+ return request({
+ url: 'KanBanManagerent/ProcureOutsourcRightTop',
+ method: 'get'
+ })
+}
+
+// 浠撳簱鐪嬫澘鍙充笅,杩戜竴鍛ㄩ攢鍞緟鍙戣揣浜у搧鎺掕TOP5
+export function ProductionStockedInRightBottom() {
+ return request({
+ url: 'KanBanManagerent/ProductionStockedInRightBottom',
+ method: 'get'
+ })
+}
diff --git a/src/main.js b/src/main.js
index d918a7d..0240c3c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -70,6 +70,9 @@
// 寮曠敤淇敼杩囩殑gantt
Vue.use(vGanttChart)
+import dataV from '@jiaminghi/data-view'
+Vue.use(dataV)
+
new Vue({
el: '#app',
router,
diff --git a/src/utils/myEcharts.js b/src/utils/myEcharts.js
index b659d64..0de0884 100644
--- a/src/utils/myEcharts.js
+++ b/src/utils/myEcharts.js
@@ -329,25 +329,25 @@
},
series: [
{
- name: '鏃堕棿',
- type: 'line',
- smooth: false,
- showAllSymbol: true,
- symbol: 'emptyCircle',
- symbolSize: 8,
- itemStyle: {
- normal: {
- color: `rgba(42, 197, 137, 1)`
- }
- },
- lineStyle: {
- normal: {
- width: 2,
- color: `rgba(42, 197, 137, 1)`
- }
- },
- data: dataY
- }
+ name: '鏃堕棿',
+ type: 'line',
+ smooth: false,
+ showAllSymbol: true,
+ symbol: 'emptyCircle',
+ symbolSize: 8,
+ itemStyle: {
+ normal: {
+ color: `rgba(42, 197, 137, 1)`
+ }
+ },
+ lineStyle: {
+ normal: {
+ width: 2,
+ color: `rgba(42, 197, 137, 1)`
+ }
+ },
+ data: dataY
+ }
]
}
@@ -360,6 +360,7 @@
// const titlename = ['澶栬鍒掍激', '琛ㄩ潰娌规薄', '灏哄', '棰滆壊', '澶у皬']
// const data = val.map(i => i.cont)
// const titlename = val.map(i => i.name)
+
const data = dataArr.filter((item, index) => index < 5)
const titlename = titlenameArr.filter((item, index) => index < 5)
@@ -425,7 +426,7 @@
color: function(value, index) {
return value === '0' ? 'transparent' : '#fff'
},
- fontSize: 20,
+ fontSize: 16,
// formatter: function(value, index) {
// return [
// '{lg|' + (index + 1) + '銆� }' + '{title|' + value + '} '
diff --git a/src/views/kanbanManager/cj.vue b/src/views/kanbanManager/cj.vue
index 84972af..eafa9fb 100644
--- a/src/views/kanbanManager/cj.vue
+++ b/src/views/kanbanManager/cj.vue
@@ -6,10 +6,10 @@
<div class="kb_header">
<div class="kb_headTime" style="top: 35px;left: 20px">
- <span>鍦ｆ玻</span>
+ <span>娴欐睙闃块瞾鍏嬪仴韬櫒鏉愭湁闄愬叕鍙�</span>
</div>
- <div class="kb_headTime kb_header_text" style="top: 35px;left: 765px">
+ <div class="kb_headTime kb_header_text" style="top: 35px;left: 800px">
<span>{{ title }}鏁板瓧鍖栫湅鏉�</span>
</div>
@@ -251,14 +251,14 @@
})
}, 1000 * 50)
- const res5 = await WorkShopProduceBottomRightData({ wkshopcode: this.wkshopcode.join(',') })
+ const res5 = await WorkShopProduceBottomRightData({ wkshopcode: 'CJ001' })
this.RightBottom = res5.data
if (this.RightBottom.length > 0) {
loadEcharts('cjzl04', cjzl04(this.RightBottom.map(i => i.name), this.RightBottom.map(i => i.cont)))
}
setInterval(() => {
- WorkShopProduceBottomRightData({ wkshopcode: this.wkshopcode.join(',') }).then(res5 => {
+ WorkShopProduceBottomRightData({ wkshopcode: 'CJ001' }).then(res5 => {
this.RightBottom = res5.data
if (this.RightBottom.length > 0) {
loadEcharts('cjzl04', cjzl04(this.RightBottom.map(i => i.name), this.RightBottom.map(i => i.cont)))
@@ -266,7 +266,7 @@
})
}, 1000 * 60)
- this.getWorkShopProduceTopData()
+ await this.getWorkShopProduceTopData()
},
// 鑾峰彇褰撳墠鏃堕棿
@@ -348,6 +348,10 @@
background-color: transparent;
}
+::v-deep .gutter {
+ display: none;
+}
+
.all_block01 {
width: 237px;
height: 180px;
diff --git a/src/views/kanbanManager/ckgl.vue b/src/views/kanbanManager/ckgl.vue
index 1b94f5f..59a2f13 100644
--- a/src/views/kanbanManager/ckgl.vue
+++ b/src/views/kanbanManager/ckgl.vue
@@ -2,323 +2,78 @@
<div>
<div class="kb_dashboard">
- <!-- 鏄熺┖鑳屾櫙-->
- <div ref="starsRef" class="stars">
- <div v-for="(item, index) in starsCount" :key="index" class="star" />
- </div>
-
+ <div class="kb_backgroundCustom" />
<div class="kb_header">
- <div class="flex_c_c kb_header_text">
- <div id="topBarLeft" style="width:600px;height:100%" />
- 浠撳簱绠＄悊鏁板瓧鍖栫湅鏉�
- <div id="topBarRight" style="width:600px;height:100%;transform:rotate(180deg);" />
+ <div class="kb_headTime" style="top: 35px;left: 20px">
+ <span>姘稿悍甯傚湥娌ｅ浠跺姞宸ュ巶</span>
</div>
- <div class="kb_headTime" style="left: 85px">
- <span>娴欐睙鏂板嚡杩暟瀛楃鎶�鑲′唤鏈夐檺鍏徃</span>
+ <div class="kb_headTime kb_header_text" style="top: 35px;left: 800px">
+ <span>浠撳簱绠＄悊鏁板瓧鍖栫湅鏉�</span>
</div>
-
- <div class="kb_headTime">
+ <div class="kb_headTime" style="top: 35px;right: 25px">
<span>{{ headTime }}</span>
</div>
</div>
- <div style="display: flex;justify-content: space-between;padding:0 20px 20px 20px;height: 980px">
- <div style="width: 1350px; " class="flex_c_b">
+
+ <div style="display: flex;justify-content: space-between;padding:0 20px 20px 20px;height: 950px">
+ <div style="width: 1350px;z-index: 2;margin-top: 50px;" class="flex_c_b">
<div style="height: 470px;">
<div class="smallTitle">
<svg-icon icon-class="cpdrk" class="svg_class" />
- 鐢熶骇寰呭叆搴�
+ 閲囪喘寰呭叆搴�
</div>
- <div class="lineContent horn" style="height: 435px">
- <el-table
- ref="tableDataTopRef"
- :data="tableDataTop"
- style="width: 100%;"
- class="tableData"
- :header-cell-style="headerCellStyleCenter"
- :cell-style="cellStyleCenter"
- height="430"
- >
- <el-table-column
- prop="voucherdate"
- label="鍗曟嵁鏃ユ湡"
- width="131"
- >
- <template slot-scope="{row}">
- <div v-if="row.voucherdate" class="ellipsis">{{ row.voucherdate.substring(0, 10) }}</div>
- <div v-else />
- </template>
- </el-table-column>
- <el-table-column
- prop="wo"
- label="鍗曟嵁缂栧彿"
- width="189"
- >
- <template slot-scope="{row}">
- <div class="ellipsis">{{ row.wo }}</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="wkshp_name"
- label="鐢熶骇杞﹂棿"
- width="105"
- >
- <template slot-scope="{row}">
- <div class="ellipsis">{{ row.wkshp_name }}</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="saleOrderCode"
- label="閿�鍞鍗曞彿"
- width="200"
- >
- <template slot-scope="{row}">
- <div v-if="row.saleOrderCode" class="ellipsis">{{ row.saleOrderCode }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="materiel_code"
- label="浜у搧缂栧彿"
- width="136"
- >
- <template slot-scope="{row}">
- <div class="ellipsis">{{ row.materiel_code }}</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="materiel_name"
- label="浜у搧鍚嶇О"
- width="180"
- >
- <template slot-scope="{row}">
- <div class="ellipsis">{{ row.materiel_name }}</div>
- </template>
- </el-table-column>
- <!-- <el-table-column-->
- <!-- prop="specification"-->
- <!-- label="瑙勬牸鍨嬪彿"-->
- <!-- width="128"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>-->
- <!-- <div v-else>/</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <el-table-column
- prop="stck_name"
- label="棰勫叆浠撳簱"
- width="100"
- >
- <template slot-scope="{row}">
- <div v-if="row.stck_name" class="ellipsis">{{ row.stck_name }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="quantity"
- label="鏁伴噺"
- width="63"
+
+ <div style="height:410px;">
+ <dv-border-box-12>
+ <dv-scroll-board
+ ref="scrollBoardTop"
+ :config="configTableTop"
+ style="width: 1326px;height: 390px;margin:0 auto;padding-top: 13px;"
/>
- <el-table-column
- prop="totalStockInQuantity"
- label="宸插叆搴撴暟閲�"
- width="100"
- >
- <template slot-scope="{row}">
- <div v-if="row.totalStockInQuantity">{{ row.totalStockInQuantity }}</div>
- <div v-else>0</div>
- </template>
- </el-table-column>
- <!-- <el-table-column-->
- <!-- prop="uomname"-->
- <!-- label="鍗曚綅"-->
- <!-- width="50"-->
- <!-- />-->
- <!-- <el-table-column-->
- <!-- prop="preStartDate"-->
- <!-- label="棰勮寮�宸�"-->
- <!-- width="100"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.preStartDate">{{ row.preStartDate.substring(0, 10) }}</div>-->
- <!-- <div v-else />-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <el-table-column
- prop="preFinishDate"
- label="棰勮鍏ュ簱"
- width="140"
- >
- <template slot-scope="{row}">
- <div v-if="row.preFinishDate">{{ row.preFinishDate.substring(0, 10) }}</div>
- <div v-else />
- </template>
- </el-table-column>
- </el-table>
+ </dv-border-box-12>
</div>
</div>
- <div style="height: 470px;">
+ <div style="height: 470px;margin-top: 30px;">
<div class="smallTitle">
<svg-icon icon-class="cpdfh" class="svg_class" />
- 浜у搧寰呭彂璐�
+ 閿�鍞緟鍙戣揣
</div>
- <div class="lineContent horn" style="height: 435px">
- <el-table
- ref="tableDataBottomRef"
- :data="tableDataBottom"
- style="width: 100%;"
- class="tableData"
- :header-cell-style="headerCellStyleCenter"
- :cell-style="cellStyleCenter"
- height="430"
- >
- <el-table-column
- prop="voucherdate"
- label="鍗曟嵁鏃ユ湡"
- width="131"
- >
- <template slot-scope="{row}">
- <div v-if="row.voucherdate" class="ellipsis">{{ row.voucherdate.substring(0, 10) }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="wo"
- label="鍗曟嵁缂栧彿"
- width="205"
- >
- <template slot-scope="{row}">
- <div class="ellipsis">{{ row.wo }}</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="customename"
- label="瀹㈡埛"
- width="388"
- >
- <template slot-scope="{row}">
- <div v-if="row.customename" class="ellipsis">{{ row.customename }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <!-- <el-table-column-->
- <!-- prop="username"-->
- <!-- label="涓氬姟鍛�"-->
- <!-- width="65"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.username" class="ellipsis">{{ row.username }}</div>-->
- <!-- <div v-else>/</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <!-- <el-table-column-->
- <!-- prop="SourceVoucherCode"-->
- <!-- label="鏉ユ簮鍗曞彿"-->
- <!-- width="185"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.SourceVoucherCode" class="ellipsis">{{ row.SourceVoucherCode }}</div>-->
- <!-- <div v-else>/</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <!-- <el-table-column-->
- <!-- prop="materiel_code"-->
- <!-- label="浜у搧缂栧彿"-->
- <!-- width="96"-->
- <!-- />-->
- <el-table-column
- prop="materiel_name"
- label="浜у搧鍚嶇О"
- width="200"
- >
- <template slot-scope="{row}">
- <div v-if="row.materiel_name" class="ellipsis">{{ row.materiel_name }}</div>
- </template>
- </el-table-column>
- <!-- <el-table-column-->
- <!-- prop="specification"-->
- <!-- label="瑙勬牸鍨嬪彿"-->
- <!-- width="100"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>-->
- <!-- <div v-else>/</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <el-table-column
- prop="quantity"
- label="鏁伴噺"
- width="100"
- >
- <template slot-scope="{row}">
- <div class="ellipsis">{{ row.quantity }}</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="saleOutQuantity"
- label="宸插彂璐ф暟閲�"
- width="120"
- >
- <template slot-scope="{row}">
- <div v-if="row.saleOutQuantity" class="ellipsis">{{ row.saleOutQuantity }}</div>
- <div v-else>0</div>
- </template>
- </el-table-column>
- <!-- <el-table-column-->
- <!-- prop="priuserdefnvc1"-->
- <!-- label="妫�楠屾柟寮�"-->
- <!-- width="110"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.priuserdefnvc1">{{ row.priuserdefnvc1 }}</div>-->
- <!-- <div v-else>/</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <!-- <el-table-column-->
- <!-- prop="priuserdefnvc2"-->
- <!-- label="妫�楠屼汉鍛�"-->
- <!-- width="110"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.priuserdefnvc2">{{ row.priuserdefnvc2 }}</div>-->
- <!-- <div v-else>/</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <el-table-column
- prop="deliveryDate"
- label="棰勮浜よ揣鏃ユ湡"
- width="200"
- >
- <template slot-scope="{row}">
- <div v-if="row.deliveryDate">{{ row.deliveryDate.substring(0,10) }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- </el-table>
+ <div style="height:410px;">
+ <dv-border-box-12>
+ <dv-scroll-board
+ ref="scrollBoardBottom"
+ :config="configTableBottom"
+ style="width: 1326px;height: 390px;margin:0 auto;padding-top: 13px;"
+ />
+ </dv-border-box-12>
</div>
</div>
</div>
- <div style="width: 500px;" class="flex_c_b">
+ <div style="width: 500px;z-index: 2;margin-top: 50px;" class="flex_c_b">
<div style="height: 470px;">
<div class="smallTitle">
<svg-icon icon-class="ph" class="svg_class" />
- 鍗婃垚鍝併�佷骇鍝佸簱瀛橀噺鎺掕Top5
+ 杩戜竴鍛ㄩ噰璐緟鍏ュ簱鐗╂枡鎺掕Top5
</div>
- <div class="lineContent horn" style="height: 435px">
- <div id="bar03" style="width: 100%;height:100%; " />
- <!--/* <div id="bar03" style="width: 100%;height:100%;margin-left: -25px;margin-top: -10px" />*/-->
+
+ <div style="height:410px;">
+ <dv-border-box-12>
+ <div id="bar03" style="width: 100%;height:100%; " />
+ </dv-border-box-12>
</div>
+
</div>
- <div style="height: 470px;">
+ <div style="height: 470px;margin-top: 30px;">
<div class="smallTitle">
<svg-icon icon-class="ph" class="svg_class" />
- 鍘熸潗鏂欏簱瀛橀噺鎺掕Top5
+ 杩戜竴鍛ㄩ攢鍞緟鍙戣揣浜у搧鎺掕Top5
</div>
- <div class="lineContent horn" style="height: 435px">
- <div id="bar04" style="width: 100%;height:100%;" />
- <!-- <div id="bar04" style="width: 100%;height:100%;margin-left: -25px;margin-top: -10px" />-->
+ <div style="height:410px;">
+ <dv-border-box-12>
+ <div id="bar04" style="width: 100%;height:100%;" />
+ </dv-border-box-12>
</div>
</div>
</div>
@@ -332,10 +87,10 @@
import './kbCommon.css'
import { bar02, kbTop, loadEcharts } from '@/utils/myEcharts'
import {
- WareHouseRightBottomData,
- WareHouseRightTopData,
- WareHouseTopBottomData,
- WareHouseTopLeftData
+ ProcureOutsourcLeftTop,
+ ProductConsignmentLeftBottom,
+ ProcureOutsourcRightTop,
+ ProductionStockedInRightBottom
} from '@/api/kanbanManager'
export default {
@@ -346,19 +101,94 @@
onLine: navigator.onLine, // 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
headTime: '',
- tableDataTop: [],
- tableDataBottom: [],
-
- MarqueeTipsContent: '', // 鍏憡
- speed: 100, // 鍏憡鎾斁鐨勯�熷害
tableTopTask: null,
tableBottomTask: null,
echartsRightTop: null,
echartsRightBottom: null,
- starsCount: 800, // 鏄熸槦鏁伴噺
- distance: 900 // 闂磋窛
+ configTableTop: {
+ headerBGC: 'rgba(38, 68 ,139, 0.2)', // 琛ㄥご鑳屾櫙鑹�
+ oddRowBGC: 'transparent', // 濂囨暟琛岃儗鏅壊
+ evenRowBGC: 'transparent', // 鍋舵暟琛岃儗鏅壊
+ headerHeight: 45,
+ waitTime: 3000,
+ rowNum: 8,
+
+ header: [
+ '<span style="color:#09d8f2;">鍗曟嵁鏃ユ湡</span>',
+ '<span style="color:#09d8f2;">鍗曟嵁缂栧彿</span>',
+ '<span style="color:#09d8f2;">閿�鍞鍗曞彿</span>',
+ '<span style="color:#09d8f2;">浜у搧鍚嶇О</span>',
+ '<span style="color:#09d8f2;">瑙勬牸鍨嬪彿</span>',
+ '<span style="color:#09d8f2;">鏁伴噺</span>',
+ '<span style="color:#09d8f2;">宸插叆搴撴暟閲�</span>',
+ '<span style="color:#09d8f2;">鏈叆搴撴暟閲�</span>'
+ ],
+ data: [
+ // ['<span style="color:#37a2da;">琛�1鍒�1</span>', '琛�1鍒�2', '琛�1鍒�3'],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9]
+
+ ],
+ index: true,
+ columnWidth: [50, 150, 150, 150, 150, 150, 150, 150, 150],
+ align: ['center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center']
+ // carousel: 'page'
+ },
+
+ configTableBottom: {
+ headerBGC: 'rgba(38, 68 ,139, 0.2)', // 琛ㄥご鑳屾櫙鑹�
+ oddRowBGC: 'transparent', // 濂囨暟琛岃儗鏅壊
+ evenRowBGC: 'transparent', // 鍋舵暟琛岃儗鏅壊
+ headerHeight: 45,
+ waitTime: 3000,
+ rowNum: 8,
+
+ header: [
+ '<span style="color:#09d8f2;">鍗曟嵁鏃ユ湡</span>',
+ '<span style="color:#09d8f2;">鍗曟嵁缂栧彿</span>',
+ '<span style="color:#09d8f2;">浜у搧鍚嶇О</span>',
+ '<span style="color:#09d8f2;">瑙勬牸鍨嬪彿</span>',
+ '<span style="color:#09d8f2;">鏁伴噺</span>',
+ '<span style="color:#09d8f2;">宸插彂璐ф暟閲�</span>',
+ '<span style="color:#09d8f2;">鏈彂璐ф暟閲�</span>',
+
+ '<span style="color:#09d8f2;">棰勮浜や粯鏃ユ湡</span>',
+ '<span style="color:#09d8f2;">寤舵湡澶╂暟</span>'
+ ],
+ data: [
+ // ['<span style="color:#37a2da;">琛�1鍒�1</span>', '琛�1鍒�2', '琛�1鍒�3'],
+
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 8, 9],
+ // [1, 2, 3, 4, 5, 6, 7, 8]
+
+ ],
+ index: true,
+ columnWidth: [50, 150, 150, 150, 150, 100, 150, 150, 150, 150],
+ align: ['center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center']
+ // carousel: 'page'
+ }
}
},
@@ -369,7 +199,7 @@
// 涓ゅ皬鏃剁湅鏉垮埛鏂颁竴娆�
setInterval(() => {
window.location.reload()
- }, 1000 * 60 * 60 * 10)
+ }, 1000 * 60 * 120)
},
mounted() {
// 鐩戝惉缃戠粶鏄惁鍦ㄧ嚎
@@ -377,12 +207,17 @@
window.addEventListener('offline', this.updateOnlineStatus)
this.updateOnlineStatus({ type: this.onLine ? 'online' : 'offline', isFirst: true })
- this.getTopBar()
+ this.getProcureOutsourcLeftTop()
+ setInterval(() => {
+ this.getProcureOutsourcLeftTop()
+ }, 10 * 1000)
- this.getWareHouseTopLeftData()
- this.getWareHouseTopBottomData()
+ this.getProductConsignmentLeftBottom()
+ setInterval(() => {
+ this.getProcureOutsourcLeftTop()
+ }, 15 * 1000)
+
this.getEcharts()
- this.setStarsRef()
},
beforeDestroy() {
window.removeEventListener('online', this.updateOnlineStatus)
@@ -411,101 +246,70 @@
}
}
},
- setStarsRef() {
- const starNodes = Array.from(this.$refs.starsRef.children)
- starNodes.forEach(item => {
- const speed = 0.2 + Math.random() * 1
- const thisDistance = this.distance + Math.random() * 300
- item.style.transformOrigin = `0 0 ${thisDistance}px`
- item.style.transform = `
- translate3d(0,0,-${thisDistance}px)
- rotateY(${Math.random() * 360}deg)
- rotateX(${Math.random() * -50}deg)
- scale(${speed},${speed})`
- })
- },
- // 鑾峰彇topEcharts
- getTopBar() {
- loadEcharts('topBarLeft', kbTop())
- loadEcharts('topBarRight', kbTop())
- },
// 鑾峰彇宸︿笂table鏁版嵁
- getWareHouseTopLeftData() {
- WareHouseTopLeftData().then(res => {
- this.tableDataTop = res.data
- // this.number1 = this.tableDataTop.length
- const divData = this.$refs.tableDataTopRef.bodyWrapper
- // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- this.tableTopTask = 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.number1 = this.tableDataTop.length
- if (this.tableDataTop.length > 10) {
- clearInterval(this.tableTopTask)
- this.getWareHouseTopLeftData()
- }
- })
- }
- }, this.tableDataTop.length <= 10 ? 1000 * 3 : 100)
+ getProcureOutsourcLeftTop() {
+ ProcureOutsourcLeftTop().then(res => {
+ const flag = this.compareArrays(this.configTableTop.data, res.data)
+ if (!flag) {
+ this.configTableTop.data = res.data.map(i =>
+ [i.voucherdate.substring(0, 10),
+ i.wo,
+ i.saleOrderCode ? i.saleOrderCode : '/',
+ i.materiel_name,
+ i.specification,
+ i.quantity,
+ i.countInQuantity ? i.countInQuantity : 0,
+ `<span style="color: red;">${i.quantity - i.countInQuantity}</span>`
+ ]
+ )
+ this.$refs['scrollBoardTop'].updateRows(this.configTableTop.data)
+ }
})
},
// 鑾峰彇宸︿笅table鏁版嵁
- getWareHouseTopBottomData() {
- WareHouseTopBottomData().then(res => {
- this.tableDataBottom = res.data
- this.number2 = this.tableDataBottom.length
- const divData = this.$refs.tableDataBottomRef.bodyWrapper
- // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- // const task = setInterval(() => {
- this.tableBottomTask = 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.number2 = this.tableDataBottom.length
- if (this.tableDataBottom.length > 10) {
- clearInterval(this.tableBottomTask)
- this.getWareHouseTopBottomData()
- }
- })
- }
- }, this.tableDataBottom.length <= 10 ? 1000 * 3 : 100)
+ getProductConsignmentLeftBottom() {
+ ProductConsignmentLeftBottom().then(res => {
+ const flag = this.compareArrays(this.configTableBottom.data, res.data)
+ if (!flag) {
+ this.configTableBottom.data = res.data.map(i =>
+ [
+ i.voucherdate.substring(0, 10),
+ i.wo,
+ i.materiel_name,
+ i.specification ? i.specification : '/',
+ i.quantity,
+ i.saleOutQuantity ? i.saleOutQuantity : '/',
+ `<span style="color:red;"> ${i.saleOutQuantity ? i.quantity - i.saleOutQuantity : i.quantity}</span>`, // 鏈彂璐ф暟閲�
+ i.deliveryDate ? i.deliveryDate.substring(0, 10) : '/',
+ i.warning < 0 ? `<span style="color:red;">${Math.abs(i.warning)}</span>` : `<span>${Math.abs(i.warning)}</span>`
+ ]
+ )
+ this.$refs['scrollBoardBottom'].updateRows(this.configTableBottom.data)
+ }
})
},
// 鑾峰彇echarts
getEcharts() {
- 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)))
+ ProcureOutsourcRightTop().then(res => {
+ loadEcharts('bar03', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name)))
})
- 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)))
+ ProductionStockedInRightBottom().then(res => {
+ loadEcharts('bar04', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name)))
})
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)))
+ ProcureOutsourcRightTop().then(res => {
+ loadEcharts('bar03', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name)))
})
- }, 1000 * 15)
+ }, 1000 * 25)
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)))
+ ProductionStockedInRightBottom().then(res => {
+ loadEcharts('bar04', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name)))
})
- }, 1000 * 15)
+ }, 1000 * 30)
},
// 鑾峰彇褰撳墠鏃堕棿
getNowTime() {
@@ -523,90 +327,37 @@
this.headTime = `${y}-${m}-${d} ${hh}:${mm}:${ss} ${week}`
},
- headerCellStyleCenter() {
- return {
- // backgroundColor: 'rgb(30 ,33, 46)',
- backgroundColor: '#000',
- padding: '10px 0',
- textAlign: 'center',
- color: '#07acc2',
- border: 'none',
- fontSize: '18px'
+
+ // 涓や釜鏁扮粍鍋氬姣�
+ compareArrays(arr1, arr2) {
+ const set1 = new Set(arr1)
+ const set2 = new Set(arr2)
+
+ if (set1.size !== set2.size) {
+ return false
}
- },
- cellStyleCenter() {
- return {
- padding: '7.5px 0',
- textAlign: 'center',
- backgroundColor: '#000',
- color: '#fff',
- border: 'none',
- fontSize: '18px'
+
+ for (const value of set1) {
+ if (!set2.has(value)) {
+ return false
+ }
}
+
+ return true
}
+
}
}
</script>
-<style scoped lang="scss">
+<style lang="scss" scoped>
-$main_color:#09d8f2;
-$color01: #00FFFF;
-.tableData{
- background: #000;
+::v-deep .header-item {
+ font-size: 16px !important;
}
-.el-table__empty-text{
- color: $main_color;
+::v-deep .row-item {
+ font-size: 16px !important;
}
-::v-deep .el-table__body-wrapper::-webkit-scrollbar {
- /* width: 0;瀹藉害涓�0鏆楄棌 */
- width: 0;
-}
-
-::v-deep .el-table::before {
- height: 0;
-}
-
-::v-deep .cell {
- padding: 0 !important;
- //font-size: 16px;
- font-size: 18px;
-}
-</style>
-
-<!--鏄熺┖-->
-<style lang="css" scoped>
-@keyframes rotate {
- 0% {
- transform: perspective(400px) rotateZ(20deg) rotateX(-40deg) rotateY(0);
- }
- 100% {
- transform: perspective(400px) rotateZ(20deg) rotateX(-40deg) rotateY(-360deg);
- }
-}
-
-.stars {
- transform: perspective(500px);
- transform-style: preserve-3d;
- position: absolute;
- perspective-origin: 50% 100%;
- left: 45%;
- animation: rotate 90s infinite linear;
- bottom: 0;
- z-index: 102;
-}
-
-.star {
- width: 2px;
- height: 2px;
- /*background: #f7f7b6;*/
- background: #8edffc;
- position: absolute;
- left: 0;
- top: 0;
- backface-visibility: hidden;
- z-index: 102;
-}
</style>
diff --git a/src/views/kanbanManager/zhkb.vue b/src/views/kanbanManager/zhkb.vue
index 4c34ef1..8306516 100644
--- a/src/views/kanbanManager/zhkb.vue
+++ b/src/views/kanbanManager/zhkb.vue
@@ -6,7 +6,7 @@
<div class="kb_header">
<div class="kb_headTime" style="top: 35px;left: 20px">
- <span>姘稿悍甯傚法绔嬮槻鎶ょ敤鍝佹湁闄愬叕鍙�</span>
+ <span>娴欐睙闃块瞾鍏嬪仴韬櫒鏉愭湁闄愬叕鍙�</span>
</div>
<div class="kb_headTime kb_header_text" style="top: 35px;left: 800px">
@@ -33,7 +33,7 @@
>
<div style="height: 180px;padding: 10px;display: flex;justify-content: space-around">
<div v-for="i in LeftTopData01" :key="i.wkshp_code" class="flex_c_s">
- <div class="all_block01 flex_c_s">
+ <div class="all_block01 flex_c_s" style="width: 317px;">
<div class="flex_c_c all_block02">{{ i.wkshp_name }}</div>
<div class="" style="display: flex;justify-content:space-between">
<div class="all_block02 flex_c_c" style="width: 49% ">浠诲姟鏁�</div>
@@ -175,7 +175,7 @@
const res = await PrentOrganizationNoCompany()
this.wkshopArr = res.data
- const temp = ['00401', '00402', '00501']
+ const temp = ['00301', '00302', '00303']
temp.forEach(i => {
const aa = this.wkshopArr.find(j => j.torg_code === i).torg_name
diff --git a/src/views/qualityManager/processCheckItem.vue b/src/views/qualityManager/processCheckItem.vue
index 916913c..800095d 100644
--- a/src/views/qualityManager/processCheckItem.vue
+++ b/src/views/qualityManager/processCheckItem.vue
@@ -193,25 +193,25 @@
fixed: false,
sortable: true
},
- {
- minWidth: 110,
- width: false,
- prop: 'org_code',
- label: '鎵�灞炶溅闂寸紪鐮�',
- id: 5,
- show: false,
- fixed: false,
- sortable: true
- }, {
- minWidth: 110,
- width: false,
- prop: 'org_name',
- label: '鎵�灞炶溅闂�',
- id: 6,
- show: true,
- fixed: false,
- sortable: true
- },
+ // {
+ // minWidth: 110,
+ // width: false,
+ // prop: 'org_code',
+ // label: '鎵�灞炶溅闂寸紪鐮�',
+ // id: 5,
+ // show: false,
+ // fixed: false,
+ // sortable: true
+ // }, {
+ // minWidth: 110,
+ // width: false,
+ // prop: 'org_name',
+ // label: '鎵�灞炶溅闂�',
+ // id: 6,
+ // show: true,
+ // fixed: false,
+ // sortable: true
+ // },
{
minWidth: 330,
width: false,
diff --git a/src/views/systemSetting/dataImport.vue b/src/views/systemSetting/dataImport.vue
index c4c8aa5..cff226e 100644
--- a/src/views/systemSetting/dataImport.vue
+++ b/src/views/systemSetting/dataImport.vue
@@ -1,5 +1,5 @@
<template>
- <div class="" :style="{height:mainHeight+'px'}">
+ <div class="">
<div style="display: flex;margin: 20px 10px;align-items: center">
--
Gitblit v1.9.3