diff --git a/dist2/html/ie.html.gz b/dist2/html/ie.html.gz index aa98a80..94554c5 100644 Binary files a/dist2/html/ie.html.gz and b/dist2/html/ie.html.gz differ diff --git a/dist2/index.html.gz b/dist2/index.html.gz index c8ff4e1..e5238fb 100644 Binary files a/dist2/index.html.gz and b/dist2/index.html.gz differ diff --git a/dist2/static/img/401.089007e7.gif.gz b/dist2/static/img/401.089007e7.gif.gz index e51e365..f97e316 100644 Binary files a/dist2/static/img/401.089007e7.gif.gz and b/dist2/static/img/401.089007e7.gif.gz differ diff --git a/dist2/static/img/FlowChart-2-2.5a555a92.png.gz b/dist2/static/img/FlowChart-2-2.5a555a92.png.gz index 7015386..da13316 100644 Binary files a/dist2/static/img/FlowChart-2-2.5a555a92.png.gz and b/dist2/static/img/FlowChart-2-2.5a555a92.png.gz differ diff --git a/dist2/static/img/dark.412ca67e.svg.gz b/dist2/static/img/dark.412ca67e.svg.gz index 6a569a7..fb7e255 100644 Binary files a/dist2/static/img/dark.412ca67e.svg.gz and b/dist2/static/img/dark.412ca67e.svg.gz differ diff --git a/dist2/static/img/light.4183aad0.svg.gz b/dist2/static/img/light.4183aad0.svg.gz index c7c2b95..0977626 100644 Binary files a/dist2/static/img/light.4183aad0.svg.gz and b/dist2/static/img/light.4183aad0.svg.gz differ diff --git a/src/views/work/resource/index.vue b/src/views/work/resource/index.vue index a09fdb2..322c894 100644 --- a/src/views/work/resource/index.vue +++ b/src/views/work/resource/index.vue @@ -7,37 +7,32 @@ 产品信息: - - - - - - - + + + + + + + - - - - - - - + + + + + + +
序号钽靶批号规格工艺直径
序号钽靶批号规格工艺直径
- {{ index + 1 }} - {{ item.id }} - {{ item.specification }} - {{ item.technology }} - {{ item.diameter }} -
+ {{ index + 1 }} + {{ + item.id }} + {{ + item.specification }} + {{ + item.technology }} + {{ + item.diameter }} +
@@ -49,123 +44,120 @@ 粗轧道次表: + style="vertical-align: middle;"> - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + +
- - {{ technologyId }}轧制工艺单 -
制作人：审核人：
道次粗轧工艺设计检移票号码：粗轧操作记录
压下量轧前厚度轧后厚度喂料角度设定值判定确认程序设定员备注
+ + {{ technologyId }}轧制工艺单 +
制作人：审核人：
道次粗轧工艺设计检移票号码：粗轧操作记录
压下量轧前厚度轧后厚度喂料角度设定值判定确认程序设定员备注
{{ item.step }}{{ item.reduction }}{{ item.thicknessFront }}{{ item.thicknessBehind }}{{ item.angle }}{{ item.setValue }}
{{ item.step }}{{ item.reduction }}{{ item.thicknessFront }}{{ item.thicknessBehind }}{{ item.angle }}{{ item.setValue }}
粗轧后厚度：轧制员：
粗轧后厚度：轧制员：
+ style="vertical-align: middle;"> - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + +
道次四辊精轧记录 - 程序设定员 - 备注
设定值范围(±0.2)辊缝设定判定
道次四辊精轧记录 + 程序设定员 + 备注
设定值范围(±0.2)辊缝设定判定
{{ item.step }}{{ item.setValue }}
{{ item.step }}{{ item.setValue }}
- 厚度标准值： - - 精轧后厚度值：OK □ NG □
轧制日期：轧制人员签字确认：
+ 厚度标准值： + + 精轧后厚度值：OK □ NG □
轧制日期：轧制人员签字确认：
+ style="vertical-align: middle;"> - - - + + +
- 精轧参数参考设定值，实际压下量根据产品厚度及厚度均匀性进行设定（精轧实际设定值在设定值范围内即可） -
+ 精轧参数参考设定值，实际压下量根据产品厚度及厚度均匀性进行设定（精轧实际设定值在设定值范围内即可） +
@@ -174,21 +166,13 @@
- 确定 + 确定 - 初始化 + 初始化 - 删除物料 + 删除物料
@@ -203,31 +187,29 @@
- - - - - - - - - - - - - - - + + + + + + + + + + + + + + +
时间:{{ messageData.createTime }} -
故障名称:{{ messageData.faultName }} -
故障信息: - {{ messageData.faultMessage }} -
时间:{{ messageData.createTime + }} +
故障名称:{{ messageData.faultName }} +
故障信息: + {{ messageData.faultMessage }} +
@@ -237,8 +219,7 @@
确定 + style="margin-right: 0;" @click="ensure">确定
@@ -259,8 +240,8 @@ import { messageUpdate, updateResource } from '@/api/system/resource' -import {getFaultMessage, newIP} from '@/api/system/common' -import {deleteMaterial} from "../../../api/system/material"; +import { getFaultMessage, newIP } from '@/api/system/common' +import { deleteMaterial } from "../../../api/system/material"; export default { name: 'index', @@ -326,90 +307,82 @@ export default { this.$modal.msgSuccess("删除成功"); }) } - } - }, + }, - // 选择材料 - getTechnologyInfo(index) { - this.indexSelect = index + // 选择材料 + getTechnologyInfo(index) { + this.indexSelect = index - let params = this.params - params.technologyId = this.dataList[index].technology - this.technologyId = params.technologyId + let params = this.params + params.technologyId = this.dataList[index].technology + this.technologyId = params.technologyId - if (params.technologyId == null) { - 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) + if (params.technologyId == null) { + return } - }) - }, - getFault() { + listTechnology(params).then(res => { + this.technologyInfoList = res.rows + }) - getFaultMessage().then(res => { - if (res.data !== 0) { - this.showFault = true - messageData(this.MessageParams).then(res => { - this.messageData = res.data - }) + 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 } - }) - }, - ensure() { - let data = { - state: 1 + listMaterial1(params).then(res => { + this.dataList = res.rows + console.log(res.rows) + if (res.rows[0].id != null && this.indexSelect === 0) { + 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() { - materialClear().then(res => { - alert('初始化成功') - }) - } - -} -, -mounted() -{ - - clearInterval(this.intervalTime) - - this.getDataList() // 接口方法 - - this.intervalTime = setInterval(() => { - newIP() - this.getFault() + mounted() { + clearInterval(this.intervalTime) this.getDataList() // 接口方法 - }, 3000) -} -, -created() -{ + this.intervalTime = setInterval(() => { + newIP() + this.getFault() + this.getDataList() // 接口方法 + }, 3000) + }, + created() { -} + } } @@ -492,7 +465,8 @@ created() border: 1px solid #CCC; } -#product .table td, #product .table th { +#product .table td, +#product .table th { padding: 0.5rem; } @@ -501,7 +475,8 @@ created() color: #fff; } -#rollingpass .table td, #rollingpass .table th { +#rollingpass .table td, +#rollingpass .table th { padding: 0; } @@ -540,7 +515,8 @@ created() text-align: left; } -.table td, .table th { +.table td, +.table th { padding: 0.5rem; }