diff --git a/src/api/project/monthJD.js b/src/api/project/monthJD.js
new file mode 100644
index 0000000..3311bf5
--- /dev/null
+++ b/src/api/project/monthJD.js
@@ -0,0 +1,28 @@
+import request from '@/utils/request';
+
+// 项目进度上报导入
+export function MonthReportImport(data) {
+  return request({
+    url: `/business/projectMonthReport/import`,
+    method: 'post',
+    data,
+  });
+}
+
+// 项目进度上报 搜索
+export const MonthReportPage = params => {
+  return request({
+    url: `/business/projectMonthReport/page`,
+    method: 'get',
+    params,
+  });
+};
+
+// 项目进度上报 修改
+export const MonthReportEdit = data => {
+  return request({
+    url: `/business/projectMonthReport/edit`,
+    method: 'put',
+    data,
+  });
+};

diff --git a/src/api/project/monthJD.js b/src/api/project/monthJD.js
new file mode 100644
index 0000000..3311bf5
--- /dev/null
+++ b/src/api/project/monthJD.js
@@ -0,0 +1,28 @@
+import request from '@/utils/request';
+
+// 项目进度上报导入
+export function MonthReportImport(data) {
+  return request({
+    url: `/business/projectMonthReport/import`,
+    method: 'post',
+    data,
+  });
+}
+
+// 项目进度上报 搜索
+export const MonthReportPage = params => {
+  return request({
+    url: `/business/projectMonthReport/page`,
+    method: 'get',
+    params,
+  });
+};
+
+// 项目进度上报 修改
+export const MonthReportEdit = data => {
+  return request({
+    url: `/business/projectMonthReport/edit`,
+    method: 'put',
+    data,
+  });
+};
diff --git a/src/layout/components/HeaderSys/index.vue b/src/layout/components/HeaderSys/index.vue
index 477237b..befedb4 100644
--- a/src/layout/components/HeaderSys/index.vue
+++ b/src/layout/components/HeaderSys/index.vue
@@ -153,7 +153,6 @@
   menuList.value = menuList.value.filter(item => item.name != 'SponeScreen'); //不显示一张图
   menuList1.value = menuList.value;
   activeIndex.value = localStorage.getItem('routerPartXG'); //默认选中
-  console.log(activeIndex.value, 'activeIndex.value');
   bus.on('closeUserCenter', e => {
     dialogShow.value = false;
   });

diff --git a/src/api/project/monthJD.js b/src/api/project/monthJD.js
new file mode 100644
index 0000000..3311bf5
--- /dev/null
+++ b/src/api/project/monthJD.js
@@ -0,0 +1,28 @@
+import request from '@/utils/request';
+
+// 项目进度上报导入
+export function MonthReportImport(data) {
+  return request({
+    url: `/business/projectMonthReport/import`,
+    method: 'post',
+    data,
+  });
+}
+
+// 项目进度上报 搜索
+export const MonthReportPage = params => {
+  return request({
+    url: `/business/projectMonthReport/page`,
+    method: 'get',
+    params,
+  });
+};
+
+// 项目进度上报 修改
+export const MonthReportEdit = data => {
+  return request({
+    url: `/business/projectMonthReport/edit`,
+    method: 'put',
+    data,
+  });
+};
diff --git a/src/layout/components/HeaderSys/index.vue b/src/layout/components/HeaderSys/index.vue
index 477237b..befedb4 100644
--- a/src/layout/components/HeaderSys/index.vue
+++ b/src/layout/components/HeaderSys/index.vue
@@ -153,7 +153,6 @@
   menuList.value = menuList.value.filter(item => item.name != 'SponeScreen'); //不显示一张图
   menuList1.value = menuList.value;
   activeIndex.value = localStorage.getItem('routerPartXG'); //默认选中
-  console.log(activeIndex.value, 'activeIndex.value');
   bus.on('closeUserCenter', e => {
     dialogShow.value = false;
   });
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 7751c3e..f63caad 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -95,8 +95,7 @@
   } else {
     paths = route.path; //当前的路由
   }
-  console.log(localStorage.getItem('fromDoorXG'), paths, newArr, '2222');
-  console.log('路由跳转位置--', paths);
+  // console.log('路由跳转位置--', paths);
   router.push(paths); //重定向打开路由
   sidebarRouters.value = newArr; //添加子菜单
   // 海绵综合一张图，不显示左侧菜单列表

diff --git a/src/api/project/monthJD.js b/src/api/project/monthJD.js
new file mode 100644
index 0000000..3311bf5
--- /dev/null
+++ b/src/api/project/monthJD.js
@@ -0,0 +1,28 @@
+import request from '@/utils/request';
+
+// 项目进度上报导入
+export function MonthReportImport(data) {
+  return request({
+    url: `/business/projectMonthReport/import`,
+    method: 'post',
+    data,
+  });
+}
+
+// 项目进度上报 搜索
+export const MonthReportPage = params => {
+  return request({
+    url: `/business/projectMonthReport/page`,
+    method: 'get',
+    params,
+  });
+};
+
+// 项目进度上报 修改
+export const MonthReportEdit = data => {
+  return request({
+    url: `/business/projectMonthReport/edit`,
+    method: 'put',
+    data,
+  });
+};
diff --git a/src/layout/components/HeaderSys/index.vue b/src/layout/components/HeaderSys/index.vue
index 477237b..befedb4 100644
--- a/src/layout/components/HeaderSys/index.vue
+++ b/src/layout/components/HeaderSys/index.vue
@@ -153,7 +153,6 @@
   menuList.value = menuList.value.filter(item => item.name != 'SponeScreen'); //不显示一张图
   menuList1.value = menuList.value;
   activeIndex.value = localStorage.getItem('routerPartXG'); //默认选中
