From 994a722829bd01de4b24f85c359b84dbf4047997 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 18 十一月 2022 08:56:31 +0800
Subject: [PATCH] 1.综合看板改为翻页形式
---
src/views/scgl/gd.vue | 100 +++++++++++++++++----------------
src/views/jcsz/yhqd.vue | 1
src/views/kb/zhkb.vue | 67 +++++++++++++++-------
3 files changed, 98 insertions(+), 70 deletions(-)
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 20a2285..0217b4d 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -141,6 +141,7 @@
prop="org_name"
label="鎵�灞炵粍缁�"
min-width="110"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
diff --git a/src/views/kb/zhkb.vue b/src/views/kb/zhkb.vue
index 2bdb36a..ba642b3 100644
--- a/src/views/kb/zhkb.vue
+++ b/src/views/kb/zhkb.vue
@@ -332,6 +332,7 @@
leftTopData: [],
tableData: [],
+ tableDataTemp: [],
tableDataRank: [],
lineCodeArr: [],
@@ -408,7 +409,6 @@
await this.getEcharts()
await this.getTableDataRoll()
await this.getTableDataRankRoll()
- await this.getMarqueeTipsContent()
await this.getMarqueeTipsContent()
},
// 鑾峰彇鍏憡
@@ -489,31 +489,54 @@
// 浜х嚎鍔犲伐浠诲姟
getTableDataRoll() {
- LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
- this.tableData = res.data
- this.number2 = this.tableData.length
+ let startValue = 0 // 鍒濆鍊�
+ const scale = 10// 鍒诲害
- const divData = this.$refs.tableData.bodyWrapper
- // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.tableDataTemp = res.data
+ this.number2 = res.data.length
+
+ this.tableData = this.tableDataTemp.slice(startValue, startValue + scale)
+
+ const loop = Math.floor(this.tableDataTemp.length / scale)// 闇�瑕佸惊鐜殑娆℃暟
+ let nowLoop = 0// 褰撳墠寰幆鐨勬鏁�
+
this.TableDataRollTask = setInterval(() => {
- // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
- divData.scrollTop += 1
- // divData.scrollTop += divData.scrollHeight / this.tableData.length
- // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
- if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
- // 閲嶇疆table璺濈椤堕儴璺濈
- divData.scrollTop = 0
- LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
- this.tableData = res.data
- this.number2 = this.tableData.length
- if (this.tableData.length > 10) {
- clearInterval(this.TableDataRollTask)
- this.getTableDataRoll()
- }
- })
+ startValue = startValue + scale
+ this.tableData = this.tableDataTemp.slice(startValue, startValue + scale)
+ if (nowLoop === loop) {
+ clearInterval(this.TableDataRollTask)
+ this.getTableDataRoll()
}
- }, this.tableData.length <= 10 ? 1000 * 3 : 100)
+ nowLoop++
+ }, 1000 * 10)
})
+
+ // LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ // this.tableData = res.data
+ // this.number2 = this.tableData.length
+ //
+ // const divData = this.$refs.tableData.bodyWrapper
+ // // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ // this.TableDataRollTask = setInterval(() => {
+ // // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+ // divData.scrollTop += 1
+ // // divData.scrollTop += divData.scrollHeight / this.tableData.length
+ // // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+ // if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+ // // 閲嶇疆table璺濈椤堕儴璺濈
+ // divData.scrollTop = 0
+ // LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ // this.tableData = res.data
+ // this.number2 = this.tableData.length
+ // if (this.tableData.length > 10) {
+ // clearInterval(this.TableDataRollTask)
+ // this.getTableDataRoll()
+ // }
+ // })
+ // }
+ // }, this.tableData.length <= 10 ? 1000 * 3 : 100)
+ // })
},
// 褰撴棩瀹屽伐浜у搧鏁伴噺鎺掕
getTableDataRankRoll() {
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 23b7184..aa6466c 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -38,10 +38,10 @@
</el-select>
</el-form-item>
<el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
- <el-input v-model="form.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px"/>
+ <el-input v-model="form.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="婧愬崟鍗曞彿" style="display: flex;">
- <el-input v-model="form.sourceorder" style="width: 200px" placeholder="璇疯緭鍏�"/>
+ <el-input v-model="form.sourceorder" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item label="鍗曟嵁绫诲瀷" style=" display: flex;">
<el-select
@@ -60,16 +60,16 @@
</el-select>
</el-form-item>
<el-form-item v-show="isExpandForm" label-width="70px" label="浜у搧缂栫爜" style=" display: flex;">
- <el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�"/>
+ <el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
- <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�"/>
+ <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="浜у搧瑙勬牸" style=" display: flex;">
- <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�"/>
+ <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
- <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�"/>
+ <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label-width="70px" label="鍒涘缓鏃堕棿" style=" display: flex;">
<!-- <el-date-picker-->
@@ -231,6 +231,7 @@
label="鐢熶骇杞﹂棿"
sortable="custom"
width="120"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.wkshp_name">{{ row.wkshp_name }}</div>
@@ -326,7 +327,7 @@
/>
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" @click="del(row)"/>
+ <i class="el-icon-delete" @click="del(row)" />
</el-tooltip>
</div>
</template>
@@ -464,7 +465,7 @@
</el-form-item>
<el-form-item label="宸ュ崟缂栧彿" prop="mesordercode">
- <el-input v-model="dialogForm.mesordercode" :disabled="operation!=='add'" style="width: 200px"/>
+ <el-input v-model="dialogForm.mesordercode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
<div style="display: flex">
<el-form-item label="宸ュ崟绫诲瀷" prop="mesorderstus">
@@ -533,13 +534,13 @@
</el-select>
</el-form-item>
<el-form-item v-if="operation!=='add'" label="浜у搧鍚嶇О" prop="partname">
- <el-input v-model="dialogForm.partname" disabled style="width: 200px"/>
+ <el-input v-model="dialogForm.partname" disabled style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜">
- <el-input v-model="dialogForm.partcode" disabled style="width: 200px"/>
+ <el-input v-model="dialogForm.partcode" disabled style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧瑙勬牸" prop="partspec">
- <el-input v-model="dialogForm.partspec" disabled style="width: 200px"/>
+ <el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
</el-form-item>
<div style="display: flex">
<div style="display: flex;flex-wrap: nowrap">
@@ -851,20 +852,20 @@
</el-select>
</el-form-item>
<el-form-item v-show="isExpandDialog" label="璁㈠崟缂栧彿" style=" display: flex;">
- <el-input v-model="sourceForm.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px"/>
+ <el-input v-model="sourceForm.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item v-show="isExpandDialog" label="浜у搧缂栫爜" style=" display: flex;">
- <el-input v-model="sourceForm.partcode" style="width: 200px" placeholder="璇疯緭鍏�"/>
+ <el-input v-model="sourceForm.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandDialog" label="浜у搧鍚嶇О" style=" display: flex;">
- <el-input v-model="sourceForm.partname" style="width: 200px" placeholder="璇疯緭鍏�"/>
+ <el-input v-model="sourceForm.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandDialog" label="浜у搧瑙勬牸" style=" display: flex;">
- <el-input v-model="sourceForm.partspec" style="width: 200px" placeholder="璇疯緭鍏�"/>
+ <el-input v-model="sourceForm.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandDialog" label="鍒涘缓浜哄憳" style=" display: flex;">
- <el-input v-model="sourceForm.creatuser" style="width: 200px" placeholder="璇疯緭鍏�"/>
+ <el-input v-model="sourceForm.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
@@ -1140,7 +1141,7 @@
>
<!-- <div id="qrCode0" ref="qrCodeDiv0" />-->
</div>
- <div style="background-color: #fff;width: 20px;height:120px; position: absolute;right: 0"/>
+ <div style="background-color: #fff;width: 20px;height:120px; position: absolute;right: 0" />
<div
style="z-index: 10;background-color:transparent;width: 120px;height:120px; position: absolute;right: 21px"
/>
@@ -1171,7 +1172,7 @@
align="center"
>
<template slot-scope="{row}">
- <div :id="'qrCode'+row.seq" :ref="'qrCodeDiv'+row.seq" class="tableColumn"/>
+ <div :id="'qrCode'+row.seq" :ref="'qrCodeDiv'+row.seq" class="tableColumn" />
</template>
</el-table-column>
<el-table-column
@@ -1211,18 +1212,15 @@
/>
</el-table>
+ <!-- <div v-if="formApprove.m_po" style="display: flex;margin-top: 20px;align-content: center;height: 130px;line-height: 130px;">-->
+ <!-- <div style="font-size: 18px;font-weight: bolder">婧愬崟鍗曞彿锛�</div>-->
+ <!-- <div id="qrCodeSource" ref="qrCodeSource" style="width: 130px;height: 130px;overflow: hidden" />-->
+ <!-- </div>-->
- <div v-if="formApprove.m_po" style="display: flex;margin-top: 20px;align-content: center;height: 130px;line-height: 130px;">
- <div style="font-size: 18px;font-weight: bolder">婧愬崟鍗曞彿锛�</div>
- <div id="qrCodeSource" ref="qrCodeSource" style="width: 130px;height: 130px;overflow: hidden"/>
- </div>
-
- <div v-if="formApprove.m_po" style="margin-top: 5px;">
-<!-- <svg-icon icon-class="UP" style="color:#000;margin-left: 130px;font-size: 50px;background-color: #FFFFFF"></svg-icon>-->
- <img src="../../assets/images/UP.png" alt="" style="margin-left: 107px;">
- <div style="font-size: 18px;font-weight: bolder;">鏍规嵁鍗曞彿鎵爜鍏ュ簱锛岀敤PDA鎵弿姝や簩缁寸爜</div>
- </div>
-
+ <!-- <div v-if="formApprove.m_po" style="margin-top: 5px;">-->
+ <!-- <img src="../../assets/images/UP.png" alt="" style="margin-left: 107px;">-->
+ <!-- <div style="font-size: 18px;font-weight: bolder;">鏍规嵁鍗曞彿鎵爜鍏ュ簱锛岀敤PDA鎵弿姝や簩缁寸爜</div>-->
+ <!-- </div>-->
</div>
<span slot="footer" class="dialog-footer">
@@ -1277,8 +1275,10 @@
style="display: flex;height: 96px;border-bottom:1px solid #000;
justify-content: center;align-items: center;position: relative"
>
- <div id="qrCode2" ref="qrCodeDiv2"
- style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
+ <div
+ id="qrCode2"
+ ref="qrCodeDiv2"
+ style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
/>
</div>
<div
@@ -1336,8 +1336,10 @@
style="display: flex;height: 96px;border-bottom:1px solid #000;
justify-content: center;align-items: center;position: relative"
>
- <div id="qrCode2" ref="qrCodeDiv2"
- style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
+ <div
+ id="qrCode2"
+ ref="qrCodeDiv2"
+ style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
/>
</div>
<div
@@ -1395,8 +1397,10 @@
style="display: flex;height: 60px;border-bottom:1px solid #000;
justify-content: center;align-items: center;position: relative"
>
- <div id="qrCode2" ref="qrCodeDiv2"
- style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
+ <div
+ id="qrCode2"
+ ref="qrCodeDiv2"
+ style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
/>
</div>
<div
@@ -1467,11 +1471,11 @@
@close="handleCloseRoute"
>
<div>
- <i class="el-icon-s-comment" style="color:#42b983;"/> 浜у搧鍚嶇О锛歿{ dialogFormRoute.projectName }}
+ <i class="el-icon-s-comment" style="color:#42b983;" /> 浜у搧鍚嶇О锛歿{ dialogFormRoute.projectName }}
</div>
- <el-divider/>
+ <el-divider />
<div style="margin-bottom: 10px">
- <i class="el-icon-s-operation" style="color:#42b983;"/> 宸ヨ壓璺嚎闆嗗悎
+ <i class="el-icon-s-operation" style="color:#42b983;" /> 宸ヨ壓璺嚎闆嗗悎
</div>
<div class="myCheckboxGroup">
@@ -1495,9 +1499,9 @@
</div>
</div>
- <el-divider/>
+ <el-divider />
<div>
- <i class="el-icon-s-operation" style="color:#42b983;"/> 榛樿宸ヨ壓璺嚎
+ <i class="el-icon-s-operation" style="color:#42b983;" /> 榛樿宸ヨ壓璺嚎
</div>
<div style="margin-top: 20px">
<el-select
@@ -1515,9 +1519,9 @@
/>
</el-select>
</div>
- <el-divider/>
+ <el-divider />
<div style="margin-bottom: 10px">
- <i class="el-icon-s-operation" style="color:#42b983;"/> 宸ュ簭鍒楄〃
+ <i class="el-icon-s-operation" style="color:#42b983;" /> 宸ュ簭鍒楄〃
</div>
<div style="overflow-y: scroll">
<el-table
@@ -1551,11 +1555,11 @@
>
<template slot-scope="{row}">
<div v-if="row.enable==='Y'">
- <svg-icon icon-class="circleYes" style="margin-right: 2px"/>
+ <svg-icon icon-class="circleYes" style="margin-right: 2px" />
鏄�
</div>
<div v-if="row.enable==='N'">
- <svg-icon icon-class="circleNo" style="margin-right: 2px"/>
+ <svg-icon icon-class="circleNo" style="margin-right: 2px" />
鍚�
</div>
</template>
@@ -2285,12 +2289,12 @@
})
}
},
- //鐢熸垚婧愬崟鍗曞彿浜岀淮鐮�
- bindQRCodeSource(text){
+ // 鐢熸垚婧愬崟鍗曞彿浜岀淮鐮�
+ bindQRCodeSource(text) {
new QRCode(this.$refs['qrCodeSource'], {
text: text,
- width: 130 ,
- height: 130 ,
+ width: 130,
+ height: 130,
// colorDark: '#333333', // 浜岀淮鐮侀鑹�
colorDark: '#000', // 浜岀淮鐮侀鑹�
colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
--
Gitblit v1.9.3