修改bug
This commit is contained in:
parent
3be7ac4237
commit
0457514f1e
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2023-12-12 13:49:02
|
* @Date: 2023-12-12 13:49:02
|
||||||
* @LastEditTime: 2024-01-24 15:54:58
|
* @LastEditTime: 2024-03-12 11:16:01
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
*/
|
*/
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 22 KiB |
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2021-07-19 15:18:30
|
* @Date: 2021-07-19 15:18:30
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @LastEditTime: 2024-02-29 15:48:47
|
* @LastEditTime: 2024-03-12 09:05:20
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -870,6 +870,8 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|
||||||
|
|
||||||
.visual-container {
|
.visual-container {
|
||||||
width: 1920px;
|
width: 1920px;
|
||||||
height: 1080px;
|
height: 1080px;
|
||||||
@ -886,14 +888,16 @@ export default {
|
|||||||
position: relative;
|
position: relative;
|
||||||
.unit{
|
.unit{
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 260px;
|
left: 290px;
|
||||||
top:25px;
|
top:25px;
|
||||||
|
color: rgba($color: #ffffff, $alpha: 8);
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
}
|
}
|
||||||
.time{
|
.time{
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 1360px;
|
left: 1360px;
|
||||||
top:25px;
|
top:25px;
|
||||||
|
color: rgba($color: #ffffff, $alpha: 8);
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
}
|
}
|
||||||
.title-button {
|
.title-button {
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
<div class="bar-item">
|
<div class="bar-item">
|
||||||
<div v-if="title" class="bar-title" ds>
|
<div v-if="title" class="bar-title" ds>
|
||||||
<span>
|
<span>
|
||||||
<svg-icon :icon-class="titleIcon" style="font-size: 1em; position: relative; top: .08em" />
|
<svg-icon :icon-class="titleIcon" style="font-size: 1em; position: relative; top: .01em" />
|
||||||
{{ title }}
|
{{ title }}
|
||||||
</span>
|
</span>
|
||||||
<!-- <span v-if="showTime" style="font-size: 20px;color:#52FFF8;margin-left: 10px;margin-top: 2px;">
|
<!-- <span v-if="showTime" style="font-size: 20px;color:#52FFF8;margin-left: 10px;margin-top: 2px;">
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
* @Author: zwq
|
* @Author: zwq
|
||||||
* @Date: 2021-07-19 15:18:30
|
* @Date: 2021-07-19 15:18:30
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @LastEditTime: 2024-03-06 12:01:10
|
* @LastEditTime: 2024-03-12 09:34:06
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
@ -982,6 +982,8 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|
||||||
|
|
||||||
.visual-container {
|
.visual-container {
|
||||||
width: 1920px;
|
width: 1920px;
|
||||||
height: 1080px;
|
height: 1080px;
|
||||||
@ -993,12 +995,15 @@ export default {
|
|||||||
background: url('../../assets/img/OperationalOverview/title.png') no-repeat;
|
background: url('../../assets/img/OperationalOverview/title.png') no-repeat;
|
||||||
background-size: 100% 100%;
|
background-size: 100% 100%;
|
||||||
color: #00fff0;
|
color: #00fff0;
|
||||||
word-spacing: 8px;
|
// word-spacing: 8px;
|
||||||
|
letter-spacing: 8px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
.unit {
|
.unit {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 260px;
|
left: 290px;
|
||||||
top: 25px;
|
top: 25px;
|
||||||
|
letter-spacing: 0px;
|
||||||
|
color: rgba($color: #ffffff, $alpha: 8);
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1006,6 +1011,8 @@ export default {
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
left: 1360px;
|
left: 1360px;
|
||||||
top: 25px;
|
top: 25px;
|
||||||
|
letter-spacing: 0px;
|
||||||
|
color: rgba($color: #ffffff, $alpha: 8);
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
}
|
}
|
||||||
.title-button {
|
.title-button {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2023-12-12 13:45:25
|
* @Date: 2023-12-12 13:45:25
|
||||||
* @LastEditTime: 2024-03-11 16:13:38
|
* @LastEditTime: 2024-03-12 11:17:53
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -114,13 +114,14 @@
|
|||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
|
<el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ scope.row.goodProductPassTrend ? scope.row.goodProductPassTrend + '%' : undefined }} </span>
|
<span v-else>{{ scope.row.goodProductPassTrend ? scope.row.goodProductPassTrend + '%' : undefined }}
|
||||||
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<div class="remark" slot="append">
|
<div style="height: 50px;" class="remark" slot="append">
|
||||||
<el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled">
|
<el-input placeholder="备注" v-if="!disabled" v-model="remark" :disabled="disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ remark }} </span>
|
<span v-else>{{ remark }} </span>
|
||||||
</div>
|
</div>
|
||||||
@ -530,14 +531,13 @@ export default {
|
|||||||
const result = await Promise.all([
|
const result = await Promise.all([
|
||||||
await updateSumProductionDataList(obj),
|
await updateSumProductionDataList(obj),
|
||||||
await updateProductionDataList(updateArr),
|
await updateProductionDataList(updateArr),
|
||||||
]);
|
])
|
||||||
if (result[0] == true && result[1] == true) {
|
console.log(result);
|
||||||
|
if (result[0].data == true && result[1].data == true) {
|
||||||
// console.log(res)
|
// console.log(res)
|
||||||
this.disabled = true
|
this.disabled = true
|
||||||
this.isSave = false
|
this.isSave = false
|
||||||
this.getDataList()
|
this.getDataList()
|
||||||
} else {
|
|
||||||
this.$modal.msgError('更新失败');
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async getDict() {
|
async getDict() {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2023-12-12 13:45:25
|
* @Date: 2023-12-12 13:45:25
|
||||||
* @LastEditTime: 2024-03-11 16:16:31
|
* @LastEditTime: 2024-03-12 11:14:04
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -122,8 +122,8 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<div class="remark" slot="append">
|
<div style="height: 50px;" class="remark" slot="append">
|
||||||
<el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled">
|
<el-input placeholder="备注" v-if="!disabled" v-model="remark" :disabled="disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ remark }} </span>
|
<span v-else>{{ remark }} </span>
|
||||||
</div>
|
</div>
|
||||||
@ -535,14 +535,13 @@ export default {
|
|||||||
const result = await Promise.all([
|
const result = await Promise.all([
|
||||||
await updateSumProductionDataList(obj),
|
await updateSumProductionDataList(obj),
|
||||||
await updateProductionDataList(updateArr),
|
await updateProductionDataList(updateArr),
|
||||||
]);
|
])
|
||||||
if (result[0] == true && result[1] == true) {
|
console.log(result);
|
||||||
|
if (result[0].data == true && result[1].data == true) {
|
||||||
// console.log(res)
|
// console.log(res)
|
||||||
this.disabled = true
|
this.disabled = true
|
||||||
this.isSave = false
|
this.isSave = false
|
||||||
this.getDataList()
|
this.getDataList()
|
||||||
} else {
|
|
||||||
this.$modal.msgError('更新失败');
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async getDataList() {
|
async getDataList() {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2023-12-12 13:45:25
|
* @Date: 2023-12-12 13:45:25
|
||||||
* @LastEditTime: 2024-03-11 15:43:16
|
* @LastEditTime: 2024-03-12 11:17:14
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -33,6 +33,12 @@
|
|||||||
<span v-else>{{ scope.row.glassType }} </span>
|
<span v-else>{{ scope.row.glassType }} </span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column prop="productionH" label="厚度" align="center">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input v-if="!disabled" v-model="scope.row.productionH" :disabled="disabled"></el-input>
|
||||||
|
<span v-else>{{ scope.row.productionH }} </span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="规格" align="center">
|
<el-table-column label="规格" align="center">
|
||||||
<el-table-column label="成品" align="center">
|
<el-table-column label="成品" align="center">
|
||||||
<el-table-column :show-header="false">
|
<el-table-column :show-header="false">
|
||||||
@ -154,8 +160,8 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
<!-- </el-table-column> -->
|
<!-- </el-table-column> -->
|
||||||
<div class="remark" slot="append">
|
<div style="height: 50px;" class="remark" slot="append">
|
||||||
<el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled">
|
<el-input placeholder="备注" v-if="!disabled" v-model="remark" :disabled="disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ remark }} </span>
|
<span v-else>{{ remark }} </span>
|
||||||
</div>
|
</div>
|
||||||
@ -180,8 +186,10 @@
|
|||||||
<script>
|
<script>
|
||||||
import {
|
import {
|
||||||
getAutoDeliveDataList,
|
getAutoDeliveDataList,
|
||||||
updateSumAutoDeliveDataList,
|
// updateSumAutoDeliveDataList,
|
||||||
updateAutoDeliveDataList
|
// updateAutoDeliveDataList
|
||||||
|
updateAutoDeliveDataList,
|
||||||
|
updateSumAutoDeliveDataList
|
||||||
} from '@/api/report/production';
|
} from '@/api/report/production';
|
||||||
// import Editor from '@/components/Editor';
|
// import Editor from '@/components/Editor';
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
@ -509,10 +517,10 @@ export default {
|
|||||||
let updateArr = this.list
|
let updateArr = this.list
|
||||||
// console.log(JSON.stringify(updateArr[1]))
|
// console.log(JSON.stringify(updateArr[1]))
|
||||||
const result = await Promise.all([
|
const result = await Promise.all([
|
||||||
await updateSumProductionDataList(obj),
|
await updateAutoDeliveDataList(obj),
|
||||||
await updateAutoDeliveDataList(updateArr),
|
await updateSumAutoDeliveDataList(updateArr),
|
||||||
]);
|
]);
|
||||||
if (result[0] == true && result[1] == true) {
|
if (result[0].data == true && result[1].data == true) {
|
||||||
// console.log(res)
|
// console.log(res)
|
||||||
this.disabled = true
|
this.disabled = true
|
||||||
this.isSave = false
|
this.isSave = false
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2023-12-12 13:45:25
|
* @Date: 2023-12-12 13:45:25
|
||||||
* @LastEditTime: 2024-03-11 17:05:50
|
* @LastEditTime: 2024-03-12 11:14:55
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -123,8 +123,8 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<div class="remark" slot="append">
|
<div style="height: 50px;" class="remark" slot="append">
|
||||||
<el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled">
|
<el-input placeholder="备注" v-if="!disabled" v-model="remark" :disabled="disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ remark }} </span>
|
<span v-else>{{ remark }} </span>
|
||||||
</div>
|
</div>
|
||||||
@ -505,14 +505,13 @@ export default {
|
|||||||
const result = await Promise.all([
|
const result = await Promise.all([
|
||||||
await updateSumProductionDataList(obj),
|
await updateSumProductionDataList(obj),
|
||||||
await updateProductionDataList(updateArr),
|
await updateProductionDataList(updateArr),
|
||||||
]);
|
])
|
||||||
|
console.log(result);
|
||||||
if (result[0].data == true && result[1].data == true) {
|
if (result[0].data == true && result[1].data == true) {
|
||||||
// console.log(res)
|
// console.log(res)
|
||||||
this.disabled = true
|
this.disabled = true
|
||||||
this.isSave = false
|
this.isSave = false
|
||||||
this.getDataList()
|
this.getDataList()
|
||||||
} else {
|
|
||||||
this.$modal.msgError('更新失败');
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
changeTime(val) {
|
changeTime(val) {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2023-12-12 13:45:25
|
* @Date: 2023-12-12 13:45:25
|
||||||
* @LastEditTime: 2024-03-11 16:18:07
|
* @LastEditTime: 2024-03-12 11:15:05
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -126,8 +126,8 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<div class="remark" slot="append">
|
<div style="height: 50px;" class="remark" slot="append">
|
||||||
<el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled">
|
<el-input placeholder="备注" v-if="!disabled" v-model="remark" :disabled="disabled">
|
||||||
</el-input>
|
</el-input>
|
||||||
<span v-else>{{ remark }} </span>
|
<span v-else>{{ remark }} </span>
|
||||||
</div>
|
</div>
|
||||||
@ -449,14 +449,13 @@ export default {
|
|||||||
const result = await Promise.all([
|
const result = await Promise.all([
|
||||||
await updateSumProductionDataList(obj),
|
await updateSumProductionDataList(obj),
|
||||||
await updateProductionDataList(updateArr),
|
await updateProductionDataList(updateArr),
|
||||||
]);
|
])
|
||||||
|
console.log(result);
|
||||||
if (result[0].data == true && result[1].data == true) {
|
if (result[0].data == true && result[1].data == true) {
|
||||||
// console.log(res)
|
// console.log(res)
|
||||||
this.disabled = true
|
this.disabled = true
|
||||||
this.isSave = false
|
this.isSave = false
|
||||||
this.getDataList()
|
this.getDataList()
|
||||||
} else {
|
|
||||||
this.$modal.msgError('更新失败');
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
transformYear(timeStamp) {// 本年最后一天
|
transformYear(timeStamp) {// 本年最后一天
|
||||||
|
Loading…
Reference in New Issue
Block a user