Tony/god-ytr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

数据采集——>1-9前端代码更新

Browse Source
This commit is contained in:
LiWeiJie 2023-12-21 15:15:55 +08:00
parent ce0f37b972
commit 3a66a7817d
7 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
god-ui/src/views/hlsnDataAcquisition/hlsnBoardFeeder/boardFeederInterface/index.vue
View File

@ -168,38 +168,36 @@
<el-table v-loading="loading" :data="boardFeederInterfaceList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="boardFeederInterfaceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键" align="center" prop="id" /> --> <!-- <el-table-column label="主键" align="center" prop="id" />
<!-- <el-table-column label="菜单名称" align="center" prop="menuName" /> --> <el-table-column label="菜单名称" align="center" prop="menuName" /> -->
<el-table-column label="设备名称" align="center" prop="deviceName" /> <el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="设备型号" align="center" prop="equipmentType" /> <el-table-column label="设备型号" align="center" prop="equipmentType" />
<el-table-column label="出厂日期" align="center" prop="factoryDate" > <el-table-column label="出厂日期" align="center" prop="factoryDate" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.acquisitionTime, '{y}-{m}-{d} ') }}</span> <span>{{ parseTime(scope.row.factoryDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="采集设备" align="center" prop="acquisitionEquipment" /> --> <!-- <el-table-column label="采集设备" align="center" prop="acquisitionEquipment" /> -->
<el-table-column label="参数" align="center" prop="argument" /> <el-table-column label="参数" align="center" prop="argument" />
<el-table-column label="参数值" align="center" prop="parameterValue" /> <el-table-column label="参数值" align="center" prop="parameterValue" />
<el-table-column label="单位" align="center" prop="unitOfData" /> <el-table-column label="单位" align="center" prop="unitOfData" />
<el-table-column label="阈值" align="center" prop="thresholdValue" /> <el-table-column label="阈值" align="center" prop="thresholdValue" />
<el-table-column label="采集时间" align="center" prop="acquisitionTime" > <el-table-column label="采集时间" align="center" prop="acquisitionTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.acquisitionTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span> <span>{{ parseTime(scope.row.acquisitionTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="设备状态" align="center" prop="deviceStatus" > <el-table-column label="设备状态" align="center" prop="deviceStatus" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.deviceStatus === '运行中' ">{{scope.row.deviceStatus}}</el-tag> <el-tag v-if="scope.row.deviceStatus === '运行中' ">{{scope.row.deviceStatus}}</el-tag>
<el-tag type="danger" v-else-if="scope.row.deviceStatus === '停止中' ">{{scope.row.deviceStatus}}</el-tag> <el-tag type="danger" v-else-if="scope.row.deviceStatus === '停止中' ">{{scope.row.deviceStatus}}</el-tag>
<el-tag type="info" v-else>{{scope.row.deviceStatus}}</el-tag> <el-tag type="info" v-else>{{scope.row.deviceStatus}}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="reserve1" :show-overflow-tooltip="true"/>
<el-table-column label="备注" align="center" prop="reserve1" :show-overflow-tooltip="true" />
<!-- <el-table-column label="备用2" align="center" prop="reserve2" /> <!-- <el-table-column label="备用2" align="center" prop="reserve2" />
<el-table-column label="备用3" align="center" prop="reserve3" /> --> <el-table-column label="备用3" align="center" prop="reserve3" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
@ -242,7 +240,6 @@
<el-input v-model="form.equipmentType" placeholder="请输入设备型号" /> <el-input v-model="form.equipmentType" placeholder="请输入设备型号" />
</el-form-item> </el-form-item>
<el-form-item label="出厂日期" prop="factoryDate"> <el-form-item label="出厂日期" prop="factoryDate">
<!-- <el-input v-model="form.factoryDate" placeholder="请输入出厂日期" /> -->
<el-date-picker clearable <el-date-picker clearable
v-model="form.factoryDate" v-model="form.factoryDate"
type="date" type="date"
@ -250,7 +247,6 @@
placeholder="请选择出厂日期"> placeholder="请选择出厂日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-form-item>
<!-- <el-form-item label="采集设备" prop="acquisitionEquipment"> <!-- <el-form-item label="采集设备" prop="acquisitionEquipment">
<el-input v-model="form.acquisitionEquipment" placeholder="请输入采集设备" /> <el-input v-model="form.acquisitionEquipment" placeholder="请输入采集设备" />
</el-form-item> --> </el-form-item> -->

2
god-ui/src/views/hlsnDataAcquisition/hlsnCoalVertical/millInducedDraftFan/index.vue
View File

@ -272,7 +272,7 @@
<el-input v-model="form.deviceStatus" placeholder="请输入设备状态" /> <el-input v-model="form.deviceStatus" placeholder="请输入设备状态" />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="reserve1"> <el-form-item label="备注" prop="reserve1">
<el-input v-model="form.reserve1" placeholder="请输入备注" /> <el-input v-model="form.reserve1" placeholder="请输入备注" type="textarea"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="备用2" prop="reserve2"> <!-- <el-form-item label="备用2" prop="reserve2">
<el-input v-model="form.reserve2" placeholder="请输入备用2" /> <el-input v-model="form.reserve2" placeholder="请输入备用2" />

9
god-ui/src/views/hlsnDataAcquisition/hlsnGrindingBelt/grindingBeltInterface/index.vue
View File

@ -173,7 +173,7 @@
<el-table-column label="设备型号" align="center" prop="equipmentType" /> <el-table-column label="设备型号" align="center" prop="equipmentType" />
<el-table-column label="出厂日期" align="center" prop="factoryDate" > <el-table-column label="出厂日期" align="center" prop="factoryDate" >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.acquisitionTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.factoryDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
@ -239,16 +239,15 @@
<el-form-item label="设备型号" prop="equipmentType"> <el-form-item label="设备型号" prop="equipmentType">
<el-input v-model="form.equipmentType" placeholder="请输入设备型号" /> <el-input v-model="form.equipmentType" placeholder="请输入设备型号" />
</el-form-item> </el-form-item>
<el-form-item label="出厂日期" prop="factoryDate"> <el-form-item label="出厂日期" prop="factoryDate">
<!-- <el-input v-model="form.factoryDate" placeholder="请输入出厂日期" /> -->
<el-date-picker clearable <el-date-picker clearable
v-model="form.factoryDate" v-model="form.factoryDate"
type="date" type="date"
value-format="yyyy-MM-dd " value-format="yyyy-MM-dd"
placeholder="请选择出厂日期"> placeholder="请选择出厂日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-form-item>
<!-- <el-form-item label="采集设备" prop="acquisitionEquipment"> <!-- <el-form-item label="采集设备" prop="acquisitionEquipment">
<el-input v-model="form.acquisitionEquipment" placeholder="请输入采集设备" /> <el-input v-model="form.acquisitionEquipment" placeholder="请输入采集设备" />
</el-form-item> --> </el-form-item> -->

6
god-ui/src/views/hlsnDataAcquisition/hlsnImpactCrusher/impactCrusherInterface/index.vue
View File

@ -173,7 +173,7 @@
<el-table-column label="设备型号" align="center" prop="equipmentType" /> <el-table-column label="设备型号" align="center" prop="equipmentType" />
<el-table-column label="出厂日期" align="center" prop="factoryDate" > <el-table-column label="出厂日期" align="center" prop="factoryDate" >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.acquisitionTime, '{y}-{m}-{d} ') }}</span> <span>{{ parseTime(scope.row.factoryDate, '{y}-{m}-{d} ') }}</span>
</template> </template>
</el-table-column> </el-table-column>
@ -239,8 +239,7 @@
<el-form-item label="设备型号" prop="equipmentType"> <el-form-item label="设备型号" prop="equipmentType">
<el-input v-model="form.equipmentType" placeholder="请输入设备型号" /> <el-input v-model="form.equipmentType" placeholder="请输入设备型号" />
</el-form-item> </el-form-item>
<el-form-item label="出厂日期" prop="factoryDate"> <el-form-item label="出厂日期" prop="factoryDate">
<!-- <el-input v-model="form.factoryDate" placeholder="请输入出厂日期" /> -->
<el-date-picker clearable <el-date-picker clearable
v-model="form.factoryDate" v-model="form.factoryDate"
type="date" type="date"
@ -248,7 +247,6 @@
placeholder="请选择出厂日期"> placeholder="请选择出厂日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-form-item>
<!-- <el-form-item label="采集设备" prop="acquisitionEquipment"> <!-- <el-form-item label="采集设备" prop="acquisitionEquipment">
<el-input v-model="form.acquisitionEquipment" placeholder="请输入采集设备" /> <el-input v-model="form.acquisitionEquipment" placeholder="请输入采集设备" />
</el-form-item> --> </el-form-item> -->

