|
|
@@ -63,7 +63,11 @@
|
|
|
v-hasPermi="['hnyz:equipment:export']">导出</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button type="info" plain icon="Upload" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button>
|
|
|
+ <el-button type="info" plain icon="Upload" @click="handleImport"
|
|
|
+ v-hasPermi="['system:user:import']">导入</el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button icon="Refresh" @click="updateEquipmentCodes">缓存更新</el-button>
|
|
|
</el-col>
|
|
|
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
@@ -105,7 +109,7 @@
|
|
|
|
|
|
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
|
|
|
v-model:limit="queryParams.pageSize" @pagination="getList" />
|
|
|
-
|
|
|
+ <!-- TODO 设备以及寄存器的code改为系统自动生成的随机且唯一的标识码 -->
|
|
|
<!-- 添加或修改设备管理对话框 -->
|
|
|
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
|
|
|
<el-form ref="equipmentRef" :model="form" :rules="rules" label-width="80px">
|
|
|
@@ -116,7 +120,7 @@
|
|
|
<el-input v-model="form.title" placeholder="请输入标题名" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="标识码" prop="code">
|
|
|
- <el-input v-model="form.code" placeholder="请输入标识码" />
|
|
|
+ <el-input v-model="form.code" placeholder="请输入标识码" :disabled="form.equipmentId != null" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="设备种类" prop="equipmentType">
|
|
|
<el-select v-model="form.equipmentType" placeholder="请选择设备种类" clearable>
|
|
|
@@ -174,7 +178,9 @@
|
|
|
|
|
|
<!-- 设备导入对话框 -->
|
|
|
<el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
|
|
|
- <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
|
|
|
+ <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
|
|
|
+ :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
|
|
|
+ :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
|
|
|
<el-icon class="el-icon--upload"><upload-filled /></el-icon>
|
|
|
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
|
|
|
<template #tip>
|
|
|
@@ -183,7 +189,8 @@
|
|
|
<el-checkbox v-model="upload.updateSupport" />是否更新已经存在的设备数据
|
|
|
</div>
|
|
|
<span>仅允许导入xls、xlsx格式文件。</span>
|
|
|
- <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
|
|
|
+ <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
|
|
|
+ @click="importTemplate">下载模板</el-link>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-upload>
|
|
|
@@ -199,7 +206,7 @@
|
|
|
|
|
|
<script setup name="Equipment">
|
|
|
import { getToken } from "@/utils/auth";
|
|
|
-import { changeStatus, listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment } from "@/api/hnyz/equipment";
|
|
|
+import { changeStatus, listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment, updateEquipmentList } from "@/api/hnyz/equipment";
|
|
|
import { getFlowList } from "@/api/hnyz/flow";
|
|
|
import { getPlcList } from "@/api/hnyz/plcInfo";
|
|
|
import { getCommProtocolList } from "@/api/hnyz/commProtocol";
|
|
|
@@ -501,5 +508,15 @@ function toDetail(code) {
|
|
|
})
|
|
|
}
|
|
|
|
|
|
+//设备列表更新
|
|
|
+function updateEquipmentCodes() {
|
|
|
+ updateEquipmentList().then(response => {
|
|
|
+ proxy.$message.success('设备列表更新成功')
|
|
|
+ }).catch(error => {
|
|
|
+ console.log(error)
|
|
|
+ proxy.$message.error('设备列表更新失败')
|
|
|
+ })
|
|
|
+}
|
|
|
+
|
|
|
getList();
|
|
|
</script>
|