lijianfu
/
eemcs_ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1.修改主机运行记录导出异常 

2.一些页面select添加可输入搜索
meizhou
selia-zx 5 days ago
parent
ff44d006db
commit
2e63ef4fea
13 changed files with 100 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .env.development
  2. 6
      src/views/alarm/alarmCode/index.vue
  3. 4
      src/views/alarm/alarmRecord/index.vue
  4. 17
      src/views/alarm/alarmRule/index.vue
  5. 8
      src/views/centerairC/hostRunReport/index.vue
  6. 6
      src/views/device/comm/index.vue
  7. 3
      src/views/device/gateway/index.vue
  8. 14
      src/views/device/gather/index.vue
  9. 12
      src/views/device/ledger/index.vue
  10. 4
      src/views/device/maintenance/index.vue
  11. 15
      src/views/device/qrCode/index.vue
  12. 9
      src/views/device/spareInOut/index.vue
  13. 2
      src/views/region/index.vue

4
.env.development
Unescape View File

@ -7,9 +7,9 @@ ENV = 'development'
# 开发环境
# VUE_APP_BASE_API = '/dev-api'
# 后台
VUE_APP_BASE_API = 'http://192.168.1.222:8080'
# VUE_APP_BASE_API = 'http://192.168.1.222:8080'
# 梅州云端
# VUE_APP_BASE_API = 'http://106.55.173.225:8091'
VUE_APP_BASE_API = 'http://106.55.173.225:8091'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

6
src/views/alarm/alarmCode/index.vue
Unescape View File

@ -21,6 +21,7 @@
v-model="queryParams.status"
placeholder="选择采集类别"
clearable
filterable
>
<el-option
v-for="dict in dict.type.alarm_collection_type"
@ -35,6 +36,7 @@
v-model="queryParams.eventType"
placeholder="选择事件类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.alarm_event_type"
@ -49,6 +51,7 @@
v-model="queryParams.alarmLevel"
placeholder="选择报警等级"
clearable
filterable
>
<el-option
v-for="dict in dict.type.alarm_level"
@ -226,6 +229,7 @@
v-model="form.collectionType"
placeholder="请选择采集类别"
clearable
filterable
>
<el-option
v-for="dict in dict.type.alarm_collection_type"
@ -244,6 +248,7 @@
v-model="form.eventType"
placeholder="请选择事件类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.alarm_event_type"
@ -259,6 +264,7 @@
v-model="form.alarmLevel"
placeholder="请选择报警等级"
clearable
filterable
>
<el-option
v-for="dict in dict.type.alarm_level"

4
src/views/alarm/alarmRecord/index.vue
Unescape View File

@ -21,6 +21,7 @@
v-model="queryParams.alarmType"
placeholder="选择报警类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.alarm_type"
@ -35,6 +36,7 @@
v-model="queryParams.eventType"
placeholder="选择事件类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.alarm_event_type"
@ -49,6 +51,7 @@
v-model="queryParams.alarmLevel"
placeholder="选择报警等级"
clearable
filterable
>
<el-option
v-for="dict in dict.type.alarm_level"
@ -71,6 +74,7 @@
v-model="queryParams.status"
placeholder="选择处理状态"
clearable
filterable
>
<el-option label="未处理" value="0" />
<el-option label="已处理" value="1" />

17
src/views/alarm/alarmRule/index.vue
Unescape View File

@ -13,6 +13,7 @@
v-model="queryParams.alarmType"
placeholder="选择报警类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.alarm_type"
@ -27,6 +28,7 @@
v-model="queryParams.eventType"
placeholder="选择事件类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.alarm_event_type"
@ -41,6 +43,7 @@
v-model="queryParams.alarmLevel"
placeholder="选择报警等级"
clearable
filterable
>
<el-option
v-for="dict in dict.type.alarm_level"
@ -252,6 +255,7 @@
placeholder="请选择设备类型"
clearable
@change="handleDevice"
filterable
>
<el-option
v-for="item in devices"
@ -269,6 +273,7 @@
placeholder="请选择设备类型"
clearable
@change="handleMeter"
filterable
>
<el-option
v-for="item in cpmList"
@ -287,6 +292,7 @@
v-model="form.alarmType"
placeholder="请选择报警类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.alarm_type"
@ -314,6 +320,7 @@
v-model="form.eventType"
placeholder="请选择事件类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.alarm_event_type"
@ -329,6 +336,7 @@
v-model="form.alarmLevel"
placeholder="请选择报警等级"
clearable
filterable
>
<el-option
v-for="dict in dict.type.alarm_level"
@ -346,6 +354,7 @@
v-model="form.triggerEvent"
placeholder="请选择"
clearable
filterable
>
<el-option label="开" value="0" />
<el-option label="关" value="1" />
@ -358,6 +367,7 @@
v-model="form.timePeriodSet"
placeholder="请选择"
clearable
filterable
>
<el-option label="全时段" value="0" />
<el-option label="自定义时段" value="1" />
@ -432,7 +442,12 @@
<el-row type="flex" justify="flex-start">
<el-col :span="12">
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="请选择" clearable>
<el-select
v-model="form.status"
placeholder="请选择"
clearable
filterable
>
<el-option label="已启用" value="0" />
<el-option label="未启用" value="1" />
</el-select>

