From 9528fd07344434c99aebd03e386bfe72a57f0c02 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 28 四月 2023 15:05:23 +0800
Subject: [PATCH] 1.提交
---
src/views/scgl/gd.vue | 5 +
vue.config.js | 2
src/views/kb/ckgl.vue | 4
src/layout/components/Sidebar/index.vue | 33 ++++++++
src/store/modules/permission.js | 1
src/api/scgl.js | 7 +
src/views/kb/zhkbc.vue | 67 ++++++++++++----
src/views/kb/zhkb.vue | 65 ++++++++++++----
src/router/index.js | 39 +++++++++
src/icons/svg/zhkb.svg | 1
10 files changed, 184 insertions(+), 40 deletions(-)
diff --git a/src/api/scgl.js b/src/api/scgl.js
index 79e49a3..274c868 100644
--- a/src/api/scgl.js
+++ b/src/api/scgl.js
@@ -394,3 +394,10 @@
})
}
+// MES宸ュ崟鏂板銆佽幏鍙栧伐鍗曞彿
+export function AddMesOrderCodeSearch() {
+ return request({
+ url: 'ProductionManagement/AddMesOrderCodeSearch',
+ method: 'post'
+ })
+}
diff --git a/src/icons/svg/zhkb.svg b/src/icons/svg/zhkb.svg
new file mode 100644
index 0000000..39c2f8e
--- /dev/null
+++ b/src/icons/svg/zhkb.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1682562180452" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2688" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><path d="M128 256a42.666667 42.666667 0 0 1 42.666667-42.666667h682.666666a42.666667 42.666667 0 0 1 42.666667 42.666667v469.333333a42.666667 42.666667 0 0 1-42.666667 42.666667H170.666667a42.666667 42.666667 0 0 1-42.666667-42.666667V256z m85.333333 42.666667v384h597.333334V298.666667H213.333333z" fill="#157b7e" p-id="2689"></path><path d="M485.802667 712.981333a42.666667 42.666667 0 0 1 52.394666 0l225.664 175.530667-52.373333 67.370667L512 800.725333l-199.466667 155.157334-52.416-67.370667 225.706667-175.530667zM554.666667 85.333333v170.666667h-85.333334V85.333333h85.333334zM448 256v106.666667a64 64 0 1 0 128 0v-106.666667h85.333333v106.666667a149.333333 149.333333 0 1 1-298.666666 0v-106.666667h85.333333z" fill="#157b7e" p-id="2690"></path></svg>
\ No newline at end of file
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index a9f4534..d336d25 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,7 +1,7 @@
<template>
<div :class="{'has-logo':showLogo}">
- <logo v-if="showLogo" :collapse="isCollapse" />
+ <logo v-if="showLogo" :collapse="isCollapse"/>
<div
v-if="$store.state.app.sidebar.opened&&!$store.state.settings.menuIsHorizontal"
@@ -74,6 +74,17 @@
routes() {
return this.$router.options.routes
},
+ // activeMenu() {
+ // const route = this.$route
+ // const { meta, path } = route
+ // // if set path, the sidebar will highlight the path you set
+ // removeCookie('ruleCode')
+ // setCookie('ruleCode', meta.code)// 灏嗙紪鐮佽鍒檆ode瀛樺埌cookie閲岄潰
+ // if (meta.activeMenu) {
+ // return meta.activeMenu
+ // }
+ // return path
+ // },
activeMenu() {
const route = this.$route
const { meta, path } = route
@@ -83,6 +94,26 @@
if (meta.activeMenu) {
return meta.activeMenu
}
+
+ if (path.indexOf('kanbanManager') !== -1) { // 褰撶偣鍑绘櫤鎱х湅鏉跨殑鏃跺��
+ const url = this.$router.resolve({
+ path
+ // query: { id: 123 }
+ })
+ const t = url.href.split('/')
+
+ if (t[2] === 'jgcj') {
+ window.open('#/zhkbc?code=10101', '_blank')
+ } else if (t[2] === 'zscj') {
+ window.open('#/zhkbc?code=10102', '_blank')
+ } else if (t[2] === 'zpcj') {
+ window.open('#/zhkbc?code=10103', '_blank')
+ } else {
+ window.open('#/' + t[2], '_blank')
+ }
+
+ }
+
return path
},
showLogo() {
diff --git a/src/router/index.js b/src/router/index.js
index 38c30a1..1acee19 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -651,6 +651,45 @@
meta: { code: '1061', title: '瀛樿揣妗ｆ', icon: '', keepAlive: true }
}
]
+ },
+
+ {
+ path: '/kanbanManager',
+ component: Layout,
+ redirect: '/kanbanManager/zhkb',
+ name: '鏅烘収鐪嬫澘',
+ code: '2023',
+ meta: { title: '鏅烘収鐪嬫澘', icon: 'zhkb' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'zhkb',
+ name: 'ZHKBCancel',
+ component: () => import('@/views/kb/zhkb'),
+ meta: { title: '缁煎悎鐪嬫澘', icon: '', keepAlive: true }
+ }, {
+ path: 'jgcj',
+ name: 'cgddCancel',
+ component: () => import('@/views/kb/zhkbc'),
+ meta: { title: '閲戝伐杞﹂棿', icon: '', keepAlive: true }
+ },{
+ path: 'zscj',
+ name: 'cgddCancel',
+ component: () => import('@/views/kb/zhkbc'),
+ meta: { title: '娉ㄥ杞﹂棿', icon: '', keepAlive: true }
+ },{
+ path: 'zpcj',
+ name: 'cgddCancel',
+ component: () => import('@/views/kb/zhkbc'),
+ meta: { title: '瑁呴厤杞﹂棿', icon: '', keepAlive: true }
+ },
+ {
+ path: 'ckgl',
+ name: 'ckglCancel',
+ component: () => import('@/views/kb/ckgl'),
+ meta: { title: '浠撳簱绠＄悊', icon: '', keepAlive: true }
+ }
+ ]
}
// {
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 554eafe..b833730 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -108,6 +108,7 @@
return i
}
})
+ newRoutes.push({ path: '*', redirect: '/404', hidden: true })
} else {
newRoutes = getAsyncRoutes(asyncRoutes, menu)
}
diff --git a/src/views/kb/ckgl.vue b/src/views/kb/ckgl.vue
index 47426c4..4245733 100644
--- a/src/views/kb/ckgl.vue
+++ b/src/views/kb/ckgl.vue
@@ -299,7 +299,7 @@
<div style="height: 470px;">
<div class="smallTitle">
<svg-icon icon-class="ph" class="svg_class" />
- 鍗婃垚鍝併�佷骇鍝佸簱瀛橀噺鎺掕Top5
+ 鍗婃垚鍝併�佷骇鍝佸簱瀛橀噺鎺掕Top3
</div>
<div class="lineContent horn" style="height: 435px">
<div id="bar03" style="width: 100%;height:100%; " />
@@ -309,7 +309,7 @@
<div style="height: 470px;">
<div class="smallTitle">
<svg-icon icon-class="ph" class="svg_class" />
- 鍘熸潗鏂欏簱瀛橀噺鎺掕Top5
+ 鍘熸潗鏂欏簱瀛橀噺鎺掕Top3
</div>
<div class="lineContent horn" style="height: 435px">
<div id="bar04" style="width: 100%;height:100%;" />
diff --git a/src/views/kb/zhkb.vue b/src/views/kb/zhkb.vue
index 68fbcf4..3c1cd28 100644
--- a/src/views/kb/zhkb.vue
+++ b/src/views/kb/zhkb.vue
@@ -151,12 +151,12 @@
<el-table-column
prop="wo_code"
label="鍔犲伐鍗曞彿"
- width="190"
+ width="214"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
- width="350"
+ width="330"
>
<template slot-scope="{row}">
<div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
@@ -420,27 +420,54 @@
},
// 浜х嚎鍔犲伐浠诲姟 宸︿笅鏁版嵁
getLeftBottomData() {
- let startValue = 0 // 鍒濆鍊�
- const scale = 10// 鍒诲害
+ // let startValue = 0 // 鍒濆鍊�
+ // const scale = 10// 鍒诲害
+ //
+ // LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ // this.tableDataLeftBottomTemp = res.data
+ // this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
+ //
+ // const loop = Math.floor(this.tableDataLeftBottomTemp.length / scale)// 闇�瑕佸惊鐜殑娆℃暟
+ // let nowLoop = 0// 褰撳墠寰幆鐨勬鏁�
+ //
+ // const timer = setInterval(() => {
+ // startValue = startValue + scale
+ // this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
+ // if (nowLoop === loop) {
+ // clearInterval(timer)
+ // this.getLeftBottomData()
+ // }
+ //
+ // nowLoop++
+ // }, 1000 * 10)
+ // })
+
LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
- this.tableDataLeftBottomTemp = res.data
- this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
+ this.tableDataLeftBottom = res.data
- const loop = Math.floor(this.tableDataLeftBottomTemp.length / scale)// 闇�瑕佸惊鐜殑娆℃暟
- let nowLoop = 0// 褰撳墠寰幆鐨勬鏁�
+ const divData = this.$refs.tableDataLeftBottomRef.bodyWrapper
+ // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ const aaa = 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.tableDataLeftBottom = res.data
- const timer = setInterval(() => {
- startValue = startValue + scale
- this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
- if (nowLoop === loop) {
- clearInterval(timer)
- this.getLeftBottomData()
+ if (this.tableDataLeftBottom.length > 10) {
+ clearInterval(aaa)
+ this.getLeftBottomData()
+ }
+ })
}
-
- nowLoop++
- }, 1000 * 10)
+ }, this.tableDataLeftBottom.length <= 10 ? 1000 * 5 : 100)
})
+
},
getEcharts() {
@@ -622,6 +649,10 @@
border-radius: 50%;
}
+::v-deep .el-table__body-wrapper{
+ overflow: hidden !important;
+}
+
</style>
<!--鏄熺┖-->
diff --git a/src/views/kb/zhkbc.vue b/src/views/kb/zhkbc.vue
index 7a5a693..90809c9 100644
--- a/src/views/kb/zhkbc.vue
+++ b/src/views/kb/zhkbc.vue
@@ -151,12 +151,12 @@
<el-table-column
prop="wo_code"
label="鍔犲伐鍗曞彿"
- width="190"
+ width="280"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
- width="350"
+ width="260"
>
<template slot-scope="{row}">
<div v-if="row.partname" class="ellipsis">{{ row.partname }}</div>
@@ -399,27 +399,54 @@
},
// 浜х嚎鍔犲伐浠诲姟 宸︿笅鏁版嵁
getLeftBottomData() {
- let startValue = 0 // 鍒濆鍊�
- const scale = 10// 鍒诲害
+ // let startValue = 0 // 鍒濆鍊�
+ // const scale = 10// 鍒诲害
+ //
+ // LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
+ // this.tableDataLeftBottomTemp = res.data
+ // this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
+ //
+ // const loop = Math.floor(this.tableDataLeftBottomTemp.length / scale)// 闇�瑕佸惊鐜殑娆℃暟
+ // let nowLoop = 0// 褰撳墠寰幆鐨勬鏁�
+ //
+ // const timer = setInterval(() => {
+ // startValue = startValue + scale
+ // this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
+ // if (nowLoop === loop) {
+ // clearInterval(timer)
+ // this.getLeftBottomData()
+ // }
+ //
+ // nowLoop++
+ // }, 1000 * 10)
+ // })
LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
- this.tableDataLeftBottomTemp = res.data
- this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
+ this.tableDataLeftBottom = res.data
+ // this.number2 = this.tableData.length
- const loop = Math.floor(this.tableDataLeftBottomTemp.length / scale)// 闇�瑕佸惊鐜殑娆℃暟
- let nowLoop = 0// 褰撳墠寰幆鐨勬鏁�
-
- const timer = setInterval(() => {
- startValue = startValue + scale
- this.tableDataLeftBottom = this.tableDataLeftBottomTemp.slice(startValue, startValue + scale)
- if (nowLoop === loop) {
- clearInterval(timer)
- this.getLeftBottomData()
+ const divData = this.$refs.tableDataLeftBottomRef.bodyWrapper
+ // 鎷垮埌鍏冪礌鍚庯紝瀵瑰厓绱犺繘琛屽畾鏃跺鍔犺窛绂婚《閮ㄨ窛绂伙紝瀹炵幇婊氬姩鏁堟灉(姝ら厤缃负姣�100姣绉诲姩1鍍忕礌)
+ const aaa = 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.tableDataLeftBottom = res.data
+ // this.number2 = this.tableData.length
+ if (this.tableDataLeftBottom.length > 10) {
+ clearInterval(aaa)
+ this.getLeftBottomData()
+ }
+ })
}
-
- nowLoop++
- }, 1000 * 10)
+ }, this.tableDataLeftBottom.length <= 10 ? 1000 * 10 : 100)
})
+
},
getEcharts() {
@@ -601,6 +628,10 @@
border-radius: 50%;
}
+::v-deep .el-table__body-wrapper{
+ overflow: hidden !important;
+}
+
</style>
<!--鏄熺┖-->
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 253ac7e..2e943cc 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -496,7 +496,7 @@
</el-form-item>
<el-form-item label="宸ュ崟缂栧彿" prop="mesordercode">
- <el-input v-model="dialogForm.mesordercode" :disabled="operation!=='add'" style="width: 200px"/>
+ <el-input v-model="dialogForm.mesordercode" disabled style="width: 200px"/>
</el-form-item>
<div style="display: flex">
<el-form-item label="宸ュ崟绫诲瀷" prop="mesorderstus">
@@ -1766,6 +1766,7 @@
<script>
import Pagination from '@/components/Pagination'
import {
+ AddMesOrderCodeSearch,
AddUpdateMesOrder,
ClosedMesOrder,
DeleteMesOrder, ErpOrderSearch, JobCreationSonAddVison, MesBadOrderSearch,
@@ -2142,6 +2143,8 @@
},
// 鏂板鎸夐挳
async add(operation) {
+ const { data: res } = await AddMesOrderCodeSearch()
+ this.dialogForm.mesordercode = res
this.operation = operation
this.dialogVisible = true
this.dialogForm.planstartdate = handleDatetime(new Date())
diff --git a/vue.config.js b/vue.config.js
index 808be46..bae9898 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -54,7 +54,7 @@
[process.env.VUE_APP_BASE_API]: {
// target: 'http://121.196.36.24:8013', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
// target: 'http://192.168.188.180:8001', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 绂忚幈娉� 锛堟湭涓婁簯锛�
- target: 'http://xyfhk5.natappfree.cc', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 绂忚幈娉� 锛堜笂浜戯級
+ target: 'http://xnkeij.natappfree.cc', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 绂忚幈娉� 锛堜笂浜戯級
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
pathRewrite: { // 璺緞閲嶅啓,鏇挎崲target涓殑璇锋眰鍦板潃
--
Gitblit v1.9.3