diff --git a/App.vue b/App.vue
index 0bb9183..201bb66 100644
--- a/App.vue
+++ b/App.vue
@@ -48,6 +48,35 @@ page {
height: 100%;
}
+// 卡片列表样式
+.common-card-list {
+ .common-card-title {
+
+ }
+
+ .u-body-item {
+ margin-bottom: 16rpx;
+ &:last-child {
+ margin-bottom: 0;
+ }
+ }
+
+ .u-body-value {
+ flex: 1
+ }
+}
+
+
+// 通用样式
+.common-item-center {
+ align-items: center;
+}
+
+.common-justify-between {
+ justify-content: space-between;
+}
+
+
// 底部按钮样式
.fixed-bottom-btn-wrap {
position: fixed;
diff --git a/api/maintain-manage/maintain-manage.js b/api/maintain-manage/maintain-manage.js
index 9d59be6..b12cc0f 100644
--- a/api/maintain-manage/maintain-manage.js
+++ b/api/maintain-manage/maintain-manage.js
@@ -29,9 +29,28 @@ export const getRoadDetails = (params) => {
};
/**
- * 巡查计划完成详情
+ * 新增养护计划
* @returns {Promise}
*/
-export const inspectionCreate = (data) => {
- return get('/app-api/app/garden/inspection-plan-commit/create',data);
+export const maintainCreate = (data) => {
+ return post('/app-api/app/garden/maintain-plan-commit/create',data);
};
+
+/**
+ * 未完成养护计划
+ * @returns {Promise}
+ */
+export const notFinish = (data) => {
+ return post('/app-api/app/garden/maintain-plan-detail/get/not-finish',data);
+};
+
+
+/**
+ * 计划详情
+ * @returns {Promise}
+ */
+export const detailList = (data) => {
+ return post('/app-api/app/garden/maintain-plan-commit/page',data);
+};
+
+
diff --git a/pages-sub/daily/maintain-manage/add-record.vue b/pages-sub/daily/maintain-manage/add-record.vue
new file mode 100644
index 0000000..94d8880
--- /dev/null
+++ b/pages-sub/daily/maintain-manage/add-record.vue
@@ -0,0 +1,371 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ uploadImgs(event)"
+ @delete="(event) => deleteImg(event)"
+ @on-exceed="handleExceed"
+ multiple
+ :max-count="3"
+ upload-text="选择图片"
+ del-color="#ff4d4f"
+ class="upload-wrap"
+ >
+
+
+
+
+
+
+ {{ inspectForm.progress }}%
+
+ 进度低于等于{{ initProgress }}%,无法调整
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages-sub/daily/maintain-manage/finish-plan-detail.vue b/pages-sub/daily/maintain-manage/finish-plan-detail.vue
new file mode 100644
index 0000000..5ae7500
--- /dev/null
+++ b/pages-sub/daily/maintain-manage/finish-plan-detail.vue
@@ -0,0 +1,220 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无问题照片
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages-sub/daily/maintain-manage/index.vue b/pages-sub/daily/maintain-manage/index.vue
index cc9581f..1556569 100644
--- a/pages-sub/daily/maintain-manage/index.vue
+++ b/pages-sub/daily/maintain-manage/index.vue
@@ -1,5 +1,5 @@
-
+
@@ -50,84 +50,122 @@
ref="pagingRef"
v-model="currentList"
@query="fetchData"
- :top="200"
- :bottom="20"
- :page-size="pageSize"
+ :auto-show-system-loading="true"
>
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
- 道路名称:{{ item.roadName || '-' }}
-
-
- 所属街道:{{ item.streetName || '-' }}
-
-
-
- 养护级别:{{uni.$dict.getDictLabel('conserve_level', item.levelId) || '-'}}
-
- 计划明细
+
+
+
+ 道路名称:
+ {{ item.roadName || '-' }}
+
+
+
+ 所属街道:
+ {{ item.streetName }}
+
+
+
+
+ 养护级别: {{uni.$dict.getDictLabel('conserve_level', item.levelId) || '-'}}
+
+
+ 计划明细
+
+
+
+
+
+ 计划时间:
+ {{ timeFormat(item.beginTime, 'yyyy-mm-dd') || '-' }} 至
+ {{ timeFormat(item.endTime, 'yyyy-mm-dd') || '-' }}
+
-
- 计划时间:{{ timeFormat(item.beginTime,'yyyy-mm-dd') || '-'}} 至 {{ timeFormat(item.endTime,'yyyy-mm-dd') || '-'}}
-
-
-
+
+
-
-
+
+
-
- {{ item.planName || '-' }}
-
- 计划编码:{{ item.planNo || '-' }}
-
-
- 养护周期:{{ item.rate || '-' }} {{ uni.$dict.getDictLabel('cycle_id_type', item.cycleId) }}
-
-
- 计划完成次数:{{ item.planNum || 0 }}
+
+
+
-
-
- 完成比较:{{ item.finishPercent || 0 }}%
-
- 提交记录
+
+
+
+
+
+ 计划编码:
+ {{ item.planNo || '-' }}
+
+
+ 养护周期:
+ {{ item.rate || '-' }}
+ {{ uni.$dict.getDictLabel('cycle_id_type', item.cycleId) }}
+
+
+
+
+ 计划完成次数: {{ item.planNum || 0 }}
+
+
+ 提交记录
+
+
+
+
+
+ 已完成比例:
+ {{ item.finishPercent || 0 }}%
+
+
+
+ 计划有效期:
+ {{ timeFormat(item.beginTime, 'yyyy-mm-dd') || '-' }} 至
+ {{ timeFormat(item.endTime, 'yyyy-mm-dd') || '-' }}
+
-
- 计划有效期: {{timeFormat(item.beginTime,'yy-mm-dd hh:MM:ss')}} 至 {{timeFormat(item.endTime,'yy-mm-dd hh:MM:ss')}}
-
-
-
+
+
+
-
@@ -298,7 +336,7 @@ onLoad(() => {
// 内容区域样式
.content-wrap {
- padding: 20rpx;
+ padding:200rpx 20rpx 20rpx;
box-sizing: border-box;
}
@@ -361,21 +399,5 @@ onLoad(() => {
}
}
-// 空数据提示
-.empty-tip {
- display: flex;
- justify-content: center;
- align-items: center;
- height: 300rpx;
- font-size: 28rpx;
- color: #999;
-}
-// 加载中提示
-.loading-tip {
- display: flex;
- justify-content: center;
- align-items: center;
- height: 300rpx;
-}
\ No newline at end of file
diff --git a/pages-sub/daily/maintain-manage/pending-plan-detail.vue b/pages-sub/daily/maintain-manage/pending-plan-detail.vue
new file mode 100644
index 0000000..527e533
--- /dev/null
+++ b/pages-sub/daily/maintain-manage/pending-plan-detail.vue
@@ -0,0 +1,176 @@
+
+
+
+
+
+
+ 计划名称:
+ {{ i.planName || '-' }}
+
+
+
+
+ 计划编码:
+ {{ i.planNo || '-' }}
+
+
+
+
+ 养护周期:
+ {{ i.rate || '-' }} {{ uni.$dict.getDictLabel('cycle_id_type', i.cycleId) }}
+
+
+
+
+
+ 计划完成次数:
+ {{ i.planNum || 0 }} 次
+
+
+
+
+
+ 已完成次数:
+ {{ planInfo.i || 0 }} 次
+
+
+
+
+ 查看记录
+
+
+
+
+
+ 计划有效期:
+
+ {{ timeFormat(i.beginTime, 'yyyy-mm-dd') }} 至
+ {{ timeFormat(i.endTime, 'yyyy-mm-dd') }}
+
+
+
+
+
+
+
+ 新增记录
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages-sub/daily/maintain-manage/record-detail-list.vue b/pages-sub/daily/maintain-manage/record-detail-list.vue
new file mode 100644
index 0000000..e4e56ab
--- /dev/null
+++ b/pages-sub/daily/maintain-manage/record-detail-list.vue
@@ -0,0 +1,218 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无问题照片
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages-sub/daily/maintain-manage/road-detail-list.vue b/pages-sub/daily/maintain-manage/road-detail-list.vue
index ae29df1..f5c8885 100644
--- a/pages-sub/daily/maintain-manage/road-detail-list.vue
+++ b/pages-sub/daily/maintain-manage/road-detail-list.vue
@@ -38,210 +38,164 @@
ref="pagingRef"
v-model="planList"
@query="queryList"
- :top="140"
+ :auto-show-system-loading="true"
>
-
-
-
+
+
+
-
-
-
-
-
- 计划编码:
- {{ item.planNo || '-' }}
+
+
+
-
- 养护周期:
- {{ item.rate || '-' }} {{ uni.$dict.getDictLabel('cycle_id_type', item.cycleId) }}
+
+
+
+
+
+ 计划编码:
+ {{ item.planNo || '-' }}
+
+
+ 养护周期:
+ {{ item.rate || '-' }}
+ {{ uni.$dict.getDictLabel('cycle_id_type', item.cycleId) }}
+
+
+
+
+ 计划完成次数: {{ item.planNum || 0 }}
+
+
+ 提交记录
+
+
+
+
+
+ 已完成比例:
+ {{ item.finishPercent || 0 }}%
+
+
+
+ 计划有效期:
+ {{ timeFormat(item.beginTime, 'yyyy-mm-dd') || '-' }} 至
+ {{ timeFormat(item.endTime, 'yyyy-mm-dd') || '-' }}
+
+
-
- 计划完成次数:
- {{ item.planNum || 0 }}
-
-
- 已完成比例:
- {{ item.finishPercent || 0 }}%
-
-
- 计划有效期:
- {{ timeFormat(item.beginTime,'yyyy-mm-dd') || '-'}} 至 {{ timeFormat(item.endTime,'yyyy-mm-dd') || '-'}}
-
-
-
-
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index af9673a..2db0d02 100644
--- a/pages.json
+++ b/pages.json
@@ -92,9 +92,28 @@
{
"path": "maintain-manage/road-detail-list",
"style": { "navigationBarTitleText": "道路明细列表" }
+ },
+
+ {
+ "path": "maintain-manage/add-record",
+ "style": { "navigationBarTitleText": "新增养护记录" }
+ },
+ {
+ "path": "maintain-manage/pending-plan-detail",
+ "style": { "navigationBarTitleText": "计划明细" }
+ },
+
+ {
+ "path": "maintain-manage/record-detail-list",
+ "style": { "navigationBarTitleText": "养护记录明细" }
+ },
+ {
+ "path": "maintain-manage/finish-plan-detail",
+ "style": { "navigationBarTitleText": "记录详情" }
}
+
]
},
{