-  console.log(activeIndex.value, 'activeIndex.value');
   bus.on('closeUserCenter', e => {
     dialogShow.value = false;
   });
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 7751c3e..f63caad 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -95,8 +95,7 @@
   } else {
     paths = route.path; //当前的路由
   }
-  console.log(localStorage.getItem('fromDoorXG'), paths, newArr, '2222');
-  console.log('路由跳转位置--', paths);
+  // console.log('路由跳转位置--', paths);
   router.push(paths); //重定向打开路由
   sidebarRouters.value = newArr; //添加子菜单
   // 海绵综合一张图，不显示左侧菜单列表
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a74a0c4..1fb07a6 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -31,7 +31,6 @@
           const rewriteRoutes = filterAsyncRouter(rdata, false, true);
           this.setSidebarRouters(constantRoutes.concat(sidebarRoutes));
           resolve(rewriteRoutes);
-          console.log('2222222222222', rewriteRoutes);
           // 登录成功之后才默认加载菜单设置
           if (localStorage.getItem('fromDoorXG') == 'chengguanweiScreen') {
             localStorage.setItem('routerPartXG', rewriteRoutes[1].name); //默认加载第一个菜单

diff --git a/src/api/project/monthJD.js b/src/api/project/monthJD.js
new file mode 100644
index 0000000..3311bf5
--- /dev/null
+++ b/src/api/project/monthJD.js
@@ -0,0 +1,28 @@
+import request from '@/utils/request';
+
+// 项目进度上报导入
+export function MonthReportImport(data) {
+  return request({
+    url: `/business/projectMonthReport/import`,
+    method: 'post',
+    data,
+  });
+}
+
+// 项目进度上报 搜索
+export const MonthReportPage = params => {
+  return request({
+    url: `/business/projectMonthReport/page`,
+    method: 'get',
+    params,
+  });
+};
+
+// 项目进度上报 修改
+export const MonthReportEdit = data => {
+  return request({
+    url: `/business/projectMonthReport/edit`,
+    method: 'put',
+    data,
+  });
+};
diff --git a/src/layout/components/HeaderSys/index.vue b/src/layout/components/HeaderSys/index.vue
index 477237b..befedb4 100644
--- a/src/layout/components/HeaderSys/index.vue
+++ b/src/layout/components/HeaderSys/index.vue
@@ -153,7 +153,6 @@
   menuList.value = menuList.value.filter(item => item.name != 'SponeScreen'); //不显示一张图
   menuList1.value = menuList.value;
   activeIndex.value = localStorage.getItem('routerPartXG'); //默认选中
-  console.log(activeIndex.value, 'activeIndex.value');
   bus.on('closeUserCenter', e => {
     dialogShow.value = false;
   });
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 7751c3e..f63caad 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -95,8 +95,7 @@
   } else {
     paths = route.path; //当前的路由
   }
-  console.log(localStorage.getItem('fromDoorXG'), paths, newArr, '2222');
-  console.log('路由跳转位置--', paths);
+  // console.log('路由跳转位置--', paths);
   router.push(paths); //重定向打开路由
   sidebarRouters.value = newArr; //添加子菜单
   // 海绵综合一张图，不显示左侧菜单列表
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a74a0c4..1fb07a6 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -31,7 +31,6 @@
           const rewriteRoutes = filterAsyncRouter(rdata, false, true);
           this.setSidebarRouters(constantRoutes.concat(sidebarRoutes));
           resolve(rewriteRoutes);
