-
-
+import { onMounted, onUnmounted } from 'vue';
+import AMapLoader from '@amap/amap-jsapi-loader';
+
+let map = null;
+
+onMounted(() => {
+ window._AMapSecurityConfig = {
+ securityJsCode: '「你申请的安全密钥」'
+ };
+ AMapLoader.load({
+ key: '', // 申请好的Web端开发者Key，首次调用 load 时必填
+ version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+ plugins: ['AMap.Scale'] //需要使用的的插件列表，如比例尺'AMap.Scale'，支持添加多个如：['...','...']
+ })
+ .then((AMap) => {
+ map = new AMap.Map('container', {
+ // 设置地图容器id
+ viewMode: '3D', // 是否为3D地图模式
+ zoom: 11, // 初始化地图级别
+ center: [116.397428, 39.90923] // 初始化地图中心点位置
+ });
+ })
+ .catch((e) => {
+ console.log(e);
+ });
+});
+
+onUnmounted(() => {
+ map?.destroy();
+});
+
+
+
+
+
+
+
diff --git a/src/components/Pageheader/index.vue b/src/components/Pageheader/index.vue
index d9ec8ef..9b2b26f 100644
--- a/src/components/Pageheader/index.vue
+++ b/src/components/Pageheader/index.vue
@@ -6,7 +6,7 @@
- {{ props.title }}
+ {{ title }}
-
+
+
-
-
-
-
+ 查看
+ 修改
+ 删除
@@ -207,6 +192,15 @@ const handleUpdate = async (row?: QuestionnaireVO) => {
});
};
+// 查看按钮操作
+const handleView = (row: QuestionnaireVO) => {
+ router.push({
+ path: '/repair/QuestionnaireView',
+ query: {
+ id: row.id
+ }
+ });
+};
/** 提交按钮 */
const submitForm = () => {
questionnaireFormRef.value?.validate(async (valid: boolean) => {
diff --git a/src/views/system/Repair/repairMain.vue b/src/views/system/Repair/repairMain.vue
index ba54977..da1d63f 100644
--- a/src/views/system/Repair/repairMain.vue
+++ b/src/views/system/Repair/repairMain.vue
@@ -74,7 +74,7 @@
:initial-index="0"
v-for="(item, index) in form.problemImageUrlList"
:key="index"
- :src="item"
+ :src="splitImages(item)"
class="carinfoImage"
>
@@ -156,6 +156,7 @@ import { listResident } from '@/api/system/resident';
import { RepairVO } from '@/api/system/Repair/type';
import { useHouseStore } from '@/store/modules/house';
import { listRepairProcess, updateRepairProcess } from '@/api/system/repairProcess';
+import { splitImages } from '@/utils';
const houseStore = useHouseStore();
const { treedata } = storeToRefs(houseStore);
diff --git a/src/views/system/Sdb/SdbBill/index.vue b/src/views/system/Sdb/SdbBill/index.vue
new file mode 100644
index 0000000..ae6056c
--- /dev/null
+++ b/src/views/system/Sdb/SdbBill/index.vue
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+ 返回
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/Sdb/SdbElectricityDevice/index.vue b/src/views/system/Sdb/SdbElectricityDevice/index.vue
new file mode 100644
index 0000000..ed5c695
--- /dev/null
+++ b/src/views/system/Sdb/SdbElectricityDevice/index.vue
@@ -0,0 +1,264 @@
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+ 导入
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.electricityRecord.balance }}
+ --
+
+
+
+
+
+
+
+ {{ scope.row.waterRecord ? scope.row.waterRecord.readTime : '--' }}
+
+
+
+
+ 生成二维码
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/Sdb/SdbElectricityDevice/index3.vue b/src/views/system/Sdb/SdbElectricityDevice/index3.vue
new file mode 100644
index 0000000..d692c63
--- /dev/null
+++ b/src/views/system/Sdb/SdbElectricityDevice/index3.vue
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.rechargeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/Sdb/SdbTopupRecord/index3.vue b/src/views/system/Sdb/SdbTopupRecord/index3.vue
new file mode 100644
index 0000000..9ce4ec6
--- /dev/null
+++ b/src/views/system/Sdb/SdbTopupRecord/index3.vue
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+ 导入
+
+
+
+
+
+
+
+
+
+
+
+ 供水
+ 断水
+
+ --
+
+
+
+
+
+
+
+ {{ scope.row.waterRecord ? scope.row.waterRecord.readTime : '--' }}
+
+
+
+
+ 生成二维码
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/Sdb/SdbWaterDevice/index2.vue b/src/views/system/Sdb/SdbWaterDevice/index2.vue
new file mode 100644
index 0000000..a739ac1
--- /dev/null
+++ b/src/views/system/Sdb/SdbWaterDevice/index2.vue
@@ -0,0 +1,12 @@
+
+
+ (proxy?.useDict('sys_user_sex'));
diff --git a/src/views/system/equipment/Archive/index.vue b/src/views/system/equipment/Archive/index.vue
new file mode 100644
index 0000000..ae6056c
--- /dev/null
+++ b/src/views/system/equipment/Archive/index.vue
@@ -0,0 +1,12 @@
+
+
+
-
-
+
-
-
+
提交
diff --git a/src/views/system/InspectionPlan/index.vue b/src/views/system/inspection/Plan/index.vue
similarity index 96%
rename from src/views/system/InspectionPlan/index.vue
rename to src/views/system/inspection/Plan/index.vue
index e30d1c0..06afde7 100644
--- a/src/views/system/InspectionPlan/index.vue
+++ b/src/views/system/inspection/Plan/index.vue
@@ -1,5 +1,6 @@
+
@@ -113,10 +114,7 @@ const data = reactive>({
executeDay: undefined,
params: {}
},
- rules: {
- id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
- planName: [{ required: true, message: '巡检计划名称不能为空', trigger: 'blur' }]
- }
+ rules: {}
});
const { queryParams, form, rules } = toRefs(data);
@@ -165,14 +163,14 @@ const router = useRouter();
/** 新增按钮操作 */
const handleAdd = () => {
router.push({
- path: '/Inspection/addInspectionPlan'
+ path: '/tool/addInspectionPlan'
});
};
/** 修改按钮操作 */
const handleUpdate = async (row?: PlanVO) => {
router.push({
- path: '/Inspection/addInspectionPlan',
+ path: '/tool/addInspectionPlan',
query: {
id: row.id
}
diff --git a/src/views/system/inspection/Point/addInspectionPoint.vue b/src/views/system/inspection/Point/addInspectionPoint.vue
new file mode 100644
index 0000000..8e5e858
--- /dev/null
+++ b/src/views/system/inspection/Point/addInspectionPoint.vue
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
diff --git a/src/views/system/inspection/Point/index.vue b/src/views/system/inspection/Point/index.vue
new file mode 100644
index 0000000..4d22c8a
--- /dev/null
+++ b/src/views/system/inspection/Point/index.vue
@@ -0,0 +1,221 @@
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/InspectionRecord/InspectionRecordMain.vue b/src/views/system/inspection/Record/RecordMain.vue
similarity index 96%
rename from src/views/system/InspectionRecord/InspectionRecordMain.vue
rename to src/views/system/inspection/Record/RecordMain.vue
index 309f1b4..24627a5 100644
--- a/src/views/system/InspectionRecord/InspectionRecordMain.vue
+++ b/src/views/system/inspection/Record/RecordMain.vue
@@ -2,7 +2,10 @@
返回
+
任务名称 :
@@ -61,7 +64,6 @@
+
+
diff --git a/src/views/system/inspection/Statistics/index.vue b/src/views/system/inspection/Statistics/index.vue
new file mode 100644
index 0000000..ae6056c
--- /dev/null
+++ b/src/views/system/inspection/Statistics/index.vue
@@ -0,0 +1,12 @@
+
+
+ (proxy?.useDict('com_review'));
diff --git a/src/views/system/resident/addResident.vue b/src/views/system/resident/addResident.vue
index e42d8fd..894a5ff 100644
--- a/src/views/system/resident/addResident.vue
+++ b/src/views/system/resident/addResident.vue
@@ -140,25 +140,25 @@ const rules = ref({
houseId: [{ required: true, message: '请选择房屋', trigger: 'blur' }],
name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
gender: [{ required: true, message: '请选择性别', trigger: 'blur' }],
- // cardImageFront: [{ required: true, message: '请上传身份证照片', trigger: 'blur' }],
- // cardImageBack: [{ required: true, message: '请上传身份证照片', trigger: 'blur' }],
- // idCard: [
- // { required: true, message: '请输入身份证号', trigger: 'blur' },
- // {
- // validator: (_, value) => validator(value, 'idCard'),
- // message: '请输入正确的18位身份证号码',
- // trigger: 'blur'
- // }
- // ],
- type: [{ required: true, message: '请选择与业主关系', trigger: 'blur' }]
- // phone: [
- // { required: true, message: '请输入手机号', trigger: 'blur' },
- // {
- // validator: (_, value) => validator(value, 'phone'),
- // message: '请输入正确的手机号码',
- // trigger: 'blur'
- // }
- // ]
+ cardImageFront: [{ required: true, message: '请上传身份证照片', trigger: 'blur' }],
+ cardImageBack: [{ required: true, message: '请上传身份证照片', trigger: 'blur' }],
+ idCard: [
+ { required: true, message: '请输入身份证号', trigger: 'blur' },
+ {
+ validator: (_, value) => validator(value, 'idCard'),
+ message: '请输入正确的18位身份证号码',
+ trigger: 'blur'
+ }
+ ],
+ type: [{ required: true, message: '请选择与业主关系', trigger: 'blur' }],
+ phone: [
+ { required: true, message: '请输入手机号', trigger: 'blur' },
+ {
+ validator: (_, value) => validator(value, 'phone'),
+ message: '请输入正确的手机号码',
+ trigger: 'blur'
+ }
+ ]
});
// !== 楼栋房屋 =============================================================================
@@ -190,15 +190,11 @@ const upload2 = ref();
const handleAvatarSuccess: UploadProps['onSuccess'] = (response, uploadFile) => {
if (response.data && response.data.url) {
form.value.cardImageFront = response.data.url;
- } else {
- ElMessage.error('短时间内不允许重复提交，请稍候再试');
}
};
const handleAvatar2Success: UploadProps['onSuccess'] = (response, uploadFile) => {
if (response.data && response.data.url) {
form.value.cardImageBack = response.data.url;
- } else {
- ElMessage.error('短时间内不允许重复提交，请稍候再试');
}
};
const handleExceed: UploadProps['onExceed'] = (files) => {
@@ -227,12 +223,12 @@ const handleError2: UploadProps['onError'] = (error: Error, uploadFile: UploadFi
const submitForm = () => {
formRef.value?.validate(async (valid: boolean) => {
if (valid) {
- // if (!form.value.cardImageFront.trim()) {
- // return ElMessage.error('请上传身份证正面照片');
- // }
- // if (!form.value.cardImageBack.trim()) {
- // return ElMessage.error('请上传身份证背面照片');
- // }
+ if (!form.value.cardImageFront.trim()) {
+ return ElMessage.error('请上传身份证正面照片');
+ }
+ if (!form.value.cardImageBack.trim()) {
+ return ElMessage.error('请上传身份证背面照片');
+ }
const obj = {
...form.value
};
diff --git a/src/views/system/resident/index.vue b/src/views/system/resident/index.vue
index 04544cc..56bf8b5 100644
--- a/src/views/system/resident/index.vue
+++ b/src/views/system/resident/index.vue
@@ -264,6 +264,7 @@ const defaultProps = {
// ! 树形------------------------------------------------------------------------
const treedata = ref([]);
function gettree() {
+ treedata.value = [];
houseStore.getCurrentVilageTreeHouse().then((res) => {
treedata.value = res;
});
@@ -274,6 +275,7 @@ gettree();
/** 查询住户管理列表 */
const getList = async () => {
loading.value = true;
+ residentList.value = [];
const res = await listResident(queryParams.value);
residentList.value = res.rows;
residentList.value.forEach((item) => {
@@ -363,7 +365,6 @@ onMounted(() => {
diff --git a/src/views/system/statistics/Personnel/index.vue b/src/views/system/statistics/Personnel/index.vue
new file mode 100644
index 0000000..ae6056c
--- /dev/null
+++ b/src/views/system/statistics/Personnel/index.vue
@@ -0,0 +1,12 @@
+
+
+
diff --git a/src/views/workbench/components/repairEcharts.vue b/src/views/workbench/components/repairEcharts.vue
index 29a13d1..4ceb6fe 100644
--- a/src/views/workbench/components/repairEcharts.vue
+++ b/src/views/workbench/components/repairEcharts.vue
@@ -1,15 +1,7 @@