From 9a34cc100384b0db98166e1a7e4f35dee44fb8ae Mon Sep 17 00:00:00 2001
From: zhitan-cloud <394600+ustcyc@user.noreply.gitee.com>
Date: 星期一, 13 一月 2025 21:49:16 +0800
Subject: [PATCH] !16 合并到主分支 Merge pull request !16 from zhitan-cloud/develop1.0
---
zhitan-vue/src/views/measuringinstruments/maintain/maintain.vue | 240 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 127 insertions(+), 113 deletions(-)
diff --git a/zhitan-vue/src/views/measuringinstruments/maintain/maintain.vue b/zhitan-vue/src/views/measuringinstruments/maintain/maintain.vue
index fced560..c99bef1 100644
--- a/zhitan-vue/src/views/measuringinstruments/maintain/maintain.vue
+++ b/zhitan-vue/src/views/measuringinstruments/maintain/maintain.vue
@@ -1,162 +1,176 @@
<template>
- <div class="page">
- <div class="form-card">
- <el-form :model="form" ref="queryRef" :inline="true" label-width="85px">
- <el-form-item label="缂栫爜" prop="code">
- <el-input v-model="form.code" placeholder="璇疯緭鍏ョ紪鐮�" />
- </el-form-item>
- <el-form-item label="鍣ㄥ叿鍚嶇О" prop="meterName">
- <el-input v-model="form.meterName" placeholder="璇疯緭鍏ュ櫒鍏峰悕绉�" />
- </el-form-item>
- <el-form-item label="绉嶇被" prop="meterType">
- <el-select v-model="form.meterType" placeholder="璇烽�夋嫨绉嶇被" style="width: 170px;">
- <el-option :label="item.label" :value="item.value" v-for="item in sys_device_type"
- :key="item.value" />
- </el-select>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
- </div>
- <div class="table-box">
- <div class=" mt20 mb20">
- <el-button type="primary" icon="Plus" @click="handleAdd">鏂板</el-button>
- </div>
- <el-table :data="tableData" v-loading="loading">
- <el-table-column prop="code" label="缂栫爜" show-overflow-tooltip align="center" />
- <el-table-column prop="meterName" label="鍣ㄥ叿鍚嶇О" show-overflow-tooltip align="center" />
- <el-table-column prop="meterType" label="绉嶇被" show-overflow-tooltip align="center"
- :formatter="(row, column) => proxy.selectDictLabel(sys_device_type, row.meterType)" />
- <el-table-column prop="energyType" label="鑳芥簮绫诲瀷" show-overflow-tooltip align="center"
- :formatter="energyTypeFormatter" />
- <el-table-column prop="modelNumber" label="瑙勬牸鍨嬪彿" show-overflow-tooltip align="center" />
- <el-table-column prop="measureRange" label="娴嬮噺鑼冨洿" show-overflow-tooltip align="center" />
- <el-table-column prop="manufacturer" label="鐢熶骇鍘傚晢" show-overflow-tooltip align="center" />
- <el-table-column prop="installLocationName" label="閰嶇數瀹�" show-overflow-tooltip align="center" />
- <el-table-column prop="meterStatus" label="鐘舵��" width="90" show-overflow-tooltip align="center"
- :formatter="(row, column) => proxy.selectDictLabel(meter_status, row.meterStatus)" />
- <el-table-column label="鎿嶄綔" width="280" align="center">
- <template #default="scope">
- <!-- <el-button link type="primary" icon="Files" @click="handleAnnexModal(scope.row)">
+ <div class="page">
+ <div class="form-card">
+ <el-form :model="form" ref="queryRef" :inline="true" label-width="85px">
+ <el-form-item label="缂栫爜" prop="code">
+ <el-input v-model="form.code" placeholder="璇疯緭鍏ョ紪鐮�" />
+ </el-form-item>
+ <el-form-item label="鍣ㄥ叿鍚嶇О" prop="meterName">
+ <el-input v-model="form.meterName" placeholder="璇疯緭鍏ュ櫒鍏峰悕绉�" />
+ </el-form-item>
+ <el-form-item label="绉嶇被" prop="meterType">
+ <el-select v-model="form.meterType" placeholder="璇烽�夋嫨绉嶇被" style="width: 170px">
+ <el-option :label="item.label" :value="item.value" v-for="item in sys_device_type" :key="item.value" />
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="table-bg-style">
+ <div class="ml20 mb20 theme-dark-mt20">
+ <el-button type="primary" icon="Plus" @click="handleAdd">鏂板</el-button>
+ </div>
+ <div class="table-box">
+ <el-table :data="tableData" v-loading="loading">
+ <el-table-column prop="code" label="缂栫爜" show-overflow-tooltip align="center" />
+ <el-table-column prop="meterName" label="鍣ㄥ叿鍚嶇О" show-overflow-tooltip align="center" />
+ <el-table-column
+ prop="meterType"
+ label="绉嶇被"
+ show-overflow-tooltip
+ align="center"
+ :formatter="(row, column) => proxy.selectDictLabel(sys_device_type, row.meterType)"
+ />
+ <el-table-column
+ prop="energyType"
+ label="鑳芥簮绫诲瀷"
+ show-overflow-tooltip
+ align="center"
+ :formatter="energyTypeFormatter"
+ />
+ <el-table-column prop="modelNumber" label="瑙勬牸鍨嬪彿" show-overflow-tooltip align="center" />
+ <el-table-column prop="measureRange" label="娴嬮噺鑼冨洿" show-overflow-tooltip align="center" />
+ <el-table-column prop="manufacturer" label="鐢熶骇鍘傚晢" show-overflow-tooltip align="center" />
+ <el-table-column prop="installLocationName" label="閰嶇數瀹�" show-overflow-tooltip align="center" />
+ <el-table-column
+ prop="meterStatus"
+ label="鐘舵��"
+ width="90"
+ show-overflow-tooltip
+ align="center"
+ :formatter="(row, column) => proxy.selectDictLabel(meter_status, row.meterStatus)"
+ />
+ <el-table-column label="鎿嶄綔" width="280" align="center">
+ <template #default="scope">
+ <!-- <el-button link type="primary" icon="Files" @click="handleAnnexModal(scope.row)">
闄勪欢
</el-button> -->
- <el-button link type="primary" icon="Document" @click="handleTargetModal(scope.row)">
- 鎸囨爣
- </el-button>
- <el-button link type="primary" icon="Edit" @click="handleAdd(scope.row)">
- 淇敼
- </el-button>
- <el-button link type="primary" icon="Delete" @click="handleDel(scope.row)">
- 鍒犻櫎
- </el-button>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
- v-model:limit="queryParams.pageSize" @pagination="getList" />
- <EditModal ref="EditModalRef" :typeArray="sys_device_type" :energyTypeArr="energyTypeArr" @getList="getList" />
- <AnnexModal ref="AnnexModalRef" />
- <TargetModal ref="TargetModalRef" />
-
-
+ <el-button link type="primary" icon="Document" @click="handleTargetModal(scope.row)"> 鎸囨爣 </el-button>
+ <el-button link type="primary" icon="Edit" @click="handleAdd(scope.row)"> 淇敼 </el-button>
+ <el-button link type="primary" icon="Delete" @click="handleDel(scope.row)"> 鍒犻櫎 </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ v-model:page="queryParams.pageNum"
+ v-model:limit="queryParams.pageSize"
+ @pagination="getList"
+ />
+ </div>
</div>
+ <EditModal ref="EditModalRef" :typeArray="sys_device_type" :energyTypeArr="energyTypeArr" @getList="getList" />
+ <AnnexModal ref="AnnexModalRef" />
+ <TargetModal ref="TargetModalRef" />
+ </div>
</template>
<script setup name="measuring">
-import EditModal from './components/EditModal.vue'
-import AnnexModal from './components/AnnexModal.vue'
-import TargetModal from './components/TargetModal.vue'
-import { listEnergyTypeList } from "@/api/modelConfiguration/energyType";
-import { getMaintainList, delMaintain } from '@/api/measuringInstruments/measuringInstruments'
-const { proxy } = getCurrentInstance();
-const { sys_device_type } = proxy.useDict("sys_device_type");
-const { meter_status } = proxy.useDict("meter_status");
+import EditModal from "./components/EditModal.vue"
+import AnnexModal from "./components/AnnexModal.vue"
+import TargetModal from "./components/TargetModal.vue"
+import { listEnergyTypeList } from "@/api/modelConfiguration/energyType"
+import { getMaintainList, delMaintain } from "@/api/measuringInstruments/measuringInstruments"
+const { proxy } = getCurrentInstance()
+const { sys_device_type } = proxy.useDict("sys_device_type")
+const { meter_status } = proxy.useDict("meter_status")
let form = ref({
- code: '',
- meterName: '',
- meterType: ''
+ code: "",
+ meterName: "",
+ meterType: "",
})
-
function handleQuery() {
- queryParams.value.pageNum = 1
- getList()
+ queryParams.value.pageNum = 1
+ getList()
}
function resetQuery() {
- proxy.resetForm("queryRef");
- handleQuery();
+ proxy.resetForm("queryRef")
+ handleQuery()
}
-
-let loading = ref(false);
-let total = ref(0);
+let loading = ref(false)
+let total = ref(0)
let tableData = ref([])
let queryParams = ref({
- pageNum: 1,
- pageSize: 10,
+ pageNum: 1,
+ pageSize: 10,
})
//鑾峰彇鍒楄〃
function getList() {
- loading.value = true
- getMaintainList({ ...queryParams.value, ...form.value }).then(res => {
- tableData.value = res.rows
- total.value = res.total
- loading.value = false
- })
+ loading.value = true
+ getMaintainList({ ...queryParams.value, ...form.value }).then((res) => {
+ tableData.value = res.rows
+ total.value = res.total
+ loading.value = false
+ })
}
getList()
-let EditModalRef = ref('')
+let EditModalRef = ref("")
function handleAdd(row) {
- if (EditModalRef.value) {
- EditModalRef.value.handleOpen(row)
- }
-
+ if (EditModalRef.value) {
+ EditModalRef.value.handleOpen(row)
+ }
}
function handleDel(row) {
- proxy.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤�?').then(function () {
- return delMaintain(row.id);
- }).then(() => {
- getList();
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => { });
+ proxy.$modal
+ .confirm("鏄惁纭鍒犻櫎鏁版嵁椤�?")
+ .then(function () {
+ return delMaintain(row.id)
+ })
+ .then(() => {
+ getList()
+ proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+ })
+ .catch(() => {})
}
-let AnnexModalRef = ref('')
+let AnnexModalRef = ref("")
function handleAnnexModal(row) {
- if (AnnexModalRef.value) {
- AnnexModalRef.value.handleOpen(row)
- }
+ if (AnnexModalRef.value) {
+ AnnexModalRef.value.handleOpen(row)
+ }
}
-let TargetModalRef = ref('')
+let TargetModalRef = ref("")
function handleTargetModal(row) {
- if (TargetModalRef.value) {
- TargetModalRef.value.handleOpen(row)
- }
-
+ if (TargetModalRef.value) {
+ TargetModalRef.value.handleOpen(row)
+ }
}
let energyTypeArr = ref([])
function energyTypeFun() {
- listEnergyTypeList().then((res) => {
- energyTypeArr.value = res.data;
- });
+ listEnergyTypeList().then((res) => {
+ energyTypeArr.value = res.data
+ })
}
energyTypeFun()
function energyTypeFormatter(value) {
- let dict = energyTypeArr.value.find(item => item.enersno == value.energyType)
- return dict ? dict.enername : ''
+ let dict = energyTypeArr.value.find((item) => item.enersno == value.energyType)
+ return dict ? dict.enername : ""
}
</script>
--
Gitblit v1.9.3