-          console.log('2222222222222', rewriteRoutes);
           // 登录成功之后才默认加载菜单设置
           if (localStorage.getItem('fromDoorXG') == 'chengguanweiScreen') {
             localStorage.setItem('routerPartXG', rewriteRoutes[1].name); //默认加载第一个菜单
diff --git a/src/views/project/projectJinDu/monthReport.vue b/src/views/project/projectJinDu/monthReport.vue
index 77c1e1d..b798c1b 100644
--- a/src/views/project/projectJinDu/monthReport.vue
+++ b/src/views/project/projectJinDu/monthReport.vue
@@ -3,16 +3,16 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true">
-      <el-form-item label="月份选择:" prop="month">
-        <el-date-picker type="month" v-model="queryParams.month" value-format="YYYY-MM" placeholder="请选择日期"> </el-date-picker>
+      <el-form-item label="月份选择:" prop="reportMonth">
+        <el-date-picker type="month" v-model="queryParams.reportMonth" value-format="YYYY-MM" placeholder="请选择日期"> </el-date-picker>
       </el-form-item>
-      <el-form-item label="项目名称:" prop="projectId">
-        <el-select v-model="queryParams.projectId" filterable clearable placeholder="请选择">
-          <el-option v-for="dict in projectList" :key="dict.id" :label="dict.projectName" :value="dict.id" />
+      <el-form-item label="项目名称:" prop="projectNo">
+        <el-select v-model="queryParams.projectNo" filterable clearable placeholder="请选择">
+          <el-option v-for="dict in projectList" :key="dict.projectNo" :label="dict.projectName" :value="dict.projectNo" />
         </el-select>
       </el-form-item>
-      <el-form-item label="建设状态:" prop="status">
-        <el-select v-model="queryParams.status" clearable placeholder="请选择">
+      <el-form-item label="建设状态:" prop="buildStatus">
+        <el-select v-model="queryParams.buildStatus" clearable placeholder="请选择">
           <el-option v-for="dict in build_status" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
@@ -25,18 +25,35 @@
 
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="月份" prop="month" />
+      <el-table-column label="月份" prop="reportMonth" />
       <el-table-column label="项目名称" prop="projectName" />
-      <el-table-column label="项目类别" prop="title" />
-      <el-table-column label="责任单位" prop="linkUrl" />
-      <el-table-column label="建设状态" prop="publishTime" />
-      <el-table-column label="建设进度(%)" prop="publishTime" />
-      <el-table-column label="累计完成项目总投资(含主体工程)(万元)" prop="publishTime" />
-      <el-table-column label="累计完成海绵投资(不含主体工程)(万元)" prop="publishTime" />
-      <el-table-column label="本月完成投资(万元)" prop="publishTime" />
-      <el-table-column label="本月完成海绵投资(万元)" prop="publishTime" />
-      <el-table-column label="项目照片" prop="publishTime" />
-      <el-table-column label="备注" prop="publishTime" />
+      <el-table-column label="项目类别" prop="projectTypeCode">
+        <template #default="scope">
+          <span>
+            {{ !!scope.row.projectTypeCode ? projectType.filter(item => item.value == scope.row.projectTypeCode)[0].label : '--' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="责任单位" prop="chargeDepartment" />
+      <el-table-column label="建设状态" prop="buildStatusName" />
+      <el-table-column label="建设进度(%)" prop="projectProgress" />
+      <el-table-column label="累计完成项目总投资(含主体工程)(万元)" prop="accomplishTotalInvest" />
+      <el-table-column label="累计完成海绵投资(不含主体工程)(万元)" prop="accomplishSpongeInvest" />
+      <el-table-column label="本月完成投资(万元)" prop="monthAccomplishTotalInvest" />
+      <el-table-column label="本月完成海绵投资(万元)" prop="monthAccomplishSpongeInvest" />
+      <el-table-column label="项目照片" prop="publishTime">
+        <template #default="scope">
+          <div v-if="scope.row.sysFileSaveRequestList && scope.row.sysFileSaveRequestList.length > 0">
+            <el-image
+              :src="item.url"
+              v-for="(item, index) in scope.row.sysFileSaveRequestList"
+              :key="index"
+              style="width: 100px; height: 100px"
+            ></el-image>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" prop="remark" />
       <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="warning" icon="Comment" @click="handleNotice(scope.row)">通知提醒</el-button>
@@ -57,18 +74,24 @@
     <!-- 文件导入 -->
     <el-dialog title="导入月报进度" v-model="dialogShowDR" width="500px" append-to-body>
       <el-form ref="formRefDR" :model="formExport" :rules="rulesFormDR" label-width="110px" class="publicForm">
-        <el-form-item label="月份:" prop="month">
-          <el-date-picker type="month" v-model="formExport.month" value-format="YYYY-MM" placeholder="请选择日期"> </el-date-picker>
+        <el-form-item label="月份:" prop="reportMonth">
+          <el-date-picker type="month" v-model="formExport.reportMonth" value-format="YYYY-MM" placeholder="请选择日期"> </el-date-picker>
         </el-form-item>
-        <el-form-item label="月度报表:" prop="fileList" style="width: 100%">
-          <ImageFileUpload
+        <el-form-item label="月度报表:" prop="file" style="width: 100%">
+          <el-upload
+            ref="uploadRef"
             :limit="1"
-            :listType="'text'"
-            :saveFileArr="formExport.fileList"
-            :refField="'coverPhotos'"
-            :refType="'rtu_site_info'"
-            :fileType="['xlsx']"
-          ></ImageFileUpload>
+            accept=".xlsx, .xls"
+            action="/"
+            :on-change="uploadFile"
+            :on-progress="handleFileUploadProgress"
+            :on-success="handleFileSuccess"
+            :auto-upload="false"
+            drag
+          >
+            <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+            <div class="el-upload__text"><em>将文件拖到此处，或点击上传</em></div>
+          </el-upload>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -82,39 +105,39 @@
     <!-- 修改弹窗 -->
     <el-dialog title="修改进度" v-model="dialogShow" width="900px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="170px" class="publicForm flex50">
-        <el-form-item label="项目名称:" prop="userName">
-          <el-input type="text" v-model="formData.userName" placeholder="请输入" clearable disabled />
+        <el-form-item label="项目名称:" prop="projectName">
+          <el-input type="text" v-model="formData.projectName" placeholder="请输入" clearable disabled />
         </el-form-item>
-        <el-form-item label="责任单位:" prop="userName">
-          <el-input type="text" v-model="formData.userName" placeholder="请输入" clearable disabled />
+        <el-form-item label="责任单位:" prop="chargeDepartment">
+          <el-input type="text" v-model="formData.chargeDepartment" placeholder="请输入" clearable disabled />
         </el-form-item>
-        <el-form-item label="累计完成总投资(万元):" prop="linkUrl">
-          <el-input type="number" :min="0" v-model="formData.linkUrl" placeholder="请输入" clearable />
+        <el-form-item label="累计完成总投资(万元):" prop="accomplishTotalInvest">
+          <el-input type="number" :min="0" v-model="formData.accomplishTotalInvest" placeholder="请输入" clearable />
         </el-form-item>
-        <el-form-item label="累计完成海绵投资(万元):" prop="linkUrl">
-          <el-input type="number" :min="0" v-model="formData.linkUrl" placeholder="请输入" clearable />
+        <el-form-item label="累计完成海绵投资(万元):" prop="accomplishSpongeInvest">
+          <el-input type="number" :min="0" v-model="formData.accomplishSpongeInvest" placeholder="请输入" clearable />
         </el-form-item>
-        <el-form-item label="本月完成投资(万元):" prop="linkUrl">
-          <el-input type="number" :min="0" v-model="formData.linkUrl" placeholder="请输入" clearable />
+        <el-form-item label="本月完成投资(万元):" prop="monthAccomplishTotalInvest">
+          <el-input type="number" :min="0" v-model="formData.monthAccomplishTotalInvest" placeholder="请输入" clearable />
         </el-form-item>
-        <el-form-item label="本月完成海绵投资(万元):" prop="linkUrl">
-          <el-input type="number" :min="0" v-model="formData.linkUrl" placeholder="请输入" clearable />
+        <el-form-item label="本月完成海绵投资(万元):" prop="monthAccomplishSpongeInvest">
+          <el-input type="number" :min="0" v-model="formData.monthAccomplishSpongeInvest" placeholder="请输入" clearable />
         </el-form-item>
-        <el-form-item label="建设进度(%):" prop="linkUrl">
-          <el-input type="number" :min="0" v-model="formData.linkUrl" placeholder="请输入" clearable />
+        <el-form-item label="建设进度(%):" prop="projectProgress">
+          <el-input type="number" :min="0" v-model="formData.projectProgress" placeholder="请输入" clearable />
         </el-form-item>
-        <el-form-item label="建设状态:" prop="status">
-          <el-select v-model="formData.status" clearable placeholder="请选择">
+        <el-form-item label="建设状态:" prop="buildStatusName">
+          <el-select v-model="formData.buildStatusName" clearable placeholder="请选择">
             <el-option v-for="dict in build_status" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
-        <el-form-item label="项目照片:" prop="fileList" style="width: 100%">
+        <el-form-item label="项目照片:" prop="sysFileSaveRequestList" style="width: 100%">
           <ImageFileUpload
-            :limit="3"
+            :limit="5"
             :listType="'picture-card'"
-            :saveFileArr="formData.fileList"
-            :refField="'coverPhotos'"
-            :refType="'rtu_site_info'"
+            :saveFileArr="formData.sysFileSaveRequestList"
+            :refField="'pjdPhotos'"
+            :refType="'projectMonthReportImages'"
           ></ImageFileUpload>
         </el-form-item>
         <el-form-item label="备注:" prop="remark" style="width: 100%">
@@ -161,13 +184,15 @@
 
 <script setup name="月度上报">
 import { getProjectInfoNewList } from '@/api/document/projectTransfer';
-import { articlePage, articleAdd, articleDetail } from '@/api/publicService/index';
-import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+import { MonthReportImport, MonthReportPage, MonthReportEdit } from '@/api/project/monthJD.js';
 import { useDicts } from '@/hooks';
+import { getToken } from '@/utils/auth';
+import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+import { projectTypeList } from '@/api/project/projectInformationNew';
 
 const { proxy } = getCurrentInstance();
 const { build_status } = useDicts(proxy);
-const tableData = ref([{ projectName: '市民城市综合体' }]);
+const tableData = ref([]);
 const tableLoading = ref(false);
 const total = ref(0);
 const dialogShow = ref(false);
@@ -178,22 +203,13 @@
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    month: proxy.moment(new Date()).format('YYYY-MM'),
-    projectId: null,
-    status: '',
-    level: '',
+    reportMonth: null,
+    projectNo: '',
+    buildStatus: '',
   },
-  formData: {
-    articleType: 'notice',
-    coverPhotosFileList: [],
-    content: '',
-    degist: '',
-    title: '',
-    remark: '',
-  },
+  formData: {},
   rulesForm: {
     title: [{ required: true, message: '请输入', trigger: 'blur' }],
-    // linkUrl: [{ required: true, message: '请输入', trigger: 'blur' }],
   },
   formDataTZ: {
     userName: '',
@@ -213,27 +229,39 @@
     fileList: [{ required: true, message: '请输入', trigger: 'blur', type: 'array' }],
   },
   formExport: {
-    fileList: [],
-    month: proxy.moment(new Date()).format('YYYY-MM'),
+    file: '',
+    reportMonth: proxy.moment(new Date()).format('YYYY-MM'),
   },
   rulesFormDR: {
-    fileList: [{ required: true, message: '请输入', trigger: 'blur', type: 'array' }],
+    reportMonth: [{ required: true, message: '请选择', trigger: 'change' }],
   },
 });
 const { queryParams, formData, rulesForm, formDataTZ, rulesFormTZ, formExport, rulesFormDR } = toRefs(allData);
