Ver código fonte

fix(water): publish facility route adapters and terminology

Kazerin 1 semana atrás
pai
commit
a6b5b7a38d

+ 30 - 30
src/views/subSystem/basic/waterUserInfo/index.vue

@@ -6,13 +6,13 @@
     </div>
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="用户编号" prop="userCode">
-        <el-input v-model="queryParams.userCode" placeholder="请输入用户编号" clearable size="small" @keyup.enter="handleQuery" />
+      <el-form-item label="用户编号" prop="userCode">
+        <el-input v-model="queryParams.userCode" placeholder="请输入用户编号" clearable size="small" @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="用户名称" prop="userName">
-        <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable size="small" @keyup.enter="handleQuery" />
+      <el-form-item label="用户名称" prop="userName">
+        <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable size="small" @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="用户类型" prop="userType">
+      <el-form-item label="用户类型" prop="userType">
         <el-select v-model="queryParams.userType" placeholder="请选择类型" clearable size="small" style="width: 120px">
           <el-option label="居民" value="居民" />
           <el-option label="工业" value="工业" />
@@ -20,7 +20,7 @@
           <el-option label="行政事业" value="行政事业" />
         </el-select>
       </el-form-item>
-      <el-form-item label="用户状态" prop="status">
+      <el-form-item label="用户状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small" style="width: 120px">
           <el-option label="正常" value="0" />
           <el-option label="欠费" value="1" />
@@ -65,9 +65,9 @@
     <!-- 数据表格 -->
     <el-table v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="用户编号" align="center" prop="userCode" :show-overflow-tooltip="true" min-width="120" />
-      <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" min-width="140" />
-      <el-table-column label="用户类型" align="center" prop="userType" width="100" />
+      <el-table-column label="用户编号" align="center" prop="userCode" :show-overflow-tooltip="true" min-width="120" />
+      <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" min-width="140" />
+      <el-table-column label="用户类型" align="center" prop="userType" width="100" />
       <el-table-column label="用水地址" align="center" prop="address" :show-overflow-tooltip="true" min-width="160" />
       <el-table-column label="联系人" align="center" prop="contactPerson" width="100" />
       <el-table-column label="联系电话" align="center" prop="contactPhone" width="120" />
@@ -75,7 +75,7 @@
       <el-table-column label="初始读数(m³)" align="center" prop="initialReading" width="120" />
       <el-table-column label="当前读数(m³)" align="center" prop="currentReading" width="120" />
       <el-table-column label="年用水量(m³)" align="center" prop="annualWaterConsumption" width="120" />
-      <el-table-column label="用户状态" align="center" width="100">
+      <el-table-column label="用户状态" align="center" width="100">
         <template #default="{ row }">
           <el-tag :type="statusTagType(row.status)" size="small">{{ statusLabel(row.status) }}</el-tag>
         </template>
@@ -98,18 +98,18 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="用户编号" prop="userCode">
-              <el-input v-model="form.userCode" placeholder="请输入用户编号" maxlength="50" />
+            <el-form-item label="用户编号" prop="userCode">
+              <el-input v-model="form.userCode" placeholder="请输入用户编号" maxlength="50" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="100" />
+            <el-form-item label="用户名称" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="100" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="用户类型" prop="userType">
-              <el-select v-model="form.userType" placeholder="请选择用户类型" style="width: 100%">
+            <el-form-item label="用户类型" prop="userType">
+              <el-select v-model="form.userType" placeholder="请选择用户类型" style="width: 100%">
                 <el-option label="居民" value="居民" />
                 <el-option label="工业" value="工业" />
                 <el-option label="商业" value="商业" />
@@ -118,7 +118,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="用户状态" prop="status">
+            <el-form-item label="用户状态" prop="status">
               <el-radio-group v-model="form.status">
                 <el-radio label="0">正常</el-radio>
                 <el-radio label="1">欠费</el-radio>
@@ -177,10 +177,10 @@
     <!-- 详情对话框 -->
     <el-dialog title="用水户详情" v-model="detailVisible" width="650px" append-to-body>
       <el-descriptions :column="2" border>
