diff --git a/src/api/basic/project.js b/src/api/basic/project.js
index 713d557..626c2ec 100644
--- a/src/api/basic/project.js
+++ b/src/api/basic/project.js
@@ -9,6 +9,15 @@ export function listProject(query) {
})
}
+// 查询项目列表
+export function listMain(query) {
+ return request({
+ url: '/project/listMain',
+ method: 'get',
+ params: query,
+ })
+}
+
// 新增项目
export function addProject(data) {
return request({
@@ -57,3 +66,11 @@ export function getProTypeListApi() {
method: 'get',
})
}
+
+//业主单位
+export function getUnitListApi() {
+ return request({
+ url: '/owner/listSelect',
+ method: 'get',
+ })
+}
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index bb87292..3666138 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -176,3 +176,12 @@ aside {
margin-bottom: 10px;
}
}
+
+.map-overlay {
+ position: absolute;
+ top: 1%;
+ right: 1%;
+ width: 20%;
+ height: 5%;
+ z-index: 9999;
+}
diff --git a/src/views/basic/class-org/addOrEditForm.vue b/src/views/basic/class-org/addOrEditForm.vue
index a1ac43c..9861e3c 100644
--- a/src/views/basic/class-org/addOrEditForm.vue
+++ b/src/views/basic/class-org/addOrEditForm.vue
@@ -3,7 +3,7 @@
-
+
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/src/views/basic/device-manage/addOrEditForm.vue b/src/views/basic/device-manage/addOrEditForm.vue
index 41fe5e3..5dfe334 100644
--- a/src/views/basic/device-manage/addOrEditForm.vue
+++ b/src/views/basic/device-manage/addOrEditForm.vue
@@ -15,7 +15,7 @@
-
+
@@ -47,6 +48,7 @@
placeholder="选择归还时间"
value-format="yyyy-MM-dd"
v-model="useOrReturnForm.returnTime"
+ :picker-options="pickerOptionsToday"
/>
@@ -76,6 +78,12 @@ export default {
returnTime: '',
},
userList: [],
+ pickerOptionsToday: {
+ disabledDate(time) {
+ // 禁用今天之前的日期(不含今天)
+ return time.getTime() < Date.now() - 8.64e7; // 8.64e7 = 24 * 60 * 60 * 1000
+ }
+ }
}
},
computed: {
diff --git a/src/views/basic/level-manage/addOrEditForm.vue b/src/views/basic/level-manage/addOrEditForm.vue
index 5b0d996..81debaf 100644
--- a/src/views/basic/level-manage/addOrEditForm.vue
+++ b/src/views/basic/level-manage/addOrEditForm.vue
@@ -11,7 +11,7 @@
-
+
@@ -31,7 +31,7 @@
>
-
+
diff --git a/src/views/basic/model-manage/addOrEditForm.vue b/src/views/basic/model-manage/addOrEditForm.vue
index 482091d..f93564e 100644
--- a/src/views/basic/model-manage/addOrEditForm.vue
+++ b/src/views/basic/model-manage/addOrEditForm.vue
@@ -6,7 +6,7 @@
-
+
diff --git a/src/views/basic/model-manage/index.vue b/src/views/basic/model-manage/index.vue
index 6ca559f..8bd4cd9 100644
--- a/src/views/basic/model-manage/index.vue
+++ b/src/views/basic/model-manage/index.vue
@@ -132,7 +132,7 @@
-
+
@@ -145,7 +145,7 @@
-
+