+const formExportData = ref({});
+const projectType = ref([]);
+
+/*** 导入参数 */
+const upload = reactive({
+  // 是否显示弹出层（用户导入）
+  open: false,
+  // 弹出层标题（用户导入）
+  title: '',
+  // 是否禁用上传
+  isUploading: false,
+  // 是否更新已经存在的用户数据
+  updateSupport: 0,
+  // 设置上传的请求头部
+  headers: { Authorization: 'Bearer ' + getToken() },
+});
 
 /** 获取查询数据列表 */
 function getDataList() {
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
-}
-/** 取消按钮 */
-function cancelForm() {
-  dialogShow.value = false;
+  tableLoading.value = true;
+  MonthReportPage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 搜索按钮操作 */
 function handleQuery() {
@@ -245,23 +273,60 @@
   proxy.resetForm('queryRef');
   handleQuery();
 }
-/** 上报当月进度操作 */
-function handleEdit() {
-  proxy.resetForm('formRef'); //清空表单
-  dialogShow.value = true;
-}
-/** 上报当月进度提交 */
+// 修改保存
 function submitForm() {
   proxy.$refs['formRef'].validate(valid => {
     if (valid) {
-      // articleAdd(formData.value).then(response => {
-      //   proxy.$modal.msgSuccess('保存成功');
-      //   dialogShow.value = false;
-      //   getDataList();
-      // });
+      MonthReportEdit(formData.value).then(res => {
+        if (res.code == 200) {
+          proxy.$modal.msgSuccess('修改成功');
+          getDataList();
+          dialogShow.value = false;
+        } else {
+          proxy.$modal.msgError('修改失败请重试');
+        }
+      });
     }
   });
 }
+/** 上报当月进度操作 */
+function handleEdit(row) {
+  proxy.resetForm('formRefDR'); //清空表单
+  formData.value = { ...row };
+  dialogShow.value = true;
+}
+/** 上报当月进度提交 */
+function submitFormExport() {
+  proxy.$refs['formRefDR'].validate(valid => {
+    if (valid) {
+      MonthReportImport(formExportData.value).then(res => {
+        if (res.code == 200) {
+          proxy.$modal.msgSuccess('导入成功');
+          getDataList();
+          dialogShowDR.value = false;
+        } else {
+          proxy.$modal.msgError('导入失败请重试');
+        }
+      });
+    }
+  });
+}
+/**文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true;
+};
+/** 文件上传成功处理 */
+const handleFileSuccess = (response, file, fileList) => {
+  upload.isUploading = false;
+  proxy.$refs['uploadRef'].handleRemove(file);
+};
+function uploadFile(file) {
+  formExport.value.file = '';
+  formExportData.value = new FormData();
+  formExportData.value.append('file', file.raw);
+  formExportData.value.append('reportMonth', formExport.value.reportMonth);
+}
+
 /** 通知提醒操作 */
 function handleNotice(row) {
   proxy.resetForm('formRefTZ'); //清空表单
@@ -271,11 +336,6 @@
 function submitFormTZ() {
   proxy.$refs['formRefTZ'].validate(valid => {
     if (valid) {
-      // articleAdd(formData.value).then(response => {
-      //   proxy.$modal.msgSuccess('保存成功');
-      //   dialogShow.value = false;
-      //   getDataList();
-      // });
     }
   });
 }
@@ -286,8 +346,6 @@
   proxy.resetForm('formRefDR'); //清空表单
 }
 
-// 导入提交
-
 // 获取项目列表
 const getProjectList = async () => {
   const res = await getProjectInfoNewList();
@@ -295,7 +353,18 @@
     projectList.value = res.data || [];
   }
 };