2
god-ui/src/views/hlsnDataAcquisition/hlsnJawCrusher/jawCrusherInterface/index.vue
View File

@ -272,7 +272,7 @@
<el-input v-model="form.deviceStatus" placeholder="请输入设备状态" /> <el-input v-model="form.deviceStatus" placeholder="请输入设备状态" />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="reserve1"> <el-form-item label="备注" prop="reserve1">
<el-input v-model="form.reserve1" placeholder="请输入备用1" /> <el-input v-model="form.reserve1" placeholder="请输入备注" type="textarea"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="备用2" prop="reserve2"> <!-- <el-form-item label="备用2" prop="reserve2">
<el-input v-model="form.reserve2" placeholder="请输入备用2" /> <el-input v-model="form.reserve2" placeholder="请输入备用2" />

2
god-ui/src/views/hlsnDataAcquisition/hlsnRawMateria/verticalMilllPort/index.vue
View File

@ -276,7 +276,7 @@
</el-form-item> </el-form-item>
<!-- <el-form-item label="备用2" prop="reserve2"> <!-- <el-form-item label="备用2" prop="reserve2">
<el-input v-model="form.reserve2" placeholder="请输入备用2" /> <el-input v-model="form.reserve2" placeholder="请输入备用2" />
</!--> </el-form-item>
<el-form-item label="备用3" prop="reserve3"> <el-form-item label="备用3" prop="reserve3">
<el-input v-model="form.reserve3" placeholder="请输入备用3" /> <el-input v-model="form.reserve3" placeholder="请输入备用3" />
</el-form-item> --> </el-form-item> -->

2
god-ui/src/views/hlsnDataAcquisition/hlsnRootsFan/rootsFanInterface/index.vue
View File

@ -272,7 +272,7 @@
<el-input v-model="form.deviceStatus" placeholder="请输入设备状态" /> <el-input v-model="form.deviceStatus" placeholder="请输入设备状态" />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="reserve1"> <el-form-item label="备注" prop="reserve1">
<el-input v-model="form.reserve1" placeholder="请输入备注" /> <el-input v-model="form.reserve1" placeholder="请输入备注" type="textarea" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="备用2" prop="reserve2"> <!-- <el-form-item label="备用2" prop="reserve2">
<el-input v-model="form.reserve2" placeholder="请输入备用2" /> <el-input v-model="form.reserve2" placeholder="请输入备用2" />