完善

src/views/dataAnalysis/projectProgress/index.vue

@@ -18,6 +18,10 @@
                 <el-button size="mini" type="primary" @click="onHandleQuery">
                     查询
                 </el-button>
+
+                <el-button size="mini" type="primary" @click="onHandleReset">
+                    重置
+                </el-button>
                 <el-button
                     size="mini"
                     type="primary"
@@ -28,7 +32,7 @@
             </el-form-item>
         </el-form>
 
-        <el-table border :data="projectList">
+        <el-table border :data="projectProgressList">
             <el-table-column
                 align="center"
                 :key="column.prop"
@@ -59,6 +63,13 @@
             </el-table-column>
         </el-table>
 
+        <pagination
+            :total="total"
+            @pagination="getProjectProgressList"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+        />
+
         <el-dialog
             append-to-body
             width="40%"
@@ -96,15 +107,7 @@ export default {
     data() {
         return {
             total: 0,
-            projectList: [
+            projectProgressList: [],
-                {
-                    projectName: '工程类型',
-                    projectName: '工程结构划分',
-                    projectName: '总验收项',
-                    projectName: '已验收项',
-                    projectName: '已验收表数量',
-                },
-            ],
             addAndEditDialogVisible: false,
             addAndEditDialogTitle: '',
             tableColumns: [
@@ -143,14 +146,26 @@ export default {
 
     methods: {
         onHandleQuery() {
-            this.getProjectList()
+            this.getProjectProgressList()
+        },
+        onHandleReset() {
+            this.queryParams = {
+                pageNum: 1,
+                pageSize: 10,
+                keyWord: '',
+            }
+            this.getProjectProgressList()
         },
         onHandleAddProject() {
             this.addAndEditDialogVisible = true
             this.addAndEditDialogTitle = '新增'
         },
-        // 获取工程质量列表
+        // 获取施工进度列表
-        getProjectList() {},
+        async getProjectProgressList() {
+            const res = await getProjectProgressListAPI(this.queryParams)
+            this.projectProgressList = res.rows
+            this.total = res.total
+        },
 
         // 新增工程质量
         addProjectQuality() {},

src/views/dataAnalysis/projectSafety/components/addAndEditFormTwo.vue

@@ -186,6 +186,7 @@ export default {
         // 删除人脸照片
         onDeleteFaceImg() {
             this.Base64PhotoUrl = null
+            this.addAndEditForm.fileList = []
         },
     },