+// 获取项目类别
+const projectTypeGet = async () => {
+  let { data } = await projectTypeList();
+  data.map(item => {
+    projectType.value.push({
+      value: item.projectTypeCode,
+      label: item.projectTypeName,
+    });
+  });
+};
 onMounted(() => {
+  projectTypeGet();
   getProjectList();
   getDataList();
 });

diff --git a/src/api/project/monthJD.js b/src/api/project/monthJD.js
new file mode 100644
index 0000000..3311bf5
--- /dev/null
+++ b/src/api/project/monthJD.js
@@ -0,0 +1,28 @@
+import request from '@/utils/request';
+
+// 项目进度上报导入
+export function MonthReportImport(data) {
+  return request({
+    url: `/business/projectMonthReport/import`,
+    method: 'post',
+    data,
+  });
+}
+
+// 项目进度上报 搜索
+export const MonthReportPage = params => {
+  return request({
+    url: `/business/projectMonthReport/page`,
+    method: 'get',
+    params,
+  });
+};
+
+// 项目进度上报 修改
+export const MonthReportEdit = data => {
+  return request({
+    url: `/business/projectMonthReport/edit`,
+    method: 'put',
+    data,
+  });
+};
diff --git a/src/layout/components/HeaderSys/index.vue b/src/layout/components/HeaderSys/index.vue
index 477237b..befedb4 100644
--- a/src/layout/components/HeaderSys/index.vue
+++ b/src/layout/components/HeaderSys/index.vue
@@ -153,7 +153,6 @@
   menuList.value = menuList.value.filter(item => item.name != 'SponeScreen'); //不显示一张图
   menuList1.value = menuList.value;
   activeIndex.value = localStorage.getItem('routerPartXG'); //默认选中
-  console.log(activeIndex.value, 'activeIndex.value');
   bus.on('closeUserCenter', e => {
     dialogShow.value = false;
   });
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 7751c3e..f63caad 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -95,8 +95,7 @@
   } else {
     paths = route.path; //当前的路由
   }
-  console.log(localStorage.getItem('fromDoorXG'), paths, newArr, '2222');
-  console.log('路由跳转位置--', paths);
+  // console.log('路由跳转位置--', paths);
   router.push(paths); //重定向打开路由
   sidebarRouters.value = newArr; //添加子菜单
   // 海绵综合一张图，不显示左侧菜单列表
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index a74a0c4..1fb07a6 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -31,7 +31,6 @@
           const rewriteRoutes = filterAsyncRouter(rdata, false, true);
           this.setSidebarRouters(constantRoutes.concat(sidebarRoutes));
           resolve(rewriteRoutes);
