init

pc/src/views/site-detail.vue

@@ -132,6 +132,18 @@
 							<div class="cell">{{item.CreatedAt}}</div>
 						</div>
 					</div>
+					<div class="page" style="flex-shrink: 0;display: flex;justify-content: center">
+						<el-pagination
+							v-model:currentPage="list.page"
+							v-model:page-size="list.pageSize"
+							:page-sizes="[5, 10, 15, 20]"
+							:small="small"
+							layout="sizes, prev, pager, next"
+							:total="list.total"
+							@size-change="handleSizeChange"
+							@current-change="handleCurrentChange"
+						/>
+					</div>
 				</div>
 			</div>
 			<div class="body-one monitor" v-else-if="tab=='monitor'">
@@ -414,7 +426,7 @@
 				list:{
 					page:1,
 					pageSize:15,
-					total:20,
+					total:0,
 					data:[
 
 					]
@@ -469,6 +481,8 @@
 					state.tab = item.value;
 					state.list.data = [];
 					state.list.page = 1;
+					state.list.pageSize = 15;
+					state.list.total = 0;
 					if(item.value=='base'){
 						initGauge();
 						getYewei();
@@ -670,6 +684,13 @@
 						return {text:'...',color:'#f78131'};
 				}
 			}
+			const handleSizeChange = (val) => {
+				state.list.pageSize = val;
+				getHistoryDataList();
+			};
+			const handleCurrentChange = (val) => {
+				getHistoryDataList(val);
+			};
 			onMounted(() => {
 				getDetail();
 				initGauge();
@@ -683,7 +704,9 @@
 				getOrderList,
 				getHistoryDataList,
 				seeDetail,
-				wcTypeChange
+				wcTypeChange,
+				handleSizeChange,
+				handleCurrentChange
 			}
 		},
 		components: {

web/src/utils/page.js

@@ -3,7 +3,7 @@ import config from '@/core/config'
 export default function getPageTitle(pageTitle, route) {
   if (pageTitle) {
     const title = fmtTitle(pageTitle, route)
-    return `${title} - ${config.appName}`
+    return `${title} - 公厕监控后台`
   }
   return `${config.appName}`
 }

web/src/view/qshToilet/qshToilet.vue

@@ -81,29 +81,30 @@
             </div>
         </div>
         <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" title="公厕详情">
-            <el-form :model="formData" label-position="right" label-width="120px">
-                <el-form-item label="点位名称:">
+            <el-form :model="formData" label-position="right" label-width="120px"
+                     :rules="rules">
+                <el-form-item label="点位名称:" prop="name">
                     <el-input v-model="formData.name" clearable placeholder="请输入"/>
                 </el-form-item>
-                <el-form-item label="公厕类型:">
+                <el-form-item label="公厕类型:" prop="type">
                     <el-select v-model="formData.type" placeholder="请选择" style="width:100%" clearable>
                         <el-option v-for="(item,key) in typeOptions" :key="key" :label="item.label"
                                    :value="item.value"/>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="公厕地址:">
+                <el-form-item label="公厕地址:" prop="address">
                     <el-input v-model="formData.address" type="textarea" resize="none" clearable placeholder="请输入"/>
                 </el-form-item>
-                <el-form-item label="展示图片:">
+                <el-form-item label="展示图片:" prop="showImage">
                     <new-upload v-if="dialogFormVisible" :list="[formData.showImage]" @upload="(file)=>formData.showImage = file[0]"></new-upload>
                 </el-form-item>
-                <el-form-item label="轮播图片:">
+                <el-form-item label="轮播图片:" prop="image">
                     <new-upload v-if="dialogFormVisible" :limit="9" :list="formData.image?formData.image.split(','):[]" @upload="(file)=>formData.image = file.join(',')" :multiply="true"></new-upload>
                 </el-form-item>
-                <el-form-item label="纬度:">
+                <el-form-item label="纬度:" prop="lat">
                     <el-input v-model="formData.lat" clearable placeholder="请输入"/>
                 </el-form-item>
-                <el-form-item label="经度:">
+                <el-form-item label="经度:" prop="lng">
                     <el-input v-model="formData.lng" clearable placeholder="请输入"/>
                 </el-form-item>
                 <el-form-item label="管理人员:">
@@ -115,10 +116,10 @@
                 <el-form-item label="监控账号:">
                     <el-input v-model="formData.monitor_ac" clearable placeholder="请输入"/>
                 </el-form-item>
-                <el-form-item label="监控ID:">
+                <el-form-item label="监控设备编号:">
                     <el-input v-model="formData.monitor_id" clearable placeholder="请输入"/>
                 </el-form-item>
-                <el-form-item label="设备ID:">
+                <el-form-item label="液位设备编号:">
                     <el-input v-model="formData.yewei_device" clearable placeholder="请输入"/>
                 </el-form-item>
             </el-form>
@@ -167,9 +168,49 @@
         yewei_device: '',//设备ID
         name: '',
         showImage: '',
-        type: undefined,
+        type: '',
+    })
+    const rules = ref({
+        name: [
+            { required: true, message: '', trigger: 'blur' }
+        ],
+        type: [
+            {
+                required: true,
+                message: '',
+                trigger: 'change',
+            },
+        ],
+        address: [
+            {
+                required: true,
+                message: '',
+                trigger: 'blur',
+            },
+        ],
+        showImage: [
+            {
+                type: 'date',
+                required: true,
+                message: '',
+                trigger: 'change',
+            },
+        ],
+        image: [
+            {
+                type: 'date',
+                required: true,
+                message: '',
+                trigger: 'change',
+            },
+        ],
+        lat: [
+            { required: true, message: '', trigger: 'blur' }
+        ],
+        lng: [
+            { required: true, message: '', trigger: 'blur' }
+        ],
     })
-
     // =========== 表格控制部分 ===========
     const page = ref(1)
     const total = ref(0)
@@ -328,12 +369,33 @@
             yewei_device: '',//设备ID
             name: '',
             showImage: '',
-            type: undefined,
+            type: '',
         }
     }
     // 弹窗确定
     const enterDialog = async () => {
         let res
+        if(!formData.value.name){
+            return ElMessage({message:'请填写公厕名称',type:'warning'})
+        }
+        if(!formData.value.type){
+            return ElMessage({message:'请选择公厕类型',type:'warning'})
+        }
+        if(!formData.value.address){
+            return ElMessage({message:'请填写公厕地址',type:'warning'})
+        }
+        if(!formData.value.showImage){
+            return ElMessage({message:'请上传展示图片',type:'warning'})
+        }
+        if(!formData.value.image){
+            return ElMessage({message:'请上传轮播图片',type:'warning'})
+        }
+        if(!formData.value.lat){
+            return ElMessage({message:'请填写经度',type:'warning'})
+        }
+        if(!formData.value.lng){
+            return ElMessage({message:'请填写纬度',type:'warning'})
+        }
         switch (type.value) {
             case 'create':
                 res = await createQshToilet(formData.value)