8
src/views/centerairC/hostRunReport/index.vue
Unescape View File

@ -85,7 +85,7 @@
</el-row>
<el-table v-loading="loading" :data="postList" stripe>
<el-table-column label="主机id" align="center" prop="deviceNum" />
<!-- <el-table-column label="主机id" align="center" prop="deviceNum" /> -->
<el-table-column label="时间" align="center" prop="curTime" />
<el-table-column label="蒸发器">
<el-table-column
@ -265,7 +265,7 @@
<el-select
v-model="form.deviceNum"
placeholder="请选择主机编号"
clearable
disabled
>
<el-option label="1号主机" value="1" />
<el-option label="2号主机" value="2" />
@ -842,7 +842,6 @@ export default {
handleExport() {
reportSysExport(this.queryParams).then((res) => {
console.log("导出返回", res);
if (res.code == 200) {
// 请求的结果就是文件
// 创建一个blob URL，用于生成下载链接
const url = window.URL.createObjectURL(new Blob([res]));
@ -860,9 +859,6 @@ export default {
type: "success",
message: "导出成功!",
});
} else {
this.$message.error("导出失败!");
}
});
},
// 打印

6
src/views/device/comm/index.vue
Unescape View File

@ -13,6 +13,7 @@
v-model="queryParams.mtType"
placeholder="请选择仪表类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.sys_mt_type"
@ -176,6 +177,7 @@
v-model="form.mtType"
placeholder="请选择仪表类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.sys_mt_type"
@ -190,6 +192,7 @@
<el-form-item label="波特率" prop="baudRate">
<el-select
clearable
filterable
placeholder="请选择波特率"
v-model="form.baudRate"
>
@ -207,6 +210,7 @@
<el-form-item label="数据位" prop="dataBit">
<el-select
clearable
filterable
placeholder="请选择数据位"
v-model="form.dataBit"
>
@ -219,6 +223,7 @@
<el-form-item label="停止位" prop="stopBit">
<el-select
clearable
filterable
placeholder="请选择停止位"
v-model="form.stopBit"
>
@ -235,6 +240,7 @@
<el-form-item label="校验位" prop="parity">
<el-select
clearable
filterable
placeholder="请选择校验位"
v-model="form.parity"
>

3
src/views/device/gateway/index.vue
Unescape View File

@ -21,6 +21,7 @@
v-model="queryParams.status"
placeholder="网关状态"
clearable
filterable
>
<el-option
v-for="dict in dict.type.gateway_status"
@ -255,6 +256,7 @@
v-model="form.operatorType"
placeholder="选择运营商"
clearable
filterable
>
<el-option
v-for="dict in dict.type.operator_type"
@ -270,6 +272,7 @@
v-model="form.communicationType"
placeholder="选择通信方式"
clearable
filterable
>
<el-option
v-for="dict in dict.type.communication_type"

14
src/views/device/gather/index.vue
Unescape View File

@ -13,6 +13,7 @@
v-model="queryParams.mtType"
placeholder="请选择仪表类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.sys_mt_type"
@ -27,6 +28,7 @@
v-model="queryParams.systemType"
placeholder="请选择系统类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.sys_type"
@ -41,6 +43,7 @@
v-model="queryParams.paramType"
placeholder="请选择采集参数类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.sys_param_type"
@ -313,6 +316,7 @@
v-model="form.mtType"
placeholder="请选择仪表类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.sys_mt_type"
@ -398,6 +402,7 @@
v-model="form.dataType"
placeholder="请选择数据类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.sys_data_type"
@ -414,6 +419,7 @@
<el-form-item label="是否累计" prop="mtIsSum">
<el-select
clearable
filterable
placeholder="请选择是否"
v-model="form.mtIsSum"
>
@ -466,6 +472,7 @@
v-model="form.protocolType"
placeholder="请选择协议类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.sys_protocol_type"
@ -482,6 +489,7 @@
v-model="form.communicationType"
placeholder="请选择通信类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.sys_communication_type"
@ -497,6 +505,7 @@
<el-form-item label="是否使用" prop="isUse">
<el-select
clearable
filterable
placeholder="请选择是否"
v-model="form.isUse"
>
@ -524,6 +533,7 @@
v-model="form.systemType"
placeholder="请选择系统类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.sys_type"
@ -541,6 +551,7 @@
v-model="form.paramType"
placeholder="请选择参数类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.sys_param_type"
@ -556,6 +567,7 @@
v-model="form.collectionType"
placeholder="请选择采集类别"
clearable
filterable
>
<el-option
v-for="dict in dict.type.alarm_collection_type"
@ -574,6 +586,7 @@
v-model="form.terminalDeviceType"
placeholder="请选择采集设备"
clearable
filterable
@change="handleDeviceType"
>
<el-option
@ -590,6 +603,7 @@
v-model="form.deviceLedgerId"
placeholder="请选择设备名称"
clearable
filterable
>
<el-option
v-for="item in ledgerList"

