Merge remote-tracking branch 'origin/dev' into dev

src/views/data_directory/basic/index.vue

@@ -41,7 +41,7 @@
               })
             "
           >
-            推进记录信息
+            推送记录信息
           </el-button>
         </template>
       </el-table-column>

src/views/data_directory/basic/reqMap.js

@@ -125,13 +125,14 @@ export const reqMapArr = [
       { key: "deptName", label: "部门" },
       { key: "postName", label: "岗位" },
       { key: "chargePerson", label: "负责人" },
-      { key: "dataId", label: "负责人" },
+      { key: "dataId", label: "数据ID" },
     ],
     reqMap: {
       planName: "",
       deptName: "",
       postName: "",
       chargePerson: "",
+      dataId: "",
     },
   },
   {
@@ -214,12 +215,14 @@ export const reqMapArr = [
       { key: "positionName", label: "岗位" },
       { key: "departmentName", label: "部门" },
       { key: "enterpriseName", label: "企业名称" },
+      { key: "dataId", label: "数据ID" },
     ],
     reqMap: {
       personName: "",
       positionName: "",
       departmentName: "",
       enterpriseName: "",
+      dataId: "",
     },
   },
   {