From 1e9fa82cb2fe2c15f46bd1dd73f5c878c74b83b8 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 04 八月 2022 15:35:50 +0800
Subject: [PATCH] 1.系统多账号登录问题2.采购订单页面样式修改及数据渲染
---
src/views/zzmx/chda.vue | 14
src/views/zlgl/gxjy.vue | 18
src/views/scgl/gd.vue | 11
src/views/kb/cgdd.vue | 531 ++++++++++++++++---------------------
src/views/login/index.vue | 39 ++
src/views/sbgl/sbqd.vue | 19
src/views/kb/ckgl.vue | 59 ++-
src/layout/components/TagsView/index.vue | 9
src/utils/request.js | 6
src/views/jcsz/yhqd.vue | 13
src/views/zzmx/jpgj.vue | 13
src/api/dzkb.js | 24 +
src/views/scgl/gd_autoPrint.vue | 12
src/views/jcsz/jsqd.vue | 13
src/views/wlgl/kwdy.vue | 12
src/views/zlgl/gxjybz.vue | 11
16 files changed, 442 insertions(+), 362 deletions(-)
diff --git a/src/api/dzkb.js b/src/api/dzkb.js
index f24a1f0..a2011fb 100644
--- a/src/api/dzkb.js
+++ b/src/api/dzkb.js
@@ -41,3 +41,27 @@
method: 'get'
})
}
+
+// 閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,宸︿笂鏈湀閲囪喘璁㈠崟鏁般�佹湰鏈堥噰璐繘璐у崟鏁般�佹湰鏈堥噰璐叆搴撳崟鏁�
+export function PurchaseLeftTop() {
+ return request({
+ url: 'KanBanManagerent/PurchaseLeftTop',
+ method: 'get'
+ })
+}
+
+// 閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,宸︿笅閲囪喘璁㈠崟璺熻釜鍒楄〃
+export function PurchaseLeftBottom() {
+ return request({
+ url: 'KanBanManagerent/PurchaseLeftBottom',
+ method: 'get'
+ })
+}
+
+// 閲囪喘璁㈠崟璺熻釜绠＄悊鐪嬫澘,鍙充晶Top
+export function PurchaseRight() {
+ return request({
+ url: 'KanBanManagerent/PurchaseRight',
+ method: 'get'
+ })
+}
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 89b1996..e029ba7 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -62,10 +62,11 @@
},
computed: {
visitedViews() {
- if (this.$store.state.tagsView.visitedViews.length > 10) {
- // eslint-disable-next-line vue/no-side-effects-in-computed-properties
- this.dialogVisible = true
- }
+ // 鏆傛椂鍙栨秷鍗佷釜鏍囩椤甸檺鍒舵彁绀�
+ // if (this.$store.state.tagsView.visitedViews.length > 10) {
+ // // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+ // this.dialogVisible = true
+ // }
return this.$store.state.tagsView.visitedViews
},
routes() {
diff --git a/src/utils/request.js b/src/utils/request.js
index 63f4fcd..19793af 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,7 +1,8 @@
import axios from 'axios'
import { MessageBox, Message } from 'element-ui'
import store from '@/store'
-import { getCookie, getToken, removeCookie } from '@/utils/auth'
+import { getCookie, getToken, removeCookie, setCookie } from '@/utils/auth'
+import { handleDatetime } from '@/utils/global'
// create an axios instance
const service = axios.create({
@@ -66,8 +67,9 @@
removeCookie('userid')
removeCookie('code')
setTimeout(() => {
+ sessionStorage.removeItem('tabViews')
window.location.reload()
- }, 3000)
+ }, 1000 * 2)
}
// 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
// if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 5bcb437..dec57fa 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -655,20 +655,27 @@
}
},
created() {
- this.getRoleSearch()
- this.getRoleTypeSearch2()
- this.getUserOrganization()
+ this.handleRequest()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ handleRequest() {
+ this.getRoleSearch().then(res => {
+ if (res.code === '200') {
+ this.getRoleTypeSearch2()
+ this.getUserOrganization()
+ }
+ })
+ },
// 鑾峰彇瑙掕壊娓呭崟
async getRoleSearch() {
const res = await RoleSearch(this.form)
this.tableData = res.data
this.total = res.count
+ return { code: res.code }
},
// 鑾峰彇鐢ㄦ埛绫诲瀷
async getRoleTypeSearch() {
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 966c620..db4f7be 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -667,19 +667,28 @@
}
},
created() {
- this.getUserSearch()
- this.getUserOrganization()
+ this.handleRequest()
},
+
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ handleRequest() {
+ this.getUserSearch().then(res => {
+ if (res.code === '200') {
+ this.getUserOrganization()
+ }
+ })
+ },
+
// 鑾峰彇鐢ㄦ埛娓呭崟
async getUserSearch() {
const res = await UserSearch(this.form)
this.tableData = res.data
this.total = res.count
+ return { code: res.code }
},
// 鑾峰彇鎵�灞炵粍缁�
async getUserOrganization() {
diff --git a/src/views/kb/cgdd.vue b/src/views/kb/cgdd.vue
index 7dc0191..6f1e00f 100644
--- a/src/views/kb/cgdd.vue
+++ b/src/views/kb/cgdd.vue
@@ -18,17 +18,17 @@
<div class="kb_left_top_block kb_pd10">
<div class="content01">
<div class="pic01" />
- <div class="number">12</div>
+ <div class="number">{{ purchaseLeftTopData.ThisMonthPurchaseArrivalOrderCont }}</div>
<div class="text">鏈湀閲囪喘鍗曟暟</div>
</div>
<div class="content01">
<div class="pic01" />
- <div class="number">90200</div>
+ <div class="number">{{ purchaseLeftTopData.ThisMonthPurchaseOrderCont }}</div>
<div class="text">鏈湀杩涜揣鍗曟暟</div>
</div>
<div class="content01">
<div class="pic01" />
- <div class="number">90200</div>
+ <div class="number">{{ purchaseLeftTopData.ThisMonthWareHouseOrderCont }}</div>
<div class="text">鏈湀鍏ュ簱鍗曟暟</div>
<!-- <div id="pie01" ref="pie01" class="pie01" />-->
<!-- <div class="text" style="margin-top: -10px">褰撴湀寤舵湡鍗犳瘮</div>-->
@@ -39,92 +39,114 @@
<!-- 2-->
<div class="kb_left_bottom kb_pd10">
<div class="kb_left_bottom_content">
- <div class="content_head">鎴戞槸鏍囬</div>
- <el-table
- :data="tableData"
- style="width: 100%;"
- :header-cell-style="headerCellStyle"
- :cell-style="cellStyle"
- height="610"
- >
- <el-table-column
- prop="xh"
- label="搴忓彿"
- width="53"
- />
- <el-table-column
- prop="jgzt"
- label="鍔犲伐鐘舵��"
- width="85"
- />
- <el-table-column
- prop="pfsj"
- label="娲惧彂鏃堕棿"
- width="86"
- />
- <el-table-column
- prop="xsddh"
- label="閿�鍞鍗曞彿"
- width="150"
- />
- <el-table-column
- prop="jgdh"
- label="鍔犲伐鍗曞彿"
- width="207"
- />
- <el-table-column
- prop="cpmc"
- label="浜у搧鍚嶇О"
- width="105"
- />
- <el-table-column
- prop="gg"
- label="瑙勬牸"
- width="60"
- />
- <el-table-column
- prop="dw"
- label="鍗曚綅"
- width="60"
- />
- <el-table-column
- prop="rwsl"
- label="浠诲姟鏁伴噺"
- width="90"
- />
- <el-table-column
- prop="wgsl"
- label="瀹屽伐鏁伴噺"
- width="90"
- />
- <el-table-column
- prop="blsl"
- label="涓嶈壇鏁伴噺"
- width="90"
- />
- <el-table-column
- prop="wcl"
- label="瀹屾垚鐜�"
- width="70"
- />
- <el-table-column
- prop="yjks"
- label="棰勮寮�濮�"
- width="86"
- />
- <el-table-column
- prop="yjjs"
- label="棰勮缁撴潫"
- width="86"
- />
- </el-table>
+ <div class="content_head">鎴戞槸鏍囬锛�</div>
+ <div class="content_body">
+ <el-table
+ ref="tableData"
+ :data="tableData"
+ style="width: 100%;"
+ :header-cell-style="headerCellStyle"
+ :cell-style="cellStyle"
+ height="588"
+ >
+ <!-- <el-table-column-->
+ <!-- prop="RowNum"-->
+ <!-- label="搴忓彿"-->
+ <!-- width="53"-->
+ <!-- />-->
+
+ <el-table-column
+ prop="PurchaseOrder"
+ label="閲囪喘璁㈠崟"
+ width="163"
+ />
+ <el-table-column
+ prop="suppername"
+ label="渚涘簲鍟�"
+ width="163"
+ />
+ <el-table-column
+ prop="username"
+ label="閲囪喘鍛�"
+ width="68"
+ />
+ <el-table-column
+ prop="partcode"
+ label="浜у搧缂栫爜"
+ width="84"
+ />
+ <el-table-column
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ width="168"
+ />
+ <el-table-column
+ prop="partspec"
+ label="瑙勬牸鍨嬪彿"
+ width="84"
+ />
+ <el-table-column
+ prop="quantity"
+ label="璁㈠崟鏁伴噺"
+ width="84"
+ />
+ <el-table-column
+ prop="checktype"
+ label="妫�楠岀姸鎬�"
+ width="84"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.checktype===null">鏈楠�</div>
+ <div v-else>宸叉楠�</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="checkuser"
+ label="妫�楠屼汉鍛�"
+ width="84"
+ />
+ <el-table-column
+ prop="quantity1"
+ label="宸叉敹鏁伴噺"
+ width="84"
+ />
+ <el-table-column
+ label="鏈敹鏁伴噺"
+ width="84"
+ >
+ <template slot-scope="{row}">
+ <div>{{ parseFloat(row.quantity- row.quantity1) }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="acceptDate"
+ label="棰勮浜ゆ湡"
+ width="84"
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.acceptDate.substring(5, 10) }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="warning"
+ label="寤舵湡澶╂暟"
+ width="84"
+ >
+ <template slot-scope="{row}">
+ <div v-if="parseFloat(row.warning)<0" style="color: red">{{ Math.abs(parseFloat(row.warning)) }}</div>
+ <div v-else-if="row.warning===null">0</div>
+ <div v-else>{{ row.warning }}</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">渚涘簲鍟嗗欢鏈熶氦璐ф帓琛�</div>
+ <div class="content_head">渚涘簲鍟嗗欢鏈熶氦璐ф帓琛岋細</div>
<div class="content_body">
<el-table
ref="tableDataRank"
@@ -132,32 +154,37 @@
style="width: 100%;"
:header-cell-style="headerCellStyle"
:cell-style="cellStyle"
- height="888"
+ :row-class-name="tableRowClassName"
+ height="923"
>
<el-table-column
- prop="xh"
+ type="index"
label="搴忓彿"
- width="75"
- />
- <el-table-column
- prop="cj"
- label="杞﹂棿"
width="100"
+ >
+ <template slot-scope="{row}">
+ <div>NO.{{ row.index }}</div>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="cj"-->
+ <!-- label="杞﹂棿"-->
+ <!-- width="100"-->
+ <!-- />-->
+ <el-table-column
+ prop="suppercode"
+ label="渚涘簲鍟嗙紪鐮�"
+ width="145"
/>
<el-table-column
- prop="cx"
- label="浜х嚎"
- width="120"
+ prop="suppername"
+ width="163"
+ label="渚涘簲鍟嗗悕绉�"
/>
<el-table-column
- prop="cp"
- width="138"
- label="浜у搧"
- />
- <el-table-column
- prop="sl"
+ prop="cont"
label="鏁伴噺"
- width="100"
+ width="125"
/>
</el-table>
</div>
@@ -172,8 +199,9 @@
<script>
import './kbCommon.css'
-import { loadEcharts, pie01 } from '@/utils/myEcharts'
+import { bar02, loadEcharts, pie01 } from '@/utils/myEcharts'
import * as echarts from 'echarts'
+import { PurchaseLeftBottom, PurchaseLeftTop, PurchaseRight } from '@/api/dzkb'
export default {
name: 'Index2',
@@ -181,178 +209,9 @@
return {
headTime: '',
- tableData: [
- {
- xh: 1,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 2,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 3,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 4,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 5,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 6,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 7,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 8,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 9,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- },
- {
- xh: 10,
- jgzt: '寮�濮�',
- pfsj: '07/29',
- xsddh: '202207290001',
- jgdh: 'MO-2022-07-29-0001',
- cpmc: '浜у搧鍚嶆祴璇�',
- gg: '@20',
- dw: 'PCS',
- rwsl: 2000,
- wgsl: 1900,
- blsl: 100,
- wcl: '99%',
- yjks: '07/21',
- yjjs: '07/29'
- }
- ],
- tableDataRank: [// 鎺掕
- { xh: 'NO.1', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.2', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.3', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.4', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.5', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.6', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.7', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 },
- { xh: 'NO.8', cj: '閿傜數杞﹂棿', cx: '閿傜數1绾�', cp: 'F09閿傜數', sl: 1000 }
- ]
+ purchaseLeftTopData: [],
+ tableData: [],
+ tableDataRank: []
}
},
@@ -361,18 +220,80 @@
setInterval(this.getNowTime, 1000)
},
mounted() {
-
+ this.getPurchaseLeftTop()
+ this.getPurchaseLeftBottom()
+ this.getPurchaseRight()
},
methods: {
- // 鑾峰彇echarts
- getEcharts() {
- loadEcharts('pie01', pie01())
-
- // setInterval(() => {
- // loadEcharts('pie01', pie01())
- // }, 5000)
+ getPurchaseLeftTop() {
+ PurchaseLeftTop().then(res => {
+ this.purchaseLeftTopData = res.data[0]
+ console.log(this.purchaseLeftTopData)
+ })
+ setInterval(() => {
+ PurchaseLeftTop().then(res => {
+ this.purchaseLeftTopData = res.data[0]
+ })
+ }, 1000 * 6)
},
+
+ getPurchaseLeftBottom() {
+ PurchaseLeftBottom().then(res => {
+ this.tableData = res.data
+ })
+
+ const divData = this.$refs.tableData.bodyWrapper
+ // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ setInterval(() => {
+ // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+ // divData.scrollTop += divData.scrollHeight / this.tableDataRank.length
+ divData.scrollTop += 1
+ // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+ if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+ // 閲嶇疆table璺濈椤堕儴璺濈
+ divData.scrollTop = 0
+ PurchaseLeftBottom().then(res => {
+ this.tableData = res.data
+ })
+ }
+ }, this.tableData.length <= 14 ? 1000 * 6 : 100)
+ },
+
+ getPurchaseRight() {
+ PurchaseRight().then(res => {
+ this.tableDataRank = res.data
+ })
+
+ const divData = this.$refs.tableDataRank.bodyWrapper
+ // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ setInterval(() => {
+ // 鍏冪礌鑷璺濈椤堕儴1鍍忕礌
+ // divData.scrollTop += divData.scrollHeight / this.tableDataRank.length
+ divData.scrollTop += 1
+ // 鍒ゆ柇鍏冪礌鏄惁婊氬姩鍒板簳閮�(鍙楂樺害+璺濈椤堕儴=鏁翠釜楂樺害)
+ if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
+ // 閲嶇疆table璺濈椤堕儴璺濈
+ divData.scrollTop = 0
+ PurchaseRight().then(res => {
+ this.tableDataRank = res.data
+ })
+ }
+ }, this.tableDataRank.length <= 22 ? 1000 * 6 : 100)
+ },
+
+ tableRowClassName({ row, rowIndex }) {
+ // 鎶婃瘡涓�琛岀殑绱㈠紩鏀捐繘row
+ row.index = rowIndex + 1
+ },
+ // 鑾峰彇echarts
+ // getEcharts() {
+ // loadEcharts('pie01', pie01())
+ //
+ // // setInterval(() => {
+ // // loadEcharts('pie01', pie01())
+ // // }, 5000)
+ // },
// 鑾峰彇褰撳墠鏃堕棿
getNowTime() {
@@ -392,20 +313,21 @@
},
headerCellStyle() {
return {
- backgroundColor: '#000',
+ backgroundColor: 'rgb(30 ,33, 46)',
padding: '10px 0',
textAlign: 'center',
- color: '#fff',
- borderRight: '1px solid rgba(255,255,255,0.6)'
+ color: '#07acc2',
+ border: 'none'
}
},
cellStyle() {
return {
- padding: '5px 0',
+ padding: '8px 0',
textAlign: 'center',
- backgroundColor: '#000',
+ backgroundColor: 'rgba(30, 33, 46 )',
+ // backgroundColor: 'transparent',
color: '#fff',
- borderRight: '1px solid rgba(255,255,255,0.6)'
+ border: 'none'
}
}
}
@@ -413,6 +335,7 @@
</script>
<style scoped lang="scss">
+$kbBorderColor: #09d8f2;
.kb_content {
display: flex;
@@ -439,6 +362,7 @@
display: flex;
//border: 1px solid rgba(255, 255, 255, 0.6);
justify-content: space-around;
+ background-color: rgba(30, 33, 46,0.6);
.content01 {
margin: auto;
@@ -477,13 +401,16 @@
height: 610px;
display: flex;
flex-direction: column;
- border: 1px solid rgba(255, 255, 255, 0.6);
.content_head {
- line-height: 55px;
- border-bottom: 1px solid rgba(255, 255, 255, 0.6);
- text-align: center;
- font-size: 26px;
+ line-height: 20px;
+ font-size: 18px;
+ margin-bottom: 10px;
+ margin-top: -10px;
+ }
+
+ .content_body {
+ border: 1px solid $kbBorderColor;
}
}
}
@@ -498,17 +425,19 @@
width: 100%;
.kb_right_top_content {
- border: 1px solid rgba(255, 255, 255, 0.6);
height: 100%;
display: flex;
flex-direction: column;
.content_head {
- font-size: 26px;
- height: 55px;
- line-height: 55px;
- border-bottom: 1px solid rgba(255, 255, 255, 0.6);
- text-align: center;
+ line-height: 20px;
+ font-size: 18px;
+ margin-bottom: 10px;
+ margin-top: -10px;
+ }
+
+ .content_body {
+ border: 1px solid $kbBorderColor;
}
}
}
@@ -516,8 +445,12 @@
}
}
+::v-deep .el-table::before {
+ height: 0;
+}
+
::v-deep .el-table__body-wrapper {
- background-color: #000;
+ background-color: rgba(30, 33, 46);
}
::v-deep .el-table__body-wrapper::-webkit-scrollbar {
diff --git a/src/views/kb/ckgl.vue b/src/views/kb/ckgl.vue
index 2cae8bb..830220a 100644
--- a/src/views/kb/ckgl.vue
+++ b/src/views/kb/ckgl.vue
@@ -16,14 +16,14 @@
<!-- 1-->
<div class="kb_left_top kb_pd10">
<div class="kb_left_top_block">
- <div class="headTitle">鎴愬搧鍏ュ簱鍗�</div>
+ <div class="headTitle">鎴愬搧鍏ュ簱鍗曪細</div>
<div class="content">
<el-table
:data="tableData"
style="width: 100%;"
:header-cell-style="headerCellStyle"
:cell-style="cellStyle"
- height="214"
+ height="240"
>
<el-table-column
prop="xh"
@@ -99,14 +99,14 @@
</div>
</div>
<div class="kb_left_top_block">
- <div class="headTitle">鎴愬搧鍑哄簱鍗�</div>
+ <div class="headTitle">鎴愬搧鍑哄簱鍗曪細</div>
<div class="content">
<el-table
:data="tableData"
style="width: 100%;"
:header-cell-style="headerCellStyle"
:cell-style="cellStyle"
- height="214"
+ height="240"
>
<el-table-column
prop="xh"
@@ -197,7 +197,7 @@
<div class="kb_right kb_pd10">
<div class="kb_right_top kb_pd10">
<div class="kb_right_top_content">
- <div class="content_head">搴撳瓨鎺掕</div>
+ <div class="content_head">搴撳瓨鎺掕锛�</div>
<div class="content_body">
<el-table
ref="tableDataRank"
@@ -205,7 +205,7 @@
style="width: 100%;"
:header-cell-style="headerCellStyle"
:cell-style="cellStyle"
- height="888"
+ height="923"
>
<el-table-column
prop="xh"
@@ -460,20 +460,21 @@
},
headerCellStyle() {
return {
- backgroundColor: '#000',
+ backgroundColor: 'rgb(30 ,33, 46)',
padding: '10px 0',
textAlign: 'center',
- color: '#fff',
- borderRight: '1px solid rgba(255,255,255,0.6)'
+ color: '#07acc2',
+ border: 'none'
}
},
cellStyle() {
return {
padding: '8px 0',
textAlign: 'center',
- backgroundColor: '#000',
+ backgroundColor: 'rgba(30, 33, 46 )',
+ // backgroundColor: 'transparent',
color: '#fff',
- borderRight: '1px solid rgba(255,255,255,0.6)'
+ border: 'none'
}
}
}
@@ -481,6 +482,7 @@
</script>
<style scoped lang="scss">
+$kbBorderColor: #09d8f2;
.kb_content {
display: flex;
@@ -505,19 +507,22 @@
width: 100%;
height: 267px;
display: flex;
- border: 1px solid rgba(255, 255, 255, 0.6);
flex-direction: column;
.headTitle{
- line-height: 54px;
- border-bottom: 1px solid rgba(255, 255, 255, 0.6);
- text-align: center;
- font-size: 26px;
+ //line-height: 54px;
+ //border-bottom: 1px solid rgba(255, 255, 255, 0.6);
+ //text-align: center;
+ //font-size: 26px;
+ line-height: 20px;
+ font-size: 18px;
+ margin-bottom: 10px;
+ margin-top: -10px;
}
.content{
-
+ border: 1px solid $kbBorderColor;
}
}
@@ -534,7 +539,8 @@
.content01{
width: 48%;
height: 100%;
- border: 1px solid rgba(255,255,255,0.6);
+ border: 1px solid $kbBorderColor;
+ border-radius: 5px;
}
}
}
@@ -549,17 +555,19 @@
width: 100%;
.kb_right_top_content {
- border: 1px solid rgba(255, 255, 255, 0.6);
height: 100%;
display: flex;
flex-direction: column;
.content_head {
- font-size: 26px;
- height: 55px;
- line-height: 55px;
- border-bottom: 1px solid rgba(255, 255, 255, 0.6);
- text-align: center;
+ line-height: 20px;
+ font-size: 18px;
+ margin-bottom: 10px;
+ margin-top: -10px;
+ }
+
+ .content_body {
+ border: 1px solid $kbBorderColor;
}
}
}
@@ -575,4 +583,7 @@
/* width: 0;瀹藉害涓�0鏆楄棌 */
width: 0;
}
+::v-deep .el-table::before {
+ height: 0;
+}
</style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 0bf205c..be161d6 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -123,12 +123,14 @@
:close-on-click-modal="false"
:show-close="false"
top="5vh"
+ class="dialogVisible"
>
- <div style="font-size:20px;">
+ <div style="font-size:18px;">
<!-- <i class="el-icon-warning-outline" style="color: #ffef00" />-->
褰撳墠璐﹀彿宸茬櫥褰曪紝鏄惁寮哄埗涓嬬嚎!
</div>
<span slot="footer" class="dialog-footer">
+
<div class="footerButton">
<el-button @click="dialogVisibleCancel">鍚�</el-button>
<el-button type="primary" @click="dialogVisibleConfirm">鏄�</el-button>
@@ -215,7 +217,7 @@
if (valid) {
this.loading = true
this.$store.dispatch('user/login', this.loginForm).then(() => {
- console.log(getCookie('code') === '302')
+ console.log(getCookie('code') === '302', 9999)
if (getCookie('code') === '302') {
this.dialogVisible = true
} else {
@@ -256,7 +258,8 @@
if (res.code === '200') {
this.$message.success('寮哄埗涓嬬嚎鎴愬姛锛�')
this.dialogVisible = false
- this.$router.push({ path: this.redirect || '/' })
+ // this.$router.push({ path: this.redirect || '/' })
+ await this.handleLogin()
}
}
}
@@ -451,4 +454,34 @@
::v-deep .el-dialog__title{
color: red;
}
+
+::v-deep .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
+}
+
+.footerButton {
+ display: flex;
+ justify-content: end;
+}
+::v-deep .dialogVisible .el-button--primary {
+ background-color: #42b983 !important;
+ height: 30px;
+ display: flex;
+ align-items: center;
+ //border: 1px solid $main_color;
+ border: none;
+ padding: 0 20px;
+}
+::v-deep .dialogVisible .el-button--default {
+ height: 30px;
+ display: flex;
+ align-items: center;
+ padding: 0 20px;
+}
+
</style>
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index c1cff22..0f01076 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -672,23 +672,30 @@
}
},
created() {
- // 鑾峰彇璁惧娓呭崟鍒楄〃
- this.getDeviceMangerSearch()
- // 鑾峰彇璁惧绫诲瀷涓嬫媺
- this.getDeviceTypeSelect()
- // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
- this.getWorkShopSelect()
+ this.handleRequest()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ handleRequest() {
+ // 鑾峰彇璁惧娓呭崟鍒楄〃
+ this.getDeviceMangerSearch().then(res => {
+ if (res.code === '200') {
+ // 鑾峰彇璁惧绫诲瀷涓嬫媺
+ this.getDeviceTypeSelect()
+ // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
+ this.getWorkShopSelect()
+ }
+ })
+ },
// 鑾峰彇璁惧娓呭崟鍒楄〃
async getDeviceMangerSearch() {
const res = await DeviceMangerSearch(this.form)
this.tableData = res.data
this.total = res.count
+ return { code: res.code }
},
// 鑾峰彇鎵�灞炶溅闂翠笅鎷�
async getWorkShopSelect() {
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 92f9c1d..b2a5755 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -860,8 +860,7 @@
}
},
created() {
- this.getMesOrderSearch()
- this.getSelect()
+ this.handleRequest()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -871,6 +870,13 @@
this.username = getCookie('username')
},
methods: {
+ handleRequest() {
+ this.getMesOrderSearch().then(res => {
+ if (res.code === '200') {
+ this.getSelect()
+ }
+ })
+ },
async getMesOrderSearch() {
// let tempDate = this.form.createdate
// if (tempDate.length > 0) {
@@ -895,6 +901,7 @@
this.total = res.count
// this.form.createdate = tempDate
+ return { code: res.code }
},
async getSelect() {
// 鑾峰彇浜у搧淇℃伅
diff --git a/src/views/scgl/gd_autoPrint.vue b/src/views/scgl/gd_autoPrint.vue
index a89ba41..3dfcad6 100644
--- a/src/views/scgl/gd_autoPrint.vue
+++ b/src/views/scgl/gd_autoPrint.vue
@@ -696,8 +696,7 @@
}
},
created() {
- this.getMesOrderSearch()
- this.getSelect()
+ this.handleRequest()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -706,6 +705,13 @@
webapp_ws_autoupdate(true)
},
methods: {
+ handleRequest() {
+ this.getMesOrderSearch().then(res => {
+ if (res.code === '200') {
+ this.getSelect()
+ }
+ })
+ },
async getMesOrderSearch() {
// let tempDate = this.form.createdate
// if (tempDate.length > 0) {
@@ -728,7 +734,7 @@
const res = await MesOrderSearch(data)
this.tableData = res.data
this.total = res.count
-
+ return { code: res.code }
// this.form.createdate = tempDate
},
async getSelect() {
diff --git a/src/views/wlgl/kwdy.vue b/src/views/wlgl/kwdy.vue
index 23f6f5d..243167b 100644
--- a/src/views/wlgl/kwdy.vue
+++ b/src/views/wlgl/kwdy.vue
@@ -241,18 +241,26 @@
}
},
created() {
- this.getStorageDefSearch()
- this.getWareHouseSelect()
+ this.handleRequest()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ handleRequest() {
+ this.getStorageDefSearch().then(res => {
+ if (res.code === '200') {
+ this.getWareHouseSelect()
+ }
+ })
+ },
+
async getStorageDefSearch() {
const res = await StorageDefSearch(this.form)
this.tableData = res.data
this.total = res.count
+ return { code: res.code }
},
async getWareHouseSelect() {
const { data: res } = await WareHouseSelect()
diff --git a/src/views/zlgl/gxjy.vue b/src/views/zlgl/gxjy.vue
index a62f8b9..1012919 100644
--- a/src/views/zlgl/gxjy.vue
+++ b/src/views/zlgl/gxjy.vue
@@ -299,9 +299,7 @@
}
},
created() {
- this.getMesOrderStepCheckSelect()
- this.getMesOrderSelectUser()
- this.getJYSelectArr()
+ this.handleRequest()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -310,6 +308,15 @@
this.getFocus()
},
methods: {
+ handleRequest() {
+ this.getMesOrderStepCheckSelect().then(res => {
+ if (res.code === '200') {
+ this.getMesOrderSelectUser()
+ this.getJYSelectArr()
+ }
+ })
+ },
+
// 鑾峰彇鑱氱劍
getFocus() {
this.$nextTick(() => {
@@ -318,8 +325,9 @@
},
// 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋暟缁�
async getMesOrderStepCheckSelect() {
- const { data: res } = await MesOrderStepCheckSelect()
- this.checkStandardSelect = res
+ const res = await MesOrderStepCheckSelect()
+ this.checkStandardSelect = res.data
+ return { code: res.code }
},
// 鑾峰彇妫�楠屼汉鍛樹笅鎷�
async getMesOrderSelectUser() {
diff --git a/src/views/zlgl/gxjybz.vue b/src/views/zlgl/gxjybz.vue
index e061160..5118d2b 100644
--- a/src/views/zlgl/gxjybz.vue
+++ b/src/views/zlgl/gxjybz.vue
@@ -314,18 +314,25 @@
}
},
created() {
- this.getStepCheckStanedSearch()
- this.getStepCheckItemSelect()
+ this.handleRequest()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ handleRequest() {
+ this.getStepCheckStanedSearch().then(res => {
+ if (res.code === '200') {
+ this.getStepCheckItemSelect()
+ }
+ })
+ },
async getStepCheckStanedSearch() {
const res = await StepCheckStanedSearch(this.form)
this.tableData = res.data
this.total = res.count
+ return { code: res.code }
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index 17aedb5..b144adf 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -693,15 +693,22 @@
}
},
created() {
- this.getInventoryFileSelect()
- this.getStockTypeSelect()
- this.getWareHouseSelect()
+ this.handleRequest()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ handleRequest() {
+ this.getInventoryFileSelect().then(res => {
+ if (res.code === '200') {
+ this.getStockTypeSelect()
+ this.getWareHouseSelect()
+ }
+ })
+ },
+
// 鍚屾璁￠噺鍗曚綅
async syncSeaveSearchUnit() {
const loading = this.$loading({
@@ -777,6 +784,7 @@
const res = await InventoryFileSelect(this.form)
this.tableData = res.data
this.total = res.count
+ return { code: res.code }
},
async getStockTypeSelect() {
const { data: res } = await StockTypeSelect()
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index b12b1f8..e971ff8 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -537,18 +537,27 @@
}
},
created() {
- this.getBeatRateSearch()
- this.getPartSelect()
+ this.handleRequest()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+
+ handleRequest() {
+ this.getBeatRateSearch().then(res => {
+ if (res.code === '200') {
+ this.getPartSelect()
+ }
+ })
+ },
+
async getBeatRateSearch() {
const res = await BeatRateSearch(this.form)
this.tableData = res.data
this.total = res.count
+ return { code: res.code }
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
--
Gitblit v1.9.3