-        <el-descriptions-item label="用户编号">{{ detailData.userCode }}</el-descriptions-item>
-        <el-descriptions-item label="用户名称">{{ detailData.userName }}</el-descriptions-item>
-        <el-descriptions-item label="用户类型">{{ detailData.userType }}</el-descriptions-item>
-        <el-descriptions-item label="用户状态">
+        <el-descriptions-item label="用户编号">{{ detailData.userCode }}</el-descriptions-item>
+        <el-descriptions-item label="用户名称">{{ detailData.userName }}</el-descriptions-item>
+        <el-descriptions-item label="用户类型">{{ detailData.userType }}</el-descriptions-item>
+        <el-descriptions-item label="用户状态">
           <el-tag :type="statusTagType(detailData.status)" size="small">{{ statusLabel(detailData.status) }}</el-tag>
         </el-descriptions-item>
         <el-descriptions-item label="用水地址" :span="2">{{ detailData.address }}</el-descriptions-item>
@@ -204,10 +204,10 @@
     <!-- 回收站对话框 -->
     <el-dialog title="回收站" v-model="recycleVisible" width="900px" append-to-body>
       <el-form :model="recycleQuery" ref="recycleForm" :inline="true" size="small">
-        <el-form-item label="用户编号" prop="userCode">
+        <el-form-item label="用户编号" prop="userCode">
           <el-input v-model="recycleQuery.userCode" placeholder="请输入编号" clearable />
         </el-form-item>
-        <el-form-item label="用户名称" prop="userName">
+        <el-form-item label="用户名称" prop="userName">
           <el-input v-model="recycleQuery.userName" placeholder="请输入名称" clearable />
         </el-form-item>
         <el-form-item>
@@ -217,12 +217,12 @@
       </el-form>
       <el-table v-loading="recycleLoading" :data="recycleData" @selection-change="handleRecycleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="用户编号" align="center" prop="userCode" />
-        <el-table-column label="用户名称" align="center" prop="userName" />
-        <el-table-column label="用户类型" align="center" prop="userType" width="100" />
+        <el-table-column label="用户编号" align="center" prop="userCode" />
+        <el-table-column label="用户名称" align="center" prop="userName" />
+        <el-table-column label="用户类型" align="center" prop="userType" width="100" />
         <el-table-column label="用水地址" align="center" prop="address" :show-overflow-tooltip="true" />
         <el-table-column label="联系电话" align="center" prop="contactPhone" width="120" />
-        <el-table-column label="用户状态" align="center" width="100">
+        <el-table-column label="用户状态" align="center" width="100">
           <template #default="{ row }">
             <el-tag :type="statusTagType(row.status)" size="small">{{ statusLabel(row.status) }}</el-tag>
           </template>
@@ -288,10 +288,10 @@ export default {
       form: {},
       rules: {
         userCode: [
-          { required: true, message: '用户编号不能为空', trigger: 'blur' }
+          { required: true, message: '用户编号不能为空', trigger: 'blur' }
         ],
         userName: [
-          { required: true, message: '用户名称不能为空', trigger: 'blur' }
+          { required: true, message: '用户名称不能为空', trigger: 'blur' }
         ]
       }
     }
@@ -395,7 +395,7 @@ export default {
     },
     handleDelete(row) {
       const ids = row.id ? [row.id] : this.ids
-      this.$modal.confirm('是否确认删除用户编号为"' + ids.join(',') + '"的数据项?').then(() => {
+      this.$modal.confirm('是否确认删除用户编号为"' + ids.join(',') + '"的数据项?').then(() => {
         return delWaterUser(ids.join(','))
       }).then(() => {
         this.getList()

+ 1 - 0
src/views/subSystem/waterSupply/facility/pipe.vue

@@ -0,0 +1 @@
+<script setup>import Page from '@/views/subSystem/basic/pipeInfo/index.vue'</script><template><Page /></template>

+ 1 - 0
src/views/subSystem/waterSupply/facility/plant.vue

@@ -0,0 +1 @@
+<script setup>import Page from '@/views/subSystem/basic/waterPlant/index.vue'</script><template><Page /></template>

+ 1 - 0
src/views/subSystem/waterSupply/facility/pumpStation.vue

@@ -0,0 +1 @@
+<script setup>import Page from '@/views/subSystem/basic/pumpStation/index.vue'</script><template><Page /></template>

+ 1 - 0
src/views/subSystem/waterSupply/facility/source.vue

@@ -0,0 +1 @@
+<script setup>import Page from '@/views/subSystem/basic/waterSource/index.vue'</script><template><Page /></template>

+ 1 - 0
src/views/subSystem/waterSupply/facility/user.vue

@@ -0,0 +1 @@
+<script setup>import Page from '@/views/subSystem/basic/waterUserInfo/index.vue'</script><template><Page /></template>