12
src/views/device/ledger/index.vue
Unescape View File

@ -29,6 +29,7 @@
v-model="queryParams.deviceType"
placeholder="请选择设备类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.sys_device_type"
@ -232,6 +233,7 @@
v-model="form.deviceType"
placeholder="请选择设备类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.sys_device_type"
@ -304,7 +306,12 @@
<el-row type="flex" justify="center">
<el-col :span="12">
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="请选择" clearable>
<el-select
v-model="form.status"
placeholder="请选择"
clearable
filterable
>
<el-option label="正常" value="0" />
<el-option label="停用" value="1" /> </el-select></el-form-item
></el-col>
@ -314,6 +321,7 @@
v-model="form.isCollection"
placeholder="请选择是否"
clearable
filterable
>
<el-option label="是" value="0" />
<el-option label="否" value="1" />
@ -328,6 +336,7 @@
v-model="form.isCalcEnergy"
placeholder="请选择是否"
clearable
filterable
>
<el-option label="是" value="0" />
<el-option label="否" value="1" />
@ -339,6 +348,7 @@
v-model="form.systemType"
placeholder="请选择系统类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.sys_type"

4
src/views/device/maintenance/index.vue
Unescape View File

@ -87,6 +87,7 @@
v-model="queryParams.deviceType"
placeholder="请选择设备类型"
clearable
filterable
>
<el-option
v-for="item in devices"
@ -102,6 +103,7 @@
v-model="queryParams.maintainType"
placeholder="请选择维保类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.maintain_type"
@ -295,6 +297,7 @@
v-model="form.maintainType"
placeholder="请选择维保类型"
clearable
filterable
:disabled="shouldDis"
>
<el-option
@ -312,6 +315,7 @@
v-model="form.deviceType"
placeholder="请选择设备类型"
clearable
filterable
:disabled="shouldDis"
>
<el-option

15
src/views/device/qrCode/index.vue
Unescape View File

@ -13,6 +13,7 @@
v-model="queryParams.status"
placeholder="请选择状态"
clearable
filterable
>
<el-option
v-for="dict in dict.type.qrcode_status"
@ -222,6 +223,7 @@
v-model="form.deviceLedgerId"
placeholder="请选择设备名称"
clearable
filterable
@change="handleDeviceChange"
>
<el-option
@ -237,6 +239,7 @@
v-model="form.status"
placeholder="请选择状态"
clearable
filterable
>
<el-option
v-for="dict in dict.type.qrcode_status"
@ -255,11 +258,7 @@
</div>
</el-dialog>
<!-- 二维码预览弹框 -->
<el-dialog
title="二维码预览"
:visible.sync="isCodePreview"
append-to-body
>
<el-dialog title="二维码预览" :visible.sync="isCodePreview" append-to-body>
<div class="dialog-img">
<img class="qrCodeImg" :src="codePreViewUrl" alt="Base64 Image" />
</div>
@ -270,11 +269,7 @@
:visible.sync="isMoreqrCode"
append-to-body
>
<el-form
ref="qrCodeForm"
:model="qrCodeForm"
:rules="qrCodeForms"
>
<el-form ref="qrCodeForm" :model="qrCodeForm" :rules="qrCodeForms">
<el-row type="flex" justify="center">
<el-col :span="24">
<el-form-item label="二维码个数" prop="qrNum">

9
src/views/device/spareInOut/index.vue
Unescape View File

@ -29,6 +29,7 @@
v-model="queryParams.operaType"
placeholder="请选择操作类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.sys_inout_type"
@ -154,6 +155,8 @@
<el-select
v-model="scope.row.sparePartsId"
@change="handleSpare(scope.row, scope.row.sparePartsId)"
filterable
clearable
>
<el-option
v-for="item in spares"
@ -175,7 +178,11 @@
></el-input>
</template>
</el-table-column>
<el-table-column label="当前库存" min-width="150" prop="inventoryLevels">
<el-table-column
label="当前库存"
min-width="150"
prop="inventoryLevels"
>
</el-table-column>
<el-table-column prop="data1" label="操作" min-width="130">
<template slot-scope="scope">

2
src/views/region/index.vue
Unescape View File

@ -241,6 +241,7 @@
v-model="dialogForm.systemType"
placeholder="选择系统类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.sys_type"
@ -467,6 +468,7 @@
v-model="dialogForm.status"
placeholder="请选择状态"
clearable
filterable
>
<el-option label="正常" value="0" />
<el-option

Write Preview
Loading…
Cancel
Save