From a1a18a7774cbf8fb33eaaa337f5c5d63b6e9b149 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期二, 05 十一月 2024 14:57:29 +0800
Subject: [PATCH] 1.项目发布
---
src/views/kanbanManager/ckgl.vue | 234 ++++++++++++++++-----------------
vue.config.js | 4
src/views/kanbanManager/cj.vue | 139 +++++++++----------
src/views/kanbanManager/zhkb.vue | 33 ++--
4 files changed, 197 insertions(+), 213 deletions(-)
diff --git a/src/views/kanbanManager/cj.vue b/src/views/kanbanManager/cj.vue
index 3776128..fff203c 100644
--- a/src/views/kanbanManager/cj.vue
+++ b/src/views/kanbanManager/cj.vue
@@ -6,12 +6,11 @@
<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">
- <!-- <span>{{ title }}鏁板瓧鍖栫湅鏉�</span>-->
- <span>鍙戞场鎸ゅ嚭鏁板瓧鍖栫湅鏉�</span>
+ <span>{{ title }}鏁板瓧鍖栫湅鏉�</span>
</div>
<div class="kb_headTime" style="top: 35px;right: 25px">
@@ -30,7 +29,7 @@
</div>
<div
class="lineContent horn"
- style="height: 870px;display: flex;flex-direction: column;justify-content: space-between"
+ style="height: 450px;display: flex;flex-direction: column;justify-content: space-between"
>
<el-table
ref="tableDataLeftCenterRef"
@@ -39,34 +38,28 @@
style="width: 100%;"
:header-cell-style="headerCellStyle"
:cell-style="cellStyle"
- height="920"
+ height="500"
>
<el-table-column
prop="wo_code"
label="宸ュ崟鍙�"
- width="270"
+ width="220"
/>
- <!-- <el-table-column-->
- <!-- prop="saleOrderCode"-->
- <!-- label="鐢熶骇鍗曞彿"-->
- <!-- width="160"-->
- <!-- />-->
<el-table-column
- prop="wkshp_name"
- label="鐢熶骇杞﹂棿"
- width="210"
+ prop="saleOrderCode"
+ label="鐢熶骇鍗曞彿"
+ width="160"
/>
- <!-- 600-->
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
- width="210"
+ width="160"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
- width="210"
+ width="160"
/>
<!-- <el-table-column-->
<!-- prop="partspec"-->
@@ -80,47 +73,47 @@
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
- width="170"
+ width="120"
/>
<el-table-column
prop="good_qty"
label="鍚堟牸鏁伴噺"
- width="170"
+ width="120"
/>
- <!-- <el-table-column-->
- <!-- prop="ng_qty"-->
- <!-- label="涓嶈壇鏁伴噺"-->
- <!-- width="120"-->
- <!-- />-->
- <!-- <el-table-column-->
- <!-- prop="laborbad_qty"-->
- <!-- label="宸ュ簾鏁伴噺"-->
- <!-- width="120"-->
- <!-- />-->
- <!-- <el-table-column-->
- <!-- prop="materielbad_qty"-->
- <!-- label="鏂欏簾鏁伴噺"-->
- <!-- width="120"-->
- <!-- />-->
- <!-- <el-table-column-->
- <!-- prop="seq"-->
- <!-- label="宸ュ簭椤哄簭"-->
- <!-- width="120"-->
- <!-- />-->
- <!-- <el-table-column-->
- <!-- prop="step_code"-->
- <!-- label="宸ュ簭缂栫爜"-->
- <!-- width="120"-->
- <!-- />-->
+ <el-table-column
+ prop="ng_qty"
+ label="涓嶈壇鏁伴噺"
+ width="120"
+ />
+ <el-table-column
+ prop="laborbad_qty"
+ label="宸ュ簾鏁伴噺"
+ width="120"
+ />
+ <el-table-column
+ prop="materielbad_qty"
+ label="鏂欏簾鏁伴噺"
+ width="120"
+ />
+ <el-table-column
+ prop="seq"
+ label="宸ュ簭椤哄簭"
+ width="120"
+ />
+ <el-table-column
+ prop="step_code"
+ label="宸ュ簭缂栫爜"
+ width="120"
+ />
<el-table-column
prop="step_name"
label="宸ュ簭鍚嶇О"
- width="320"
+ width="120"
/>
<el-table-column
prop="schedule"
label="瀹屾垚杩涘害(%)"
- width="313"
+ width="213"
/>
</el-table>
</div>
@@ -128,27 +121,27 @@
</div>
<!-- 涓嬭竟-->
- <!-- <div style="display: flex;justify-content: space-between;margin-top: 15px;">-->
- <!-- <div style="width: 1000px;">-->
- <!-- <div class="smallTitle">-->
- <!-- <svg-icon icon-class="blcs" class="svg_class" />-->
- <!-- 璐ㄩ噺涓嶈壇(杩戜竴鍛�)-->
- <!-- </div>-->
- <!-- <div class="lineContent horn" style="height: 380px;display: flex;justify-content: space-between">-->
- <!-- <div id="cjzl03" class="flex_c_c" style="width: 100%;height:100%" />-->
+ <div style="display: flex;justify-content: space-between;margin-top: 15px;">
+ <div style="width: 1000px;">
+ <div class="smallTitle">
+ <svg-icon icon-class="blcs" class="svg_class" />
+ 璐ㄩ噺涓嶈壇(杩戜竴鍛�)
+ </div>
+ <div class="lineContent horn" style="height: 380px;display: flex;justify-content: space-between">
+ <div id="cjzl03" class="flex_c_c" style="width: 100%;height:100%" />
- <!-- </div>-->
- <!-- </div>-->
- <!-- <div style="width: 850px;">-->
- <!-- <div class="smallTitle">-->
- <!-- <svg-icon icon-class="ckkc" class="svg_class" />-->
- <!-- 涓嶈壇缁熻(杩戜竴鏈�)-->
- <!-- </div>-->
- <!-- <div class="lineContent horn" style="height: 380px;display: flex;justify-content: space-between">-->
- <!-- <div id="cjzl04" class="flex_c_c" style="width: 100%;height:100%" />-->
- <!-- </div>-->
- <!-- </div>-->
- <!-- </div>-->
+ </div>
+ </div>
+ <div style="width: 850px;">
+ <div class="smallTitle">
+ <svg-icon icon-class="ckkc" class="svg_class" />
+ 涓嶈壇缁熻(杩戜竴鏈�)
+ </div>
+ <div class="lineContent horn" style="height: 380px;display: flex;justify-content: space-between">
+ <div id="cjzl04" class="flex_c_c" style="width: 100%;height:100%" />
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -189,10 +182,6 @@
}
},
- activated() {
- window.addEventListener('resize', this.getHeight)
- this.getHeight()
- },
created() {
setInterval(this.getNowTime, 1000)
@@ -202,13 +191,11 @@
}, 1000 * 60 * 120)
},
mounted() {
- // this.getAllApi()
- this.getWorkShopProduceTopData()
+ this.getAllApi()
},
methods: {
async getWorkShopProduceTopData() {
- // WorkShopProduceTopData({ wkshopcode: this.wkshopcode.join(',') }).then(res => {
- WorkShopProduceTopData({ wkshopcode: '101,102' }).then(res => {
+ WorkShopProduceTopData({ wkshopcode: this.wkshopcode.join(',') }).then(res => {
this.tableDataCenterTop = res.data
const divData = this.$refs.tableDataLeftCenterRef.bodyWrapper
@@ -220,13 +207,13 @@
WorkShopProduceTopData({ wkshopcode: this.wkshopcode.join(',') }).then(res => {
this.tableDataCenterTop = res.data
- if (this.tableDataCenterTop.length > 22) {
+ if (this.tableDataCenterTop.length > 11) {
clearInterval(timer)
this.getWorkShopProduceTopData()
}
})
}
- }, this.tableDataCenterTop.length <= 22 ? 1000 * 30 : 200)
+ }, this.tableDataCenterTop.length <= 11 ? 1000 * 30 : 200)
})
},
diff --git a/src/views/kanbanManager/ckgl.vue b/src/views/kanbanManager/ckgl.vue
index 830582a..735dc7c 100644
--- a/src/views/kanbanManager/ckgl.vue
+++ b/src/views/kanbanManager/ckgl.vue
@@ -5,7 +5,7 @@
<div class="kb_backgroundCustom" />
<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">
@@ -19,12 +19,12 @@
<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>
+ <div style="height: 945px;">
<div class="smallTitle">
<svg-icon icon-class="cpdrk" class="svg_class" />
- 鐢熶骇鍏ュ簱
+ 鐢熶骇寰呭叆搴�
</div>
- <div class="lineContent horn" style="height: 886px">
+ <div class="lineContent horn" style="height: 885px">
<el-table
ref="tableDataTopRef"
:data="tableDataTop"
@@ -32,7 +32,7 @@
class="tableData"
:header-cell-style="headerCellStyleCenter"
:cell-style="cellStyleCenter"
- height="870"
+ height="880"
>
<el-table-column
prop="voucherdate"
@@ -56,7 +56,7 @@
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
- width="105"
+ width="135"
>
<template slot-scope="{row}">
<div class="ellipsis">{{ row.wkshp_name }}</div>
@@ -84,26 +84,26 @@
<el-table-column
prop="materiel_name"
label="浜у搧鍚嶇О"
- width="270"
+ width="400"
>
<template slot-scope="{row}">
<div class="ellipsis">{{ row.materiel_name }}</div>
</template>
</el-table-column>
- <el-table-column
- prop="specification"
- label="瑙勬牸鍨嬪彿"
- width="186"
- >
- <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="specification"-->
+ <!-- label="瑙勬牸鍨嬪彿"-->
+ <!-- width="136"-->
+ <!-- >-->
+ <!-- <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"
+ width="156"
>
<template slot-scope="{row}">
<div v-if="row.stck_name" class="ellipsis">{{ row.stck_name }}</div>
@@ -113,7 +113,7 @@
<el-table-column
prop="quantity"
label="鏁伴噺"
- width="113"
+ width="83"
/>
<el-table-column
prop="totalStockInQuantity"
@@ -154,104 +154,104 @@
</el-table>
</div>
</div>
- <!-- <div style="height: 470px;margin-top: 30px;">-->
- <!-- <div class="smallTitle">-->
- <!-- <svg-icon icon-class="drk" class="svg_class" />-->
- <!-- 濮斿寰呭叆搴�-->
- <!-- </div>-->
- <!-- <div class="lineContent horn" style="height: 410px">-->
- <!-- <el-table-->
- <!-- ref="tableDataBottomRef"-->
- <!-- :data="tableDataBottom"-->
- <!-- style="width: 100%;"-->
- <!-- class="tableData"-->
- <!-- :header-cell-style="headerCellStyleCenter"-->
- <!-- :cell-style="cellStyleCenter"-->
- <!-- height="405"-->
- <!-- >-->
- <!-- <el-table-column-->
- <!-- prop="voucherdate"-->
- <!-- label="鍗曟嵁鏃ユ湡"-->
- <!-- width="151"-->
- <!-- >-->
- <!-- <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="225"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div class="ellipsis">{{ row.wo }}</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
+ <div v-if="false" style="height: 470px;margin-top: 30px;">
+ <div class="smallTitle">
+ <svg-icon icon-class="drk" class="svg_class" />
+ 濮斿寰呭叆搴�
+ </div>
+ <div class="lineContent horn" style="height: 410px">
+ <el-table
+ ref="tableDataBottomRef"
+ :data="tableDataBottom"
+ style="width: 100%;"
+ class="tableData"
+ :header-cell-style="headerCellStyleCenter"
+ :cell-style="cellStyleCenter"
+ height="405"
+ >
+ <el-table-column
+ prop="voucherdate"
+ label="鍗曟嵁鏃ユ湡"
+ width="151"
+ >
+ <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="225"
+ >
+ <template slot-scope="{row}">
+ <div class="ellipsis">{{ row.wo }}</div>
+ </template>
+ </el-table-column>
- <!-- <el-table-column-->
- <!-- prop="materiel_name"-->
- <!-- label="浜у搧鍚嶇О"-->
- <!-- width="278"-->
- <!-- >-->
- <!-- <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="220"-->
- <!-- >-->
- <!-- <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="120"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div class="ellipsis">{{ row.quantity }}</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <!-- <el-table-column-->
- <!-- prop="saleOutQuantity"-->
- <!-- label="宸插彂璐ф暟閲�"-->
- <!-- width="140"-->
- <!-- >-->
- <!-- <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="materiel_name"
+ label="浜у搧鍚嶇О"
+ width="278"
+ >
+ <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="220"
+ >
+ <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="120"
+ >
+ <template slot-scope="{row}">
+ <div class="ellipsis">{{ row.quantity }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="saleOutQuantity"
+ label="宸插彂璐ф暟閲�"
+ width="140"
+ >
+ <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="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-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-column–>-->
- <!-- <!– prop="warning"–>-->
- <!-- <!– label="寤舵湡澶╂暟"–>-->
- <!-- <!– width="130"–>-->
- <!-- <!– >–>-->
- <!-- <!– <template slot-scope="{row}">–>-->
- <!-- <!– <div v-if="row.warning">{{ row.warning }}</div>–>-->
- <!-- <!– <div v-else>/</div>–>-->
- <!-- <!– </template>–>-->
- <!-- <!– </el-table-column>–>-->
- <!-- </el-table>-->
- <!-- </div>-->
- <!-- </div>-->
+ <!-- <el-table-column-->
+ <!-- prop="warning"-->
+ <!-- label="寤舵湡澶╂暟"-->
+ <!-- width="130"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.warning">{{ row.warning }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ </el-table>
+ </div>
+ </div>
</div>
<div style="width: 500px;z-index: 2;margin-top: 50px;" class="flex_c_b">
@@ -301,7 +301,7 @@
headTime: '',
tableDataTop: [],
- // tableDataBottom: [],
+ tableDataBottom: [],
MarqueeTipsContent: '', // 鍏憡
speed: 100, // 鍏憡鎾斁鐨勯�熷害
@@ -317,10 +317,6 @@
}
},
- activated() {
- window.addEventListener('resize', this.getHeight)
- this.getHeight()
- },
created() {
setInterval(this.getNowTime, 1000)
diff --git a/src/views/kanbanManager/zhkb.vue b/src/views/kanbanManager/zhkb.vue
index cf34a0f..6563c7d 100644
--- a/src/views/kanbanManager/zhkb.vue
+++ b/src/views/kanbanManager/zhkb.vue
@@ -6,11 +6,11 @@
<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">
- <span>妗ヤ笅缁煎悎鏁板瓧鍖栫湅鏉�</span>
+ <span>杞﹂棿缁煎悎鏁板瓧鍖栫湅鏉�</span>
</div>
<div class="kb_headTime" style="top: 35px;right: 25px">
@@ -147,11 +147,11 @@
<div class="box02" />
<div>鍘熸潗鏂�</div>
</div>
- <!-- <div class="kb_center_block_children all_block06">-->
- <!-- <div style="font-size: 24px;">{{ parseFloat(RightBottom.B) }}</div>-->
- <!-- <div class="box02" />-->
- <!-- <div>鍗婃垚鍝�</div>-->
- <!-- </div>-->
+ <div class="kb_center_block_children all_block06">
+ <div style="font-size: 24px;">{{ parseFloat(RightBottom.B) }}</div>
+ <div class="box02" />
+ <div>鍗婃垚鍝�</div>
+ </div>
<div class="kb_center_block_children all_block07">
<div style="font-size: 24px;">{{ parseFloat(RightBottom.C) }}</div>
<div class="box02" />
@@ -211,8 +211,9 @@
async getAllApi() {
// const { data: res } = await ShopSearch()
const res = [
- { org_code: '101', org_name: '鍙戞场杞﹂棿' },
- { org_code: '102', org_name: '鎸ゅ嚭杞﹂棿' }
+ { org_code: '1501', org_name: '鏈ㄦ枡杞﹂棿' },
+ { org_code: '1502', org_name: '瑁呴厤杞﹂棿' },
+ { org_code: '1503', org_name: '鍘嬮摳杞﹂棿' }
]
this.wkshopArr = res
@@ -518,19 +519,19 @@
.all_block05 {
position: absolute;
animation: upDown 3s ease-in-out infinite;
- left: 140px;
+ left: 60px;
}
-//.all_block06 {
-// position: absolute;
-// animation: upDown2 3s ease-in-out infinite;
-// left: 320px;
-//}
+.all_block06 {
+ position: absolute;
+ animation: upDown2 3s ease-in-out infinite;
+ left: 290px;
+}
.all_block07 {
position: absolute;
animation: upDown 3s ease-in-out infinite;
- left: 500px;
+ left: 520px;
}
@keyframes upDown {
diff --git a/vue.config.js b/vue.config.js
index 3cd6e83..1011ce7 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -52,8 +52,8 @@
},
proxy: {
[process.env.VUE_APP_BASE_API]: {
- target: 'http://121.196.36.24:8034', // 鏈湴
- // target: 'http://192.168.0.99:8000', // 妗ヤ笅
+ target: 'http://121.196.36.24:8037', // 鏈湴
+ // target: 'http://192.168.10.81:8000', // 鏂板厜
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
['^' + process.env.VUE_APP_BASE_API]: '/api/'
--
Gitblit v1.9.3