yys 联调用水管理

maven

2025-08-11 ac62137e3fec9b37b2289ba703674a266ebdd163

yys  联调用水管理

 src/api/energyManagement/waterManagement.js

@@ -4,7 +4,7 @@
// 用水设备-分页查询
export function waterEquipmentListPage(query) {
  return request({
    url: '/waterEquipmentConsumption/listPage',
    url: '/waterRecord/listPage',
    method: 'get',
    params: query,
  })
@@ -13,7 +13,7 @@
// 用水趋势-分页查询
export function listPageByWaterTrend(query) {
  return request({
    url: '/waterEquipmentConsumption/listPageByTrend',
    url: '/waterRecord/listPageByTrend',
    method: 'get',
    params: query,
  })
@@ -22,7 +22,7 @@
// 用水设备-删除
export function waterEquipmentDelete(query) {
  return request({
    url: '/waterEquipmentConsumption/delete',
    url: '/waterRecord/delete',
    method: 'delete',
    data: query,
  })
@@ -31,7 +31,7 @@
// 用水设备-新增
export function waterEquipmentAdd(query) {
  return request({
    url: '/waterEquipmentConsumption/add',
    url: '/waterRecord/add',
    method: 'post',
    data: query,
  })
@@ -40,7 +40,7 @@
// 用水设备-修改
export function waterEquipmentUpdate(query) {
  return request({
    url: '/waterEquipmentConsumption/update',
    url: '/waterRecord/update',
    method: 'post',
    data: query,
  })
@@ -49,8 +49,9 @@
// 用水设备下拉框查询
export function waterDeviceList(query) {
  return request({
    url: '/waterEquipmentConsumption/deviceList',
    url: '/device/ledger/page',
    method: 'get',
    params: query,
  })
}


 src/views/energyManagement/waterManagement/components/formDia.vue

@@ -15,9 +15,9 @@
            >
                <el-row :gutter="30">
                    <el-col :span="12">
                        <el-form-item label="设备：" prop="code">
                        <el-form-item label="设备：" prop="deviceModel">
                            <el-select
                                v-model="form.code"
                                v-model="form.deviceModel"
                                placeholder="请选择"
                                clearable
                                @change="setName"
@@ -35,9 +35,9 @@
                        </el-form-item>
                    </el-col>
                    <el-col :span="12">
                        <el-form-item label="每日限制水量：" prop="everyNum">
                        <el-form-item label="每日限制水量：" prop="waterDayLimit">
                            <el-input
                                v-model="form.everyNum"
                                v-model="form.waterDayLimit"
                                placeholder="请输入"
                                clearable
                            />
@@ -46,18 +46,18 @@
                </el-row>
                <el-row :gutter="30">
                    <el-col :span="12">
                        <el-form-item label="额定流量：" prop="flowRating">
                        <el-form-item label="额定流量：" prop="ratedRate">
                            <el-input
                                v-model="form.flowRating"
                                v-model="form.ratedRate"
                                placeholder="请输入"
                                clearable
                            />
                        </el-form-item>
                    </el-col>
                    <el-col :span="12">
                        <el-form-item label="实际流量：" prop="flowActual">
                        <el-form-item label="实际流量：" prop="actualTraffic">
                            <el-input
                                v-model="form.flowActual"
                                v-model="form.actualTraffic"
                                placeholder="请输入"
                                clearable
                            />
@@ -66,10 +66,10 @@
                </el-row>
                <el-row :gutter="30">
                    <el-col :span="12">
                        <el-form-item label="运行时间：" prop="runDate">
                        <el-form-item label="运行时间：" prop="runTime">
                            <el-date-picker
                                style="width: 100%"
                                v-model="form.runDate"
                                v-model="form.runTime"
                                value-format="YYYY-MM-DD"
                                format="YYYY-MM-DD"
                                type="date"
@@ -79,9 +79,9 @@
                        </el-form-item>
                    </el-col>
                    <el-col :span="12">
                        <el-form-item label="当日用水量：" prop="dayNum">
                        <el-form-item label="当日用水量：" prop="waterDay">
                            <el-input
                                v-model="form.dayNum"
                                v-model="form.waterDay"
                                placeholder="请输入"
                                clearable
                            />
@@ -99,9 +99,9 @@
                        </el-form-item>
                    </el-col>
                    <el-col :span="12">
                        <el-form-item label="用水类型：" prop="waterType">
                        <el-form-item label="用水类型：" prop="type">
                            <el-select
                                v-model="form.waterType"
                                v-model="form.type"
                                placeholder="请选择"
                                clearable
                            >
@@ -136,25 +136,25 @@

const data = reactive({
    form: {
        name: "",
        code: "",
        everyNum: "",
        flowRating: "",
        flowActual: "",
        runDate: "",
        dayNum: "",
    deviceName: "",
    deviceModel: "",
    waterDayLimit: "",
    ratedRate: "",
    actualTraffic: "",
    runTime: "",
    waterDay: "",
        waterPrice: "",
        waterType: "",
    type: "",
    },
    rules: {
        code: [{ required: true, message: "请选择", trigger: "change" }],
        runDate: [{ required: true, message: "请选择", trigger: "change" }],
        everyNum: [{ required: true, message: "请输入", trigger: "blur" }],
        flowRating: [{ required: true, message: "请输入", trigger: "blur" }],
        flowActual: [{ required: true, message: "请输入", trigger: "blur" }],
        dayNum: [{ required: true, message: "请输入", trigger: "blur" }],
    deviceModel: [{ required: true, message: "请选择", trigger: "change" }],
        runTime: [{ required: true, message: "请选择", trigger: "change" }],
    waterDayLimit: [{ required: true, message: "请输入", trigger: "blur" }],
    ratedRate: [{ required: true, message: "请输入", trigger: "blur" }],
    actualTraffic: [{ required: true, message: "请输入", trigger: "blur" }],
    waterDay: [{ required: true, message: "请输入", trigger: "blur" }],
        waterPrice: [{ required: true, message: "请输入", trigger: "blur" }],
        waterType: [{ required: true, message: "请选择", trigger: "change" }],
    type: [{ required: true, message: "请选择", trigger: "change" }],
    },
})
const { form, rules } = toRefs(data);
@@ -166,8 +166,8 @@
  dialogFormVisible.value = true;
    form.value = {}
    proxy.resetForm("formRef");
    waterDeviceList().then((res) => {
        codeList.value = res.data;
    waterDeviceList({size: -1}).then((res) => {
        codeList.value = res.data.records;
    });
    if (type === "edit") {
        form.value = {...row}

 src/views/energyManagement/waterManagement/index.vue

@@ -4,7 +4,7 @@
            <div>
                <span class="search_title">设备名称：</span>
                <el-input
                    v-model="searchForm.name"
                    v-model="searchForm.deviceName"
                    style="width: 240px"
                    placeholder="请输入"
                    @change="handleQuery"
@@ -101,35 +101,35 @@
const tableColumn = ref([
    {
        label: "设备名称",
        prop: "name",
        prop: "deviceName",
        width: 200,
    },
    {
        label: "规格型号",
        prop: "code",
        prop: "deviceModel",
        width: 200,
    },
    {
        label: "额定流量",
        prop: "flowRating",
        prop: "ratedRate",
    },
    {
        label: "实际流量",
        prop: "flowActual",
        prop: "actualTraffic",
    },
    {
        label: "运行时间",
        prop: "runDate",
        prop: "runTime",
        width:150
    },
    {
        label: "当日用水量",
        prop: "dayNum",
        prop: "waterDay",
        width: 150,
    },
    {
        label: "每日限制水量",
        prop: "everyNum",
        prop: "waterDayLimit",
        width:220
    },
    {
@@ -175,7 +175,7 @@
    // 设置上传的请求头部
    headers: { Authorization: "Bearer " + getToken() },
    // 上传的地址
    url: import.meta.env.VITE_APP_BASE_API + "/waterEquipmentConsumption/importData",
    url: import.meta.env.VITE_APP_BASE_API + "/waterRecord/importData",
    // 文件上传前的回调
    beforeUpload: (file) => {
        console.log('文件即将上传', file);
@@ -257,7 +257,7 @@
}
function importTemplate() {
    proxy.download(
        "/waterEquipmentConsumption/export",
        "/waterRecord/export",
        {},
        '用水设备导入模版.xlsx'
    );

 src/views/equipmentManagement/ledger/Form.vue

@@ -8,7 +8,7 @@
      </el-col>
      <el-col :span="12">
        <el-form-item label="规格型号" prop="deviceModel">
          <el-input v-model="form.deviceModel" placeholder="请输入规格型号" />
          <el-input v-model="form.deviceModel" :disabled="form.deviceModel != null ? true : false" placeholder="请输入规格型号" />
        </el-form-item>
      </el-col>
      <el-col :span="12">