From d0a2c018b1612fb40d5e38f78d5180f2b90500fd Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 06 九月 2022 17:28:49 +0800
Subject: [PATCH] 1.新增车间公告页面2.新看板修改并部署
---
src/views/kb/bzcj.vue | 909 ++++++++
src/views/kb/zpcj.vue | 909 ++++++++
src/views/scgl/scdd.vue | 9
src/views/zlgl/gxjy.vue | 2
src/views/scgl/gd.vue | 80
src/views/kb/cgdd.vue | 61
src/views/scgl/sckbg.vue | 2
src/views/kb/ckgl.vue | 130
src/views/template.vue | 27
src/views/kb/zhkb.vue | 614 +----
src/router/index.js | 27
src/views/scgl/sckbg_autoPrint_back.vue | 0
src/api/xtsz.js | 27
src/utils/myEcharts.js | 2
src/views/xtsz/cjgg.vue | 594 +++++
src/views/kb/kbCommon.css | 12
src/views/scgl/gdplgb.vue | 496 ++++
src/api/dzkb.js | 47
src/views/kb/zhkb_back.vue | 1248 ++++++++++++
package.json | 1
src/views/scgl/gd_autoPrint_back.vue | 0
src/views/kb/dccj.vue | 909 ++++++++
22 files changed, 5,470 insertions(+), 636 deletions(-)
diff --git a/package.json b/package.json
index 378e3db..10288c6 100644
--- a/package.json
+++ b/package.json
@@ -62,6 +62,7 @@
"serve-static": "1.13.2",
"svg-sprite-loader": "4.1.3",
"svgo": "1.2.2",
+ "vue-marquee-tips": "^1.0.8",
"vue-template-compiler": "2.6.10",
"webpack-dev-server": "^3.0.0"
},
diff --git a/src/api/dzkb.js b/src/api/dzkb.js
index 378f9e3..2e64f59 100644
--- a/src/api/dzkb.js
+++ b/src/api/dzkb.js
@@ -1,5 +1,21 @@
import request from '@/utils/request'
+// 澶у矝杞﹂棿缁煎悎鐪嬫澘,鑾峰彇鐢熶骇杞﹂棿
+export function ShopSearch() {
+ return request({
+ url: 'KanBanManagerent/ShopSearch',
+ method: 'get'
+ })
+}
+// 澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛
+export function LineSearchTopLeftData(data) {
+ return request({
+ url: 'KanBanManagerent/LineSearchTopLeftData',
+ method: 'post',
+ params: data
+ })
+}
+
// 澶у矝杞﹂棿缁煎悎鐪嬫澘,鐢熶骇杞﹂棿鏌ユ壘浜х嚎鎺ュ彛
export function ShopSearchLine(data) {
return request({
@@ -9,36 +25,39 @@
})
}
-// 澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛
-export function LineSearchTopLeftData(data) {
- return request({
- url: 'KanBanManagerent/LineSearchTopLeftData',
- method: 'post',
- data
- })
-}
+// // 澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛
+// export function LineSearchTopLeftData(data) {
+// return request({
+// url: 'KanBanManagerent/LineSearchTopLeftData',
+// method: 'post',
+// data
+// })
+// }
// 澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笅鍒楄〃鎺ュ彛
-export function LineSearchBottomLeftData() {
+export function LineSearchBottomLeftData(data) {
return request({
url: 'KanBanManagerent/LineSearchBottomLeftData',
- method: 'get'
+ method: 'get',
+ params: data
})
}
// 澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笂top鎺掕鎺ュ彛
-export function LineSearchTopRightData() {
+export function LineSearchTopRightData(data) {
return request({
url: 'KanBanManagerent/LineSearchTopRightData',
- method: 'get'
+ method: 'get',
+ params: data
})
}
// 澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笅top鎺掕鎺ュ彛
-export function LineSearchBottomRightData() {
+export function LineSearchBottomRightData(data) {
return request({
url: 'KanBanManagerent/LineSearchBottomRightData',
- method: 'get'
+ method: 'get',
+ params: data
})
}
diff --git a/src/api/xtsz.js b/src/api/xtsz.js
index d3c6b84..dc37f10 100644
--- a/src/api/xtsz.js
+++ b/src/api/xtsz.js
@@ -25,3 +25,30 @@
params: data
})
}
+
+// 杞﹂棿鍏憡鍒楄〃
+export function SystemAnnouncementSearch(data) {
+ return request({
+ url: 'SystemSetting/SystemAnnouncementSearch',
+ method: 'get',
+ params: data
+ })
+}
+
+// 杞﹂棿鍏憡鏂板缂栬緫鎻愪氦
+export function SystemAnnouncementAddUpdate(data, id, ancetitle, ancecont, level, cancel, opertype) {
+ return request({
+ url: 'SystemSetting/SystemAnnouncementAddUpdate?id=' + id + '&ancetitle=' + ancetitle + '&ancecont=' + ancecont + '&level=' + level + '&cancel=' + cancel + '&opertype=' + opertype,
+ method: 'post',
+ data
+ })
+}
+
+// 杞﹂棿鍏憡鍒犻櫎
+export function SystemAnnouncementDelete(data) {
+ return request({
+ url: 'SystemSetting/SystemAnnouncementDelete',
+ method: 'post',
+ params: data
+ })
+}
diff --git a/src/router/index.js b/src/router/index.js
index d65648e..2b5bff5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -49,6 +49,21 @@
component: () => import('@/views/kb/cgdd'),
hidden: true
},
+ {
+ path: '/zpcj',
+ component: () => import('@/views/kb/zpcj'),
+ hidden: true
+ },
+ {
+ path: '/dccj',
+ component: () => import('@/views/kb/dccj'),
+ hidden: true
+ },
+ {
+ path: '/bzcj',
+ component: () => import('@/views/kb/bzcj'),
+ hidden: true
+ },
{
path: '/login',
@@ -418,6 +433,12 @@
code: '1073',
component: () => import('@/views/scgl/sckbg'),
meta: { code: '1073', title: '鐢熶骇寮�鎶ュ伐', icon: '', keepAlive: true }
+ }, {
+ path: 'gdplgb',
+ name: 'GDPLGBCancel',
+ code: '1074',
+ component: () => import('@/views/scgl/gdplgb'),
+ meta: { code: '1074', title: 'MES宸ュ崟鎵归噺鍏抽棴', icon: '', keepAlive: true }
}
]
},
@@ -533,6 +554,12 @@
code: '1104',
component: () => import('@/views/xtsz/sc'),
meta: { code: '1104', title: 'SOP涓婁紶', icon: '', keepAlive: true }
+ }, {
+ path: 'cjgg',
+ name: 'CJGGancel',
+ code: '1105',
+ component: () => import('@/views/xtsz/cjgg'),
+ meta: { code: '1105', title: '杞﹂棿鍏憡', icon: '', keepAlive: true }
}
]
}
diff --git a/src/utils/myEcharts.js b/src/utils/myEcharts.js
index 87aa80a..e36dadd 100644
--- a/src/utils/myEcharts.js
+++ b/src/utils/myEcharts.js
@@ -351,7 +351,6 @@
// 缁煎悎鐪嬫澘鍥�
export function bar02(dataArr, titlenameArr) {
- // console.log(val)
// const data = [70, 60, 50, 40, 30]
// const titlename = ['澶栬鍒掍激', '琛ㄩ潰娌规薄', '灏哄', '棰滆壊', '澶у皬']
// const data = val.map(i => i.cont)
@@ -367,7 +366,6 @@
}
}
- console.log(titlenameArr)
const valdata = [683, 500, 400, 300, 200]
// const myColor = ['#FF0000', '#FF5511', '#FF8800', '#FFBB00', '#FFFF00']
// const myColor = ['#0000FF']
diff --git a/src/views/kb/bzcj.vue b/src/views/kb/bzcj.vue
new file mode 100644
index 0000000..3a739bd
--- /dev/null
+++ b/src/views/kb/bzcj.vue
@@ -0,0 +1,909 @@
+<template>
+ <div>
+ <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">
+ <span>{{ headTime }}</span>
+ </div>
+ </div>
+ <MarqueeTips
+ :content="MarqueeTipsContent"
+ class="MarqueeTipsContentClass"
+ :speed="speed"
+ />
+ <div class="kb_content">
+ <div class="kb_left">
+ <!-- 1-->
+ <div class="kb_left_top_title01 kb_title_text">
+ <!-- <div class="PG01" />-->
+ <!-- <svg-icon icon-class="sccx" />-->
+ 浜х嚎鍔犲伐涓换鍔�
+ </div>
+
+ <div class="kb_left_top kb_pd10">
+
+ <div v-if="false" class="kb_left_top_block">
+ <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 v-if="lineContent01.children&&lineContent01.children.length===0" class="kb_mt5">
+ 浠诲姟鏁伴噺:
+ </div>
+ <div v-else class="kb_mt5">
+ 浠诲姟鏁伴噺:{{ lineContent01.children ? parseFloat(lineContent01.children.qty) : '' }}
+ </div>
+ </div>
+ </div>
+ <div class="kb_block03 kb_pd10 ">
+ <div v-if="lineContent01.children!==undefined" class="flex_s_c">
+ <div
+ v-for="item in lineContent01.children.children"
+ :key="item.stepseq"
+ class="kb_block03_content flex_c_c"
+ >
+ <div>
+ <div class="content01">{{ item.stepname }}</div>
+ </div>
+ <div class="content02Parent">
+ <div class="content02">
+ <div class="content02_1 ">浠诲姟</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.planqty) }}</div>
+ </div>
+ <div class="content02">
+ <div class="content02_1 ">鍚堟牸</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.goodqty) }}</div>
+ </div>
+ <div class="content02" style="border-right: 0">
+ <div class="content02_1 ">涓嶈壇</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.ngqty) }}</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div v-if="lineContent01.children!==undefined" class="kb_block03_02 flex_s_c">
+ <div
+ v-for="item in lineContent01.children.children"
+ :key="item.stepseq"
+ class="kb_block03_02_content flex_c_c"
+ >
+ <div class="flex_c_c content01">
+ <div
+ v-if="item.status==='START'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
+ class="circle"
+ style="background-color: blue;"
+ />
+ <div
+ v-else-if="item.status==='ALLO'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
+ class="circle"
+ style="background-color: rgb(255 255 255)"
+ />
+ <div
+ v-else-if="parseFloat(item.ngqty)+parseFloat(item.goodqty)>=parseFloat(item.planqty)"
+ class="circle"
+ />
+ <div v-else class="circleYellow" />
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div v-for="item in lineContent4" :key="item.workcode" class="kb_left_top_block">
+ <div class="kb_block02 kb_pd10">
+ <div>
+ <div>閿�鍞崟鍙�:{{ item.saleordercode }}</div>
+ <div class="kb_mt5">
+ 鍔犲伐鍗曞彿:{{ item.workcode }}
+ </div>
+ <div class="kb_mt5">
+ 浜у搧鍚嶇О:{{ item.partname }}
+ </div>
+ <div class="kb_mt5">
+ 浠诲姟鏁伴噺:{{ parseFloat(item.qty) }}
+ </div>
+ </div>
+ </div>
+ <div class="kb_block03 kb_pd10 ">
+ <div v-if="item.children&&item.children.length>0" class="flex_s_c">
+ <div
+ v-for="(it,ind) in item.children"
+ :key="ind"
+ class="kb_block03_content flex_c_c"
+ >
+ <div>
+ <div class="content01">{{ it.stepname }}</div>
+ </div>
+ <div class="content02Parent">
+ <div class="content02">
+ <div class="content02_1 ">浠诲姟</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(it.planqty) }}</div>
+ </div>
+ <div class="content02">
+ <div class="content02_1 ">鍚堟牸</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(it.goodqty) }}</div>
+ </div>
+ <div class="content02" style="border-right: 0">
+ <div class="content02_1 ">涓嶈壇</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(it.ngqty) }}</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div v-if="item.children&&item.children.length>0" class="kb_block03_02 flex_s_c">
+ <div
+ v-for="(it,ind) in item.children"
+ :key="ind"
+ class="kb_block03_02_content flex_c_c"
+ >
+ <div class="flex_c_c content01">
+ <div
+ v-if="it.status==='START'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
+ class="circle"
+ style="background-color: blue;"
+ />
+ <div
+ v-else-if="it.status==='ALLO'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
+ class="circle"
+ style="background-color: rgb(255 255 255)"
+ />
+ <div
+ v-else-if="parseFloat(it.ngqty)+parseFloat(it.goodqty)>=parseFloat(it.planqty)"
+ class="circle"
+ />
+ <div v-else class="circleYellow" />
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ </div>
+ <!-- 2-->
+ <div class="kb_left_bottom kb_pd10">
+ <div class="kb_left_bottom_content">
+ <div class="content_head kb_title_text">浜х嚎鍔犲伐浠诲姟</div>
+ <div class="content_body">
+ <el-table
+ ref="tableData"
+ :data="tableData"
+ style="width: 100%;"
+ :header-cell-style="headerCellStyle"
+ :cell-style="cellStyle"
+ height="440"
+ >
+ <el-table-column
+ prop="RowNum"
+ label="搴忓彿"
+ width="40"
+ />
+ <el-table-column
+ prop="status"
+ label="鍔犲伐鐘舵��"
+ width="70"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
+ <div v-if="row.status==='START'">寮�宸�</div>
+ <div v-if="row.status==='NEW'">鏂板伐鍗�</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="lm_date"
+ label="娲惧彂鏃堕棿"
+ width="95"
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.lm_date.substring(0, 10) }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞鍗曞彿"
+ width="158"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wo_code"
+ label="鍔犲伐鍗曞彿"
+ width="170"
+ />
+ <el-table-column
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ width="145"
+ />
+ <el-table-column
+ prop="partspec"
+ label="瑙勬牸"
+ width="130"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partspec" class="ellipsis">{{ row.partspec }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鍗曚綅"
+ width="50"
+ />
+ <el-table-column
+ prop="plan_qty"
+ label="浠诲姟鏁伴噺"
+ width="70"
+ />
+ <el-table-column
+ prop="good_qty"
+ label="瀹屽伐鏁伴噺"
+ width="70"
+ />
+ <el-table-column
+ prop="ng_qty"
+ label="涓嶈壇鏁伴噺"
+ width="70"
+ />
+ <el-table-column
+ prop="wcl"
+ label="瀹屾垚鐜�"
+ width="50"
+ >
+ <template slot-scope="{row}">
+ <div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="planenddate"
+ label="棰勮寮�濮�"
+ width="95"
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.planenddate.substring(0, 10) }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="planstartdate"
+ label="棰勮缁撴潫"
+ width="105"
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.planstartdate.substring(0, 10) }}</div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="kb_right kb_pd10">
+ <div class="kb_right_top kb_pd10">
+ <div class="kb_right_top_content">
+ <div class="content_head kb_title_text">褰撴棩瀹屽伐浜у搧鏁伴噺鎺掕</div>
+ <div class="content_body">
+ <el-table
+ ref="tableDataRank"
+ :data="tableDataRank"
+ class="tableDataRank"
+ style="width: 100%;"
+ :header-cell-style="headerCellStyle"
+ :cell-style="cellStyle"
+ height="396"
+ >
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ width="55"
+ />
+ <el-table-column
+ prop="wkshname"
+ label="杞﹂棿锛堜緵鏂癸級"
+ width="120"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.wkshname" class="ellipsis">{{ row.wkshname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="linename"
+ label="浜х嚎"
+ width="120"
+ />
+ <el-table-column
+ prop="partname"
+ width="138"
+ label="浜у搧"
+ />
+ <el-table-column
+ prop="good_qty"
+ label="鏁伴噺"
+ width="100"
+ />
+ </el-table>
+ </div>
+ </div>
+ </div>
+ <div class="kb_right_bottom kb_pd10">
+ <div class="kb_right_bottom_content_title kb_title_text">
+ 涓�鍛ㄤ笉鑹疶op5
+ </div>
+ <div class="kb_right_bottom_content">
+ <div id="bar02" style="width: 100%;height:100%" />
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+import './kbCommon.css'
+import { bar02, loadEcharts } from '@/utils/myEcharts'
+import {
+ LineSearchBottomLeftData,
+ LineSearchBottomRightData,
+ LineSearchTopLeftData,
+ LineSearchTopRightData, ShopSearch,
+ ShopSearchLine
+} from '@/api/dzkb'
+import MarqueeTips from 'vue-marquee-tips'
+
+export default {
+ name: 'Index2',
+ components: {
+ MarqueeTips
+ },
+ data() {
+ return {
+ headTime: '',
+
+ lineArr: [],
+ // lineContent01: {},
+ lineContent01: {
+ linename: '',
+ lineworkcont: '',
+ children: undefined
+ },
+
+ lineContent: [],
+ lineContent4: [],
+
+ leftTopData: [],
+ tableData: [],
+ tableDataRank: [],
+ lineCodeArr: [],
+
+ ShopArr: [], // 杞﹂棿缂栫爜鏁扮粍
+
+ MarqueeTipsContent: '', // 鍏憡
+ speed: 100// 鍏憡鎾斁鐨勯�熷害
+
+ }
+ },
+
+ created() {
+ setInterval(this.getNowTime, 1000)
+ },
+ mounted() {
+ this.getValue()
+ },
+ methods: {
+ async getValue() {
+ await this.getShopSearch()
+ await this.getShopSearchLine()
+
+ await this.getEcharts()
+ await this.getTableDataRoll()
+ await this.getTableDataRankRoll()
+ await this.getMarqueeTipsContent()
+ },
+ // 鑾峰彇鍏憡
+ getMarqueeTipsContent() {
+ this.MarqueeTipsContent = '鍚勪綅鍛樺伐浠細鏍规嵁涓婄骇鐨勯�氱煡锛岀粨鍚堟垜浼佸疄闄呮儏鍐碉紝鐜板皢20xx骞寸殑鍏冩棪鏀惧亣閫氱煡濡備笅锛氫竴銆�1鏈�1鏃ヨ嚦1鏈�3鏃ユ斁鍋囪皟浼戯紝鍏�3澶┿��1鏈�4鏃ユ寮忎笂鐝�備簩銆佽妭鍋囨棩鏈熼棿锛屽悇鐝粍瑕佷弗鏍艰惤瀹炰笂绾х殑閲嶈鎸囩ず绮剧锛屾寜鐓т笂绾х殑鍏蜂綋瑕佹眰锛岃鐪熸姄濂借惤瀹炶妭鏃ユ湡闂村�肩彮澶囧嫟宸ヤ綔锛岀‘淇濊妭鏃ユ湡闂翠紒涓氬悇椤瑰伐浣滄甯歌繍杞�倄x浼佷笟20xx骞�12鏈�28鏃�'
+ const spance = ' '.padStart(this.MarqueeTipsContent.length * 2, ' ')
+ this.MarqueeTipsContent = this.MarqueeTipsContent + spance
+ this.speed = this.MarqueeTipsContent.length / 10
+ },
+ // 鑾峰彇杞﹂棿缂栫爜
+ async getShopSearch() {
+ this.ShopArr = ['CJ003'] // 鍖呰杞﹂棿
+ // const res1 = await ShopSearch()
+ // if (res1.code === '200') {
+ // this.ShopArr = []
+ // res1.data.forEach(item => {
+ // this.ShopArr.push(item.org_code)
+ // })
+ // }
+ // setInterval(() => {
+ // ShopSearch().then(res1 => {
+ // if (res1.code === '200') {
+ // this.ShopArr = []
+ // res1.data.forEach(item => {
+ // this.ShopArr.push(item.org_code)
+ // })
+ // }
+ // console.log(this.ShopArr, 997)
+ // })
+ // }, 1000 * 30)
+ },
+ // 浜х嚎鍔犲伐涓换鍔�
+ getShopSearchLine() {
+ let length, count
+ LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.lineContent = res.data
+ length = this.lineContent.length
+ count = Math.ceil(length / 4) // 闇�瑕佽疆鎾殑缁勬暟 4涓负涓�缁�
+ this.lineContent4 = this.lineContent.slice(0, 4)
+ // this.lineContent4[0].children.push({})
+ })
+
+ let start = 0
+ const task = setInterval(() => {
+ if (Math.floor(start / 4) === count) {
+ // clearInterval(task)
+ // this.getShopSearchLine()
+ start = 0
+ LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.lineContent = res.data
+ length = this.lineContent.length
+ count = Math.ceil(length / 4) // 闇�瑕佽疆鎾殑缁勬暟 4涓负涓�缁�
+ this.lineContent4 = this.lineContent.slice(0, 4)
+ console.log(count)
+ })
+ }
+ this.lineContent4 = this.lineContent.slice(start, start + 4)
+ start = start + 4
+ console.log(start)
+ console.log('鎵ц浜嗭紒锛侊紒')
+ }, 1000 * 3)
+ },
+
+ // 浜х嚎鍔犲伐浠诲姟
+ getTableDataRoll() {
+ LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.tableData = res.data
+
+ const divData = this.$refs.tableData.bodyWrapper
+ // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ const task = 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
+ if (this.tableData.length > 10) {
+ clearInterval(task)
+ this.getTableDataRoll()
+ }
+ })
+ }
+ }, this.tableData.length <= 10 ? 1000 * 3 : 100)
+ })
+ },
+ // 褰撴棩瀹屽伐浜у搧鏁伴噺鎺掕
+ getTableDataRankRoll() {
+ LineSearchTopRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.tableDataRank = res.data
+
+ const divData = this.$refs.tableDataRank.bodyWrapper
+ // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ const task = setInterval(() => {
+ // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+ // divData.scrollTop += divData.scrollHeight / this.tableDataRank.length
+ divData.scrollTop += 1
+ // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+ if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+ // 閲嶇疆table璺濈椤堕儴璺濈
+ divData.scrollTop = 0
+ LineSearchTopRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.tableDataRank = res.data
+
+ if (this.tableDataRank.length > 9) {
+ clearInterval(task)
+ this.getTableDataRankRoll()
+ }
+ })
+ }
+ }, this.tableDataRank.length <= 9 ? 1000 * 3 : 100)
+ })
+ },
+ // 鑾峰彇echarts
+ getEcharts() {
+ LineSearchBottomRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
+ })
+
+ setInterval(() => {
+ LineSearchBottomRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
+ })
+ }, 1000 * 15)
+ },
+ // 鑾峰彇褰撳墠鏃堕棿
+ getNowTime() {
+ const dt = new Date()
+ const wk = dt.getDay()
+ const y = dt.getFullYear()
+ const m = (dt.getMonth() + 1 + '').padStart(2, '0')
+ const d = (dt.getDate() + '').padStart(2, '0')
+
+ const hh = (dt.getHours() + '').padStart(2, '0')
+ const mm = (dt.getMinutes() + '').padStart(2, '0')
+ const ss = (dt.getSeconds() + '').padStart(2, '0')
+ const weeks = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�']
+ const week = weeks[wk]
+
+ this.headTime = `${y}-${m}-${d} ${hh}:${mm}:${ss} ${week}`
+ },
+ headerCellStyle() {
+ return {
+ backgroundColor: 'rgb(30 ,33, 46)',
+ padding: '10px 0',
+ textAlign: 'center',
+ color: '#07acc2',
+ border: 'none'
+ }
+ },
+ cellStyle() {
+ return {
+ padding: '8px 0',
+ textAlign: 'center',
+ backgroundColor: 'rgba(30, 33, 46 )',
+ // backgroundColor: 'transparent',
+ color: '#fff',
+ border: 'none'
+ }
+ }
+
+ }
+}
+</script>
+
+<style scoped lang="scss">
+//$kbBorderColor: #3A0088;
+//$kbBorderColor: #09d8f2;
+$kbBorderColor: rgba(9, 216, 242, 0.4);
+$kbBackgroundColor: rgba(30, 33, 46, 0.6);
+.kb_content {
+ display: flex;
+ position: relative;
+ height: 990px;
+ width: 100%;
+ //background-color: #000;
+ letter-spacing: 2px;
+ //color: #d8d7d9;
+ color: #fff;
+
+ .kb_left {
+ width: 1345px;
+ height: 100%;
+ padding-left: 5px;
+
+ .kb_left_top_title01 {
+ position: absolute;
+ top: 40px;
+ left: 15px;
+ font-size: 18px;
+ display: flex;
+ color: #00ffff;
+
+ .PG01 {
+ background: url("../../assets/images/GP_1.png") no-repeat;
+ width: 28px;
+ height: 12px;
+ margin-top: 4px;
+ margin-right: 10px;
+ }
+ }
+
+ .kb_left_top {
+ height: 495px;
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ //justify-content: flex-end;
+ //padding-top: 30px;
+ padding-top: 70px;
+ //padding-bottom: 25px;
+
+ .kb_left_top_block {
+ //margin-top: 10px;
+ width: 100%;
+ height: 100px;
+ display: flex;
+ border-radius: 5px;
+ font-size: 14px;
+ //padding: 10px 0;
+ //border: 1px solid rgba(255, 255, 255, 0.6);
+ //border: 1px solid $kbBorderColor;
+ //border-bottom: 1px solid $kbBorderColor;
+ border-top: 1px solid $kbBorderColor;
+ border-right: 1px solid $kbBorderColor;
+ border-left: 1px solid $kbBorderColor;
+ justify-content: flex-start;
+
+ .kb_block02 {
+ width: 304px;
+ display: flex;
+ align-items: center;
+ border-right: 1px solid $kbBorderColor;
+ background-color: $kbBackgroundColor;
+ }
+
+ .kb_block03 {
+ width: 1020px;
+ //width: 100%;
+ display: flex;
+ flex-direction: column;
+ font-size: 12px;
+ background-color: $kbBackgroundColor;
+ border-radius: 5px;
+
+ .kb_block03_content {
+ border: 1px solid $kbBorderColor;
+ //width: 152px;
+ width: 180px;
+ height: 50px;
+ margin-right: 15px;
+ //margin-right: 20px;
+ display: flex;
+ flex-direction: column;
+
+ .content01 {
+ //width: 50px;
+ width: 100%;
+ height: 18px;
+ border-bottom: 1px solid $kbBorderColor;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .content02Parent {
+ display: flex;
+ //height:30px;
+ .content02 {
+ width: 60px;
+ border-right: 1px solid $kbBorderColor;
+
+ .content02_1 {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 50%;
+ }
+
+ .content02_2 {
+ height: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .borderTop {
+ border-top: 1px solid $kbBorderColor;
+ }
+ }
+ }
+
+ }
+ }
+
+ .kb_block03_02 {
+ margin-top: 7px;
+ display: flex;
+
+ .kb_block03_02_content {
+ //width: 152px;
+ width: 180px;
+ margin-right: 15px;
+
+ .content01 {
+ .circle {
+ width: 26px;
+ height: 26px;
+ background-color: #00ff8b;
+ border-radius: 50%;
+ }
+
+ }
+
+ }
+ }
+
+ }
+
+ .kb_left_top_block:last-child{
+ border-bottom: 1px solid $kbBorderColor;
+ }
+ }
+
+ .kb_left_bottom {
+ height: 495px;
+
+ .kb_left_bottom_content {
+ height: 460px;
+ display: flex;
+ flex-direction: column;
+ //border: 1px solid $kbBorderColor;
+
+ .content_head {
+ ////font-size: 26px;
+ //font-size: 18px;
+ //height: 55px;
+ //line-height: 55px;
+ ////border-bottom: 1px solid $kbBorderColor;
+ ////text-align: center;
+ //padding-left: 10px;
+
+ font-size: 18px;
+ line-height: 20px;
+ //padding-left: 10px;
+ margin-bottom: 10px;
+ margin-top: -10px;
+ color: #00ffff;
+
+ }
+
+ .content_body {
+ border: 1px solid $kbBorderColor;
+ }
+ }
+ }
+ }
+
+ .kb_right {
+ width: 575px;
+ height: 100%;
+
+ .kb_right_top {
+ margin-top: 30px;
+ margin-bottom: -30px;
+ height: 476px;
+ width: 100%;
+
+ .kb_right_top_content {
+ //border: 1px solid $kbBorderColor;
+ height: 430px;
+ display: flex;
+ flex-direction: column;
+
+ .content_head {
+ font-size: 18px;
+ line-height: 20px;
+ //padding-left: 10px;
+ margin-bottom: 10px;
+ margin-top: -10px;
+ color: #00ffff;
+ }
+
+ .content_body {
+ border: 1px solid $kbBorderColor;
+ //border-radius: 5px;
+ }
+ }
+ }
+
+ .kb_right_bottom {
+ height: 482px;
+ margin-top: 8px;
+
+ .kb_right_bottom_content_title {
+ color: #00ffff;
+ font-size: 18px;
+ margin-bottom: 10px;
+ margin-top: -10px;
+ }
+
+ .kb_right_bottom_content {
+ border: 1px solid $kbBorderColor;
+ height: 441px;
+ width: 100%;
+ border-radius: 5px;
+ background-color: $kbBackgroundColor;
+ //height: 100%;
+ }
+ }
+ }
+}
+
+::v-deep .el-table::before {
+ height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+ //background-color: #044563;
+ background-color: rgba(30, 33, 46);
+}
+
+::v-deep .el-table__body-wrapper::-webkit-scrollbar {
+ /* width: 0;瀹藉害涓�0鏆楄棌 */
+ width: 0;
+}
+
+::v-deep .cell {
+ padding: 0 !important;
+}
+
+//
+///* 瀹氫箟keyframes鍔ㄧ敾锛屽懡鍚嶄负blink*/
+//@keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+///*娣诲姞鍏煎鎬у墠缂�*/
+//@-webkit-keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+//@-o-keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+//@-moz-keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+//@-ms-keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+.circleYellow {
+ width: 26px;
+ height: 26px;
+ background-color: rgb(255 255 0);
+ border-radius: 50%;
+
+ //animation: blink 2s linear infinite;
+ //-webkit-animation: blink 2s linear infinite;
+ //-moz-animation: blink 2s linear infinite;
+ //-ms-animation: blink 2s linear infinite;
+ //-o-animation: blink 2s linear infinite;
+}
+</style>
diff --git a/src/views/kb/cgdd.vue b/src/views/kb/cgdd.vue
index 78a6f61..910ffc3 100644
--- a/src/views/kb/cgdd.vue
+++ b/src/views/kb/cgdd.vue
@@ -10,7 +10,12 @@
<span>{{ headTime }}</span>
</div>
</div>
-
+ <MarqueeTips
+ :content="MarqueeTipsContent"
+ class="MarqueeTipsContentClass"
+ style="top:100px"
+ :speed="speed"
+ />
<div class="kb_content">
<div class="kb_left">
<!-- 1-->
@@ -183,15 +188,16 @@
:header-cell-style="headerCellStyle"
:cell-style="cellStyle"
:row-class-name="tableRowClassName"
- height="923"
+ height="865"
>
<el-table-column
type="index"
label="搴忓彿"
- width="90"
+ width="70"
>
<template slot-scope="{row}">
<div>NO.{{ row.index }}</div>
+ <!-- <div>NO.100</div>-->
</template>
</el-table-column>
<!-- <el-table-column-->
@@ -202,17 +208,21 @@
<el-table-column
prop="suppercode"
label="渚涘簲鍟嗙紪鐮�"
- width="170"
+ width="130"
/>
<el-table-column
prop="suppername"
- width="183"
+ width="283"
label="渚涘簲鍟嗗悕绉�"
- />
+ >
+ <template slot-scope="{row}">
+ <div class="ellipsis">{{ row.suppername }}</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="cont"
- label="寤舵湡娆℃暟"
- width="90"
+ label="娆℃暟"
+ width="50"
/>
</el-table>
</div>
@@ -230,16 +240,23 @@
import { bar02, loadEcharts, pie01 } from '@/utils/myEcharts'
import * as echarts from 'echarts'
import { PurchaseLeftBottom, PurchaseLeftTop, PurchaseRight } from '@/api/dzkb'
+import MarqueeTips from 'vue-marquee-tips'
export default {
name: 'Index2',
+ components: {
+ MarqueeTips
+ },
data() {
return {
headTime: '',
purchaseLeftTopData: [],
tableData: [],
- tableDataRank: []
+ tableDataRank: [],
+
+ MarqueeTipsContent: '', // 鍏憡
+ speed: 100// 鍏憡鎾斁鐨勯�熷害
}
},
@@ -251,9 +268,17 @@
this.getPurchaseLeftTop()
this.getPurchaseLeftBottom()
this.getPurchaseRight()
+
+ this.getMarqueeTipsContent()
},
methods: {
-
+ // 鑾峰彇鍏憡
+ getMarqueeTipsContent() {
+ this.MarqueeTipsContent = '鍚勪綅鍛樺伐浠細鏍规嵁涓婄骇鐨勯�氱煡锛岀粨鍚堟垜浼佸疄闄呮儏鍐碉紝鐜板皢20xx骞寸殑鍏冩棪鏀惧亣閫氱煡濡備笅锛氫竴銆�1鏈�1鏃ヨ嚦1鏈�3鏃ユ斁鍋囪皟浼戯紝鍏�3澶┿��1鏈�4鏃ユ寮忎笂鐝�備簩銆佽妭鍋囨棩鏈熼棿锛屽悇鐝粍瑕佷弗鏍艰惤瀹炰笂绾х殑閲嶈鎸囩ず绮剧锛屾寜鐓т笂绾х殑鍏蜂綋瑕佹眰锛岃鐪熸姄濂借惤瀹炶妭鏃ユ湡闂村�肩彮澶囧嫟宸ヤ綔锛岀‘淇濊妭鏃ユ湡闂翠紒涓氬悇椤瑰伐浣滄甯歌繍杞�倄x浼佷笟20xx骞�12鏈�28鏃�'
+ const spance = ' '.padStart(this.MarqueeTipsContent.length * 2, ' ')
+ this.MarqueeTipsContent = this.MarqueeTipsContent + spance
+ this.speed = this.MarqueeTipsContent.length / 10
+ },
getPurchaseLeftTop() {
PurchaseLeftTop().then(res => {
this.purchaseLeftTopData = res.data[0]
@@ -274,7 +299,6 @@
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
const task = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
- // divData.scrollTop += divData.scrollHeight / this.tableDataRank.length
divData.scrollTop += 1
// 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
@@ -295,12 +319,10 @@
getPurchaseRight() {
PurchaseRight().then(res => {
this.tableDataRank = res.data
-
const divData = this.$refs.tableDataRank.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
const task = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
- // divData.scrollTop += divData.scrollHeight / this.tableDataRank.length
divData.scrollTop += 1
// 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
@@ -308,13 +330,13 @@
divData.scrollTop = 0
PurchaseRight().then(res => {
this.tableDataRank = res.data
- if (this.tableDataRank.length > 22) {
+ if (this.tableDataRank.length > 21) {
clearInterval(task)
this.getPurchaseRight()
}
})
}
- }, this.tableDataRank.length <= 22 ? 1000 * 3 : 100)
+ }, this.tableDataRank.length <= 21 ? 1000 * 3 : 100)
})
},
@@ -391,11 +413,12 @@
height: 345px;
display: flex;
flex-direction: column;
- justify-content: space-around;
+ //justify-content: space-around;
+ justify-content: flex-end;
.kb_left_top_block {
width: 100%;
- height: 267px;
+ height: 237px;
display: flex;
//border: 1px solid rgba(255, 255, 255, 0.6);
justify-content: space-around;
@@ -459,7 +482,8 @@
height: 100%;
.kb_right_top {
- height: 964px;
+ height: 906px;
+ margin-top: 58px;
width: 100%;
.kb_right_top_content {
@@ -500,4 +524,5 @@
::v-deep .cell {
padding: 0 !important;
}
+
</style>
diff --git a/src/views/kb/ckgl.vue b/src/views/kb/ckgl.vue
index 0d93c85..749ccb1 100644
--- a/src/views/kb/ckgl.vue
+++ b/src/views/kb/ckgl.vue
@@ -10,11 +10,15 @@
<span>{{ headTime }}</span>
</div>
</div>
-
+ <MarqueeTips
+ :content="MarqueeTipsContent"
+ class="MarqueeTipsContentClass"
+ style="top:90px"
+ :speed="speed"
+ />
<div class="kb_content">
<div class="kb_left">
<!-- 1-->
- <!-- <div class="kb_left_top kb_pd10" style="padding:10px 0px 10px 5px">-->
<div class="kb_left_top kb_pd10">
<div class="kb_left_top_block" style="margin-top: 10px">
<div class="headTitle kb_title_text">浜у搧寰呭叆搴�</div>
@@ -25,12 +29,12 @@
style="width: 100%;"
:header-cell-style="headerCellStyle"
:cell-style="cellStyle"
- height="440"
+ height="400"
>
<el-table-column
prop="voucherdate"
label="鍗曟嵁鏃ユ湡"
- width="110"
+ width="120"
>
<template slot-scope="{row}">
<div v-if=" row.voucherdate">{{ row.voucherdate.substring(0, 10) }}</div>
@@ -40,17 +44,17 @@
<el-table-column
prop="wo"
label="鍗曟嵁缂栧彿"
- width="149"
+ width="159"
/>
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
- width="95"
+ width="105"
/>
<el-table-column
prop="saleOrderCode"
label="閿�鍞鍗曞彿"
- width="170"
+ width="180"
>
<template slot-scope="{row}">
<div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
@@ -60,17 +64,21 @@
<el-table-column
prop="materiel_code"
label="浜у搧缂栧彿"
- width="86"
+ width="96"
/>
<el-table-column
prop="materiel_name"
label="浜у搧鍚嶇О"
- width="140"
- />
+ width="160"
+ >
+ <template slot-scope="{row}">
+ <div class="ellipsis">{{ row.materiel_name }}</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="specification"
label="瑙勬牸鍨嬪彿"
- width="113"
+ width="128"
>
<template slot-scope="{row}">
<div v-if="row.specification" class="ellipsis">{{ row.specification }}</div>
@@ -90,7 +98,7 @@
<el-table-column
prop="quantity"
label="鏁伴噺"
- width="50"
+ width="55"
/>
<el-table-column
prop="totalStockInQuantity"
@@ -107,20 +115,20 @@
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="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="110"
+ label="棰勮鍏ュ簱"
+ width="120"
>
<template slot-scope="{row}">
<div v-if="row.preFinishDate">{{ row.preFinishDate.substring(0, 10) }}</div>
@@ -240,26 +248,15 @@
</div>
</div>
</div>
- <!-- 2-->
- <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>
- <div class="content01">
- <!-- <div id="bar04" style="width: 100%;height:100%" />-->
- </div>
- </div>
- </div>
</div>
<div class="kb_right kb_pd10">
<div class="kb_right_top kb_pd10">
<div class="kb_right_top_content">
- <div class="content_head kb_title_text">浜у搧搴撳瓨閲忔帓琛孴op5</div>
- <div class="content_body">
+ <div class="content_head kb_title_text" style="margin-top: 30px;">浜у搧搴撳瓨閲忔帓琛孴op5</div>
+ <div class="content_body" style="height:402px;">
<div id="bar03" style="width: 100%;height:100%" />
</div>
- <div class="content_head kb_title_text" style="margin-top: 12px">鍘熸枡搴撳瓨閲忔帓琛孴op5</div>
+ <div class="content_head kb_title_text" style="margin-top: 12px">鍗婃垚鍝佸簱瀛橀噺鎺掕Top5</div>
<div class="content_body">
<div id="bar04" style="width: 100%;height:100%" />
</div>
@@ -281,14 +278,21 @@
WareHouseTopBottomData,
WareHouseTopLeftData
} from '@/api/dzkb'
+import MarqueeTips from 'vue-marquee-tips'
export default {
name: 'Index2',
+ components: {
+ MarqueeTips
+ },
data() {
return {
headTime: '',
tableDataTop: [],
- tableDataBottom: []
+ tableDataBottom: [],
+
+ MarqueeTipsContent: '', // 鍏憡
+ speed: 100// 鍏憡鎾斁鐨勯�熷害
}
},
@@ -299,8 +303,17 @@
this.getWareHouseTopLeftData()
this.getWareHouseTopBottomData()
this.getEcharts()
+
+ this.getMarqueeTipsContent()
},
methods: {
+ // 鑾峰彇鍏憡
+ getMarqueeTipsContent() {
+ this.MarqueeTipsContent = '鍚勪綅鍛樺伐浠細鏍规嵁涓婄骇鐨勯�氱煡锛岀粨鍚堟垜浼佸疄闄呮儏鍐碉紝鐜板皢20xx骞寸殑鍏冩棪鏀惧亣閫氱煡濡備笅锛氫竴銆�1鏈�1鏃ヨ嚦1鏈�3鏃ユ斁鍋囪皟浼戯紝鍏�3澶┿��1鏈�4鏃ユ寮忎笂鐝�備簩銆佽妭鍋囨棩鏈熼棿锛屽悇鐝粍瑕佷弗鏍艰惤瀹炰笂绾х殑閲嶈鎸囩ず绮剧锛屾寜鐓т笂绾х殑鍏蜂綋瑕佹眰锛岃鐪熸姄濂借惤瀹炶妭鏃ユ湡闂村�肩彮澶囧嫟宸ヤ綔锛岀‘淇濊妭鏃ユ湡闂翠紒涓氬悇椤瑰伐浣滄甯歌繍杞�倄x浼佷笟20xx骞�12鏈�28鏃�'
+ const spance = ' '.padStart(this.MarqueeTipsContent.length * 2, ' ')
+ this.MarqueeTipsContent = this.MarqueeTipsContent + spance
+ this.speed = this.MarqueeTipsContent.length / 10
+ },
// 鑾峰彇宸︿笂table鏁版嵁
getWareHouseTopLeftData() {
WareHouseTopLeftData().then(res => {
@@ -308,7 +321,7 @@
const divData = this.$refs.tableDataTopRef.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- setInterval(() => {
+ const task = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
divData.scrollTop += 1
// divData.scrollTop += divData.scrollHeight / this.tableData.length
@@ -318,9 +331,13 @@
divData.scrollTop = 0
WareHouseTopLeftData().then(res => {
this.tableDataTop = res.data
+ if (this.tableDataTop.length > 9) {
+ clearInterval(task)
+ this.getWareHouseTopLeftData()
+ }
})
}
- }, this.tableDataTop.length <= 10 ? 1000 * 6 : 100)
+ }, this.tableDataTop.length <= 9 ? 1000 * 3 : 100)
})
},
// 鑾峰彇宸︿笅table鏁版嵁
@@ -330,7 +347,7 @@
const divData = this.$refs.tableDataBottomRef.bodyWrapper
// 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
- setInterval(() => {
+ const task = setInterval(() => {
// 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
divData.scrollTop += 1
// divData.scrollTop += divData.scrollHeight / this.tableData.length
@@ -340,9 +357,14 @@
divData.scrollTop = 0
WareHouseTopBottomData().then(res => {
this.tableDataBottom = res.data
+
+ if (this.tableDataBottom.length > 10) {
+ clearInterval(task)
+ this.getWareHouseTopBottomData()
+ }
})
}
- }, this.tableDataBottom.length <= 10 ? 1000 * 6 : 100)
+ }, this.tableDataBottom.length <= 10 ? 1000 * 3 : 100)
})
},
@@ -426,7 +448,8 @@
padding-left: 5px;
.kb_left_top {
- height: 920px;
+ height:880px;
+ margin-top: 40px;
display: flex;
flex-direction: column;
justify-content: flex-start;
@@ -457,23 +480,6 @@
}
- .kb_left_bottom {
- height: 395px;
-
- .kb_left_bottom_content {
- height: 360px;
- display: flex;
- justify-content: space-between;
-
- .content01 {
- width: 48%;
- height: 100%;
- border: 1px solid $kbBorderColor;
- background-color: $kbBackgroundColor;
- border-radius: 5px;
- }
- }
- }
}
.kb_right {
@@ -498,7 +504,7 @@
}
.content_body {
- height: 442px;
+ height: 443px;
border: 1px solid $kbBorderColor;
background-color: $kbBackgroundColor;
diff --git a/src/views/kb/dccj.vue b/src/views/kb/dccj.vue
new file mode 100644
index 0000000..587b3c5
--- /dev/null
+++ b/src/views/kb/dccj.vue
@@ -0,0 +1,909 @@
+<template>
+ <div>
+ <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">
+ <span>{{ headTime }}</span>
+ </div>
+ </div>
+ <MarqueeTips
+ :content="MarqueeTipsContent"
+ class="MarqueeTipsContentClass"
+ :speed="speed"
+ />
+ <div class="kb_content">
+ <div class="kb_left">
+ <!-- 1-->
+ <div class="kb_left_top_title01 kb_title_text">
+ <!-- <div class="PG01" />-->
+ <!-- <svg-icon icon-class="sccx" />-->
+ 浜х嚎鍔犲伐涓换鍔�
+ </div>
+
+ <div class="kb_left_top kb_pd10">
+
+ <div v-if="false" class="kb_left_top_block">
+ <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 v-if="lineContent01.children&&lineContent01.children.length===0" class="kb_mt5">
+ 浠诲姟鏁伴噺:
+ </div>
+ <div v-else class="kb_mt5">
+ 浠诲姟鏁伴噺:{{ lineContent01.children ? parseFloat(lineContent01.children.qty) : '' }}
+ </div>
+ </div>
+ </div>
+ <div class="kb_block03 kb_pd10 ">
+ <div v-if="lineContent01.children!==undefined" class="flex_s_c">
+ <div
+ v-for="item in lineContent01.children.children"
+ :key="item.stepseq"
+ class="kb_block03_content flex_c_c"
+ >
+ <div>
+ <div class="content01">{{ item.stepname }}</div>
+ </div>
+ <div class="content02Parent">
+ <div class="content02">
+ <div class="content02_1 ">浠诲姟</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.planqty) }}</div>
+ </div>
+ <div class="content02">
+ <div class="content02_1 ">鍚堟牸</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.goodqty) }}</div>
+ </div>
+ <div class="content02" style="border-right: 0">
+ <div class="content02_1 ">涓嶈壇</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.ngqty) }}</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div v-if="lineContent01.children!==undefined" class="kb_block03_02 flex_s_c">
+ <div
+ v-for="item in lineContent01.children.children"
+ :key="item.stepseq"
+ class="kb_block03_02_content flex_c_c"
+ >
+ <div class="flex_c_c content01">
+ <div
+ v-if="item.status==='START'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
+ class="circle"
+ style="background-color: blue;"
+ />
+ <div
+ v-else-if="item.status==='ALLO'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
+ class="circle"
+ style="background-color: rgb(255 255 255)"
+ />
+ <div
+ v-else-if="parseFloat(item.ngqty)+parseFloat(item.goodqty)>=parseFloat(item.planqty)"
+ class="circle"
+ />
+ <div v-else class="circleYellow" />
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div v-for="item in lineContent4" :key="item.workcode" class="kb_left_top_block">
+ <div class="kb_block02 kb_pd10">
+ <div>
+ <div>閿�鍞崟鍙�:{{ item.saleordercode }}</div>
+ <div class="kb_mt5">
+ 鍔犲伐鍗曞彿:{{ item.workcode }}
+ </div>
+ <div class="kb_mt5">
+ 浜у搧鍚嶇О:{{ item.partname }}
+ </div>
+ <div class="kb_mt5">
+ 浠诲姟鏁伴噺:{{ parseFloat(item.qty) }}
+ </div>
+ </div>
+ </div>
+ <div class="kb_block03 kb_pd10 ">
+ <div v-if="item.children&&item.children.length>0" class="flex_s_c">
+ <div
+ v-for="(it,ind) in item.children"
+ :key="ind"
+ class="kb_block03_content flex_c_c"
+ >
+ <div>
+ <div class="content01">{{ it.stepname }}</div>
+ </div>
+ <div class="content02Parent">
+ <div class="content02">
+ <div class="content02_1 ">浠诲姟</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(it.planqty) }}</div>
+ </div>
+ <div class="content02">
+ <div class="content02_1 ">鍚堟牸</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(it.goodqty) }}</div>
+ </div>
+ <div class="content02" style="border-right: 0">
+ <div class="content02_1 ">涓嶈壇</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(it.ngqty) }}</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div v-if="item.children&&item.children.length>0" class="kb_block03_02 flex_s_c">
+ <div
+ v-for="(it,ind) in item.children"
+ :key="ind"
+ class="kb_block03_02_content flex_c_c"
+ >
+ <div class="flex_c_c content01">
+ <div
+ v-if="it.status==='START'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
+ class="circle"
+ style="background-color: blue;"
+ />
+ <div
+ v-else-if="it.status==='ALLO'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
+ class="circle"
+ style="background-color: rgb(255 255 255)"
+ />
+ <div
+ v-else-if="parseFloat(it.ngqty)+parseFloat(it.goodqty)>=parseFloat(it.planqty)"
+ class="circle"
+ />
+ <div v-else class="circleYellow" />
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ </div>
+ <!-- 2-->
+ <div class="kb_left_bottom kb_pd10">
+ <div class="kb_left_bottom_content">
+ <div class="content_head kb_title_text">浜х嚎鍔犲伐浠诲姟</div>
+ <div class="content_body">
+ <el-table
+ ref="tableData"
+ :data="tableData"
+ style="width: 100%;"
+ :header-cell-style="headerCellStyle"
+ :cell-style="cellStyle"
+ height="440"
+ >
+ <el-table-column
+ prop="RowNum"
+ label="搴忓彿"
+ width="40"
+ />
+ <el-table-column
+ prop="status"
+ label="鍔犲伐鐘舵��"
+ width="70"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
+ <div v-if="row.status==='START'">寮�宸�</div>
+ <div v-if="row.status==='NEW'">鏂板伐鍗�</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="lm_date"
+ label="娲惧彂鏃堕棿"
+ width="95"
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.lm_date.substring(0, 10) }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞鍗曞彿"
+ width="158"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wo_code"
+ label="鍔犲伐鍗曞彿"
+ width="170"
+ />
+ <el-table-column
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ width="145"
+ />
+ <el-table-column
+ prop="partspec"
+ label="瑙勬牸"
+ width="130"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partspec" class="ellipsis">{{ row.partspec }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鍗曚綅"
+ width="50"
+ />
+ <el-table-column
+ prop="plan_qty"
+ label="浠诲姟鏁伴噺"
+ width="70"
+ />
+ <el-table-column
+ prop="good_qty"
+ label="瀹屽伐鏁伴噺"
+ width="70"
+ />
+ <el-table-column
+ prop="ng_qty"
+ label="涓嶈壇鏁伴噺"
+ width="70"
+ />
+ <el-table-column
+ prop="wcl"
+ label="瀹屾垚鐜�"
+ width="50"
+ >
+ <template slot-scope="{row}">
+ <div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="planenddate"
+ label="棰勮寮�濮�"
+ width="95"
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.planenddate.substring(0, 10) }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="planstartdate"
+ label="棰勮缁撴潫"
+ width="105"
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.planstartdate.substring(0, 10) }}</div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="kb_right kb_pd10">
+ <div class="kb_right_top kb_pd10">
+ <div class="kb_right_top_content">
+ <div class="content_head kb_title_text">褰撴棩瀹屽伐浜у搧鏁伴噺鎺掕</div>
+ <div class="content_body">
+ <el-table
+ ref="tableDataRank"
+ :data="tableDataRank"
+ class="tableDataRank"
+ style="width: 100%;"
+ :header-cell-style="headerCellStyle"
+ :cell-style="cellStyle"
+ height="396"
+ >
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ width="55"
+ />
+ <el-table-column
+ prop="wkshname"
+ label="杞﹂棿锛堜緵鏂癸級"
+ width="120"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.wkshname" class="ellipsis">{{ row.wkshname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="linename"
+ label="浜х嚎"
+ width="120"
+ />
+ <el-table-column
+ prop="partname"
+ width="138"
+ label="浜у搧"
+ />
+ <el-table-column
+ prop="good_qty"
+ label="鏁伴噺"
+ width="100"
+ />
+ </el-table>
+ </div>
+ </div>
+ </div>
+ <div class="kb_right_bottom kb_pd10">
+ <div class="kb_right_bottom_content_title kb_title_text">
+ 涓�鍛ㄤ笉鑹疶op5
+ </div>
+ <div class="kb_right_bottom_content">
+ <div id="bar02" style="width: 100%;height:100%" />
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+import './kbCommon.css'
+import { bar02, loadEcharts } from '@/utils/myEcharts'
+import {
+ LineSearchBottomLeftData,
+ LineSearchBottomRightData,
+ LineSearchTopLeftData,
+ LineSearchTopRightData, ShopSearch,
+ ShopSearchLine
+} from '@/api/dzkb'
+import MarqueeTips from 'vue-marquee-tips'
+
+export default {
+ name: 'Index2',
+ components: {
+ MarqueeTips
+ },
+ data() {
+ return {
+ headTime: '',
+
+ lineArr: [],
+ // lineContent01: {},
+ lineContent01: {
+ linename: '',
+ lineworkcont: '',
+ children: undefined
+ },
+
+ lineContent: [],
+ lineContent4: [],
+
+ leftTopData: [],
+ tableData: [],
+ tableDataRank: [],
+ lineCodeArr: [],
+
+ ShopArr: [], // 杞﹂棿缂栫爜鏁扮粍
+
+ MarqueeTipsContent: '', // 鍏憡
+ speed: 100// 鍏憡鎾斁鐨勯�熷害
+
+ }
+ },
+
+ created() {
+ setInterval(this.getNowTime, 1000)
+ },
+ mounted() {
+ this.getValue()
+ },
+ methods: {
+ async getValue() {
+ await this.getShopSearch()
+ await this.getShopSearchLine()
+
+ await this.getEcharts()
+ await this.getTableDataRoll()
+ await this.getTableDataRankRoll()
+ await this.getMarqueeTipsContent()
+ },
+ // 鑾峰彇鍏憡
+ getMarqueeTipsContent() {
+ this.MarqueeTipsContent = '鍚勪綅鍛樺伐浠細鏍规嵁涓婄骇鐨勯�氱煡锛岀粨鍚堟垜浼佸疄闄呮儏鍐碉紝鐜板皢20xx骞寸殑鍏冩棪鏀惧亣閫氱煡濡備笅锛氫竴銆�1鏈�1鏃ヨ嚦1鏈�3鏃ユ斁鍋囪皟浼戯紝鍏�3澶┿��1鏈�4鏃ユ寮忎笂鐝�備簩銆佽妭鍋囨棩鏈熼棿锛屽悇鐝粍瑕佷弗鏍艰惤瀹炰笂绾х殑閲嶈鎸囩ず绮剧锛屾寜鐓т笂绾х殑鍏蜂綋瑕佹眰锛岃鐪熸姄濂借惤瀹炶妭鏃ユ湡闂村�肩彮澶囧嫟宸ヤ綔锛岀‘淇濊妭鏃ユ湡闂翠紒涓氬悇椤瑰伐浣滄甯歌繍杞�倄x浼佷笟20xx骞�12鏈�28鏃�'
+ const spance = ' '.padStart(this.MarqueeTipsContent.length * 2, ' ')
+ this.MarqueeTipsContent = this.MarqueeTipsContent + spance
+ this.speed = this.MarqueeTipsContent.length / 10
+ },
+ // 鑾峰彇杞﹂棿缂栫爜
+ async getShopSearch() {
+ this.ShopArr = ['CJ002'] // 鐢垫睜杞﹂棿
+ // const res1 = await ShopSearch()
+ // if (res1.code === '200') {
+ // this.ShopArr = []
+ // res1.data.forEach(item => {
+ // this.ShopArr.push(item.org_code)
+ // })
+ // }
+ // setInterval(() => {
+ // ShopSearch().then(res1 => {
+ // if (res1.code === '200') {
+ // this.ShopArr = []
+ // res1.data.forEach(item => {
+ // this.ShopArr.push(item.org_code)
+ // })
+ // }
+ // console.log(this.ShopArr, 997)
+ // })
+ // }, 1000 * 30)
+ },
+ // 浜х嚎鍔犲伐涓换鍔�
+ getShopSearchLine() {
+ let length, count
+ LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.lineContent = res.data
+ length = this.lineContent.length
+ count = Math.ceil(length / 4) // 闇�瑕佽疆鎾殑缁勬暟 4涓负涓�缁�
+ this.lineContent4 = this.lineContent.slice(0, 4)
+ // this.lineContent4[0].children.push({})
+ })
+
+ let start = 0
+ const task = setInterval(() => {
+ if (Math.floor(start / 4) === count) {
+ // clearInterval(task)
+ // this.getShopSearchLine()
+ start = 0
+ LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.lineContent = res.data
+ length = this.lineContent.length
+ count = Math.ceil(length / 4) // 闇�瑕佽疆鎾殑缁勬暟 4涓负涓�缁�
+ this.lineContent4 = this.lineContent.slice(0, 4)
+ console.log(count)
+ })
+ }
+ this.lineContent4 = this.lineContent.slice(start, start + 4)
+ start = start + 4
+ console.log(start)
+ console.log('鎵ц浜嗭紒锛侊紒')
+ }, 1000 * 3)
+ },
+
+ // 浜х嚎鍔犲伐浠诲姟
+ getTableDataRoll() {
+ LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.tableData = res.data
+
+ const divData = this.$refs.tableData.bodyWrapper
+ // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ const task = 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
+ if (this.tableData.length > 10) {
+ clearInterval(task)
+ this.getTableDataRoll()
+ }
+ })
+ }
+ }, this.tableData.length <= 10 ? 1000 * 3 : 100)
+ })
+ },
+ // 褰撴棩瀹屽伐浜у搧鏁伴噺鎺掕
+ getTableDataRankRoll() {
+ LineSearchTopRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.tableDataRank = res.data
+
+ const divData = this.$refs.tableDataRank.bodyWrapper
+ // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ const task = setInterval(() => {
+ // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+ // divData.scrollTop += divData.scrollHeight / this.tableDataRank.length
+ divData.scrollTop += 1
+ // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+ if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+ // 閲嶇疆table璺濈椤堕儴璺濈
+ divData.scrollTop = 0
+ LineSearchTopRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.tableDataRank = res.data
+
+ if (this.tableDataRank.length > 9) {
+ clearInterval(task)
+ this.getTableDataRankRoll()
+ }
+ })
+ }
+ }, this.tableDataRank.length <= 9 ? 1000 * 3 : 100)
+ })
+ },
+ // 鑾峰彇echarts
+ getEcharts() {
+ LineSearchBottomRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
+ })
+
+ setInterval(() => {
+ LineSearchBottomRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
+ })
+ }, 1000 * 15)
+ },
+ // 鑾峰彇褰撳墠鏃堕棿
+ getNowTime() {
+ const dt = new Date()
+ const wk = dt.getDay()
+ const y = dt.getFullYear()
+ const m = (dt.getMonth() + 1 + '').padStart(2, '0')
+ const d = (dt.getDate() + '').padStart(2, '0')
+
+ const hh = (dt.getHours() + '').padStart(2, '0')
+ const mm = (dt.getMinutes() + '').padStart(2, '0')
+ const ss = (dt.getSeconds() + '').padStart(2, '0')
+ const weeks = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�']
+ const week = weeks[wk]
+
+ this.headTime = `${y}-${m}-${d} ${hh}:${mm}:${ss} ${week}`
+ },
+ headerCellStyle() {
+ return {
+ backgroundColor: 'rgb(30 ,33, 46)',
+ padding: '10px 0',
+ textAlign: 'center',
+ color: '#07acc2',
+ border: 'none'
+ }
+ },
+ cellStyle() {
+ return {
+ padding: '8px 0',
+ textAlign: 'center',
+ backgroundColor: 'rgba(30, 33, 46 )',
+ // backgroundColor: 'transparent',
+ color: '#fff',
+ border: 'none'
+ }
+ }
+
+ }
+}
+</script>
+
+<style scoped lang="scss">
+//$kbBorderColor: #3A0088;
+//$kbBorderColor: #09d8f2;
+$kbBorderColor: rgba(9, 216, 242, 0.4);
+$kbBackgroundColor: rgba(30, 33, 46, 0.6);
+.kb_content {
+ display: flex;
+ position: relative;
+ height: 990px;
+ width: 100%;
+ //background-color: #000;
+ letter-spacing: 2px;
+ //color: #d8d7d9;
+ color: #fff;
+
+ .kb_left {
+ width: 1345px;
+ height: 100%;
+ padding-left: 5px;
+
+ .kb_left_top_title01 {
+ position: absolute;
+ top: 40px;
+ left: 15px;
+ font-size: 18px;
+ display: flex;
+ color: #00ffff;
+
+ .PG01 {
+ background: url("../../assets/images/GP_1.png") no-repeat;
+ width: 28px;
+ height: 12px;
+ margin-top: 4px;
+ margin-right: 10px;
+ }
+ }
+
+ .kb_left_top {
+ height: 495px;
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ //justify-content: flex-end;
+ //padding-top: 30px;
+ padding-top: 70px;
+ //padding-bottom: 25px;
+
+ .kb_left_top_block {
+ //margin-top: 10px;
+ width: 100%;
+ height: 100px;
+ display: flex;
+ border-radius: 5px;
+ font-size: 14px;
+ //padding: 10px 0;
+ //border: 1px solid rgba(255, 255, 255, 0.6);
+ //border: 1px solid $kbBorderColor;
+ //border-bottom: 1px solid $kbBorderColor;
+ border-top: 1px solid $kbBorderColor;
+ border-right: 1px solid $kbBorderColor;
+ border-left: 1px solid $kbBorderColor;
+ justify-content: flex-start;
+
+ .kb_block02 {
+ width: 304px;
+ display: flex;
+ align-items: center;
+ border-right: 1px solid $kbBorderColor;
+ background-color: $kbBackgroundColor;
+ }
+
+ .kb_block03 {
+ width: 1020px;
+ //width: 100%;
+ display: flex;
+ flex-direction: column;
+ font-size: 12px;
+ background-color: $kbBackgroundColor;
+ border-radius: 5px;
+
+ .kb_block03_content {
+ border: 1px solid $kbBorderColor;
+ //width: 152px;
+ width: 180px;
+ height: 50px;
+ margin-right: 15px;
+ //margin-right: 20px;
+ display: flex;
+ flex-direction: column;
+
+ .content01 {
+ //width: 50px;
+ width: 100%;
+ height: 18px;
+ border-bottom: 1px solid $kbBorderColor;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .content02Parent {
+ display: flex;
+ //height:30px;
+ .content02 {
+ width: 60px;
+ border-right: 1px solid $kbBorderColor;
+
+ .content02_1 {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 50%;
+ }
+
+ .content02_2 {
+ height: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .borderTop {
+ border-top: 1px solid $kbBorderColor;
+ }
+ }
+ }
+
+ }
+ }
+
+ .kb_block03_02 {
+ margin-top: 7px;
+ display: flex;
+
+ .kb_block03_02_content {
+ //width: 152px;
+ width: 180px;
+ margin-right: 15px;
+
+ .content01 {
+ .circle {
+ width: 26px;
+ height: 26px;
+ background-color: #00ff8b;
+ border-radius: 50%;
+ }
+
+ }
+
+ }
+ }
+
+ }
+
+ .kb_left_top_block:last-child{
+ border-bottom: 1px solid $kbBorderColor;
+ }
+ }
+
+ .kb_left_bottom {
+ height: 495px;
+
+ .kb_left_bottom_content {
+ height: 460px;
+ display: flex;
+ flex-direction: column;
+ //border: 1px solid $kbBorderColor;
+
+ .content_head {
+ ////font-size: 26px;
+ //font-size: 18px;
+ //height: 55px;
+ //line-height: 55px;
+ ////border-bottom: 1px solid $kbBorderColor;
+ ////text-align: center;
+ //padding-left: 10px;
+
+ font-size: 18px;
+ line-height: 20px;
+ //padding-left: 10px;
+ margin-bottom: 10px;
+ margin-top: -10px;
+ color: #00ffff;
+
+ }
+
+ .content_body {
+ border: 1px solid $kbBorderColor;
+ }
+ }
+ }
+ }
+
+ .kb_right {
+ width: 575px;
+ height: 100%;
+
+ .kb_right_top {
+ margin-top: 30px;
+ margin-bottom: -30px;
+ height: 476px;
+ width: 100%;
+
+ .kb_right_top_content {
+ //border: 1px solid $kbBorderColor;
+ height: 430px;
+ display: flex;
+ flex-direction: column;
+
+ .content_head {
+ font-size: 18px;
+ line-height: 20px;
+ //padding-left: 10px;
+ margin-bottom: 10px;
+ margin-top: -10px;
+ color: #00ffff;
+ }
+
+ .content_body {
+ border: 1px solid $kbBorderColor;
+ //border-radius: 5px;
+ }
+ }
+ }
+
+ .kb_right_bottom {
+ height: 482px;
+ margin-top: 8px;
+
+ .kb_right_bottom_content_title {
+ color: #00ffff;
+ font-size: 18px;
+ margin-bottom: 10px;
+ margin-top: -10px;
+ }
+
+ .kb_right_bottom_content {
+ border: 1px solid $kbBorderColor;
+ height: 441px;
+ width: 100%;
+ border-radius: 5px;
+ background-color: $kbBackgroundColor;
+ //height: 100%;
+ }
+ }
+ }
+}
+
+::v-deep .el-table::before {
+ height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+ //background-color: #044563;
+ background-color: rgba(30, 33, 46);
+}
+
+::v-deep .el-table__body-wrapper::-webkit-scrollbar {
+ /* width: 0;瀹藉害涓�0鏆楄棌 */
+ width: 0;
+}
+
+::v-deep .cell {
+ padding: 0 !important;
+}
+
+//
+///* 瀹氫箟keyframes鍔ㄧ敾锛屽懡鍚嶄负blink*/
+//@keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+///*娣诲姞鍏煎鎬у墠缂�*/
+//@-webkit-keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+//@-o-keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+//@-moz-keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+//@-ms-keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+.circleYellow {
+ width: 26px;
+ height: 26px;
+ background-color: rgb(255 255 0);
+ border-radius: 50%;
+
+ //animation: blink 2s linear infinite;
+ //-webkit-animation: blink 2s linear infinite;
+ //-moz-animation: blink 2s linear infinite;
+ //-ms-animation: blink 2s linear infinite;
+ //-o-animation: blink 2s linear infinite;
+}
+</style>
diff --git a/src/views/kb/kbCommon.css b/src/views/kb/kbCommon.css
index dac111f..a858176 100644
--- a/src/views/kb/kbCommon.css
+++ b/src/views/kb/kbCommon.css
@@ -89,7 +89,17 @@
.kb_mt5 {
margin-top: 5px;
}
-
+/*鍏憡鏍峰紡*/
+.MarqueeTipsContentClass {
+ color: #00ffff;
+ height: 30px;
+ width: 100%;
+ line-height: 30px;
+ font-size: 26px;
+ z-index: 2;
+ position: absolute;
+ top:80px;
+}
/*
瀹氫箟婊氬姩鏉￠珮瀹藉強鑳屾櫙
diff --git a/src/views/kb/zhkb.vue b/src/views/kb/zhkb.vue
index d24b679..4c538d4 100644
--- a/src/views/kb/zhkb.vue
+++ b/src/views/kb/zhkb.vue
@@ -10,7 +10,11 @@
<span>{{ headTime }}</span>
</div>
</div>
-
+ <MarqueeTips
+ :content="MarqueeTipsContent"
+ class="MarqueeTipsContentClass"
+ :speed="speed"
+ />
<div class="kb_content">
<div class="kb_left">
<!-- 1-->
@@ -22,20 +26,7 @@
<div class="kb_left_top kb_pd10">
- <div class="kb_left_top_block">
- <div class="kb_block01 kb_pd10">
- <div>
- <div>浜х嚎鍚嶇О:{{ lineContent01.linename }}</div>
- <div class="kb_mt10">浜х嚎鎬婚噺:{{
- lineContent01.children !== undefined ? lineContent01.lineworkcont : ''
- }}
- </div>
- </div>
- <div>
- <!-- <div>{{ lineContent01.linename }}</div>-->
- <!-- <div v-if="lineContent01.children!==undefined" class="kb_mt10">{{ lineContent01.lineworkcont }}</div>-->
- </div>
- </div>
+ <div v-if="false" class="kb_left_top_block">
<div class="kb_block02 kb_pd10">
<div>
<div>閿�鍞崟鍙�:{{ lineContent01.children !== undefined ? lineContent01.children.saleordercode : '' }}</div>
@@ -50,10 +41,9 @@
浠诲姟鏁伴噺:
</div>
<div v-else class="kb_mt5">
- 浠诲姟鏁伴噺:{{ lineContent01.children? parseFloat(lineContent01.children.qty) : '' }}
+ 浠诲姟鏁伴噺:{{ lineContent01.children ? parseFloat(lineContent01.children.qty) : '' }}
</div>
</div>
-
</div>
<div class="kb_block03 kb_pd10 ">
<div v-if="lineContent01.children!==undefined" class="flex_s_c">
@@ -110,258 +100,66 @@
</div>
</div>
- <!-- 234-->
- <div class="kb_left_top_block">
- <div class="kb_block01 kb_pd10">
- <div>
- <div>浜х嚎鍚嶇О:{{ lineContent02.linename }}</div>
- <div class="kb_mt10">浜х嚎鎬婚噺:{{
- lineContent02.children !== undefined ? lineContent02.lineworkcont : ''
- }}
- </div>
- </div>
- <div>
- <!-- <div>{{ lineContent02.linename }}</div>-->
- <!-- <div v-if="lineContent02.children!==undefined" class="kb_mt10">{{ lineContent02.lineworkcont }}</div>-->
- </div>
- </div>
+ <div v-for="item in lineContent4" :key="item.workcode" class="kb_left_top_block">
<div class="kb_block02 kb_pd10">
<div>
- <div>閿�鍞崟鍙�:{{ lineContent02.children !== undefined ? lineContent02.children.saleordercode : '' }}</div>
+ <div>閿�鍞崟鍙�:{{ item.saleordercode }}</div>
<div class="kb_mt5">
- 鍔犲伐鍗曞彿:{{ lineContent02.children !== undefined ? lineContent02.children.workcode : '' }}
+ 鍔犲伐鍗曞彿:{{ item.workcode }}
</div>
<div class="kb_mt5">
- 浜у搧鍚嶇О:{{ lineContent02.children !== undefined ? lineContent02.children.partname : '' }}
+ 浜у搧鍚嶇О:{{ item.partname }}
</div>
- <div v-if="lineContent02.children&&lineContent02.children.length===0" class="kb_mt5">
- 浠诲姟鏁伴噺:
- </div>
- <div v-else class="kb_mt5">
- 浠诲姟鏁伴噺:{{ lineContent02.children ? parseFloat(lineContent02.children.qty) : '' }}
+ <div class="kb_mt5">
+ 浠诲姟鏁伴噺:{{ parseFloat(item.qty) }}
</div>
</div>
-
</div>
<div class="kb_block03 kb_pd10 ">
- <div v-if="lineContent02.children!==undefined" class="flex_s_c">
+ <div v-if="item.children&&item.children.length>0" class="flex_s_c">
<div
- v-for="item in lineContent02.children.children"
- :key="item.stepseq"
+ v-for="(it,ind) in item.children"
+ :key="ind"
class="kb_block03_content flex_c_c"
>
<div>
- <div class="content01">{{ item.stepname }}</div>
+ <div class="content01">{{ it.stepname }}</div>
</div>
<div class="content02Parent">
<div class="content02">
<div class="content02_1 ">浠诲姟</div>
- <div class="content02_2 borderTop ">{{ parseFloat(item.planqty) }}</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(it.planqty) }}</div>
</div>
<div class="content02">
<div class="content02_1 ">鍚堟牸</div>
- <div class="content02_2 borderTop ">{{ parseFloat(item.goodqty) }}</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(it.goodqty) }}</div>
</div>
<div class="content02" style="border-right: 0">
<div class="content02_1 ">涓嶈壇</div>
- <div class="content02_2 borderTop ">{{ parseFloat(item.ngqty) }}</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(it.ngqty) }}</div>
</div>
</div>
</div>
</div>
- <div v-if="lineContent02.children!==undefined" class="kb_block03_02 flex_s_c">
+ <div v-if="item.children&&item.children.length>0" class="kb_block03_02 flex_s_c">
<div
- v-for="item in lineContent02.children.children"
- :key="item.stepseq"
+ v-for="(it,ind) in item.children"
+ :key="ind"
class="kb_block03_02_content flex_c_c"
>
<div class="flex_c_c content01">
<div
- v-if="item.status==='START'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
+ v-if="it.status==='START'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
class="circle"
style="background-color: blue;"
/>
<div
- v-else-if="item.status==='ALLO'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
+ v-else-if="it.status==='ALLO'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
class="circle"
style="background-color: rgb(255 255 255)"
/>
<div
- v-else-if="parseFloat(item.ngqty)+parseFloat(item.goodqty)>=parseFloat(item.planqty)"
- class="circle"
- />
- <div v-else class="circleYellow" />
- </div>
- </div>
- </div>
-
- </div>
- </div>
-
- <div class="kb_left_top_block">
- <div class="kb_block01 kb_pd10">
- <div>
- <div>浜х嚎鍚嶇О:{{ lineContent03.linename }}</div>
- <div class="kb_mt10">浜х嚎鎬婚噺:{{
- lineContent03.children !== undefined ? lineContent03.lineworkcont : ''
- }}
- </div>
- </div>
- <div>
- <!-- <div>{{ lineContent03.linename }}</div>-->
- <!-- <div v-if="lineContent03.children!==undefined" class="kb_mt10">{{ lineContent03.lineworkcont }}</div>-->
- </div>
- </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 v-if="lineContent03.children&&lineContent03.children.length===0" class="kb_mt5">
- 浠诲姟鏁伴噺:
- </div>
- <div v-else class="kb_mt5">
- 浠诲姟鏁伴噺:{{ lineContent03.children ? parseFloat(lineContent03.children.qty) : '' }}
- </div>
- </div>
-
- </div>
- <div class="kb_block03 kb_pd10 ">
- <div v-if="lineContent03.children!==undefined" class="flex_s_c">
- <div
- v-for="item in lineContent03.children.children"
- :key="item.stepseq"
- class="kb_block03_content flex_c_c"
- >
- <div>
- <div class="content01">{{ item.stepname }}</div>
- </div>
- <div class="content02Parent">
- <div class="content02">
- <div class="content02_1 ">浠诲姟</div>
- <div class="content02_2 borderTop ">{{ parseFloat(item.planqty) }}</div>
- </div>
- <div class="content02">
- <div class="content02_1 ">鍚堟牸</div>
- <div class="content02_2 borderTop ">{{ parseFloat(item.goodqty) }}</div>
- </div>
- <div class="content02" style="border-right: 0">
- <div class="content02_1 ">涓嶈壇</div>
- <div class="content02_2 borderTop ">{{ parseFloat(item.ngqty) }}</div>
- </div>
- </div>
- </div>
- </div>
- <div v-if="lineContent03.children!==undefined" class="kb_block03_02 flex_s_c">
- <div
- v-for="item in lineContent03.children.children"
- :key="item.stepseq"
- class="kb_block03_02_content flex_c_c"
- >
- <div class="flex_c_c content01">
- <div
- v-if="item.status==='START'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
- class="circle"
- style="background-color: blue;"
- />
- <div
- v-else-if="item.status==='ALLO'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
- class="circle"
- style="background-color: rgb(255 255 255)"
- />
- <div
- v-else-if="parseFloat(item.ngqty)+parseFloat(item.goodqty)>=parseFloat(item.planqty)"
- class="circle"
- />
- <div v-else class="circleYellow" />
- </div>
- </div>
- </div>
-
- </div>
- </div>
-
- <div class="kb_left_top_block">
- <div class="kb_block01 kb_pd10">
- <div>
- <div>浜х嚎鍚嶇О:{{ lineContent04.linename }}</div>
- <div class="kb_mt10">浜х嚎鎬婚噺:{{
- lineContent04.children !== undefined ? lineContent04.lineworkcont : ''
- }}
- </div>
- </div>
- <div>
- <!-- <div>{{ lineContent04.linename }}</div>-->
- <!-- <div v-if="lineContent04.children!==undefined" class="kb_mt10">{{ lineContent04.lineworkcont }}</div>-->
- </div>
- </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 v-if="lineContent04.children&&lineContent04.children.length===0" class="kb_mt5">
- 浠诲姟鏁伴噺:
- </div>
- <div v-else class="kb_mt5">
- 浠诲姟鏁伴噺:{{ lineContent04.children ? parseFloat(lineContent04.children.qty) : '' }}
- </div>
- </div>
-
- </div>
- <div class="kb_block03 kb_pd10 ">
- <div v-if="lineContent04.children!==undefined" class="flex_s_c">
- <div
- v-for="item in lineContent04.children.children"
- :key="item.stepseq"
- class="kb_block03_content flex_c_c"
- >
- <div>
- <div class="content01">{{ item.stepname }}</div>
- </div>
- <div class="content02Parent">
- <div class="content02">
- <div class="content02_1 ">浠诲姟</div>
- <div class="content02_2 borderTop ">{{ parseFloat(item.planqty) }}</div>
- </div>
- <div class="content02">
- <div class="content02_1 ">鍚堟牸</div>
- <div class="content02_2 borderTop ">{{ parseFloat(item.goodqty) }}</div>
- </div>
- <div class="content02" style="border-right: 0">
- <div class="content02_1 ">涓嶈壇</div>
- <div class="content02_2 borderTop ">{{ parseFloat(item.ngqty) }}</div>
- </div>
- </div>
- </div>
- </div>
- <div v-if="lineContent04.children!==undefined" class="kb_block03_02 flex_s_c">
- <div
- v-for="item in lineContent04.children.children"
- :key="item.stepseq"
- class="kb_block03_02_content flex_c_c"
- >
- <div class="flex_c_c content01">
- <div
- v-if="item.status==='START'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
- class="circle"
- style="background-color: blue;"
- />
- <div
- v-else-if="item.status==='ALLO'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
- class="circle"
- style="background-color: rgb(255 255 255)"
- />
- <div
- v-else-if="parseFloat(item.ngqty)+parseFloat(item.goodqty)>=parseFloat(item.planqty)"
+ v-else-if="parseFloat(it.ngqty)+parseFloat(it.goodqty)>=parseFloat(it.planqty)"
class="circle"
/>
<div v-else class="circleYellow" />
@@ -505,7 +303,7 @@
style="width: 100%;"
:header-cell-style="headerCellStyle"
:cell-style="cellStyle"
- height="426"
+ height="396"
>
<el-table-column
type="index"
@@ -562,12 +360,16 @@
LineSearchBottomLeftData,
LineSearchBottomRightData,
LineSearchTopLeftData,
- LineSearchTopRightData,
+ LineSearchTopRightData, ShopSearch,
ShopSearchLine
} from '@/api/dzkb'
+import MarqueeTips from 'vue-marquee-tips'
export default {
name: 'Index2',
+ components: {
+ MarqueeTips
+ },
data() {
return {
headTime: '',
@@ -579,41 +381,19 @@
lineworkcont: '',
children: undefined
},
- lineContent02: {
- linename: '',
- lineworkcont: '',
- children: undefined
- },
- lineContent03: {
- linename: '',
- lineworkcont: '',
- children: undefined
- },
- lineContent04: {
- linename: '',
- lineworkcont: '',
- children: undefined
- // children: {
- // workcode: '',
- // partname: '',
- // qty: 0,
- // saleordercode: '',
- // children: [
- // {
- // stepseq: '',
- // stepname: '',
- // planqty: 0,
- // goodqty: '',
- // ngqty: ''
- // }
- // ]
- // }
- },
+
+ lineContent: [],
+ lineContent4: [],
leftTopData: [],
tableData: [],
tableDataRank: [],
- lineCodeArr: []
+ lineCodeArr: [],
+
+ ShopArr: [], // 杞﹂棿缂栫爜鏁扮粍
+
+ MarqueeTipsContent: '', // 鍏憡
+ speed: 100// 鍏憡鎾斁鐨勯�熷害
}
},
@@ -626,202 +406,77 @@
},
methods: {
async getValue() {
+ await this.getShopSearch()
await this.getShopSearchLine()
- await this.getLineSearchTopLeftData()
- this.getEcharts()
- this.getTableDataRoll()
- this.getTableDataRankRoll()
+ await this.getEcharts()
+ await this.getTableDataRoll()
+ await this.getTableDataRankRoll()
+ await this.getMarqueeTipsContent()
},
- // 鐢熶骇浜х嚎
- async getShopSearchLine() {
- const { data: res } = await ShopSearchLine({ shopcode: 'CJ001' })
- this.lineArr = res
+ // 鑾峰彇鍏憡
+ getMarqueeTipsContent() {
+ this.MarqueeTipsContent = '鍚勪綅鍛樺伐浠細鏍规嵁涓婄骇鐨勯�氱煡锛岀粨鍚堟垜浼佸疄闄呮儏鍐碉紝鐜板皢20xx骞寸殑鍏冩棪鏀惧亣閫氱煡濡備笅锛氫竴銆�1鏈�1鏃ヨ嚦1鏈�3鏃ユ斁鍋囪皟浼戯紝鍏�3澶┿��1鏈�4鏃ユ寮忎笂鐝�備簩銆佽妭鍋囨棩鏈熼棿锛屽悇鐝粍瑕佷弗鏍艰惤瀹炰笂绾х殑閲嶈鎸囩ず绮剧锛屾寜鐓т笂绾х殑鍏蜂綋瑕佹眰锛岃鐪熸姄濂借惤瀹炶妭鏃ユ湡闂村�肩彮澶囧嫟宸ヤ綔锛岀‘淇濊妭鏃ユ湡闂翠紒涓氬悇椤瑰伐浣滄甯歌繍杞�倄x浼佷笟20xx骞�12鏈�28鏃�'
+ const spance = ' '.padStart(this.MarqueeTipsContent.length * 2, ' ')
+ this.MarqueeTipsContent = this.MarqueeTipsContent + spance
+ this.speed = this.MarqueeTipsContent.length / 10
},
-
- getLineSearchTopLeftData() {
- this.lineArr.forEach((item, index) => {
- if (index <= 3) {
- this.handleEveryLine(item, index)
- this.lineCodeArr.push(item.code)
- }
+ // 鑾峰彇杞﹂棿缂栫爜
+ async getShopSearch() {
+ const res1 = await ShopSearch()
+ if (res1.code === '200') {
+ this.ShopArr = []
+ res1.data.forEach(item => {
+ this.ShopArr.push(item.org_code)
+ })
+ }
+ setInterval(() => {
+ ShopSearch().then(res1 => {
+ if (res1.code === '200') {
+ this.ShopArr = []
+ res1.data.forEach(item => {
+ this.ShopArr.push(item.org_code)
+ })
+ }
+ console.log(this.ShopArr, 997)
+ })
+ }, 1000 * 30)
+ },
+ // 浜х嚎鍔犲伐涓换鍔�
+ getShopSearchLine() {
+ let length, count
+ LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.lineContent = res.data
+ length = this.lineContent.length
+ count = Math.ceil(length / 4) // 闇�瑕佽疆鎾殑缁勬暟 4涓负涓�缁�
+ this.lineContent4 = this.lineContent.slice(0, 4)
+ // this.lineContent4[0].children.push({})
})
- },
- // 澶勭悊姣忎竴鏉′骇绾�
- async handleEveryLine(item, index) {
- const res = await LineSearchTopLeftData([item])
- let res1, res2, res3, res4
- if (res.data[0].linecode === this.lineCodeArr[0]) {
- res1 = res
- }
- if (res.data[0].linecode === this.lineCodeArr[1]) {
- res2 = res
- }
- if (res.data[0].linecode === this.lineCodeArr[2]) {
- res3 = res
- }
- if (res.data[0].linecode === this.lineCodeArr[3]) {
- res4 = res
- }
-
- let flag1 = true
- let flag2 = true
- let flag3 = true
- let flag4 = true
- if (index === 0) {
- let count = 0
- if (flag1) {
- this.lineContent01 = {
- linename: res1.data[0].linename,
- lineworkcont: res1.data[0].lineworkcont,
- children: res1.data[0].children ? res.data[0].children[count] : []
- }
- flag1 = false
+ let start = 0
+ const task = setInterval(() => {
+ if (Math.floor(start / 4) === count) {
+ // clearInterval(task)
+ // this.getShopSearchLine()
+ start = 0
+ LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.lineContent = res.data
+ length = this.lineContent.length
+ count = Math.ceil(length / 4) // 闇�瑕佽疆鎾殑缁勬暟 4涓负涓�缁�
+ this.lineContent4 = this.lineContent.slice(0, 4)
+ console.log(count)
+ })
}
- setInterval(() => {
- if (count > 0) {
- this.lineContent01 = {
- linename: res1.data[0].linename,
- lineworkcont: res1.data[0].lineworkcont,
- children: res1.data[0].children ? res1.data[0].children[count] : []
- }
- }
- console.log(res1.data[0].children === null, 999)
- if (res1.data[0].children === null) {
- res1.data[0].children = []
- }
- if (this.lineContent01.children === undefined || res1.data[0].children.length >= 0) {
- LineSearchTopLeftData([item]).then(res => {
- res1 = res
- })
- }
- if (res1.data[0].children.length === count++) {
- count = 0
- this.lineContent01 = {
- linename: res1.data[0].linename,
- lineworkcont: res1.data[0].lineworkcont,
- children: res1.data[0].children ? res1.data[0].children[count] : []
- }
- }
- }, 1000 * 3)
- } else if (index === 1) {
- let count = 0
- if (flag2) {
- this.lineContent02 = {
- linename: res2.data[0].linename,
- lineworkcont: res2.data[0].lineworkcont,
- children: res2.data[0].children ? res2.data[0].children[count] : []
- }
- flag2 = false
- }
- setInterval(() => {
- if (count > 0) {
- this.lineContent02 = {
- linename: res2.data[0].linename,
- lineworkcont: res2.data[0].lineworkcont,
- children: res2.data[0].children ? res2.data[0].children[count] : []
- }
- }
- if (res2.data[0].children === null) {
- res2.data[0].children = []
- }
- if (this.lineContent02.children === undefined || res2.data[0].children.length >= 0) {
- LineSearchTopLeftData([item]).then(res => {
- res2 = res
- })
- }
- if (res2.data[0].children.length === count++) {
- count = 0
- this.lineContent02 = {
- linename: res2.data[0].linename,
- lineworkcont: res2.data[0].lineworkcont,
- children: res2.data[0].children ? res2.data[0].children[count] : []
- }
- }
- }, 1000 * 3)
- } else if (index === 2) {
- let count = 0
- if (flag3) {
- this.lineContent03 = {
- linename: res3.data[0].linename,
- lineworkcont: res3.data[0].lineworkcont,
- children: res3.data[0].children ? res3.data[0].children[count] : []
- }
- flag3 = false
- }
- setInterval(() => {
- if (count > 0) {
- this.lineContent03 = {
- linename: res3.data[0].linename,
- lineworkcont: res3.data[0].lineworkcont,
- children: res3.data[0].children ? res3.data[0].children[count] : []
- }
- }
-
- if (res3.data[0].children === null) {
- res3.data[0].children = []
- }
-
- if (this.lineContent03.children === undefined || res3.data[0].children.length >= 0) {
- LineSearchTopLeftData([item]).then(res => {
- res3 = res
- })
- }
-
- if (res3.data[0].children.length === count++) {
- count = 0
- this.lineContent03 = {
- linename: res3.data[0].linename,
- lineworkcont: res3.data[0].lineworkcont,
- children: res3.data[0].children ? res3.data[0].children[count] : []
- }
- }
- }, 1000 * 3)
- } else if (index === 3) {
- let count = 0
- if (flag4) {
- this.lineContent04 = {
- linename: res4.data[0].linename,
- lineworkcont: res4.data[0].lineworkcont,
- children: res4.data[0].children ? res4.data[0].children[count] : []
- }
- flag4 = false
- }
- setInterval(() => {
- if (count > 0) {
- this.lineContent04 = {
- linename: res4.data[0].linename,
- lineworkcont: res4.data[0].lineworkcont,
- children: res4.data[0].children ? res4.data[0].children[count] : []
- }
- }
-
- if (res4.data[0].children === null) {
- res4.data[0].children = []
- }
-
- if (res4.data[0].children.length === count || this.lineContent04.children === undefined) {
- LineSearchTopLeftData([item]).then(res => {
- res4 = res
- })
- }
-
- if (res4.data[0].children.length === count++) {
- count = 0
- this.lineContent04 = {
- linename: res4.data[0].linename,
- lineworkcont: res4.data[0].lineworkcont,
- children: res4.data[0].children ? res4.data[0].children[count] : []
- }
- }
- }, 1000 * 3)
- }
+ this.lineContent4 = this.lineContent.slice(start, start + 4)
+ start = start + 4
+ console.log(start)
+ console.log('鎵ц浜嗭紒锛侊紒')
+ }, 1000 * 3)
},
// 浜х嚎鍔犲伐浠诲姟
getTableDataRoll() {
- LineSearchBottomLeftData().then(res => {
+ LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
this.tableData = res.data
const divData = this.$refs.tableData.bodyWrapper
@@ -834,7 +489,7 @@
if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
// 閲嶇疆table璺濈椤堕儴璺濈
divData.scrollTop = 0
- LineSearchBottomLeftData().then(res => {
+ LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
this.tableData = res.data
if (this.tableData.length > 10) {
clearInterval(task)
@@ -847,7 +502,7 @@
},
// 褰撴棩瀹屽伐浜у搧鏁伴噺鎺掕
getTableDataRankRoll() {
- LineSearchTopRightData().then(res => {
+ LineSearchTopRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
this.tableDataRank = res.data
const divData = this.$refs.tableDataRank.bodyWrapper
@@ -860,26 +515,26 @@
if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
// 閲嶇疆table璺濈椤堕儴璺濈
divData.scrollTop = 0
- LineSearchTopRightData().then(res => {
+ LineSearchTopRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
this.tableDataRank = res.data
- if (this.tableDataRank.length > 10) {
+ if (this.tableDataRank.length > 9) {
clearInterval(task)
this.getTableDataRankRoll()
}
})
}
- }, this.tableDataRank.length <= 10 ? 1000 * 3 : 100)
+ }, this.tableDataRank.length <= 9 ? 1000 * 3 : 100)
})
},
// 鑾峰彇echarts
getEcharts() {
- LineSearchBottomRightData().then(res => {
+ LineSearchBottomRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
})
setInterval(() => {
- LineSearchBottomRightData().then(res => {
+ LineSearchBottomRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
})
}, 1000 * 15)
@@ -946,7 +601,7 @@
.kb_left_top_title01 {
position: absolute;
- top: 10px;
+ top: 40px;
left: 15px;
font-size: 18px;
display: flex;
@@ -966,29 +621,26 @@
display: flex;
flex-direction: column;
justify-content: flex-start;
- padding-top: 30px;
+ //justify-content: flex-end;
+ //padding-top: 30px;
+ padding-top: 70px;
+ //padding-bottom: 25px;
.kb_left_top_block {
- margin-top: 10px;
+ //margin-top: 10px;
width: 100%;
height: 100px;
display: flex;
border-radius: 5px;
font-size: 14px;
+ //padding: 10px 0;
//border: 1px solid rgba(255, 255, 255, 0.6);
- border: 1px solid $kbBorderColor;
+ //border: 1px solid $kbBorderColor;
+ //border-bottom: 1px solid $kbBorderColor;
+ border-top: 1px solid $kbBorderColor;
+ border-right: 1px solid $kbBorderColor;
+ border-left: 1px solid $kbBorderColor;
justify-content: flex-start;
-
- .kb_block01 {
- width: 171px;
- display: flex;
- align-items: center;
- border-right: 1px solid $kbBorderColor;
- background-color: $kbBackgroundColor;
- border-bottom-left-radius: 5px;
- border-top-left-radius: 5px;
-
- }
.kb_block02 {
width: 304px;
@@ -999,7 +651,8 @@
}
.kb_block03 {
- width: 843px;
+ width: 1020px;
+ //width: 100%;
display: flex;
flex-direction: column;
font-size: 12px;
@@ -1008,7 +661,8 @@
.kb_block03_content {
border: 1px solid $kbBorderColor;
- width: 152px;
+ //width: 152px;
+ width: 180px;
height: 50px;
margin-right: 15px;
//margin-right: 20px;
@@ -1018,7 +672,7 @@
.content01 {
//width: 50px;
width: 100%;
- height: 20px;
+ height: 18px;
border-bottom: 1px solid $kbBorderColor;
display: flex;
align-items: center;
@@ -1027,9 +681,9 @@
.content02Parent {
display: flex;
-
+ //height:30px;
.content02 {
- width: 50px;
+ width: 60px;
border-right: 1px solid $kbBorderColor;
.content02_1 {
@@ -1060,7 +714,8 @@
display: flex;
.kb_block03_02_content {
- width: 152px;
+ //width: 152px;
+ width: 180px;
margin-right: 15px;
.content01 {
@@ -1078,6 +733,9 @@
}
+ .kb_left_top_block:last-child{
+ border-bottom: 1px solid $kbBorderColor;
+ }
}
.kb_left_bottom {
@@ -1119,12 +777,14 @@
height: 100%;
.kb_right_top {
+ margin-top: 30px;
+ margin-bottom: -30px;
height: 476px;
width: 100%;
.kb_right_top_content {
//border: 1px solid $kbBorderColor;
- height: 460px;
+ height: 430px;
display: flex;
flex-direction: column;
@@ -1145,7 +805,7 @@
}
.kb_right_bottom {
- height: 481px;
+ height: 482px;
margin-top: 8px;
.kb_right_bottom_content_title {
@@ -1157,7 +817,7 @@
.kb_right_bottom_content {
border: 1px solid $kbBorderColor;
- height: 440px;
+ height: 441px;
width: 100%;
border-radius: 5px;
background-color: $kbBackgroundColor;
diff --git a/src/views/kb/zhkb_back.vue b/src/views/kb/zhkb_back.vue
new file mode 100644
index 0000000..d24b679
--- /dev/null
+++ b/src/views/kb/zhkb_back.vue
@@ -0,0 +1,1248 @@
+<template>
+ <div>
+ <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">
+ <span>{{ headTime }}</span>
+ </div>
+ </div>
+
+ <div class="kb_content">
+ <div class="kb_left">
+ <!-- 1-->
+ <div class="kb_left_top_title01 kb_title_text">
+ <!-- <div class="PG01" />-->
+ <!-- <svg-icon icon-class="sccx" />-->
+ 浜х嚎鍔犲伐涓换鍔�
+ </div>
+
+ <div class="kb_left_top kb_pd10">
+
+ <div class="kb_left_top_block">
+ <div class="kb_block01 kb_pd10">
+ <div>
+ <div>浜х嚎鍚嶇О:{{ lineContent01.linename }}</div>
+ <div class="kb_mt10">浜х嚎鎬婚噺:{{
+ lineContent01.children !== undefined ? lineContent01.lineworkcont : ''
+ }}
+ </div>
+ </div>
+ <div>
+ <!-- <div>{{ lineContent01.linename }}</div>-->
+ <!-- <div v-if="lineContent01.children!==undefined" class="kb_mt10">{{ lineContent01.lineworkcont }}</div>-->
+ </div>
+ </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 v-if="lineContent01.children&&lineContent01.children.length===0" class="kb_mt5">
+ 浠诲姟鏁伴噺:
+ </div>
+ <div v-else class="kb_mt5">
+ 浠诲姟鏁伴噺:{{ lineContent01.children? parseFloat(lineContent01.children.qty) : '' }}
+ </div>
+ </div>
+
+ </div>
+ <div class="kb_block03 kb_pd10 ">
+ <div v-if="lineContent01.children!==undefined" class="flex_s_c">
+ <div
+ v-for="item in lineContent01.children.children"
+ :key="item.stepseq"
+ class="kb_block03_content flex_c_c"
+ >
+ <div>
+ <div class="content01">{{ item.stepname }}</div>
+ </div>
+ <div class="content02Parent">
+ <div class="content02">
+ <div class="content02_1 ">浠诲姟</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.planqty) }}</div>
+ </div>
+ <div class="content02">
+ <div class="content02_1 ">鍚堟牸</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.goodqty) }}</div>
+ </div>
+ <div class="content02" style="border-right: 0">
+ <div class="content02_1 ">涓嶈壇</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.ngqty) }}</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div v-if="lineContent01.children!==undefined" class="kb_block03_02 flex_s_c">
+ <div
+ v-for="item in lineContent01.children.children"
+ :key="item.stepseq"
+ class="kb_block03_02_content flex_c_c"
+ >
+ <div class="flex_c_c content01">
+ <div
+ v-if="item.status==='START'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
+ class="circle"
+ style="background-color: blue;"
+ />
+ <div
+ v-else-if="item.status==='ALLO'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
+ class="circle"
+ style="background-color: rgb(255 255 255)"
+ />
+ <div
+ v-else-if="parseFloat(item.ngqty)+parseFloat(item.goodqty)>=parseFloat(item.planqty)"
+ class="circle"
+ />
+ <div v-else class="circleYellow" />
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <!-- 234-->
+ <div class="kb_left_top_block">
+ <div class="kb_block01 kb_pd10">
+ <div>
+ <div>浜х嚎鍚嶇О:{{ lineContent02.linename }}</div>
+ <div class="kb_mt10">浜х嚎鎬婚噺:{{
+ lineContent02.children !== undefined ? lineContent02.lineworkcont : ''
+ }}
+ </div>
+ </div>
+ <div>
+ <!-- <div>{{ lineContent02.linename }}</div>-->
+ <!-- <div v-if="lineContent02.children!==undefined" class="kb_mt10">{{ lineContent02.lineworkcont }}</div>-->
+ </div>
+ </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 v-if="lineContent02.children&&lineContent02.children.length===0" class="kb_mt5">
+ 浠诲姟鏁伴噺:
+ </div>
+ <div v-else class="kb_mt5">
+ 浠诲姟鏁伴噺:{{ lineContent02.children ? parseFloat(lineContent02.children.qty) : '' }}
+ </div>
+ </div>
+
+ </div>
+ <div class="kb_block03 kb_pd10 ">
+ <div v-if="lineContent02.children!==undefined" class="flex_s_c">
+ <div
+ v-for="item in lineContent02.children.children"
+ :key="item.stepseq"
+ class="kb_block03_content flex_c_c"
+ >
+ <div>
+ <div class="content01">{{ item.stepname }}</div>
+ </div>
+ <div class="content02Parent">
+ <div class="content02">
+ <div class="content02_1 ">浠诲姟</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.planqty) }}</div>
+ </div>
+ <div class="content02">
+ <div class="content02_1 ">鍚堟牸</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.goodqty) }}</div>
+ </div>
+ <div class="content02" style="border-right: 0">
+ <div class="content02_1 ">涓嶈壇</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.ngqty) }}</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div v-if="lineContent02.children!==undefined" class="kb_block03_02 flex_s_c">
+ <div
+ v-for="item in lineContent02.children.children"
+ :key="item.stepseq"
+ class="kb_block03_02_content flex_c_c"
+ >
+ <div class="flex_c_c content01">
+ <div
+ v-if="item.status==='START'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
+ class="circle"
+ style="background-color: blue;"
+ />
+ <div
+ v-else-if="item.status==='ALLO'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
+ class="circle"
+ style="background-color: rgb(255 255 255)"
+ />
+ <div
+ v-else-if="parseFloat(item.ngqty)+parseFloat(item.goodqty)>=parseFloat(item.planqty)"
+ class="circle"
+ />
+ <div v-else class="circleYellow" />
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="kb_left_top_block">
+ <div class="kb_block01 kb_pd10">
+ <div>
+ <div>浜х嚎鍚嶇О:{{ lineContent03.linename }}</div>
+ <div class="kb_mt10">浜х嚎鎬婚噺:{{
+ lineContent03.children !== undefined ? lineContent03.lineworkcont : ''
+ }}
+ </div>
+ </div>
+ <div>
+ <!-- <div>{{ lineContent03.linename }}</div>-->
+ <!-- <div v-if="lineContent03.children!==undefined" class="kb_mt10">{{ lineContent03.lineworkcont }}</div>-->
+ </div>
+ </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 v-if="lineContent03.children&&lineContent03.children.length===0" class="kb_mt5">
+ 浠诲姟鏁伴噺:
+ </div>
+ <div v-else class="kb_mt5">
+ 浠诲姟鏁伴噺:{{ lineContent03.children ? parseFloat(lineContent03.children.qty) : '' }}
+ </div>
+ </div>
+
+ </div>
+ <div class="kb_block03 kb_pd10 ">
+ <div v-if="lineContent03.children!==undefined" class="flex_s_c">
+ <div
+ v-for="item in lineContent03.children.children"
+ :key="item.stepseq"
+ class="kb_block03_content flex_c_c"
+ >
+ <div>
+ <div class="content01">{{ item.stepname }}</div>
+ </div>
+ <div class="content02Parent">
+ <div class="content02">
+ <div class="content02_1 ">浠诲姟</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.planqty) }}</div>
+ </div>
+ <div class="content02">
+ <div class="content02_1 ">鍚堟牸</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.goodqty) }}</div>
+ </div>
+ <div class="content02" style="border-right: 0">
+ <div class="content02_1 ">涓嶈壇</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.ngqty) }}</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div v-if="lineContent03.children!==undefined" class="kb_block03_02 flex_s_c">
+ <div
+ v-for="item in lineContent03.children.children"
+ :key="item.stepseq"
+ class="kb_block03_02_content flex_c_c"
+ >
+ <div class="flex_c_c content01">
+ <div
+ v-if="item.status==='START'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
+ class="circle"
+ style="background-color: blue;"
+ />
+ <div
+ v-else-if="item.status==='ALLO'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
+ class="circle"
+ style="background-color: rgb(255 255 255)"
+ />
+ <div
+ v-else-if="parseFloat(item.ngqty)+parseFloat(item.goodqty)>=parseFloat(item.planqty)"
+ class="circle"
+ />
+ <div v-else class="circleYellow" />
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="kb_left_top_block">
+ <div class="kb_block01 kb_pd10">
+ <div>
+ <div>浜х嚎鍚嶇О:{{ lineContent04.linename }}</div>
+ <div class="kb_mt10">浜х嚎鎬婚噺:{{
+ lineContent04.children !== undefined ? lineContent04.lineworkcont : ''
+ }}
+ </div>
+ </div>
+ <div>
+ <!-- <div>{{ lineContent04.linename }}</div>-->
+ <!-- <div v-if="lineContent04.children!==undefined" class="kb_mt10">{{ lineContent04.lineworkcont }}</div>-->
+ </div>
+ </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 v-if="lineContent04.children&&lineContent04.children.length===0" class="kb_mt5">
+ 浠诲姟鏁伴噺:
+ </div>
+ <div v-else class="kb_mt5">
+ 浠诲姟鏁伴噺:{{ lineContent04.children ? parseFloat(lineContent04.children.qty) : '' }}
+ </div>
+ </div>
+
+ </div>
+ <div class="kb_block03 kb_pd10 ">
+ <div v-if="lineContent04.children!==undefined" class="flex_s_c">
+ <div
+ v-for="item in lineContent04.children.children"
+ :key="item.stepseq"
+ class="kb_block03_content flex_c_c"
+ >
+ <div>
+ <div class="content01">{{ item.stepname }}</div>
+ </div>
+ <div class="content02Parent">
+ <div class="content02">
+ <div class="content02_1 ">浠诲姟</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.planqty) }}</div>
+ </div>
+ <div class="content02">
+ <div class="content02_1 ">鍚堟牸</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.goodqty) }}</div>
+ </div>
+ <div class="content02" style="border-right: 0">
+ <div class="content02_1 ">涓嶈壇</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.ngqty) }}</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div v-if="lineContent04.children!==undefined" class="kb_block03_02 flex_s_c">
+ <div
+ v-for="item in lineContent04.children.children"
+ :key="item.stepseq"
+ class="kb_block03_02_content flex_c_c"
+ >
+ <div class="flex_c_c content01">
+ <div
+ v-if="item.status==='START'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
+ class="circle"
+ style="background-color: blue;"
+ />
+ <div
+ v-else-if="item.status==='ALLO'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
+ class="circle"
+ style="background-color: rgb(255 255 255)"
+ />
+ <div
+ v-else-if="parseFloat(item.ngqty)+parseFloat(item.goodqty)>=parseFloat(item.planqty)"
+ class="circle"
+ />
+ <div v-else class="circleYellow" />
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ </div>
+ <!-- 2-->
+ <div class="kb_left_bottom kb_pd10">
+ <div class="kb_left_bottom_content">
+ <div class="content_head kb_title_text">浜х嚎鍔犲伐浠诲姟</div>
+ <div class="content_body">
+ <el-table
+ ref="tableData"
+ :data="tableData"
+ style="width: 100%;"
+ :header-cell-style="headerCellStyle"
+ :cell-style="cellStyle"
+ height="440"
+ >
+ <el-table-column
+ prop="RowNum"
+ label="搴忓彿"
+ width="40"
+ />
+ <el-table-column
+ prop="status"
+ label="鍔犲伐鐘舵��"
+ width="70"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
+ <div v-if="row.status==='START'">寮�宸�</div>
+ <div v-if="row.status==='NEW'">鏂板伐鍗�</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="lm_date"
+ label="娲惧彂鏃堕棿"
+ width="95"
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.lm_date.substring(0, 10) }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞鍗曞彿"
+ width="158"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wo_code"
+ label="鍔犲伐鍗曞彿"
+ width="170"
+ />
+ <el-table-column
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ width="145"
+ />
+ <el-table-column
+ prop="partspec"
+ label="瑙勬牸"
+ width="130"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partspec" class="ellipsis">{{ row.partspec }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鍗曚綅"
+ width="50"
+ />
+ <el-table-column
+ prop="plan_qty"
+ label="浠诲姟鏁伴噺"
+ width="70"
+ />
+ <el-table-column
+ prop="good_qty"
+ label="瀹屽伐鏁伴噺"
+ width="70"
+ />
+ <el-table-column
+ prop="ng_qty"
+ label="涓嶈壇鏁伴噺"
+ width="70"
+ />
+ <el-table-column
+ prop="wcl"
+ label="瀹屾垚鐜�"
+ width="50"
+ >
+ <template slot-scope="{row}">
+ <div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="planenddate"
+ label="棰勮寮�濮�"
+ width="95"
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.planenddate.substring(0, 10) }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="planstartdate"
+ label="棰勮缁撴潫"
+ width="105"
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.planstartdate.substring(0, 10) }}</div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="kb_right kb_pd10">
+ <div class="kb_right_top kb_pd10">
+ <div class="kb_right_top_content">
+ <div class="content_head kb_title_text">褰撴棩瀹屽伐浜у搧鏁伴噺鎺掕</div>
+ <div class="content_body">
+ <el-table
+ ref="tableDataRank"
+ :data="tableDataRank"
+ class="tableDataRank"
+ style="width: 100%;"
+ :header-cell-style="headerCellStyle"
+ :cell-style="cellStyle"
+ height="426"
+ >
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ width="55"
+ />
+ <el-table-column
+ prop="wkshname"
+ label="杞﹂棿锛堜緵鏂癸級"
+ width="120"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.wkshname" class="ellipsis">{{ row.wkshname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="linename"
+ label="浜х嚎"
+ width="120"
+ />
+ <el-table-column
+ prop="partname"
+ width="138"
+ label="浜у搧"
+ />
+ <el-table-column
+ prop="good_qty"
+ label="鏁伴噺"
+ width="100"
+ />
+ </el-table>
+ </div>
+ </div>
+ </div>
+ <div class="kb_right_bottom kb_pd10">
+ <div class="kb_right_bottom_content_title kb_title_text">
+ 涓�鍛ㄤ笉鑹疶op5
+ </div>
+ <div class="kb_right_bottom_content">
+ <div id="bar02" style="width: 100%;height:100%" />
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+import './kbCommon.css'
+import { bar02, loadEcharts } from '@/utils/myEcharts'
+import {
+ LineSearchBottomLeftData,
+ LineSearchBottomRightData,
+ LineSearchTopLeftData,
+ LineSearchTopRightData,
+ ShopSearchLine
+} from '@/api/dzkb'
+
+export default {
+ name: 'Index2',
+ data() {
+ return {
+ headTime: '',
+
+ lineArr: [],
+ // lineContent01: {},
+ lineContent01: {
+ linename: '',
+ lineworkcont: '',
+ children: undefined
+ },
+ lineContent02: {
+ linename: '',
+ lineworkcont: '',
+ children: undefined
+ },
+ lineContent03: {
+ linename: '',
+ lineworkcont: '',
+ children: undefined
+ },
+ lineContent04: {
+ linename: '',
+ lineworkcont: '',
+ children: undefined
+ // children: {
+ // workcode: '',
+ // partname: '',
+ // qty: 0,
+ // saleordercode: '',
+ // children: [
+ // {
+ // stepseq: '',
+ // stepname: '',
+ // planqty: 0,
+ // goodqty: '',
+ // ngqty: ''
+ // }
+ // ]
+ // }
+ },
+
+ leftTopData: [],
+ tableData: [],
+ tableDataRank: [],
+ lineCodeArr: []
+
+ }
+ },
+
+ created() {
+ setInterval(this.getNowTime, 1000)
+ },
+ mounted() {
+ this.getValue()
+ },
+ methods: {
+ async getValue() {
+ await this.getShopSearchLine()
+ await this.getLineSearchTopLeftData()
+
+ this.getEcharts()
+ this.getTableDataRoll()
+ this.getTableDataRankRoll()
+ },
+ // 鐢熶骇浜х嚎
+ async getShopSearchLine() {
+ const { data: res } = await ShopSearchLine({ shopcode: 'CJ001' })
+ this.lineArr = res
+ },
+
+ getLineSearchTopLeftData() {
+ this.lineArr.forEach((item, index) => {
+ if (index <= 3) {
+ this.handleEveryLine(item, index)
+ this.lineCodeArr.push(item.code)
+ }
+ })
+ },
+ // 澶勭悊姣忎竴鏉′骇绾�
+ async handleEveryLine(item, index) {
+ const res = await LineSearchTopLeftData([item])
+
+ let res1, res2, res3, res4
+ if (res.data[0].linecode === this.lineCodeArr[0]) {
+ res1 = res
+ }
+ if (res.data[0].linecode === this.lineCodeArr[1]) {
+ res2 = res
+ }
+ if (res.data[0].linecode === this.lineCodeArr[2]) {
+ res3 = res
+ }
+ if (res.data[0].linecode === this.lineCodeArr[3]) {
+ res4 = res
+ }
+
+ let flag1 = true
+ let flag2 = true
+ let flag3 = true
+ let flag4 = true
+ if (index === 0) {
+ let count = 0
+ if (flag1) {
+ this.lineContent01 = {
+ linename: res1.data[0].linename,
+ lineworkcont: res1.data[0].lineworkcont,
+ children: res1.data[0].children ? res.data[0].children[count] : []
+ }
+ flag1 = false
+ }
+ setInterval(() => {
+ if (count > 0) {
+ this.lineContent01 = {
+ linename: res1.data[0].linename,
+ lineworkcont: res1.data[0].lineworkcont,
+ children: res1.data[0].children ? res1.data[0].children[count] : []
+ }
+ }
+ console.log(res1.data[0].children === null, 999)
+ if (res1.data[0].children === null) {
+ res1.data[0].children = []
+ }
+ if (this.lineContent01.children === undefined || res1.data[0].children.length >= 0) {
+ LineSearchTopLeftData([item]).then(res => {
+ res1 = res
+ })
+ }
+ if (res1.data[0].children.length === count++) {
+ count = 0
+ this.lineContent01 = {
+ linename: res1.data[0].linename,
+ lineworkcont: res1.data[0].lineworkcont,
+ children: res1.data[0].children ? res1.data[0].children[count] : []
+ }
+ }
+ }, 1000 * 3)
+ } else if (index === 1) {
+ let count = 0
+ if (flag2) {
+ this.lineContent02 = {
+ linename: res2.data[0].linename,
+ lineworkcont: res2.data[0].lineworkcont,
+ children: res2.data[0].children ? res2.data[0].children[count] : []
+ }
+ flag2 = false
+ }
+ setInterval(() => {
+ if (count > 0) {
+ this.lineContent02 = {
+ linename: res2.data[0].linename,
+ lineworkcont: res2.data[0].lineworkcont,
+ children: res2.data[0].children ? res2.data[0].children[count] : []
+ }
+ }
+ if (res2.data[0].children === null) {
+ res2.data[0].children = []
+ }
+ if (this.lineContent02.children === undefined || res2.data[0].children.length >= 0) {
+ LineSearchTopLeftData([item]).then(res => {
+ res2 = res
+ })
+ }
+ if (res2.data[0].children.length === count++) {
+ count = 0
+ this.lineContent02 = {
+ linename: res2.data[0].linename,
+ lineworkcont: res2.data[0].lineworkcont,
+ children: res2.data[0].children ? res2.data[0].children[count] : []
+ }
+ }
+ }, 1000 * 3)
+ } else if (index === 2) {
+ let count = 0
+ if (flag3) {
+ this.lineContent03 = {
+ linename: res3.data[0].linename,
+ lineworkcont: res3.data[0].lineworkcont,
+ children: res3.data[0].children ? res3.data[0].children[count] : []
+ }
+ flag3 = false
+ }
+ setInterval(() => {
+ if (count > 0) {
+ this.lineContent03 = {
+ linename: res3.data[0].linename,
+ lineworkcont: res3.data[0].lineworkcont,
+ children: res3.data[0].children ? res3.data[0].children[count] : []
+ }
+ }
+
+ if (res3.data[0].children === null) {
+ res3.data[0].children = []
+ }
+
+ if (this.lineContent03.children === undefined || res3.data[0].children.length >= 0) {
+ LineSearchTopLeftData([item]).then(res => {
+ res3 = res
+ })
+ }
+
+ if (res3.data[0].children.length === count++) {
+ count = 0
+ this.lineContent03 = {
+ linename: res3.data[0].linename,
+ lineworkcont: res3.data[0].lineworkcont,
+ children: res3.data[0].children ? res3.data[0].children[count] : []
+ }
+ }
+ }, 1000 * 3)
+ } else if (index === 3) {
+ let count = 0
+ if (flag4) {
+ this.lineContent04 = {
+ linename: res4.data[0].linename,
+ lineworkcont: res4.data[0].lineworkcont,
+ children: res4.data[0].children ? res4.data[0].children[count] : []
+ }
+ flag4 = false
+ }
+ setInterval(() => {
+ if (count > 0) {
+ this.lineContent04 = {
+ linename: res4.data[0].linename,
+ lineworkcont: res4.data[0].lineworkcont,
+ children: res4.data[0].children ? res4.data[0].children[count] : []
+ }
+ }
+
+ if (res4.data[0].children === null) {
+ res4.data[0].children = []
+ }
+
+ if (res4.data[0].children.length === count || this.lineContent04.children === undefined) {
+ LineSearchTopLeftData([item]).then(res => {
+ res4 = res
+ })
+ }
+
+ if (res4.data[0].children.length === count++) {
+ count = 0
+ this.lineContent04 = {
+ linename: res4.data[0].linename,
+ lineworkcont: res4.data[0].lineworkcont,
+ children: res4.data[0].children ? res4.data[0].children[count] : []
+ }
+ }
+ }, 1000 * 3)
+ }
+ },
+
+ // 浜х嚎鍔犲伐浠诲姟
+ getTableDataRoll() {
+ LineSearchBottomLeftData().then(res => {
+ this.tableData = res.data
+
+ const divData = this.$refs.tableData.bodyWrapper
+ // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ const task = setInterval(() => {
+ // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+ divData.scrollTop += 1
+ // divData.scrollTop += divData.scrollHeight / this.tableData.length
+ // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+ if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+ // 閲嶇疆table璺濈椤堕儴璺濈
+ divData.scrollTop = 0
+ LineSearchBottomLeftData().then(res => {
+ this.tableData = res.data
+ if (this.tableData.length > 10) {
+ clearInterval(task)
+ this.getTableDataRoll()
+ }
+ })
+ }
+ }, this.tableData.length <= 10 ? 1000 * 3 : 100)
+ })
+ },
+ // 褰撴棩瀹屽伐浜у搧鏁伴噺鎺掕
+ getTableDataRankRoll() {
+ LineSearchTopRightData().then(res => {
+ this.tableDataRank = res.data
+
+ const divData = this.$refs.tableDataRank.bodyWrapper
+ // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ const task = setInterval(() => {
+ // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+ // divData.scrollTop += divData.scrollHeight / this.tableDataRank.length
+ divData.scrollTop += 1
+ // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+ if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+ // 閲嶇疆table璺濈椤堕儴璺濈
+ divData.scrollTop = 0
+ LineSearchTopRightData().then(res => {
+ this.tableDataRank = res.data
+
+ if (this.tableDataRank.length > 10) {
+ clearInterval(task)
+ this.getTableDataRankRoll()
+ }
+ })
+ }
+ }, this.tableDataRank.length <= 10 ? 1000 * 3 : 100)
+ })
+ },
+ // 鑾峰彇echarts
+ getEcharts() {
+ LineSearchBottomRightData().then(res => {
+ loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
+ })
+
+ setInterval(() => {
+ LineSearchBottomRightData().then(res => {
+ loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
+ })
+ }, 1000 * 15)
+ },
+ // 鑾峰彇褰撳墠鏃堕棿
+ getNowTime() {
+ const dt = new Date()
+ const wk = dt.getDay()
+ const y = dt.getFullYear()
+ const m = (dt.getMonth() + 1 + '').padStart(2, '0')
+ const d = (dt.getDate() + '').padStart(2, '0')
+
+ const hh = (dt.getHours() + '').padStart(2, '0')
+ const mm = (dt.getMinutes() + '').padStart(2, '0')
+ const ss = (dt.getSeconds() + '').padStart(2, '0')
+ const weeks = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�']
+ const week = weeks[wk]
+
+ this.headTime = `${y}-${m}-${d} ${hh}:${mm}:${ss} ${week}`
+ },
+ headerCellStyle() {
+ return {
+ backgroundColor: 'rgb(30 ,33, 46)',
+ padding: '10px 0',
+ textAlign: 'center',
+ color: '#07acc2',
+ border: 'none'
+ }
+ },
+ cellStyle() {
+ return {
+ padding: '8px 0',
+ textAlign: 'center',
+ backgroundColor: 'rgba(30, 33, 46 )',
+ // backgroundColor: 'transparent',
+ color: '#fff',
+ border: 'none'
+ }
+ }
+
+ }
+}
+</script>
+
+<style scoped lang="scss">
+//$kbBorderColor: #3A0088;
+//$kbBorderColor: #09d8f2;
+$kbBorderColor: rgba(9, 216, 242, 0.4);
+$kbBackgroundColor: rgba(30, 33, 46, 0.6);
+.kb_content {
+ display: flex;
+ position: relative;
+ height: 990px;
+ width: 100%;
+ //background-color: #000;
+ letter-spacing: 2px;
+ //color: #d8d7d9;
+ color: #fff;
+
+ .kb_left {
+ width: 1345px;
+ height: 100%;
+ padding-left: 5px;
+
+ .kb_left_top_title01 {
+ position: absolute;
+ top: 10px;
+ left: 15px;
+ font-size: 18px;
+ display: flex;
+ color: #00ffff;
+
+ .PG01 {
+ background: url("../../assets/images/GP_1.png") no-repeat;
+ width: 28px;
+ height: 12px;
+ margin-top: 4px;
+ margin-right: 10px;
+ }
+ }
+
+ .kb_left_top {
+ height: 495px;
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ padding-top: 30px;
+
+ .kb_left_top_block {
+ margin-top: 10px;
+ width: 100%;
+ height: 100px;
+ display: flex;
+ border-radius: 5px;
+ font-size: 14px;
+ //border: 1px solid rgba(255, 255, 255, 0.6);
+ border: 1px solid $kbBorderColor;
+ justify-content: flex-start;
+
+ .kb_block01 {
+ width: 171px;
+ display: flex;
+ align-items: center;
+ border-right: 1px solid $kbBorderColor;
+ background-color: $kbBackgroundColor;
+ border-bottom-left-radius: 5px;
+ border-top-left-radius: 5px;
+
+ }
+
+ .kb_block02 {
+ width: 304px;
+ display: flex;
+ align-items: center;
+ border-right: 1px solid $kbBorderColor;
+ background-color: $kbBackgroundColor;
+ }
+
+ .kb_block03 {
+ width: 843px;
+ display: flex;
+ flex-direction: column;
+ font-size: 12px;
+ background-color: $kbBackgroundColor;
+ border-radius: 5px;
+
+ .kb_block03_content {
+ border: 1px solid $kbBorderColor;
+ width: 152px;
+ height: 50px;
+ margin-right: 15px;
+ //margin-right: 20px;
+ display: flex;
+ flex-direction: column;
+
+ .content01 {
+ //width: 50px;
+ width: 100%;
+ height: 20px;
+ border-bottom: 1px solid $kbBorderColor;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .content02Parent {
+ display: flex;
+
+ .content02 {
+ width: 50px;
+ border-right: 1px solid $kbBorderColor;
+
+ .content02_1 {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 50%;
+ }
+
+ .content02_2 {
+ height: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .borderTop {
+ border-top: 1px solid $kbBorderColor;
+ }
+ }
+ }
+
+ }
+ }
+
+ .kb_block03_02 {
+ margin-top: 7px;
+ display: flex;
+
+ .kb_block03_02_content {
+ width: 152px;
+ margin-right: 15px;
+
+ .content01 {
+ .circle {
+ width: 26px;
+ height: 26px;
+ background-color: #00ff8b;
+ border-radius: 50%;
+ }
+
+ }
+
+ }
+ }
+
+ }
+
+ }
+
+ .kb_left_bottom {
+ height: 495px;
+
+ .kb_left_bottom_content {
+ height: 460px;
+ display: flex;
+ flex-direction: column;
+ //border: 1px solid $kbBorderColor;
+
+ .content_head {
+ ////font-size: 26px;
+ //font-size: 18px;
+ //height: 55px;
+ //line-height: 55px;
+ ////border-bottom: 1px solid $kbBorderColor;
+ ////text-align: center;
+ //padding-left: 10px;
+
+ font-size: 18px;
+ line-height: 20px;
+ //padding-left: 10px;
+ margin-bottom: 10px;
+ margin-top: -10px;
+ color: #00ffff;
+
+ }
+
+ .content_body {
+ border: 1px solid $kbBorderColor;
+ }
+ }
+ }
+ }
+
+ .kb_right {
+ width: 575px;
+ height: 100%;
+
+ .kb_right_top {
+ height: 476px;
+ width: 100%;
+
+ .kb_right_top_content {
+ //border: 1px solid $kbBorderColor;
+ height: 460px;
+ display: flex;
+ flex-direction: column;
+
+ .content_head {
+ font-size: 18px;
+ line-height: 20px;
+ //padding-left: 10px;
+ margin-bottom: 10px;
+ margin-top: -10px;
+ color: #00ffff;
+ }
+
+ .content_body {
+ border: 1px solid $kbBorderColor;
+ //border-radius: 5px;
+ }
+ }
+ }
+
+ .kb_right_bottom {
+ height: 481px;
+ margin-top: 8px;
+
+ .kb_right_bottom_content_title {
+ color: #00ffff;
+ 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;
+ //height: 100%;
+ }
+ }
+ }
+}
+
+::v-deep .el-table::before {
+ height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+ //background-color: #044563;
+ background-color: rgba(30, 33, 46);
+}
+
+::v-deep .el-table__body-wrapper::-webkit-scrollbar {
+ /* width: 0;瀹藉害涓�0鏆楄棌 */
+ width: 0;
+}
+
+::v-deep .cell {
+ padding: 0 !important;
+}
+
+//
+///* 瀹氫箟keyframes鍔ㄧ敾锛屽懡鍚嶄负blink*/
+//@keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+///*娣诲姞鍏煎鎬у墠缂�*/
+//@-webkit-keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+//@-o-keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+//@-moz-keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+//@-ms-keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+.circleYellow {
+ width: 26px;
+ height: 26px;
+ background-color: rgb(255 255 0);
+ border-radius: 50%;
+
+ //animation: blink 2s linear infinite;
+ //-webkit-animation: blink 2s linear infinite;
+ //-moz-animation: blink 2s linear infinite;
+ //-ms-animation: blink 2s linear infinite;
+ //-o-animation: blink 2s linear infinite;
+}
+</style>
diff --git a/src/views/kb/zpcj.vue b/src/views/kb/zpcj.vue
new file mode 100644
index 0000000..efb468c
--- /dev/null
+++ b/src/views/kb/zpcj.vue
@@ -0,0 +1,909 @@
+<template>
+ <div>
+ <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">
+ <span>{{ headTime }}</span>
+ </div>
+ </div>
+ <MarqueeTips
+ :content="MarqueeTipsContent"
+ class="MarqueeTipsContentClass"
+ :speed="speed"
+ />
+ <div class="kb_content">
+ <div class="kb_left">
+ <!-- 1-->
+ <div class="kb_left_top_title01 kb_title_text">
+ <!-- <div class="PG01" />-->
+ <!-- <svg-icon icon-class="sccx" />-->
+ 浜х嚎鍔犲伐涓换鍔�
+ </div>
+
+ <div class="kb_left_top kb_pd10">
+
+ <div v-if="false" class="kb_left_top_block">
+ <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 v-if="lineContent01.children&&lineContent01.children.length===0" class="kb_mt5">
+ 浠诲姟鏁伴噺:
+ </div>
+ <div v-else class="kb_mt5">
+ 浠诲姟鏁伴噺:{{ lineContent01.children ? parseFloat(lineContent01.children.qty) : '' }}
+ </div>
+ </div>
+ </div>
+ <div class="kb_block03 kb_pd10 ">
+ <div v-if="lineContent01.children!==undefined" class="flex_s_c">
+ <div
+ v-for="item in lineContent01.children.children"
+ :key="item.stepseq"
+ class="kb_block03_content flex_c_c"
+ >
+ <div>
+ <div class="content01">{{ item.stepname }}</div>
+ </div>
+ <div class="content02Parent">
+ <div class="content02">
+ <div class="content02_1 ">浠诲姟</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.planqty) }}</div>
+ </div>
+ <div class="content02">
+ <div class="content02_1 ">鍚堟牸</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.goodqty) }}</div>
+ </div>
+ <div class="content02" style="border-right: 0">
+ <div class="content02_1 ">涓嶈壇</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(item.ngqty) }}</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div v-if="lineContent01.children!==undefined" class="kb_block03_02 flex_s_c">
+ <div
+ v-for="item in lineContent01.children.children"
+ :key="item.stepseq"
+ class="kb_block03_02_content flex_c_c"
+ >
+ <div class="flex_c_c content01">
+ <div
+ v-if="item.status==='START'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
+ class="circle"
+ style="background-color: blue;"
+ />
+ <div
+ v-else-if="item.status==='ALLO'&&(parseFloat(item.ngqty)===0||item.ngqty==='')&&(parseFloat(item.goodqty)===0||item.goodqty==='')"
+ class="circle"
+ style="background-color: rgb(255 255 255)"
+ />
+ <div
+ v-else-if="parseFloat(item.ngqty)+parseFloat(item.goodqty)>=parseFloat(item.planqty)"
+ class="circle"
+ />
+ <div v-else class="circleYellow" />
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div v-for="item in lineContent4" :key="item.workcode" class="kb_left_top_block">
+ <div class="kb_block02 kb_pd10">
+ <div>
+ <div>閿�鍞崟鍙�:{{ item.saleordercode }}</div>
+ <div class="kb_mt5">
+ 鍔犲伐鍗曞彿:{{ item.workcode }}
+ </div>
+ <div class="kb_mt5">
+ 浜у搧鍚嶇О:{{ item.partname }}
+ </div>
+ <div class="kb_mt5">
+ 浠诲姟鏁伴噺:{{ parseFloat(item.qty) }}
+ </div>
+ </div>
+ </div>
+ <div class="kb_block03 kb_pd10 ">
+ <div v-if="item.children&&item.children.length>0" class="flex_s_c">
+ <div
+ v-for="(it,ind) in item.children"
+ :key="ind"
+ class="kb_block03_content flex_c_c"
+ >
+ <div>
+ <div class="content01">{{ it.stepname }}</div>
+ </div>
+ <div class="content02Parent">
+ <div class="content02">
+ <div class="content02_1 ">浠诲姟</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(it.planqty) }}</div>
+ </div>
+ <div class="content02">
+ <div class="content02_1 ">鍚堟牸</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(it.goodqty) }}</div>
+ </div>
+ <div class="content02" style="border-right: 0">
+ <div class="content02_1 ">涓嶈壇</div>
+ <div class="content02_2 borderTop ">{{ parseFloat(it.ngqty) }}</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div v-if="item.children&&item.children.length>0" class="kb_block03_02 flex_s_c">
+ <div
+ v-for="(it,ind) in item.children"
+ :key="ind"
+ class="kb_block03_02_content flex_c_c"
+ >
+ <div class="flex_c_c content01">
+ <div
+ v-if="it.status==='START'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
+ class="circle"
+ style="background-color: blue;"
+ />
+ <div
+ v-else-if="it.status==='ALLO'&&(parseFloat(it.ngqty)===0||it.ngqty==='')&&(parseFloat(it.goodqty)===0||it.goodqty==='')"
+ class="circle"
+ style="background-color: rgb(255 255 255)"
+ />
+ <div
+ v-else-if="parseFloat(it.ngqty)+parseFloat(it.goodqty)>=parseFloat(it.planqty)"
+ class="circle"
+ />
+ <div v-else class="circleYellow" />
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ </div>
+ <!-- 2-->
+ <div class="kb_left_bottom kb_pd10">
+ <div class="kb_left_bottom_content">
+ <div class="content_head kb_title_text">浜х嚎鍔犲伐浠诲姟</div>
+ <div class="content_body">
+ <el-table
+ ref="tableData"
+ :data="tableData"
+ style="width: 100%;"
+ :header-cell-style="headerCellStyle"
+ :cell-style="cellStyle"
+ height="440"
+ >
+ <el-table-column
+ prop="RowNum"
+ label="搴忓彿"
+ width="40"
+ />
+ <el-table-column
+ prop="status"
+ label="鍔犲伐鐘舵��"
+ width="70"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
+ <div v-if="row.status==='START'">寮�宸�</div>
+ <div v-if="row.status==='NEW'">鏂板伐鍗�</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="lm_date"
+ label="娲惧彂鏃堕棿"
+ width="95"
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.lm_date.substring(0, 10) }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞鍗曞彿"
+ width="158"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wo_code"
+ label="鍔犲伐鍗曞彿"
+ width="170"
+ />
+ <el-table-column
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ width="145"
+ />
+ <el-table-column
+ prop="partspec"
+ label="瑙勬牸"
+ width="130"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partspec" class="ellipsis">{{ row.partspec }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鍗曚綅"
+ width="50"
+ />
+ <el-table-column
+ prop="plan_qty"
+ label="浠诲姟鏁伴噺"
+ width="70"
+ />
+ <el-table-column
+ prop="good_qty"
+ label="瀹屽伐鏁伴噺"
+ width="70"
+ />
+ <el-table-column
+ prop="ng_qty"
+ label="涓嶈壇鏁伴噺"
+ width="70"
+ />
+ <el-table-column
+ prop="wcl"
+ label="瀹屾垚鐜�"
+ width="50"
+ >
+ <template slot-scope="{row}">
+ <div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="planenddate"
+ label="棰勮寮�濮�"
+ width="95"
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.planenddate.substring(0, 10) }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="planstartdate"
+ label="棰勮缁撴潫"
+ width="105"
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.planstartdate.substring(0, 10) }}</div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="kb_right kb_pd10">
+ <div class="kb_right_top kb_pd10">
+ <div class="kb_right_top_content">
+ <div class="content_head kb_title_text">褰撴棩瀹屽伐浜у搧鏁伴噺鎺掕</div>
+ <div class="content_body">
+ <el-table
+ ref="tableDataRank"
+ :data="tableDataRank"
+ class="tableDataRank"
+ style="width: 100%;"
+ :header-cell-style="headerCellStyle"
+ :cell-style="cellStyle"
+ height="396"
+ >
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ width="55"
+ />
+ <el-table-column
+ prop="wkshname"
+ label="杞﹂棿锛堜緵鏂癸級"
+ width="120"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.wkshname" class="ellipsis">{{ row.wkshname }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="linename"
+ label="浜х嚎"
+ width="120"
+ />
+ <el-table-column
+ prop="partname"
+ width="138"
+ label="浜у搧"
+ />
+ <el-table-column
+ prop="good_qty"
+ label="鏁伴噺"
+ width="100"
+ />
+ </el-table>
+ </div>
+ </div>
+ </div>
+ <div class="kb_right_bottom kb_pd10">
+ <div class="kb_right_bottom_content_title kb_title_text">
+ 涓�鍛ㄤ笉鑹疶op5
+ </div>
+ <div class="kb_right_bottom_content">
+ <div id="bar02" style="width: 100%;height:100%" />
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+import './kbCommon.css'
+import { bar02, loadEcharts } from '@/utils/myEcharts'
+import {
+ LineSearchBottomLeftData,
+ LineSearchBottomRightData,
+ LineSearchTopLeftData,
+ LineSearchTopRightData, ShopSearch,
+ ShopSearchLine
+} from '@/api/dzkb'
+import MarqueeTips from 'vue-marquee-tips'
+
+export default {
+ name: 'Index2',
+ components: {
+ MarqueeTips
+ },
+ data() {
+ return {
+ headTime: '',
+
+ lineArr: [],
+ // lineContent01: {},
+ lineContent01: {
+ linename: '',
+ lineworkcont: '',
+ children: undefined
+ },
+
+ lineContent: [],
+ lineContent4: [],
+
+ leftTopData: [],
+ tableData: [],
+ tableDataRank: [],
+ lineCodeArr: [],
+
+ ShopArr: [], // 杞﹂棿缂栫爜鏁扮粍
+
+ MarqueeTipsContent: '', // 鍏憡
+ speed: 100// 鍏憡鎾斁鐨勯�熷害
+
+ }
+ },
+
+ created() {
+ setInterval(this.getNowTime, 1000)
+ },
+ mounted() {
+ this.getValue()
+ },
+ methods: {
+ async getValue() {
+ await this.getShopSearch()
+ await this.getShopSearchLine()
+
+ await this.getEcharts()
+ await this.getTableDataRoll()
+ await this.getTableDataRankRoll()
+ await this.getMarqueeTipsContent()
+ },
+ // 鑾峰彇鍏憡
+ getMarqueeTipsContent() {
+ this.MarqueeTipsContent = '鍚勪綅鍛樺伐浠細鏍规嵁涓婄骇鐨勯�氱煡锛岀粨鍚堟垜浼佸疄闄呮儏鍐碉紝鐜板皢20xx骞寸殑鍏冩棪鏀惧亣閫氱煡濡備笅锛氫竴銆�1鏈�1鏃ヨ嚦1鏈�3鏃ユ斁鍋囪皟浼戯紝鍏�3澶┿��1鏈�4鏃ユ寮忎笂鐝�備簩銆佽妭鍋囨棩鏈熼棿锛屽悇鐝粍瑕佷弗鏍艰惤瀹炰笂绾х殑閲嶈鎸囩ず绮剧锛屾寜鐓т笂绾х殑鍏蜂綋瑕佹眰锛岃鐪熸姄濂借惤瀹炶妭鏃ユ湡闂村�肩彮澶囧嫟宸ヤ綔锛岀‘淇濊妭鏃ユ湡闂翠紒涓氬悇椤瑰伐浣滄甯歌繍杞�倄x浼佷笟20xx骞�12鏈�28鏃�'
+ const spance = ' '.padStart(this.MarqueeTipsContent.length * 2, ' ')
+ this.MarqueeTipsContent = this.MarqueeTipsContent + spance
+ this.speed = this.MarqueeTipsContent.length / 10
+ },
+ // 鑾峰彇杞﹂棿缂栫爜
+ async getShopSearch() {
+ this.ShopArr = ['CJ001'] // 瑁呴厤杞﹂棿
+ // const res1 = await ShopSearch()
+ // if (res1.code === '200') {
+ // this.ShopArr = []
+ // res1.data.forEach(item => {
+ // this.ShopArr.push(item.org_code)
+ // })
+ // }
+ // setInterval(() => {
+ // ShopSearch().then(res1 => {
+ // if (res1.code === '200') {
+ // this.ShopArr = []
+ // res1.data.forEach(item => {
+ // this.ShopArr.push(item.org_code)
+ // })
+ // }
+ // console.log(this.ShopArr, 997)
+ // })
+ // }, 1000 * 30)
+ },
+ // 浜х嚎鍔犲伐涓换鍔�
+ getShopSearchLine() {
+ let length, count
+ LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.lineContent = res.data
+ length = this.lineContent.length
+ count = Math.ceil(length / 4) // 闇�瑕佽疆鎾殑缁勬暟 4涓负涓�缁�
+ this.lineContent4 = this.lineContent.slice(0, 4)
+ // this.lineContent4[0].children.push({})
+ })
+
+ let start = 0
+ const task = setInterval(() => {
+ if (Math.floor(start / 4) === count) {
+ // clearInterval(task)
+ // this.getShopSearchLine()
+ start = 0
+ LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.lineContent = res.data
+ length = this.lineContent.length
+ count = Math.ceil(length / 4) // 闇�瑕佽疆鎾殑缁勬暟 4涓负涓�缁�
+ this.lineContent4 = this.lineContent.slice(0, 4)
+ console.log(count)
+ })
+ }
+ this.lineContent4 = this.lineContent.slice(start, start + 4)
+ start = start + 4
+ console.log(start)
+ console.log('鎵ц浜嗭紒锛侊紒')
+ }, 1000 * 3)
+ },
+
+ // 浜х嚎鍔犲伐浠诲姟
+ getTableDataRoll() {
+ LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.tableData = res.data
+
+ const divData = this.$refs.tableData.bodyWrapper
+ // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ const task = 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
+ if (this.tableData.length > 10) {
+ clearInterval(task)
+ this.getTableDataRoll()
+ }
+ })
+ }
+ }, this.tableData.length <= 10 ? 1000 * 3 : 100)
+ })
+ },
+ // 褰撴棩瀹屽伐浜у搧鏁伴噺鎺掕
+ getTableDataRankRoll() {
+ LineSearchTopRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.tableDataRank = res.data
+
+ const divData = this.$refs.tableDataRank.bodyWrapper
+ // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ const task = setInterval(() => {
+ // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+ // divData.scrollTop += divData.scrollHeight / this.tableDataRank.length
+ divData.scrollTop += 1
+ // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+ if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+ // 閲嶇疆table璺濈椤堕儴璺濈
+ divData.scrollTop = 0
+ LineSearchTopRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ this.tableDataRank = res.data
+
+ if (this.tableDataRank.length > 9) {
+ clearInterval(task)
+ this.getTableDataRankRoll()
+ }
+ })
+ }
+ }, this.tableDataRank.length <= 9 ? 1000 * 3 : 100)
+ })
+ },
+ // 鑾峰彇echarts
+ getEcharts() {
+ LineSearchBottomRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
+ })
+
+ setInterval(() => {
+ LineSearchBottomRightData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ loadEcharts('bar02', bar02(res.data.map(i => i.cont), res.data.map(i => i.name)))
+ })
+ }, 1000 * 15)
+ },
+ // 鑾峰彇褰撳墠鏃堕棿
+ getNowTime() {
+ const dt = new Date()
+ const wk = dt.getDay()
+ const y = dt.getFullYear()
+ const m = (dt.getMonth() + 1 + '').padStart(2, '0')
+ const d = (dt.getDate() + '').padStart(2, '0')
+
+ const hh = (dt.getHours() + '').padStart(2, '0')
+ const mm = (dt.getMinutes() + '').padStart(2, '0')
+ const ss = (dt.getSeconds() + '').padStart(2, '0')
+ const weeks = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�']
+ const week = weeks[wk]
+
+ this.headTime = `${y}-${m}-${d} ${hh}:${mm}:${ss} ${week}`
+ },
+ headerCellStyle() {
+ return {
+ backgroundColor: 'rgb(30 ,33, 46)',
+ padding: '10px 0',
+ textAlign: 'center',
+ color: '#07acc2',
+ border: 'none'
+ }
+ },
+ cellStyle() {
+ return {
+ padding: '8px 0',
+ textAlign: 'center',
+ backgroundColor: 'rgba(30, 33, 46 )',
+ // backgroundColor: 'transparent',
+ color: '#fff',
+ border: 'none'
+ }
+ }
+
+ }
+}
+</script>
+
+<style scoped lang="scss">
+//$kbBorderColor: #3A0088;
+//$kbBorderColor: #09d8f2;
+$kbBorderColor: rgba(9, 216, 242, 0.4);
+$kbBackgroundColor: rgba(30, 33, 46, 0.6);
+.kb_content {
+ display: flex;
+ position: relative;
+ height: 990px;
+ width: 100%;
+ //background-color: #000;
+ letter-spacing: 2px;
+ //color: #d8d7d9;
+ color: #fff;
+
+ .kb_left {
+ width: 1345px;
+ height: 100%;
+ padding-left: 5px;
+
+ .kb_left_top_title01 {
+ position: absolute;
+ top: 40px;
+ left: 15px;
+ font-size: 18px;
+ display: flex;
+ color: #00ffff;
+
+ .PG01 {
+ background: url("../../assets/images/GP_1.png") no-repeat;
+ width: 28px;
+ height: 12px;
+ margin-top: 4px;
+ margin-right: 10px;
+ }
+ }
+
+ .kb_left_top {
+ height: 495px;
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ //justify-content: flex-end;
+ //padding-top: 30px;
+ padding-top: 70px;
+ //padding-bottom: 25px;
+
+ .kb_left_top_block {
+ //margin-top: 10px;
+ width: 100%;
+ height: 100px;
+ display: flex;
+ border-radius: 5px;
+ font-size: 14px;
+ //padding: 10px 0;
+ //border: 1px solid rgba(255, 255, 255, 0.6);
+ //border: 1px solid $kbBorderColor;
+ //border-bottom: 1px solid $kbBorderColor;
+ border-top: 1px solid $kbBorderColor;
+ border-right: 1px solid $kbBorderColor;
+ border-left: 1px solid $kbBorderColor;
+ justify-content: flex-start;
+
+ .kb_block02 {
+ width: 304px;
+ display: flex;
+ align-items: center;
+ border-right: 1px solid $kbBorderColor;
+ background-color: $kbBackgroundColor;
+ }
+
+ .kb_block03 {
+ width: 1020px;
+ //width: 100%;
+ display: flex;
+ flex-direction: column;
+ font-size: 12px;
+ background-color: $kbBackgroundColor;
+ border-radius: 5px;
+
+ .kb_block03_content {
+ border: 1px solid $kbBorderColor;
+ //width: 152px;
+ width: 180px;
+ height: 50px;
+ margin-right: 15px;
+ //margin-right: 20px;
+ display: flex;
+ flex-direction: column;
+
+ .content01 {
+ //width: 50px;
+ width: 100%;
+ height: 18px;
+ border-bottom: 1px solid $kbBorderColor;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .content02Parent {
+ display: flex;
+ //height:30px;
+ .content02 {
+ width: 60px;
+ border-right: 1px solid $kbBorderColor;
+
+ .content02_1 {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 50%;
+ }
+
+ .content02_2 {
+ height: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .borderTop {
+ border-top: 1px solid $kbBorderColor;
+ }
+ }
+ }
+
+ }
+ }
+
+ .kb_block03_02 {
+ margin-top: 7px;
+ display: flex;
+
+ .kb_block03_02_content {
+ //width: 152px;
+ width: 180px;
+ margin-right: 15px;
+
+ .content01 {
+ .circle {
+ width: 26px;
+ height: 26px;
+ background-color: #00ff8b;
+ border-radius: 50%;
+ }
+
+ }
+
+ }
+ }
+
+ }
+
+ .kb_left_top_block:last-child{
+ border-bottom: 1px solid $kbBorderColor;
+ }
+ }
+
+ .kb_left_bottom {
+ height: 495px;
+
+ .kb_left_bottom_content {
+ height: 460px;
+ display: flex;
+ flex-direction: column;
+ //border: 1px solid $kbBorderColor;
+
+ .content_head {
+ ////font-size: 26px;
+ //font-size: 18px;
+ //height: 55px;
+ //line-height: 55px;
+ ////border-bottom: 1px solid $kbBorderColor;
+ ////text-align: center;
+ //padding-left: 10px;
+
+ font-size: 18px;
+ line-height: 20px;
+ //padding-left: 10px;
+ margin-bottom: 10px;
+ margin-top: -10px;
+ color: #00ffff;
+
+ }
+
+ .content_body {
+ border: 1px solid $kbBorderColor;
+ }
+ }
+ }
+ }
+
+ .kb_right {
+ width: 575px;
+ height: 100%;
+
+ .kb_right_top {
+ margin-top: 30px;
+ margin-bottom: -30px;
+ height: 476px;
+ width: 100%;
+
+ .kb_right_top_content {
+ //border: 1px solid $kbBorderColor;
+ height: 430px;
+ display: flex;
+ flex-direction: column;
+
+ .content_head {
+ font-size: 18px;
+ line-height: 20px;
+ //padding-left: 10px;
+ margin-bottom: 10px;
+ margin-top: -10px;
+ color: #00ffff;
+ }
+
+ .content_body {
+ border: 1px solid $kbBorderColor;
+ //border-radius: 5px;
+ }
+ }
+ }
+
+ .kb_right_bottom {
+ height: 482px;
+ margin-top: 8px;
+
+ .kb_right_bottom_content_title {
+ color: #00ffff;
+ font-size: 18px;
+ margin-bottom: 10px;
+ margin-top: -10px;
+ }
+
+ .kb_right_bottom_content {
+ border: 1px solid $kbBorderColor;
+ height: 441px;
+ width: 100%;
+ border-radius: 5px;
+ background-color: $kbBackgroundColor;
+ //height: 100%;
+ }
+ }
+ }
+}
+
+::v-deep .el-table::before {
+ height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+ //background-color: #044563;
+ background-color: rgba(30, 33, 46);
+}
+
+::v-deep .el-table__body-wrapper::-webkit-scrollbar {
+ /* width: 0;瀹藉害涓�0鏆楄棌 */
+ width: 0;
+}
+
+::v-deep .cell {
+ padding: 0 !important;
+}
+
+//
+///* 瀹氫箟keyframes鍔ㄧ敾锛屽懡鍚嶄负blink*/
+//@keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+///*娣诲姞鍏煎鎬у墠缂�*/
+//@-webkit-keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+//@-o-keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+//@-moz-keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+//@-ms-keyframes blink {
+// 0% {
+// opacity: 1
+// }
+// 100% {
+// opacity: 0
+// }
+//}
+//
+.circleYellow {
+ width: 26px;
+ height: 26px;
+ background-color: rgb(255 255 0);
+ border-radius: 50%;
+
+ //animation: blink 2s linear infinite;
+ //-webkit-animation: blink 2s linear infinite;
+ //-moz-animation: blink 2s linear infinite;
+ //-ms-animation: blink 2s linear infinite;
+ //-o-animation: blink 2s linear infinite;
+}
+</style>
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 3e80c78..6ba0ea3 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -705,6 +705,44 @@
style="display: flex;justify-content: space-between"
>
<div class="elForm">
+
+ <el-form-item
+
+ label="棰勮寮�宸ユ椂闂�"
+ label-width="100px"
+ style=" display: flex;font-size: 14px;margin-top: 3px"
+ >
+ <el-date-picker
+ v-model="sourceForm.paystartdate"
+ type="daterange"
+ range-separator="~"
+ class="timeMini"
+ size="mini"
+ style="width: 200px;display: flex;line-height: 34px;height: 34px;font-size: 14px!important;"
+ :clearable="false"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ />
+ <!-- :picker-options="expireTimeOption"-->
+
+ </el-form-item>
+ <el-form-item
+ label="棰勮瀹屽伐鏃堕棿"
+ label-width="100px"
+ style=" display: flex;font-size: 14px;margin-top: 3px"
+ >
+ <el-date-picker
+ v-model="sourceForm.payenddate"
+ type="daterange"
+ :clearable="false"
+ class="timeMini"
+ range-separator="~"
+ start-placeholder="寮�濮嬫棩鏈�"
+ style="width: 200px;display: flex;line-height: 34px ;height: 34px ;font-size: 14px !important;"
+ end-placeholder="缁撴潫鏃ユ湡"
+ size="mini"
+ />
+ </el-form-item>
<el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
<el-select
v-model="sourceForm.erporderstus"
@@ -721,10 +759,10 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
+ <el-form-item v-show="isExpand" label="璁㈠崟缂栧彿" style=" display: flex;">
<el-input v-model="sourceForm.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
+ <el-form-item v-show="isExpand" label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="sourceForm.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
@@ -736,44 +774,6 @@
</el-form-item>
<el-form-item v-show="isExpand" label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="sourceForm.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
- <el-form-item
- v-show="isExpand"
- label="棰勮寮�宸ユ椂闂�"
- label-width="100px"
- style=" display: flex;font-size: 14px;margin-top: 3px"
- >
- <el-date-picker
- v-model="sourceForm.paystartdate"
- type="daterange"
- range-separator="~"
- class="timeMini"
- size="mini"
- style="width: 250px;display: flex;line-height: 34px;height: 34px;font-size: 14px!important;"
- :clearable="false"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- />
- <!-- :picker-options="expireTimeOption"-->
-
- </el-form-item>
- <el-form-item
- v-show="isExpand"
- label="棰勮瀹屽伐鏃堕棿"
- label-width="100px"
- style=" display: flex;font-size: 14px;margin-top: 3px"
- >
- <el-date-picker
- v-model="sourceForm.payenddate"
- type="daterange"
- :clearable="false"
- class="timeMini"
- range-separator="~"
- start-placeholder="寮�濮嬫棩鏈�"
- style="width: 250px;display: flex;line-height: 34px ;height: 34px ;font-size: 14px !important;"
- end-placeholder="缁撴潫鏃ユ湡"
- size="mini"
- />
</el-form-item>
</div>
diff --git a/src/views/scgl/gd_autoPrint.vue b/src/views/scgl/gd_autoPrint_back.vue
similarity index 100%
rename from src/views/scgl/gd_autoPrint.vue
rename to src/views/scgl/gd_autoPrint_back.vue
diff --git a/src/views/scgl/gdplgb.vue b/src/views/scgl/gdplgb.vue
new file mode 100644
index 0000000..004b88f
--- /dev/null
+++ b/src/views/scgl/gdplgb.vue
@@ -0,0 +1,496 @@
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div class="bodyTopButtonGroup">
+ <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+ </div>
+
+ <div class="bodyTopFormGroup">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="80px"
+ inline
+ style="display: flex;justify-content: space-between"
+ >
+ <div class="elForm">
+ <el-form-item label="缁勭粐缂栫爜" style=" display: flex;">
+ <el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="缁勭粐鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="缁勭粐绫诲瀷" style=" display: flex;">
+ <el-select v-model="form.OrgType" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in OrgTypeArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
+ <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </div>
+ <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
+ <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ </div>
+ </el-form>
+ </div>
+
+ <div class="elTableDiv">
+ <el-table
+ :data="tableData"
+ :height="tableHeight+'px'"
+ border
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:tableHeight+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <el-table-column
+ prop="RowNum"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="org_code"
+ label="缁勭粐缂栫爜"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="org_name"
+ label="缁勭粐鍚嶇О"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="description"
+ label="缁勭粐绫诲瀷"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="parentorg_name"
+ label="涓婄骇鍗曚綅"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="lm_user"
+ label="鍒涘缓浜哄憳"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="lm_date"
+ label="鍒涘缓鏃堕棿"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ label="鎿嶄綔"
+ width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ </el-tooltip>
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+ <i class="el-icon-delete" @click="del(row)" />
+ </el-tooltip>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getOrganizationSearch"
+ />
+ </div>
+
+ <el-dialog
+ :title="operation==='add'?'鏂板':'缂栬緫'"
+ :visible.sync="dialogVisible"
+ width="800px"
+ :close-on-click-modal="false"
+ top="15vh"
+ @closed="handleClose"
+ @close="handleClose"
+ >
+ <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <el-form-item label="缁勭粐缂栫爜" prop="OrgCode">
+ <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
+ <el-input v-model="dialogForm.OrgName" style="width: 200px" />
+ </el-form-item>
+ <el-form-item prop="SupUnit" label="涓婄骇鍗曚綅">
+ <el-select
+ v-model="dialogForm.SupUnit"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ :popper-append-to-body="false"
+ >
+ <el-option
+ v-for="item in SupUnitArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+
+ <!--瀵煎叆缁勪欢-->
+ <import-picker ref="importPickerFunc" class="importPickerClass" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />
+
+ </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
+import { getCookie } from '@/utils/auth'
+import ImportPicker from '@/components/ImportPicker'
+
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
+export default {
+ name: 'Zzjg',
+ components: {
+ Pagination, ImportPicker
+ },
+ data() {
+ const validateName = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇疯緭鍏ョ紪鐮�'))
+ } else {
+ if (SER_HZ.test(value)) {
+ return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
+ } else {
+ callback()
+ }
+ }
+ }
+ const validateTypeCode = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇烽�夋嫨涓婄骇'))
+ } else {
+ callback()
+ }
+ }
+ return {
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ OrgCode: '', // 缁勭粐鏋舵瀯浠ｇ爜
+ OrgName: '', // 缁勭粐鏋舵瀯鍚嶇О
+ OrgType: '', // 缁勭粐绫诲瀷
+ UserName: '', // 鍒涘缓浜哄憳
+ prop: 'lm_date', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ OrgTypeArr: [
+ { label: '宸ュ巶', value: 'F' },
+ { label: '閮ㄩ棬', value: 'D' },
+ { label: '杞﹂棿', value: 'W' },
+ { label: '绉戝', value: 'K' },
+ { label: '鐢熶骇绾�', value: 'L' }
+ ],
+
+ total: 10,
+ tableData: [],
+ dialogVisible: false,
+ dialogForm: {
+ OrgType: '',
+ OrgCode: '',
+ OrgName: '',
+ SupUnit: ''// 涓婄骇鍗曚綅
+ },
+ operation: '',
+ dialogFormRules: {
+ OrgType: [
+ { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
+ ],
+ OrgCode: [
+ { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ ],
+ OrgName: [
+ { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+ ],
+ SupUnit: [
+ { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
+ ]
+ },
+
+ title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
+ code: '4',
+ shows: false
+
+ }
+ },
+ watch: {
+ shows() {
+ if (!this.shows) {
+ this.getOrganizationSearch()
+ }
+ }
+ },
+ created() {
+ this.getOrganizationSearch()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ async getOrganizationSearch() {
+ const res = await OrganizationSearch(this.form)
+ this.tableData = res.data
+ this.total = res.count
+ },
+ // 鎺掑簭鏀瑰彉鏃�
+ sortChange({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.form.order = order
+ this.form.prop = prop
+ this.getOrganizationSearch()
+ },
+ // 鏌ヨ
+ search() {
+ this.getOrganizationSearch()
+ },
+ // 瀵煎叆鎸夐挳
+ upload() {
+ this.shows = true
+ this.$refs.importPickerFunc.newDataFunc()
+ },
+ colos() {
+ this.shows = false
+ },
+ // 閲嶇疆
+ reset() {
+ this.form.OrgCode = ''
+ this.form.OrgName = ''
+ this.form.OrgType = ''
+ this.form.UserName = ''
+ this.getOrganizationSearch()
+ },
+
+ // 鏂板鎸夐挳
+ add(operation) {
+ this.operation = operation
+ this.dialogVisible = true
+ },
+ // 淇敼鎸夐挳
+ edit(operation, row) {
+ this.operation = operation
+ this.dialogVisible = true
+
+ this.$nextTick(() => {
+ this.dialogForm.OrgCode = row.org_code
+ this.dialogForm.OrgName = row.org_name
+ this.dialogForm.SupUnit = row.parent_id
+ })
+ },
+ // 鍒犻櫎鎸夐挳
+ async del(row) {
+ this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ DeleteOrganization({ orgid: row.code }).then(res => {
+ if (res.code === '200') {
+ this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
+ this.getOrganizationSearch()
+ }
+ })
+ }).catch(() => {
+ this.$message.info('宸插彇娑堝垹闄�')
+ })
+ },
+ // 瀵硅瘽妗嗗叧闂簨浠�
+ handleClose() {
+ this.dialogForm.OrgType = ''
+ this.dialogForm.OrgCode = ''
+ this.dialogForm.OrgName = ''
+ this.dialogForm.SupUnit = ''
+ this.$refs.dialogForm.clearValidate()
+ },
+ // 瀵硅瘽妗嗗彇娑�
+ dialogVisibleCancel() {
+ this.dialogVisible = false
+ },
+ // 瀵硅瘽妗嗙‘璁�
+ dialogVisibleConfirm() {
+ this.$refs.dialogForm.validate(valid => {
+ if (valid) {
+ const data = {
+ OrganCode: this.dialogForm.OrgCode,
+ OrganName: this.dialogForm.OrgName,
+ OperType: this.operation === 'add' ? 'Add' : 'Update',
+ Operator: getCookie('admin')
+ }
+ AddUpdateOrganization(data).then(res => {
+ if (res.code === '200') {
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.dialogVisible = false
+ this.getOrganizationSearch()
+ } else {
+ this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
+ }
+ })
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 200
+ })
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ }
+ }
+}
+</script>
+
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+::v-deep .el-button--text{
+ font-size: 14px ;
+ cursor: pointer ;
+}
+.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+ color: $main_color;
+ cursor: pointer;
+}
+.el-icon-edit-outline{
+ margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+ height: 34px;
+ display: flex;
+ align-items: center;
+ padding: 0 15px;
+}
+
+::v-deep .el-button--primary {
+ //background-color: $main_color !important;
+}
+
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
+ border: none;
+}
+
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
+}
+
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+ height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td{
+ background-color: #eaecef ;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
+}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+::v-deep .el-select__caret{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+</style>
+<style>
+
+.el-table .custom-row {
+ background: #f8f8fa;
+}
+</style>
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index f8b4fdc..d3dcd73 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -63,11 +63,12 @@
range-separator="~"
class="timeMini"
size="mini"
- style="width: 250px;display: flex;line-height: 34px;height: 34px;font-size: 14px!important;"
+ style="width: 200px;display: flex;line-height: 34px;height: 34px;"
:clearable="false"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
/>
+ <!-- font-size: 14px!important;-->
<!-- :picker-options="expireTimeOption"-->
</el-form-item>
@@ -79,7 +80,7 @@
class="timeMini"
range-separator="~"
start-placeholder="寮�濮嬫棩鏈�"
- style="width: 250px;display: flex;line-height: 34px ;height: 34px ;font-size: 14px !important;"
+ style="width: 200px;display: flex;line-height: 34px ;height: 34px ;"
end-placeholder="缁撴潫鏃ユ湡"
size="mini"
/>
@@ -731,7 +732,7 @@
<style lang="scss" scoped>
$main_color: #42b983;
::v-deep .el-range-input{
- font-size: 14px !important;
+ //font-size: 14px !important;
}
::v-deep .el-range__icon{
line-height: 28px !important;
@@ -740,7 +741,7 @@
line-height: 28px !important;
}
::v-deep .el-range-input{
- font-size: 14px ;
+ font-size: 14px;
}
::v-deep .el-range-separator{
display: flex;
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 01bc811..abe93aa 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -1476,7 +1476,7 @@
this.judgeIsScanningArr.push(timenow)
let i
for (i in this.judgeIsScanningArr) {
- flag = Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]) < 1
+ flag = Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]) < 0.1
if (i > 0 && this.judgeIsScanningArr.length === parseInt(i) + 1) {
if (flag) {
this.fnThrottle(this.enterNative, 500, 2000, belong)()
diff --git a/src/views/scgl/sckbg_autoPrint.vue b/src/views/scgl/sckbg_autoPrint_back.vue
similarity index 100%
rename from src/views/scgl/sckbg_autoPrint.vue
rename to src/views/scgl/sckbg_autoPrint_back.vue
diff --git a/src/views/template.vue b/src/views/template.vue
index c50cab1..7716a9c 100644
--- a/src/views/template.vue
+++ b/src/views/template.vue
@@ -54,13 +54,10 @@
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
- <!-- <el-table-column-->
- <!-- type="selection"-->
- <!-- width="50"-->
- <!-- />-->
<el-table-column
prop="RowNum"
width="50"
+ fixed
label="搴忓彿"
/>
<el-table-column
@@ -77,15 +74,7 @@
prop="description"
label="缁勭粐绫诲瀷"
sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.description==='F'">宸ュ巶</div>
- <div v-if="row.description==='D'">閮ㄩ棬</div>
- <div v-if="row.description==='W'">杞﹂棿</div>
- <div v-if="row.description==='K'">绉戝</div>
- <div v-if="row.description==='L'">鐢熶骇绾�</div>
- </template>
- </el-table-column>
+ />
<el-table-column
prop="parentorg_name"
label="涓婄骇鍗曚綅"
@@ -104,11 +93,17 @@
/>
<el-table-column
label="鎿嶄綔"
+ width="120"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ </el-tooltip>
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+ <i class="el-icon-delete" @click="del(row)" />
+ </el-tooltip>
</div>
</template>
</el-table-column>
@@ -120,7 +115,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getOrganizationSearch"
/>
diff --git a/src/views/xtsz/cjgg.vue b/src/views/xtsz/cjgg.vue
new file mode 100644
index 0000000..337d2d1
--- /dev/null
+++ b/src/views/xtsz/cjgg.vue
@@ -0,0 +1,594 @@
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div class="bodyTopButtonGroup">
+ <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <!-- <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>-->
+ </div>
+
+ <div class="bodyTopFormGroup">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="80px"
+ inline
+ style="display: flex;justify-content: space-between"
+ >
+ <div class="elForm">
+ <el-form-item label="鎵ц杞﹂棿" style=" display: flex;">
+ <el-select v-model="form.wkspcode" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in wkspSelectArr"
+ :key="item.org_code"
+ :label="item.org_name"
+ :value="item.org_code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍏憡涓婚" style=" display: flex;">
+ <el-input v-model="form.ancetitle" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鍏憡鍐呭" style=" display: flex;">
+ <el-input v-model="form.ancecont" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鏄惁鎾ら攢" style=" display: flex;">
+ <el-select v-model="form.cancel" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in cancelSelectArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍏憡绛夌骇" style=" display: flex;">
+ <el-select v-model="form.level" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in levelSelectArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ </div>
+ <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
+ <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ </div>
+ </el-form>
+ </div>
+
+ <div class="elTableDiv">
+ <el-table
+ :data="tableData"
+ :height="tableHeight+'px'"
+ border
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:tableHeight+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <el-table-column
+ prop="RowNum"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="wksp_name"
+ label="鎵ц杞﹂棿"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="title"
+ label="鍏憡涓婚"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="contents"
+ label="鍏憡鍐呭"
+ sortable="custom"
+ width="400"
+ show-tooltip-when-overflow
+ />
+ <el-table-column
+ prop="lm_user"
+ label="鍒涘缓浜哄憳"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="lm_date"
+ label="鍒涘缓鏃堕棿"
+
+ sortable="custom"
+ />
+ <el-table-column
+ prop="if_cancel"
+ label="鏄惁鎾ら攢"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.if_cancel==='Y'">鏄�</div>
+ <div v-if="row.if_cancel==='N'">鍚�</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="priority"
+ label="鍏憡绛夌骇"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.priority===3">涓�鑸�</div>
+ <div v-if="row.priority===2">绱ф��</div>
+ <div v-if="row.priority===1">鐗圭骇</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ </el-tooltip>
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+ <i class="el-icon-delete" @click="del(row)" />
+ </el-tooltip>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getSystemAnnouncementSearch"
+ />
+ </div>
+
+ <el-dialog
+ :title="operation==='add'?'鏂板':'缂栬緫'"
+ :visible.sync="dialogVisible"
+ width="800px"
+ :close-on-click-modal="false"
+ top="15vh"
+ @closed="handleClose"
+ @close="handleClose"
+ >
+ <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <el-form-item prop="dtString" label="鎵ц杞﹂棿">
+ <el-select
+ v-model="dialogForm.dtString"
+ style="width: 200px"
+ multiple
+ collapse-tags
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in wkspSelectArr"
+ :key="item.org_code"
+ :label="item.org_name"
+ :value="item.org_code"
+ />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="鍏憡涓婚" prop="ancetitle">
+ <el-input v-model="dialogForm.ancetitle" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item prop="level" label="鍏憡绛夌骇">
+ <el-select
+ v-model="dialogForm.level"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in levelSelectArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item prop="cancel" label="鏄惁鎾ら攢">
+ <el-select
+ v-model="dialogForm.cancel"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in cancelSelectArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item prop="ancecont" label="鍏憡鍐呭">
+ <el-input v-model="dialogForm.ancecont" :rows="8" type="textarea" style="width: 490px" />
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+
+ <!--瀵煎叆缁勪欢-->
+ <import-picker ref="importPickerFunc" class="importPickerClass" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />
+
+ </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import ImportPicker from '@/components/ImportPicker'
+import { SystemAnnouncementAddUpdate, SystemAnnouncementDelete, SystemAnnouncementSearch } from '@/api/xtsz'
+import { ShopSearch } from '@/api/dzkb'
+
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
+export default {
+ name: 'Zzjg',
+ components: {
+ Pagination, ImportPicker
+ },
+ data() {
+ const validateName = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇疯緭鍏ョ紪鐮�'))
+ } else {
+ if (SER_HZ.test(value)) {
+ return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
+ } else {
+ callback()
+ }
+ }
+ }
+ const validateTypeCode = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇烽�夋嫨涓婄骇'))
+ } else {
+ callback()
+ }
+ }
+ return {
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ wkspcode: '', // 杞﹂棿缂栫爜
+ ancetitle: '', // 鍏憡涓婚
+ ancecont: '', // 鍏憡鍐呭
+ cancel: '', // 鏄惁鎾ら攢
+ level: '', // 鍏憡绛夌骇
+ prop: 'lm_date', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ wkspSelectArr: [], // 杞﹂棿涓嬫媺鏁扮粍
+ cancelSelectArr: [
+ { code: 'Y', name: '鏄�' },
+ { code: 'N', name: '鍚�' }
+ ], // 鏄惁鎾ら攢涓嬫媺鏁扮粍
+ levelSelectArr: [
+ { code: 1, name: '鐗圭骇' },
+ { code: 2, name: '绱ф��' },
+ { code: 3, name: '涓�鑸�' }
+ ], // 鍏憡绛夌骇涓嬫媺鏁扮粍
+ total: 10,
+ tableData: [],
+ dialogVisible: false,
+ dialogForm: {
+ id: '',
+ dtString: [], // 鎵ц杞﹂棿
+ ancetitle: '', // 鍏憡涓婚
+ ancecont: '', // 鍏憡鍐呭
+ level: 3, // 鍏憡绛夌骇
+ cancel: 'N', // 鏄惁鎾ら攢
+ opertype: ''
+ },
+ operation: '',
+ dialogFormRules: {
+ dtString: [
+ { required: true, message: '璇烽�夋嫨鎵ц杞﹂棿', trigger: ['blur', 'change'] }
+ ],
+ ancetitle: [
+ { required: true, message: '璇疯緭鍏ュ叕鍛婁富棰�', trigger: ['blur', 'change'] }
+ ],
+ level: [
+ { required: true, message: '璇烽�夋嫨鍏憡绛夌骇', trigger: ['blur', 'change'] }
+ ],
+ cancel: [
+ { required: true, message: '璇烽�夋嫨鏄惁鎾ら攢', trigger: ['blur', 'change'] }
+ ],
+ ancecont: [
+ { required: true, message: '璇疯緭鍏ュ叕鍛婂唴瀹�', trigger: ['blur', 'change'] }
+ ]
+ },
+
+ title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
+ code: '4',
+ shows: false
+
+ }
+ },
+ watch: {
+ shows() {
+ if (!this.shows) {
+ this.getSystemAnnouncementSearch()
+ }
+ }
+ },
+ created() {
+ // this.getSystemAnnouncementSearch()
+ this.handleRequest()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ handleRequest() {
+ this.getSystemAnnouncementSearch().then(res => {
+ if (res.code === '200') {
+ this.getShopSearch()
+ }
+ })
+ },
+ // 鑾峰彇鎵ц杞﹂棿涓嬫媺鏁扮粍
+ async getShopSearch() {
+ const { data: res } = await ShopSearch()
+ this.wkspSelectArr = res
+ },
+ // 鑾峰彇鍒楄〃
+ async getSystemAnnouncementSearch() {
+ const res = await SystemAnnouncementSearch(this.form)
+ this.tableData = res.data
+ this.total = res.count
+
+ return { code: res.code }
+ },
+ // 鎺掑簭鏀瑰彉鏃�
+ sortChange({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.form.order = order
+ this.form.prop = prop
+ this.getSystemAnnouncementSearch()
+ },
+ // 鏌ヨ
+ search() {
+ this.getSystemAnnouncementSearch()
+ },
+ // 瀵煎叆鎸夐挳
+ upload() {
+ this.shows = true
+ this.$refs.importPickerFunc.newDataFunc()
+ },
+ colos() {
+ this.shows = false
+ },
+ // 閲嶇疆
+ reset() {
+ this.form.wkspcode = ''
+ this.form.ancetitle = ''
+ this.form.ancecont = ''
+ this.form.cancel = ''
+ this.form.level = ''
+ this.getSystemAnnouncementSearch()
+ },
+
+ // 鏂板鎸夐挳
+ add(operation) {
+ this.operation = operation
+ this.dialogVisible = true
+ },
+ // 淇敼鎸夐挳
+ edit(operation, row) {
+ this.operation = operation
+ this.dialogVisible = true
+
+ this.$nextTick(() => {
+ this.dialogForm.id = row.id
+ this.dialogForm.dtString = [row.wksp_code]
+ this.dialogForm.ancetitle = row.title
+ this.dialogForm.ancecont = row.contents
+ this.dialogForm.level = row.priority
+ this.dialogForm.cancel = row.if_cancel
+ })
+ },
+ // 鍒犻櫎鎸夐挳
+ async del(row) {
+ this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ SystemAnnouncementDelete({ id: row.id }).then(res => {
+ if (res.code === '200') {
+ this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
+ this.getSystemAnnouncementSearch()
+ }
+ })
+ }).catch(() => {
+ this.$message.info('宸插彇娑堝垹闄�')
+ })
+ },
+ // 瀵硅瘽妗嗗叧闂簨浠�
+ handleClose() {
+ this.dialogForm.id = ''
+ this.dialogForm.dtString = []
+ this.dialogForm.ancetitle = ''
+ this.dialogForm.ancecont = ''
+ this.dialogForm.level = 3
+ this.dialogForm.cancel = 'N'
+ this.$refs.dialogForm.clearValidate()
+ },
+ // 瀵硅瘽妗嗗彇娑�
+ dialogVisibleCancel() {
+ this.dialogVisible = false
+ },
+ // 瀵硅瘽妗嗙‘璁�
+ dialogVisibleConfirm() {
+ console.log(this.dialogForm.dtString, 111)
+ console.log(this.dialogForm.id, this.dialogForm.ancetitle, this.dialogForm.ancecont, this.dialogForm.level, this.dialogForm.cancel, this.dialogForm.opertype, 111)
+ this.$refs.dialogForm.validate(valid => {
+ if (valid) {
+ const data = []
+ this.dialogForm.dtString.forEach(item => {
+ data.push({ wksp_code: item })
+ })
+ SystemAnnouncementAddUpdate(data, this.dialogForm.id, this.dialogForm.ancetitle, this.dialogForm.ancecont, this.dialogForm.level, this.dialogForm.cancel, this.operation === 'add' ? 'Add' : 'Update').then(res => {
+ if (res.code === '200') {
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.dialogVisible = false
+ this.getSystemAnnouncementSearch()
+ } else {
+ this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
+ }
+ })
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 200
+ })
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ }
+ }
+}
+</script>
+
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+::v-deep .el-button--text{
+ font-size: 14px ;
+ cursor: pointer ;
+}
+.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+ color: $main_color;
+ cursor: pointer;
+}
+.el-icon-edit-outline{
+ margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+ height: 34px;
+ display: flex;
+ align-items: center;
+ padding: 0 15px;
+}
+
+::v-deep .el-button--primary {
+ //background-color: $main_color !important;
+}
+
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
+ border: none;
+}
+
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
+}
+
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+ height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td{
+ background-color: #eaecef ;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
+}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+::v-deep .el-select__caret{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+</style>
+<style>
+
+.el-table .custom-row {
+ background: #f8f8fa;
+}
+</style>
diff --git a/src/views/zlgl/gxjy.vue b/src/views/zlgl/gxjy.vue
index b4ed8be..343fb73 100644
--- a/src/views/zlgl/gxjy.vue
+++ b/src/views/zlgl/gxjy.vue
@@ -529,7 +529,7 @@
this.judgeIsScanningArr.push(timenow)
let i
for (i in this.judgeIsScanningArr) {
- flag = Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]) < 1
+ flag = Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]) < 0.1
if (i > 0 && this.judgeIsScanningArr.length === parseInt(i) + 1) {
if (flag) {
this.fnThrottle(this.enterNative, 500, 2000, belong)()
--
Gitblit v1.9.3