-          console.log('2222222222222', rewriteRoutes);
           // 登录成功之后才默认加载菜单设置
           if (localStorage.getItem('fromDoorXG') == 'chengguanweiScreen') {
             localStorage.setItem('routerPartXG', rewriteRoutes[1].name); //默认加载第一个菜单
diff --git a/src/views/project/projectJinDu/monthReport.vue b/src/views/project/projectJinDu/monthReport.vue
index 77c1e1d..b798c1b 100644
--- a/src/views/project/projectJinDu/monthReport.vue
+++ b/src/views/project/projectJinDu/monthReport.vue
@@ -3,16 +3,16 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true">
-      <el-form-item label="月份选择:" prop="month">
-        <el-date-picker type="month" v-model="queryParams.month" value-format="YYYY-MM" placeholder="请选择日期"> </el-date-picker>
+      <el-form-item label="月份选择:" prop="reportMonth">
+        <el-date-picker type="month" v-model="queryParams.reportMonth" value-format="YYYY-MM" placeholder="请选择日期"> </el-date-picker>
       </el-form-item>
-      <el-form-item label="项目名称:" prop="projectId">
-        <el-select v-model="queryParams.projectId" filterable clearable placeholder="请选择">
-          <el-option v-for="dict in projectList" :key="dict.id" :label="dict.projectName" :value="dict.id" />
+      <el-form-item label="项目名称:" prop="projectNo">
+        <el-select v-model="queryParams.projectNo" filterable clearable placeholder="请选择">
+          <el-option v-for="dict in projectList" :key="dict.projectNo" :label="dict.projectName" :value="dict.projectNo" />
         </el-select>
       </el-form-item>
-      <el-form-item label="建设状态:" prop="status">
-        <el-select v-model="queryParams.status" clearable placeholder="请选择">
+      <el-form-item label="建设状态:" prop="buildStatus">
+        <el-select v-model="queryParams.buildStatus" clearable placeholder="请选择">
           <el-option v-for="dict in build_status" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
@@ -25,18 +25,35 @@
 
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="月份" prop="month" />
+      <el-table-column label="月份" prop="reportMonth" />
       <el-table-column label="项目名称" prop="projectName" />
-      <el-table-column label="项目类别" prop="title" />
-      <el-table-column label="责任单位" prop="linkUrl" />
-      <el-table-column label="建设状态" prop="publishTime" />
-      <el-table-column label="建设进度(%)" prop="publishTime" />
-      <el-table-column label="累计完成项目总投资(含主体工程)(万元)" prop="publishTime" />
-      <el-table-column label="累计完成海绵投资(不含主体工程)(万元)" prop="publishTime" />
-      <el-table-column label="本月完成投资(万元)" prop="publishTime" />
-      <el-table-column label="本月完成海绵投资(万元)" prop="publishTime" />
-      <el-table-column label="项目照片" prop="publishTime" />
-      <el-table-column label="备注" prop="publishTime" />
+      <el-table-column label="项目类别" prop="projectTypeCode">
+        <template #default="scope">
+          <span>
+            {{ !!scope.row.projectTypeCode ? projectType.filter(item => item.value == scope.row.projectTypeCode)[0].label : '--' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="责任单位" prop="chargeDepartment" />
+      <el-table-column label="建设状态" prop="buildStatusName" />
+      <el-table-column label="建设进度(%)" prop="projectProgress" />
+      <el-table-column label="累计完成项目总投资(含主体工程)(万元)" prop="accomplishTotalInvest" />
+      <el-table-column label="累计完成海绵投资(不含主体工程)(万元)" prop="accomplishSpongeInvest" />
+      <el-table-column label="本月完成投资(万元)" prop="monthAccomplishTotalInvest" />
+      <el-table-column label="本月完成海绵投资(万元)" prop="monthAccomplishSpongeInvest" />
+      <el-table-column label="项目照片" prop="publishTime">
+        <template #default="scope">
+          <div v-if="scope.row.sysFileSaveRequestList && scope.row.sysFileSaveRequestList.length > 0">
+            <el-image
+              :src="item.url"
+              v-for="(item, index) in scope.row.sysFileSaveRequestList"
+              :key="index"
+              style="width: 100px; height: 100px"
+            ></el-image>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" prop="remark" />
       <el-table-column label="操作" width="240" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="warning" icon="Comment" @click="handleNotice(scope.row)">通知提醒</el-button>
@@ -57,18 +74,24 @@
     <!-- 文件导入 -->
     <el-dialog title="导入月报进度" v-model="dialogShowDR" width="500px" append-to-body>
       <el-form ref="formRefDR" :model="formExport" :rules="rulesFormDR" label-width="110px" class="publicForm">
-        <el-form-item label="月份:" prop="month">
-          <el-date-picker type="month" v-model="formExport.month" value-format="YYYY-MM" placeholder="请选择日期"> </el-date-picker>
+        <el-form-item label="月份:" prop="reportMonth">
+          <el-date-picker type="month" v-model="formExport.reportMonth" value-format="YYYY-MM" placeholder="请选择日期"> </el-date-picker>
         </el-form-item>
-        <el-form-item label="月度报表:" prop="fileList" style="width: 100%">
-          <ImageFileUpload
+        <el-form-item label="月度报表:" prop="file" style="width: 100%">
+          <el-upload
+            ref="uploadRef"
             :limit="1"
-            :listType="'text'"
-            :saveFileArr="formExport.fileList"
-            :refField="'coverPhotos'"
-            :refType="'rtu_site_info'"
-            :fileType="['xlsx']"
-          ></ImageFileUpload>
+            accept=".xlsx, .xls"
+            action="/"
+            :on-change="uploadFile"
+            :on-progress="handleFileUploadProgress"
+            :on-success="handleFileSuccess"
+            :auto-upload="false"
+            drag
+          >
+            <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+            <div class="el-upload__text"><em>将文件拖到此处，或点击上传</em></div>
+          </el-upload>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -82,39 +105,39 @@
     <!-- 修改弹窗 -->
     <el-dialog title="修改进度" v-model="dialogShow" width="900px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="170px" class="publicForm flex50">
-        <el-form-item label="项目名称:" prop="userName">
-          <el-input type="text" v-model="formData.userName" placeholder="请输入" clearable disabled />
+        <el-form-item label="项目名称:" prop="projectName">
+          <el-input type="text" v-model="formData.projectName" placeholder="请输入" clearable disabled />
         </el-form-item>
-        <el-form-item label="责任单位:" prop="userName">
-          <el-input type="text" v-model="formData.userName" placeholder="请输入" clearable disabled />
+        <el-form-item label="责任单位:" prop="chargeDepartment">
+          <el-input type="text" v-model="formData.chargeDepartment" placeholder="请输入" clearable disabled />
         </el-form-item>
-        <el-form-item label="累计完成总投资(万元):" prop="linkUrl">
-          <el-input type="number" :min="0" v-model="formData.linkUrl" placeholder="请输入" clearable />
+        <el-form-item label="累计完成总投资(万元):" prop="accomplishTotalInvest">
+          <el-input type="number" :min="0" v-model="formData.accomplishTotalInvest" placeholder="请输入" clearable />
         </el-form-item>
-        <el-form-item label="累计完成海绵投资(万元):" prop="linkUrl">
-          <el-input type="number" :min="0" v-model="formData.linkUrl" placeholder="请输入" clearable />
+        <el-form-item label="累计完成海绵投资(万元):" prop="accomplishSpongeInvest">
+          <el-input type="number" :min="0" v-model="formData.accomplishSpongeInvest" placeholder="请输入" clearable />
         </el-form-item>
-        <el-form-item label="本月完成投资(万元):" prop="linkUrl">
-          <el-input type="number" :min="0" v-model="formData.linkUrl" placeholder="请输入" clearable />
+        <el-form-item label="本月完成投资(万元):" prop="monthAccomplishTotalInvest">
+          <el-input type="number" :min="0" v-model="formData.monthAccomplishTotalInvest" placeholder="请输入" clearable />
         </el-form-item>
-        <el-form-item label="本月完成海绵投资(万元):" prop="linkUrl">
-          <el-input type="number" :min="0" v-model="formData.linkUrl" placeholder="请输入" clearable />
+        <el-form-item label="本月完成海绵投资(万元):" prop="monthAccomplishSpongeInvest">
+          <el-input type="number" :min="0" v-model="formData.monthAccomplishSpongeInvest" placeholder="请输入" clearable />
         </el-form-item>
-        <el-form-item label="建设进度(%):" prop="linkUrl">
-          <el-input type="number" :min="0" v-model="formData.linkUrl" placeholder="请输入" clearable />
+        <el-form-item label="建设进度(%):" prop="projectProgress">
+          <el-input type="number" :min="0" v-model="formData.projectProgress" placeholder="请输入" clearable />
         </el-form-item>
-        <el-form-item label="建设状态:" prop="status">
-          <el-select v-model="formData.status" clearable placeholder="请选择">
+        <el-form-item label="建设状态:" prop="buildStatusName">
+          <el-select v-model="formData.buildStatusName" clearable placeholder="请选择">
             <el-option v-for="dict in build_status" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
-        <el-form-item label="项目照片:" prop="fileList" style="width: 100%">
+        <el-form-item label="项目照片:" prop="sysFileSaveRequestList" style="width: 100%">
           <ImageFileUpload
-            :limit="3"
+            :limit="5"
             :listType="'picture-card'"
-            :saveFileArr="formData.fileList"
-            :refField="'coverPhotos'"
-            :refType="'rtu_site_info'"
+            :saveFileArr="formData.sysFileSaveRequestList"
+            :refField="'pjdPhotos'"
+            :refType="'projectMonthReportImages'"
           ></ImageFileUpload>
         </el-form-item>
         <el-form-item label="备注:" prop="remark" style="width: 100%">
@@ -161,13 +184,15 @@
 
 <script setup name="月度上报">
 import { getProjectInfoNewList } from '@/api/document/projectTransfer';
-import { articlePage, articleAdd, articleDetail } from '@/api/publicService/index';
-import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+import { MonthReportImport, MonthReportPage, MonthReportEdit } from '@/api/project/monthJD.js';
 import { useDicts } from '@/hooks';
+import { getToken } from '@/utils/auth';
+import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+import { projectTypeList } from '@/api/project/projectInformationNew';
 
 const { proxy } = getCurrentInstance();
 const { build_status } = useDicts(proxy);
-const tableData = ref([{ projectName: '市民城市综合体' }]);
+const tableData = ref([]);
 const tableLoading = ref(false);
 const total = ref(0);
 const dialogShow = ref(false);
@@ -178,22 +203,13 @@
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    month: proxy.moment(new Date()).format('YYYY-MM'),
-    projectId: null,
-    status: '',
-    level: '',
+    reportMonth: null,
+    projectNo: '',
+    buildStatus: '',
   },
-  formData: {
-    articleType: 'notice',
-    coverPhotosFileList: [],
-    content: '',
-    degist: '',
-    title: '',
-    remark: '',
-  },
+  formData: {},
   rulesForm: {
     title: [{ required: true, message: '请输入', trigger: 'blur' }],
-    // linkUrl: [{ required: true, message: '请输入', trigger: 'blur' }],
   },
   formDataTZ: {
     userName: '',
@@ -213,27 +229,39 @@
     fileList: [{ required: true, message: '请输入', trigger: 'blur', type: 'array' }],
   },
   formExport: {
-    fileList: [],
-    month: proxy.moment(new Date()).format('YYYY-MM'),
+    file: '',
+    reportMonth: proxy.moment(new Date()).format('YYYY-MM'),
   },
   rulesFormDR: {
-    fileList: [{ required: true, message: '请输入', trigger: 'blur', type: 'array' }],
+    reportMonth: [{ required: true, message: '请选择', trigger: 'change' }],
   },
 });
 const { queryParams, formData, rulesForm, formDataTZ, rulesFormTZ, formExport, rulesFormDR } = toRefs(allData);
