refactor(l2): 统一轧辊字典命名并优化样式
- 将roller_type和roller_position统一重命名为main_roll_type和main_roll_position - 移除冗余的标签显示,直接使用dict-tag组件 - 调整页面布局和样式,移除不必要的背景和边框 - 更新日志模块使用新的字典类型 - 更新hand-factory版本号至1.3.12 - 修改staging环境API地址
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
"name" : "科伦普",
|
"name" : "科伦普",
|
||||||
"appid" : "__UNI__E781B49",
|
"appid" : "__UNI__E781B49",
|
||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "1.3.10",
|
"versionName" : "1.3.12",
|
||||||
"versionCode" : 1,
|
"versionCode" : 1,
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
|
|||||||
@@ -224,7 +224,7 @@
|
|||||||
coilId: coilData.coilId,
|
coilId: coilData.coilId,
|
||||||
currentCoilNo: coilData.currentCoilNo,
|
currentCoilNo: coilData.currentCoilNo,
|
||||||
actionType: parseInt(actionType),
|
actionType: parseInt(actionType),
|
||||||
actionStatus: 0, // 待处理
|
actionStatus: 0, // 待处理
|
||||||
sourceType: 'scan', // 扫码来源
|
sourceType: 'scan', // 扫码来源
|
||||||
scanTime: new Date().toISOString(),
|
scanTime: new Date().toISOString(),
|
||||||
scanDevice: this.getDeviceInfo(),
|
scanDevice: this.getDeviceInfo(),
|
||||||
|
|||||||
@@ -11,4 +11,4 @@ ENV = 'staging'
|
|||||||
# 若依管理系统/测试环境
|
# 若依管理系统/测试环境
|
||||||
VUE_APP_BASE_API = '/stage-api'
|
VUE_APP_BASE_API = '/stage-api'
|
||||||
|
|
||||||
VUE_APP_SERVICE_BASE_API = 'http://140.143.206.120:18081'
|
VUE_APP_SERVICE_BASE_API = 'http://140.143.206.120:10082/prod-api'
|
||||||
|
|||||||
@@ -60,12 +60,14 @@
|
|||||||
<el-table-column prop="timestamp" label="发生时间" width="180" align="center"></el-table-column>
|
<el-table-column prop="timestamp" label="发生时间" width="180" align="center"></el-table-column>
|
||||||
<el-table-column prop="module" label="报警模块" align="center">
|
<el-table-column prop="module" label="报警模块" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tag>{{ formatModule(scope.row.module) }}</el-tag>
|
<!-- <el-tag>{{ formatModule(scope.row.module) }}</el-tag> -->
|
||||||
|
<dict-tag :options="dict.type.main_log_module" :value="scope.row.module" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="logtype" label="报警类型" align="center">
|
<el-table-column prop="logtype" label="报警类型" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tag :type="getLogTypeTagType(scope.row.logtype)">{{ formatLogType(scope.row.logtype) }}</el-tag>
|
<!-- <el-tag :type="getLogTypeTagType(scope.row.logtype)">{{ formatLogType(scope.row.logtype) }}</el-tag> -->
|
||||||
|
<dict-tag :options="dict.type.main_log_type" :value="scope.row.logtype" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="logtext" label="警报内容" min-width="200"></el-table-column>
|
<el-table-column prop="logtext" label="警报内容" min-width="200"></el-table-column>
|
||||||
@@ -127,6 +129,7 @@ import { getLogDataPage, alarmAck } from '@/api/l2/log'; // 假设API文件路
|
|||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'LogDataTable',
|
name: 'LogDataTable',
|
||||||
|
dicts: ['main_log_type', 'main_log_module'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
// 查询表单数据
|
// 查询表单数据
|
||||||
|
|||||||
@@ -205,8 +205,8 @@ export default {
|
|||||||
padding: 15px;
|
padding: 15px;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
background: #ffffff;
|
// background: #ffffff;
|
||||||
border: 1px solid #dcdcdc;
|
// border: 1px solid #dcdcdc;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,12 +17,12 @@
|
|||||||
<el-table-column prop="standid" label="机架号" align="center" show-overflow-tooltip />
|
<el-table-column prop="standid" label="机架号" align="center" show-overflow-tooltip />
|
||||||
<el-table-column label="位置" align="center" prop="position">
|
<el-table-column label="位置" align="center" prop="position">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<dict-tag :options="dict.type.roller_position" :value="scope.row.position" />
|
<dict-tag :options="dict.type.main_roll_position" :value="scope.row.position" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="类型" align="center" prop="type" >
|
<el-table-column label="类型" align="center" prop="type" >
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<dict-tag :options="dict.type.roller_type" :value="scope.row.type" />
|
<dict-tag :options="dict.type.main_roll_type" :value="scope.row.type" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="changeType" label="换辊类型" align="center" show-overflow-tooltip />
|
<el-table-column prop="changeType" label="换辊类型" align="center" show-overflow-tooltip />
|
||||||
@@ -65,7 +65,7 @@
|
|||||||
import { getRollHistorytList } from '@/api/l2/roller'
|
import { getRollHistorytList } from '@/api/l2/roller'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
dicts: ['roller_type','roller_position'],
|
dicts: ['main_roll_type','main_roll_position'],
|
||||||
name: 'RollerHistory',
|
name: 'RollerHistory',
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
@@ -93,8 +93,8 @@ export default {
|
|||||||
{ label: '换辊号', prop: 'changeid' },
|
{ label: '换辊号', prop: 'changeid' },
|
||||||
{ label: '轧辊号', prop: 'rollid' },
|
{ label: '轧辊号', prop: 'rollid' },
|
||||||
{ label: '机架号', prop: 'standid' },
|
{ label: '机架号', prop: 'standid' },
|
||||||
{ label: '位置', prop: 'position', dict: 'roller_position' },
|
{ label: '位置', prop: 'position', dict: 'main_roll_position' },
|
||||||
{ label: '类型', prop: 'type', dict: 'roller_type' },
|
{ label: '类型', prop: 'type', dict: 'main_roll_type' },
|
||||||
{ label: '换辊类型', prop: 'changeType' },
|
{ label: '换辊类型', prop: 'changeType' },
|
||||||
{ label: '换辊时间', prop: 'changeTime' },
|
{ label: '换辊时间', prop: 'changeTime' },
|
||||||
{ label: '安装时间', prop: 'instalTime' },
|
{ label: '安装时间', prop: 'instalTime' },
|
||||||
|
|||||||
@@ -17,14 +17,12 @@
|
|||||||
<el-table-column prop="rollid" label="轧辊号" show-overflow-tooltip />
|
<el-table-column prop="rollid" label="轧辊号" show-overflow-tooltip />
|
||||||
<el-table-column label="位置" align="center" prop="position" show-overflow-tooltip>
|
<el-table-column label="位置" align="center" prop="position" show-overflow-tooltip>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ scope.row.position }}</span>
|
<dict-tag :options="dict.type.main_roll_position" :value="scope.row.position" />
|
||||||
<dict-tag :options="dict.type.roller_position" :value="scope.row.position" />
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="类型" align="center" prop="type" show-overflow-tooltip>
|
<el-table-column label="类型" align="center" prop="type" show-overflow-tooltip>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ scope.row.type }}</span>
|
<dict-tag :options="dict.type.main_roll_type" :value="scope.row.type" />
|
||||||
<dict-tag :options="dict.type.roller_type" :value="scope.row.type" />
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="diameter" label="直径" show-overflow-tooltip />
|
<el-table-column prop="diameter" label="直径" show-overflow-tooltip />
|
||||||
@@ -41,7 +39,7 @@
|
|||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
name: "Online",
|
name: "Online",
|
||||||
dicts: ['roller_type','roller_position'],
|
dicts: ['main_roll_type','main_roll_position'],
|
||||||
props: {
|
props: {
|
||||||
onlineData: {
|
onlineData: {
|
||||||
type: Array,
|
type: Array,
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ import { getOfflineRollList, backupRoll, getReadyRollList, onlineRoll } from '@/
|
|||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'Standby',
|
name: 'Standby',
|
||||||
dicts: ['roller_type', 'roller_position'],
|
dicts: ['main_roll_type', 'main_roll_position'],
|
||||||
props: {
|
props: {
|
||||||
onlineData: {
|
onlineData: {
|
||||||
type: Array,
|
type: Array,
|
||||||
|
|||||||
@@ -1,30 +1,30 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="roller-page" v-loading="loading">
|
<div class="roller-page" v-loading="loading">
|
||||||
<el-row :gutter="12" class="panel-row">
|
<el-row class="panel-row">
|
||||||
<el-col :span="7" class="panel-col">
|
<el-col :span="7">
|
||||||
<div class="panel-card tall-panel">
|
<div class="panel-card tall-panel">
|
||||||
<Standby :onlineData="onlineData" @online="fetchData" />
|
<Standby :onlineData="onlineData" @online="fetchData" />
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12" class="panel-col">
|
<el-col :span="12">
|
||||||
<div class="panel-card tall-panel">
|
<div class="panel-card tall-panel">
|
||||||
<Online :onlineData="onlineData" />
|
<Online :onlineData="onlineData" />
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="5" class="panel-col">
|
<el-col :span="5">
|
||||||
<div class="panel-card tall-panel">
|
<div class="panel-card tall-panel">
|
||||||
<Standard :onlineData="onlineData" />
|
<Standard :onlineData="onlineData" />
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
<el-row :gutter="12" class="panel-row bottom-row">
|
<el-row :gutter="12" style="height: 520px;">
|
||||||
<el-col :span="18" class="panel-col">
|
<el-col :span="18" class="panel-col" style="height: 100%;">
|
||||||
<div class="panel-card">
|
<div class="panel-card">
|
||||||
<History :historyData="historyData" :params="historyParams" />
|
<History :historyData="historyData" :params="historyParams" />
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6" class="panel-col">
|
<el-col :span="6" class="panel-col" style="height: 100%;">
|
||||||
<div class="panel-card">
|
<div class="panel-card">
|
||||||
<FilterVue @filter="setHistoryParams" />
|
<FilterVue @filter="setHistoryParams" />
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user