Yangwl
/
LJ-UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改看板

Browse Source
yangwl
夜笙歌 2 months ago
parent 3d7ba5bb7f
commit dcdb5a789b
3 changed files with 97 additions and 20 deletions
Show Stats Download Patch File Download Diff File

2
src/utils/request.js
Unescape Escape View File

@ -24,7 +24,7 @@ const service = axios.create({
// request拦截器
service.interceptors.request.use(config => {
if(localStorage.getItem('USER_POOL_NAME_CURRENT')){
config.headers['poolName'] = config.header?.PoolName || localStorage.getItem('USER_POOL_NAME_CURRENT');
config.headers['Poolname'] = config.header?.PoolName || localStorage.getItem('USER_POOL_NAME_CURRENT');
}
// 是否需要设置 token
const isToken = (config.headers || {}).isToken === false

108
src/views/cs/index4.vue
Unescape Escape View File

@ -51,22 +51,38 @@
<div class="subTitle" style="top: 15.2%; left: 51.4%;">{{ type }}机信息</div>
<Chart ref="chart1" class="chart1"></Chart>
<div class="table1">
<div v-for="ii in groupByCount(list)">
<div v-for="(i,k) in ii" class="item">
<div class="itemTitle">{{ type }}{{ i.equipmentCode.split('').at(-1) }}</div>
<div class="info1">运行状态：</div>
<div class="info1-1" :style="`color:${getColor(i.completed_count > 0 ?1:0)}`">
<!-- {{ i.completed_count > 0 ? '运行中' : '调试中' }}-->
{{ k !== 7 ? '运行中' : '调试中' }}
</div>
<div class="info2">订单号：<span style="width: 100%;display: inline-block"></span></div>
<div class="info2-1">{{ i.workorder_code }}</div>
<div class="info3">产品名称：</div>
<div class="info3-1">{{ i.product_name }}</div>
<div class="info4">完成数量：</div>
<div class="info4-1">{{ i.completed_count }}</div>
</div>
</div>
<!-- <div class="item">-->
<!-- <div class="itemTitle">{{ type }}{{ type }}</div>-->
<!-- <div class="info1">运行状态：</div>-->
<!-- <div class="info1-1" style="color:#77d75b">-->
<!-- &lt;!&ndash; {{ i.completed_count > 0 ? '运行中' : '调试中' }}&ndash;&gt;-->
<!-- <span>{{ type }}</span>-->
<!-- </div>-->
<!-- <div class="info2">订单号：<span style="width: 100%;display: inline-block"></span></div>-->
<!-- <div class="info2-1">{{ type }}</div>-->
<!-- <div class="info3">产品名称：</div>-->
<!-- <div class="info3-1">{{ type }}</div>-->
<!-- <div class="info4">完成数量：</div>-->
<!-- <div class="info4-1">{{ type }}</div>-->
<!-- </div>-->
<div v-for="(ii,kk) in lists">
<div v-for="(i,k) in ii" class="item">
<div class="itemTitle">{{ type }}{{ i.equipmentCode }}</div>
<div class="info1">运行状态：</div>
<div class="info1-1" style="color:#77d75b">
<!-- {{ i.completed_count > 0 ? '运行中' : '调试中' }}-->
<span v-if="(kk * 3 + k) === 7">调试中</span>
<span v-if="(kk * 3 + k) !== 7">运行中</span>
</div>
<div class="info2">订单号：<span style="width: 100%;display: inline-block"></span></div>
<div class="info2-1">{{ i.workorder_code }}</div>
<div class="info3">产品名称：</div>
<div class="info3-1">{{ i.product_name }}</div>
<div class="info4">完成数量：</div>
<div class="info4-1">{{ i.completed_count }}</div>
</div>
</div>
</div>
</div>
</template>
@ -83,6 +99,7 @@ export default {
data() {
return {
list: [],
lists: [],
type: '成型',
bz: '白班',
equipmentCode: 'C',
@ -109,7 +126,64 @@ export default {
shiftId: this.shiftId,
equipmentCode: this.equipmentCode
}).then((e) => {
this.list = e.data.rightlist.slice(0,7)
let aa = [
{
"equipmentCode": "C1",
"workorder_code": "DD2024123000011-1",
"completed_count": 61,
"product_name": "Φ130mm微烟免拆白坯"
},
{
"equipmentCode": "C2",
"workorder_code": "DD2024123000012-1",
"completed_count": 83,
"product_name": "Φ130mm微烟白坯"
},
{
"equipmentCode": "C3",
"workorder_code": "DD2024123000012-1",
"completed_count": 78,
"product_name": "Φ130mm微烟白坯"
},
{
"equipmentCode": "C4",
"workorder_code": "DD2024123000012-2",
"completed_count": 81,
"product_name": "Φ130mm微烟白坯"
},
{
"equipmentCode": "C5",
"workorder_code": "DD2024123000013-1",
"completed_count": 71,
"product_name": "Φ125mm微烟白坯"
},
{
"equipmentCode": "C6",
"workorder_code": "DD2024123000013-1",
"completed_count": 72,
"product_name": "Φ125mm微烟白坯"
},
{
"equipmentCode": "C7",
"workorder_code": "DD2024123000013-2",
"completed_count": 82,
"product_name": "Φ125mm微烟白坯"
},
{
"equipmentCode": "C8",
"workorder_code": "DD2024123000012-3",
"completed_count": 22,
"product_name": "Φ130mm微烟白坯"
}
]
// this.list = aa.slice(0, 8).map(v => {
this.list = e.data.rightlist.slice(0, 8).map(v => {
return {
...v,
equipmentCode: v.equipmentCode.split('').at(-1)
}
})
this.lists = this.groupByCount(this.list)
this.$refs.chart1.setData({
tooltip: {
trigger: "axis",

7
vue.config.js
Unescape Escape View File

@ -36,10 +36,13 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.202.20:8080`,
target: `http://localhost:8080`,
// target: `http://localhost:8080`,
// target: `http://172.18.80.215:8080`,
// target: `http://192.168.3.93:8080`,
// target: `http://192.168.3.158:8080`,
// target: `http://192.168.202.34:30000`,
// target: `http://10.11.176.97:8080`,
target: `http://192.168.202.34:30000/prod-api`,
// target: `http://192.168.202.20:9000/prod-api`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''

Write Preview
Loading…
Cancel
Save