+const formExportData = ref({});
+const projectType = ref([]);
+
+/*** 导入参数 */
+const upload = reactive({
+  // 是否显示弹出层（用户导入）
+  open: false,
+  // 弹出层标题（用户导入）
+  title: '',
+  // 是否禁用上传
+  isUploading: false,
+  // 是否更新已经存在的用户数据
+  updateSupport: 0,
+  // 设置上传的请求头部
+  headers: { Authorization: 'Bearer ' + getToken() },
+});
 
 /** 获取查询数据列表 */
 function getDataList() {
-  // tableLoading.value = true;
-  // articlePage(queryParams.value).then(response => {
-  //   tableData.value = response.data;
-  //   total.value = response.total;
-  //   tableLoading.value = false;
-  // });
-}
-/** 取消按钮 */
-function cancelForm() {
-  dialogShow.value = false;
+  tableLoading.value = true;
+  MonthReportPage(queryParams.value).then(response => {
+    tableData.value = response.data;
+    total.value = response.total;
+    tableLoading.value = false;
+  });
 }
 /** 搜索按钮操作 */
 function handleQuery() {
@@ -245,23 +273,60 @@
   proxy.resetForm('queryRef');
   handleQuery();
 }
-/** 上报当月进度操作 */
-function handleEdit() {
-  proxy.resetForm('formRef'); //清空表单
-  dialogShow.value = true;
-}
-/** 上报当月进度提交 */
+// 修改保存
 function submitForm() {
   proxy.$refs['formRef'].validate(valid => {
     if (valid) {
-      // articleAdd(formData.value).then(response => {
-      //   proxy.$modal.msgSuccess('保存成功');
-      //   dialogShow.value = false;
-      //   getDataList();
-      // });
+      MonthReportEdit(formData.value).then(res => {
+        if (res.code == 200) {
+          proxy.$modal.msgSuccess('修改成功');
+          getDataList();
+          dialogShow.value = false;
+        } else {
+          proxy.$modal.msgError('修改失败请重试');
+        }
+      });
     }
   });
 }
