Skip to content

王刘锁 / jianlin-tms-view

Go to a project
Commit 7ef7034d by 郑艺斌
Options

fix:优化

parent e2bbbff2
Inline Side-by-side
Showing with 19 additions and 10 deletions
src/views/modules/equipmentAdmin/equipmentAccount/add.vue
<template> <template>
<el-dialog :title="dialogConfig.title" :visible.sync="dialogVisible" width="30%" @close="dialogClose" <el-dialog :title="dialogConfig.title" :visible.sync="dialogVisible" width="36%" @close="dialogClose"
:close-on-click-modal="false"> :close-on-click-modal="false">
<el-form :model="formData" label-width="100px" :disabled="dialogConfig.disabled" ref="ruleForm" :rules="rules"> <el-form :model="formData" label-width="100px" :disabled="dialogConfig.disabled" ref="ruleForm" :rules="rules">
<el-form-item label="设备类型：" prop="equipmentType"> <el-form-item label="设备类型：" prop="equipmentType">
......
src/views/modules/equipmentAdmin/equipmentAccount/index.vue
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<vxe-column field="equipmentModel" title="设备型号" align="center" width="100px"></vxe-column> <vxe-column field="equipmentModel" title="设备型号" align="center" width="100px"></vxe-column>
<vxe-column field="ipAddr" title="IP地址" align="center" width="100px"></vxe-column> <vxe-column field="ipAddr" title="IP地址" align="center" width="100px"></vxe-column>
<vxe-column field="groupName" title="分组" align="center" width="100px"></vxe-column> <vxe-column field="groupName" title="分组" align="center" width="100px"></vxe-column>
<vxe-column field="mapId" title="工作地图" align="center" width="100px"></vxe-column> <vxe-column field="mapId_dictText" title="工作地图" align="center" width="100px"></vxe-column>
<vxe-column field="onlineStatus" title="在线状态" align="center" width="100px"> <vxe-column field="onlineStatus" title="在线状态" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.onlineStatus === '1'" style="color: #249601;font-weight: bold;">在线</span> <span v-if="scope.row.onlineStatus === '1'" style="color: #249601;font-weight: bold;">在线</span>
......
src/views/modules/siteAdmin/factoryAdmin/add.vue
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
<el-form-item label="厂区ID：" prop="factoryId"> <el-form-item label="厂区ID：" prop="factoryId">
<el-input v-model="formData.factoryId" placeholder="厂区ID"></el-input> <el-input v-model="formData.factoryId" placeholder="厂区ID"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="区域ID" prop="areaId"> <!-- <el-form-item label="区域ID" prop="areaId">
<el-input v-model="formData.areaId" placeholder="区域ID"></el-input> <el-input v-model="formData.areaId" placeholder="区域ID"></el-input>
</el-form-item> </el-form-item> -->
<el-form-item label="MIR调度IP：" prop="mirIp"> <el-form-item label="MIR调度IP：" prop="mirIp">
<el-input v-model="formData.mirIp" placeholder="MIR调度系统IP地址"></el-input> <el-input v-model="formData.mirIp" placeholder="MIR调度系统IP地址"></el-input>
</el-form-item> </el-form-item>
...@@ -84,9 +84,9 @@ export default { ...@@ -84,9 +84,9 @@ export default {
factoryId: [ factoryId: [
{ required: true, message: '请输入厂区ID', trigger: 'blur' }, { required: true, message: '请输入厂区ID', trigger: 'blur' },
], ],
areaId: [ // areaId: [
{ required: true, message: '请输入区域ID', trigger: 'blur' }, // { required: true, message: '请输入区域ID', trigger: 'blur' },
], // ],
mirIp: [ mirIp: [
{ required: true, message: '请输入MIR调度IP', trigger: 'blur' }, { required: true, message: '请输入MIR调度IP', trigger: 'blur' },
], ],
......
src/views/modules/siteAdmin/siteTaskType/add.vue
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="上级分类：" prop="parentId"> <el-form-item label="上级分类：" prop="parentId">
<el-select v-model="formData.parentId" placeholder="请选择厂区"> <el-select v-model="formData.parentId" placeholder="请选择上级分类">
<el-option v-for="item in classificationOptions" :key="item.id" :label="item.typeName" :value="item.id"> <el-option v-for="item in classificationOptions" :key="item.id" :label="item.typeName" :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
......
src/views/modules/taskPlan/taskChainList/index.vue
...@@ -85,7 +85,13 @@ ...@@ -85,7 +85,13 @@
<vxe-column field="deviceType" title="设备类型"></vxe-column> <vxe-column field="deviceType" title="设备类型"></vxe-column>
<vxe-column field="deviceId" title="执行设备ID"></vxe-column> <vxe-column field="deviceId" title="执行设备ID"></vxe-column>
<vxe-column field="deviceName" title="执行设备名称"></vxe-column> <vxe-column field="deviceName" title="执行设备名称"></vxe-column>
<vxe-column field="taskSubState" title="子任务状态"></vxe-column> <vxe-column field="taskSubState" title="子任务状态">
<template slot-scope="scope">
<span v-if="scope.row.taskSubState === '3'" style="color: #249601;">已完成</span>
<span v-else-if="scope.row.taskStatus === '1'" style="color: #E1750F;">执行中</span>
<span v-else-if="scope.row.taskStatus === '5'" style="color: #999999;">未执行</span>
</template>
</vxe-column>
<vxe-column field="beginAt" title="执行开始时间" width="180px"></vxe-column> <vxe-column field="beginAt" title="执行开始时间" width="180px"></vxe-column>
<vxe-column field="finishAt" title="执行结束时间" width="180px"></vxe-column> <vxe-column field="finishAt" title="执行结束时间" width="180px"></vxe-column>
<vxe-column field="consumingAt" title="耗时"></vxe-column> <vxe-column field="consumingAt" title="耗时"></vxe-column>
......
src/views/modules/taskPlan/taskPlanTemplate/add.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<el-form-item label="地图名称：" prop="mapName"> <el-form-item label="地图名称：" prop="mapName">
<el-input v-model="formData.mapName"></el-input> <el-input v-model="formData.mapName"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="设备分组："> <el-form-item label="设备分组：" prop="deviceGroup">
<el-input v-model="formData.deviceGroup"></el-input> <el-input v-model="formData.deviceGroup"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="是/否包含变量：" prop="variableStatus"> <el-form-item label="是/否包含变量：" prop="variableStatus">
...@@ -104,6 +104,9 @@ export default { ...@@ -104,6 +104,9 @@ export default {
takeName: [ takeName: [
{ required: true, message: '请输入任务名称', trigger: 'blur' }, { required: true, message: '请输入任务名称', trigger: 'blur' },
], ],
deviceGroup: [
{ required: true, message: '请输入设备分组', trigger: 'blur' },
],
mapName: [ mapName: [
{ required: true, message: '请输入地图名称', trigger: 'blur' }, { required: true, message: '请输入地图名称', trigger: 'blur' },
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment