🐞 fix: 代码排版错误

This commit is contained in:
砂糖
2025-08-09 18:01:54 +08:00
parent b25868e092
commit d750d38222
7 changed files with 216 additions and 240 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -7,37 +7,32 @@
<span>产品信息:</span> <span>产品信息:</span>
<table class="table table-hover table-bordered table-striped table-condensed text-nowrap"> <table class="table table-hover table-bordered table-striped table-condensed text-nowrap">
<thead class="hxjx_table_th"> <thead class="hxjx_table_th">
<tr> <tr>
<th class="hxjx_table_th_width">序号</th> <th class="hxjx_table_th_width">序号</th>
<th class="hxjx_table_th_width">钽靶批号</th> <th class="hxjx_table_th_width">钽靶批号</th>
<th class="hxjx_table_th_width">规格</th> <th class="hxjx_table_th_width">规格</th>
<th class="hxjx_table_th_width">工艺</th> <th class="hxjx_table_th_width">工艺</th>
<th class="hxjx_table_th_width">直径</th> <th class="hxjx_table_th_width">直径</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr v-if="dataList.length>0 " v-for="(item,index) in dataList" @click="getTechnologyInfo(index)"> <tr v-if="dataList.length > 0" v-for="(item, index) in dataList" @click="getTechnologyInfo(index)">
<td class="hxjx_table_btnColumn" <td class="hxjx_table_btnColumn" :class="{ table_td_select: index === indexSelect && item.id != null }">
:class="{table_td_select:index===indexSelect && item.id!=null}"> {{ index + 1 }}
{{ index + 1 }} </td>
</td> <td class="hxjx_table_btnColumn" :class="{ table_td_select: index === indexSelect && item.id != null }">{{
<td class="hxjx_table_btnColumn" item.id }}
:class="{table_td_select:index===indexSelect && item.id!=null}" </td>
>{{ item.id }} <td class="hxjx_table_btnColumn" :class="{ table_td_select: index === indexSelect && item.id != null }">{{
</td> item.specification }}
<td class="hxjx_table_btnColumn" </td>
:class="{table_td_select:index===indexSelect && item.id!=null}" <td class="hxjx_table_btnColumn" :class="{ table_td_select: index === indexSelect && item.id != null }">{{
>{{ item.specification }} item.technology }}
</td> </td>
<td class="hxjx_table_btnColumn" <td class="hxjx_table_btnColumn" :class="{ table_td_select: index === indexSelect && item.id != null }">{{
:class="{table_td_select:index===indexSelect && item.id!=null}" item.diameter }}
>{{ item.technology }} </td>
</td> </tr>
<td class="hxjx_table_btnColumn"
:class="{table_td_select:index===indexSelect && item.id!=null}"
>{{ item.diameter }}
</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
@@ -49,123 +44,120 @@
<span>粗轧道次表:</span> <span>粗轧道次表:</span>
<!-- 表1 --> <!-- 表1 -->
<table class="table table-hover table-bordered table-striped table-condensed text-nowrap" <table class="table table-hover table-bordered table-striped table-condensed text-nowrap"
style="vertical-align: middle;" style="vertical-align: middle;">
>
<thead> <thead>
<tr> <tr>
<th class="hxjx_table_th_width table_tdth" colspan="5" rowspan="2"> <th class="hxjx_table_th_width table_tdth" colspan="5" rowspan="2">
<span id="hxjx-table-title"></span> <span id="hxjx-table-title"></span>
{{ technologyId }}轧制工艺单 {{ technologyId }}轧制工艺单
</th> </th>
<th class="hxjx_table_th_width table_tdth" colspan="4"></th> <th class="hxjx_table_th_width table_tdth" colspan="4"></th>
</tr> </tr>
<tr> <tr>
<th class="hxjx_table_th_width table_tdth">制作人</th> <th class="hxjx_table_th_width table_tdth">制作人</th>
<th class="hxjx_table_th_width table_tdth"></th> <th class="hxjx_table_th_width table_tdth"></th>
<th class="hxjx_table_th_width table_tdth">审核人</th> <th class="hxjx_table_th_width table_tdth">审核人</th>
<th class="hxjx_table_th_width table_tdth"></th> <th class="hxjx_table_th_width table_tdth"></th>
</tr> </tr>
<tr> <tr>
<th class="hxjx_table_th_width table_tdth" rowspan="2" style="vertical-align: middle;">道次</th> <th class="hxjx_table_th_width table_tdth" rowspan="2" style="vertical-align: middle;">道次</th>
<th class="hxjx_table_th_width table_tdth" colspan="3">粗轧工艺设计</th> <th class="hxjx_table_th_width table_tdth" colspan="3">粗轧工艺设计</th>
<th class="hxjx_table_th_width table_tdth" colspan="3">检移票号码</th> <th class="hxjx_table_th_width table_tdth" colspan="3">检移票号码</th>
<th class="hxjx_table_th_width table_tdth" colspan="2">粗轧操作记录</th> <th class="hxjx_table_th_width table_tdth" colspan="2">粗轧操作记录</th>
</tr> </tr>
<tr> <tr>
<th class="hxjx_table_th_width table_tdth">压下量</th> <th class="hxjx_table_th_width table_tdth">压下量</th>
<th class="hxjx_table_th_width table_tdth">轧前厚度</th> <th class="hxjx_table_th_width table_tdth">轧前厚度</th>
<th class="hxjx_table_th_width table_tdth">轧后厚度</th> <th class="hxjx_table_th_width table_tdth">轧后厚度</th>
<th class="hxjx_table_th_width table_tdth">喂料角度</th> <th class="hxjx_table_th_width table_tdth">喂料角度</th>
<th class="hxjx_table_th_width table_tdth">设定值</th> <th class="hxjx_table_th_width table_tdth">设定值</th>
<th class="hxjx_table_th_width table_tdth">判定确认</th> <th class="hxjx_table_th_width table_tdth">判定确认</th>
<th class="hxjx_table_th_width table_tdth">程序设定员</th> <th class="hxjx_table_th_width table_tdth">程序设定员</th>
<th class="hxjx_table_th_width table_tdth">备注</th> <th class="hxjx_table_th_width table_tdth">备注</th>
</tr> </tr>
</thead> </thead>
<tbody id="hxjx-tbody-one"> <tbody id="hxjx-tbody-one">
<tr v-for="(item,index) in technologyInfoList"> <tr v-for="(item, index) in technologyInfoList">
<td class="hxjx_table_btnColumn table_tdth">{{ item.step }}</td> <td class="hxjx_table_btnColumn table_tdth">{{ item.step }}</td>
<td class="hxjx_table_btnColumn table_tdth">{{ item.reduction }}</td> <td class="hxjx_table_btnColumn table_tdth">{{ item.reduction }}</td>
<td class="hxjx_table_btnColumn table_tdth">{{ item.thicknessFront }}</td> <td class="hxjx_table_btnColumn table_tdth">{{ item.thicknessFront }}</td>
<td class="hxjx_table_btnColumn table_tdth">{{ item.thicknessBehind }}</td> <td class="hxjx_table_btnColumn table_tdth">{{ item.thicknessBehind }}</td>
<td class="hxjx_table_btnColumn table_tdth">{{ item.angle }}</td> <td class="hxjx_table_btnColumn table_tdth">{{ item.angle }}</td>
<td class="hxjx_table_btnColumn table_tdth">{{ item.setValue }}</td> <td class="hxjx_table_btnColumn table_tdth">{{ item.setValue }}</td>
<td class="hxjx_table_btnColumn table_tdth"></td> <td class="hxjx_table_btnColumn table_tdth"></td>
<td class="hxjx_table_btnColumn table_tdth"></td> <td class="hxjx_table_btnColumn table_tdth"></td>
<td class="hxjx_table_btnColumn table_tdth"></td> <td class="hxjx_table_btnColumn table_tdth"></td>
</tr> </tr>
</tbody> </tbody>
<thead> <thead>
<tr> <tr>
<th class="hxjx_table_th_width table_tdth" colspan="2">粗轧后厚度</th> <th class="hxjx_table_th_width table_tdth" colspan="2">粗轧后厚度</th>
<th class="hxjx_table_th_width table_tdth" colspan="2"></th> <th class="hxjx_table_th_width table_tdth" colspan="2"></th>
<th class="hxjx_table_th_width table_tdth"></th> <th class="hxjx_table_th_width table_tdth"></th>
<th class="hxjx_table_th_width table_tdth">轧制员</th> <th class="hxjx_table_th_width table_tdth">轧制员</th>
<th class="hxjx_table_th_width table_tdth" colspan="3"></th> <th class="hxjx_table_th_width table_tdth" colspan="3"></th>
</tr> </tr>
</thead> </thead>
</table> </table>
<!-- 表2 --> <!-- 表2 -->
<table class="table table-hover table-bordered table-striped table-condensed text-nowrap" <table class="table table-hover table-bordered table-striped table-condensed text-nowrap"
style="vertical-align: middle;" style="vertical-align: middle;">
>
<thead> <thead>
<tr> <tr>
<th class="hxjx_table_th_width table_tdth" rowspan="2" style="vertical-align: middle;">道次</th> <th class="hxjx_table_th_width table_tdth" rowspan="2" style="vertical-align: middle;">道次</th>
<th class="hxjx_table_th_width table_tdth" colspan="5">四辊精轧记录</th> <th class="hxjx_table_th_width table_tdth" colspan="5">四辊精轧记录</th>
<th class="hxjx_table_th_width table_tdth" colspan="3" rowspan="2" style="vertical-align: middle;"> <th class="hxjx_table_th_width table_tdth" colspan="3" rowspan="2" style="vertical-align: middle;">
程序设定员 程序设定员
</th> </th>
<th class="hxjx_table_th_width table_tdth" rowspan="2" style="vertical-align: middle;">备注</th> <th class="hxjx_table_th_width table_tdth" rowspan="2" style="vertical-align: middle;">备注</th>
</tr> </tr>
<tr> <tr>
<th class="hxjx_table_th_width table_tdth" colspan="2">设定值范围(±0.2)</th> <th class="hxjx_table_th_width table_tdth" colspan="2">设定值范围(±0.2)</th>
<th class="hxjx_table_th_width table_tdth" colspan="2">辊缝设定</th> <th class="hxjx_table_th_width table_tdth" colspan="2">辊缝设定</th>
<th class="hxjx_table_th_width table_tdth">判定</th> <th class="hxjx_table_th_width table_tdth">判定</th>
</tr> </tr>
</thead> </thead>
<tbody id="hxjx-tbody-two"> <tbody id="hxjx-tbody-two">
<tr v-for="(item,index) in technologyInfoListByFour"> <tr v-for="(item, index) in technologyInfoListByFour">
<td class="hxjx_table_btnColumn table_tdth">{{ item.step }}</td> <td class="hxjx_table_btnColumn table_tdth">{{ item.step }}</td>
<td class="hxjx_table_btnColumn table_tdth" colspan="2">{{ item.setValue }}</td> <td class="hxjx_table_btnColumn table_tdth" colspan="2">{{ item.setValue }}</td>
<td class="hxjx_table_btnColumn table_tdth" colspan="2"></td> <td class="hxjx_table_btnColumn table_tdth" colspan="2"></td>
<td class="hxjx_table_btnColumn table_tdth"></td> <td class="hxjx_table_btnColumn table_tdth"></td>
<td class="hxjx_table_btnColumn table_tdth" colspan="2"></td> <td class="hxjx_table_btnColumn table_tdth" colspan="2"></td>
<td class="hxjx_table_btnColumn table_tdth"></td> <td class="hxjx_table_btnColumn table_tdth"></td>
<td class="hxjx_table_btnColumn table_tdth"></td> <td class="hxjx_table_btnColumn table_tdth"></td>
</tr> </tr>
</tbody> </tbody>
<thead> <thead>
<tr> <tr>
<th class="hxjx_table_th_width table_tdth" colspan="3"> <th class="hxjx_table_th_width table_tdth" colspan="3">
厚度标准值 厚度标准值
<span id="hxjx-table-thickness"></span> <span id="hxjx-table-thickness"></span>
</th> </th>
<th class="hxjx_table_th_width table_tdth" colspan="2">精轧后厚度值</th> <th class="hxjx_table_th_width table_tdth" colspan="2">精轧后厚度值</th>
<th class="hxjx_table_th_width table_tdth"></th> <th class="hxjx_table_th_width table_tdth"></th>
<th class="hxjx_table_th_width table_tdth" colspan="2">OK NG </th> <th class="hxjx_table_th_width table_tdth" colspan="2">OK NG </th>
<th class="hxjx_table_th_width table_tdth"></th> <th class="hxjx_table_th_width table_tdth"></th>
</tr> </tr>
<tr> <tr>
<th class="hxjx_table_th_width table_tdth" colspan="3">轧制日期</th> <th class="hxjx_table_th_width table_tdth" colspan="3">轧制日期</th>
<th class="hxjx_table_th_width table_tdth" colspan="2">轧制人员签字确认</th> <th class="hxjx_table_th_width table_tdth" colspan="2">轧制人员签字确认</th>
<th class="hxjx_table_th_width table_tdth" colspan="5"></th> <th class="hxjx_table_th_width table_tdth" colspan="5"></th>
</tr> </tr>
</thead> </thead>
</table> </table>
<!-- 表3 --> <!-- 表3 -->
<table class="table table-hover table-bordered table-striped table-condensed text-nowrap" <table class="table table-hover table-bordered table-striped table-condensed text-nowrap"
style="vertical-align: middle;" style="vertical-align: middle;">
>
<thead> <thead>
<tr> <tr>
<th class="hxjx_table_th_width table_tdth" colspan="9"> <th class="hxjx_table_th_width table_tdth" colspan="9">
精轧参数参考设定值实际压下量根据产品厚度及厚度均匀性进行设定精轧实际设定值在设定值范围内即可 精轧参数参考设定值实际压下量根据产品厚度及厚度均匀性进行设定精轧实际设定值在设定值范围内即可
</th> </th>
</tr> </tr>
</thead> </thead>
</table> </table>
</div> </div>
@@ -174,21 +166,13 @@
<!-- 按钮操作 --> <!-- 按钮操作 -->
<div style="display: flex;justify-content: center;"> <div style="display: flex;justify-content: center;">
<el-button style="margin-right: 0;" <el-button style="margin-right: 0;" @click="success">确定
@click="success"
>确定
</el-button> </el-button>
<el-button style="margin-left: 20px;" <el-button style="margin-left: 20px;" @click="clear">初始化
@click="clear"
>初始化
</el-button> </el-button>
<el-button style="margin-left: 20px;" <el-button style="margin-left: 20px;" type="danger" @click="removeMaterial" :disabled="indexSelect !== 0">删除物料
type="danger"
@click="removeMaterial"
:disabled="indexSelect!==0"
>删除物料
</el-button> </el-button>
</div> </div>
@@ -203,31 +187,29 @@
<div style="width:100%;height:227px;"> <div style="width:100%;height:227px;">
<table class="table table-borderless hxjx_table_text_left"> <table class="table table-borderless hxjx_table_text_left">
<tbody> <tbody>
<tr> <tr>
<td class="hxjx_table_label_format hxjx_table_label" style="padding:0.25rem;">时间:</td> <td class="hxjx_table_label_format hxjx_table_label" style="padding:0.25rem;">时间:</td>
<td class="hxjx_table_label_format hxjx_table_text" style="padding:0.25rem;">{{ messageData.createTime }} <td class="hxjx_table_label_format hxjx_table_text" style="padding:0.25rem;">{{ messageData.createTime
</td> }}
<td class="hxjx_table_label_format hxjx_table_text_rule" </td>
style="padding:0.25rem;vertical-align: middle;" <td class="hxjx_table_label_format hxjx_table_text_rule"
></td> style="padding:0.25rem;vertical-align: middle;"></td>
</tr> </tr>
<tr> <tr>
<td class="hxjx_table_label_format hxjx_table_label" style="padding:0.25rem;">故障名称:</td> <td class="hxjx_table_label_format hxjx_table_label" style="padding:0.25rem;">故障名称:</td>
<td class="hxjx_table_label_format hxjx_table_text" style="padding:0.25rem;">{{ messageData.faultName }} <td class="hxjx_table_label_format hxjx_table_text" style="padding:0.25rem;">{{ messageData.faultName }}
</td> </td>
<td class="hxjx_table_label_format hxjx_table_text_rule" <td class="hxjx_table_label_format hxjx_table_text_rule"
style="padding:0.25rem;vertical-align: middle;" style="padding:0.25rem;vertical-align: middle;"></td>
></td> </tr>
</tr> <tr>
<tr> <td class="hxjx_table_label_format hxjx_table_label" style="padding:0.25rem;">故障信息:</td>
<td class="hxjx_table_label_format hxjx_table_label" style="padding:0.25rem;">故障信息:</td> <td class="hxjx_table_label_format hxjx_table_text" style="padding:0.25rem;">
<td class="hxjx_table_label_format hxjx_table_text" style="padding:0.25rem;"> {{ messageData.faultMessage }}
{{ messageData.faultMessage }} </td>
</td> <td class="hxjx_table_label_format hxjx_table_text_rule"
<td class="hxjx_table_label_format hxjx_table_text_rule" style="padding:0.25rem;vertical-align: middle;"></td>
style="padding:0.25rem;vertical-align: middle;" </tr>
></td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
@@ -237,8 +219,7 @@
<td style="padding: 20px 0 0 0;text-align: right; border-top:0px solid #dc3545"> <td style="padding: 20px 0 0 0;text-align: right; border-top:0px solid #dc3545">
<div class="btn-group btn-group-sm"> <div class="btn-group btn-group-sm">
<a href="#" class="hxjx-button-ensure btn btn-danger btn-sm custom hxjx_foot_btn_custom" <a href="#" class="hxjx-button-ensure btn btn-danger btn-sm custom hxjx_foot_btn_custom"
style="margin-right: 0;" @click="ensure" style="margin-right: 0;" @click="ensure">确定</a>
>确定</a>
</div> </div>
@@ -259,8 +240,8 @@ import {
messageUpdate, messageUpdate,
updateResource updateResource
} from '@/api/system/resource' } from '@/api/system/resource'
import {getFaultMessage, newIP} from '@/api/system/common' import { getFaultMessage, newIP } from '@/api/system/common'
import {deleteMaterial} from "../../../api/system/material"; import { deleteMaterial } from "../../../api/system/material";
export default { export default {
name: 'index', name: 'index',
@@ -326,90 +307,82 @@ export default {
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}) })
} }
} },
},
// 选择材料 // 选择材料
getTechnologyInfo(index) { getTechnologyInfo(index) {
this.indexSelect = index this.indexSelect = index
let params = this.params let params = this.params
params.technologyId = this.dataList[index].technology params.technologyId = this.dataList[index].technology
this.technologyId = params.technologyId this.technologyId = params.technologyId
if (params.technologyId == null) { if (params.technologyId == null) {
return return
}
listTechnology(params).then(res => {
this.technologyInfoList = res.rows
})
let params2 = this.params2
params2.technologyId = this.dataList[index].technology
listTechnology(params2).then(res => {
this.technologyInfoListByFour = res.rows
})
},
getDataList() {
//state==0表示并未送进轧制页面的新进材料
let params = {
state: 0
}
listMaterial1(params).then(res => {
this.dataList = res.rows
console.log(res.rows)
if (res.rows[0].id != null && this.indexSelect === 0) {
this.getTechnologyInfo(0)
} }
}) listTechnology(params).then(res => {
}, this.technologyInfoList = res.rows
getFault() { })
getFaultMessage().then(res => { let params2 = this.params2
if (res.data !== 0) { params2.technologyId = this.dataList[index].technology
this.showFault = true listTechnology(params2).then(res => {
messageData(this.MessageParams).then(res => { this.technologyInfoListByFour = res.rows
this.messageData = res.data })
}) },
getDataList() {
//state==0表示并未送进轧制页面的新进材料
let params = {
state: 0
} }
}) listMaterial1(params).then(res => {
}, this.dataList = res.rows
ensure() { console.log(res.rows)
let data = { if (res.rows[0].id != null && this.indexSelect === 0) {
state: 1 this.getTechnologyInfo(0)
}
})
},
getFault() {
getFaultMessage().then(res => {
if (res.data !== 0) {
this.showFault = true
messageData(this.MessageParams).then(res => {
this.messageData = res.data
})
}
})
},
ensure() {
let data = {
state: 1
}
messageUpdate(data).then(res => {
this.showFault = false
})
},
clear() {
materialClear().then(res => {
alert('初始化成功')
})
} }
messageUpdate(data).then(res => {
this.showFault = false
})
}, },
clear() { mounted() {
materialClear().then(res => { clearInterval(this.intervalTime)
alert('初始化成功')
})
}
}
,
mounted()
{
clearInterval(this.intervalTime)
this.getDataList() // 接口方法
this.intervalTime = setInterval(() => {
newIP()
this.getFault()
this.getDataList() // 接口方法 this.getDataList() // 接口方法
}, 3000) this.intervalTime = setInterval(() => {
} newIP()
, this.getFault()
created() this.getDataList() // 接口方法
{ }, 3000)
},
created() {
} }
} }
</script> </script>
@@ -492,7 +465,8 @@ created()
border: 1px solid #CCC; border: 1px solid #CCC;
} }
#product .table td, #product .table th { #product .table td,
#product .table th {
padding: 0.5rem; padding: 0.5rem;
} }
@@ -501,7 +475,8 @@ created()
color: #fff; color: #fff;
} }
#rollingpass .table td, #rollingpass .table th { #rollingpass .table td,
#rollingpass .table th {
padding: 0; padding: 0;
} }
@@ -540,7 +515,8 @@ created()
text-align: left; text-align: left;
} }
.table td, .table th { .table td,
.table th {
padding: 0.5rem; padding: 0.5rem;
} }