+/** 上报当月进度操作 */
+function handleEdit(row) {
+  proxy.resetForm('formRefDR'); //清空表单
+  formData.value = { ...row };
+  dialogShow.value = true;
+}
+/** 上报当月进度提交 */
+function submitFormExport() {
+  proxy.$refs['formRefDR'].validate(valid => {
+    if (valid) {
+      MonthReportImport(formExportData.value).then(res => {
+        if (res.code == 200) {
+          proxy.$modal.msgSuccess('导入成功');
+          getDataList();
+          dialogShowDR.value = false;
+        } else {
+          proxy.$modal.msgError('导入失败请重试');
+        }
+      });
+    }
+  });
+}
+/**文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true;
+};
+/** 文件上传成功处理 */
+const handleFileSuccess = (response, file, fileList) => {
+  upload.isUploading = false;
+  proxy.$refs['uploadRef'].handleRemove(file);
+};
+function uploadFile(file) {
+  formExport.value.file = '';
+  formExportData.value = new FormData();
+  formExportData.value.append('file', file.raw);
+  formExportData.value.append('reportMonth', formExport.value.reportMonth);
+}
+
 /** 通知提醒操作 */
 function handleNotice(row) {
   proxy.resetForm('formRefTZ'); //清空表单
@@ -271,11 +336,6 @@
 function submitFormTZ() {
   proxy.$refs['formRefTZ'].validate(valid => {
     if (valid) {
-      // articleAdd(formData.value).then(response => {
-      //   proxy.$modal.msgSuccess('保存成功');
-      //   dialogShow.value = false;
-      //   getDataList();
-      // });
     }
   });
 }
@@ -286,8 +346,6 @@
   proxy.resetForm('formRefDR'); //清空表单
 }
 
-// 导入提交
-
 // 获取项目列表
 const getProjectList = async () => {
   const res = await getProjectInfoNewList();
@@ -295,7 +353,18 @@
     projectList.value = res.data || [];
   }
 };
+// 获取项目类别
+const projectTypeGet = async () => {
+  let { data } = await projectTypeList();
+  data.map(item => {
+    projectType.value.push({
+      value: item.projectTypeCode,
+      label: item.projectTypeName,
+    });
+  });
+};
 onMounted(() => {
+  projectTypeGet();
   getProjectList();
   getDataList();
 });
diff --git a/vite.config.js b/vite.config.js
index ea36ec6..d814042 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -6,9 +6,9 @@
 
 const Timestamp = new Date().getTime(); //随机时间戳
 
-// const targetUrl = 'http://192.168.16.254:7200'; //孙逢时
+const targetUrl = 'http://192.168.16.254:7200'; //孙逢时
 // const targetUrl = 'http://192.168.20.52:7300'; //杨辉
-const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
+// const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode, command }) => {