联调

src/components/page/createData.vue

 <template>
   <el-dialog :title="title" :visible.sync="showModal" width="700px" @close="close" center>
     <el-form ref="form" :model="form" label-width="150px" size="medium " :rules="rules">
-      <el-form-item label="项目名称" prop="pName">
-        <el-select v-model="form.pName" placeholder="请选择项目名称">
+      <el-form-item label="项目名称" prop="projectMainId">
+        <el-select v-model="form.projectMainId" placeholder="请选择项目名称">
           <el-option v-for="item in pNameList" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
@@ -185,8 +185,8 @@ export default {
       idsList: [],
       showModal: true,
       uploadHeaders: {
-        token: window.localStorage.getItem('token')
-        // token: "9606E40DDB704396AB532B2AE771048E",
+        // token: window.localStorage.getItem('token')
+        token: "84CAB9E36D0B467DA2AA36183A7855A6",
       },
     };
   },
@@ -252,6 +252,7 @@ export default {
       this.$emit("close");
     },
     submitForm(formName) {
+      console.log("createData.submitForm() : formName = " + formName);
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.handleType == "1") {
@@ -267,6 +268,7 @@ export default {
               }
             );
           } else {
+            console.log("createData.submitForm() : this.form = " + this.form);
             this.getData("put", "/sensitive/import/data", this.form, (data) => {
               setTimeout(() => {
                 this.$emit("saveSuccess");

src/views/sensitive-control/data-in.vue

@@ -148,7 +148,7 @@ export default {
       },
       form: {
         status: 1,
-        pName: [],    //项目名称
+        projectMainId: [],    //项目名称
         dingdingNumber: "", // 审批编号
         dingdingDate: "", // 申请日期
         dataSheetName: "", //sheet名称
@@ -165,7 +165,7 @@ export default {
         sensitiveDataColumn: "" // 敏感信息列所在位置
       },
       rules: {
-        pName: [
+        projectMainId: [
           { required: true, message: "请选择项目名称", trigger: "blur" }
         ],
         dingdingNumber: [
@@ -312,12 +312,13 @@ export default {
     // 根据页码获取数据
     handleSizeChange(size) {
       this.pageSize = size;
-      this.getDataList(this.currentPage, {});
+      this.getDataList(this.currentPage, this.queryParams);
     },
     // 根据分页获取数据
     dataListChange(num) {
+      console.log("dataListChange() : num = " + num);
       this.currentPage = num;
-      this.getDataList(num, {});
+      this.getDataList(num, this.queryParams);
     },
     // 过滤状态显示
     formatStatus(row, column) {
@@ -345,7 +346,7 @@ export default {
       this.handleType = "1";
       this.form = {
         status: 1,
-        pName: [],    //项目名称
+        projectMainId: [],    //项目名称
         dingdingNumber: "", // 审批编号
         dingdingDate: "", // 申请日期
         dataSheetName: "", //sheet名称
@@ -381,6 +382,7 @@ export default {
     },
     // 修改数据
     modifyDataHandle(id) {
+      console.log("modifyDataHandle() : id = " + id)
       // 为了方便测试，这里写一个有效的dev环境的id值!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!切记删除
       // 为了方便测试，这里写一个有效的dev环境的id值!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!切记删除
       // id = 60;

src/views/sensitive-control/data-statistic.vue

@@ -286,24 +286,24 @@ export default {
       },
       rules: {
         pName: [{ required: true, message: "请选择项目名称", trigger: "blur" }],
-        dingdingNumber: [
-          {
-            required: true,
-            validator: checkNumLength,
-            message: "请输入正确格式的审批编号",
-            trigger: ["blur", "change"],
-          },
-          {
-            pattern: /^[5A-Za-z0-9-\_]+$/,
-            message: "只能输入英文，数字，下划线，横线",
-          },
-        ],
-        dingdingDate: [
-          { required: true, message: "请选择日期", trigger: "change" },
-        ],
-        dataSheetName: [
-          { required: true, message: "请输入sheet名称", trigger: "change" },
-        ],
+        // dingdingNumber: [
+        //   {
+        //     required: true,
+        //     validator: checkNumLength,
+        //     message: "请输入正确格式的审批编号",
+        //     trigger: ["blur", "change"],
+        //   },
+        //   {
+        //     pattern: /^[5A-Za-z0-9-\_]+$/,
+        //     message: "只能输入英文，数字，下划线，横线",
+        //   },
+        // ],
+        // dingdingDate: [
+        //   { required: true, message: "请选择日期", trigger: "change" },
+        // ],
+        // dataSheetName: [
+        //   { required: true, message: "请输入sheet名称", trigger: "change" },
+        // ],
         dataType: [
           {
             required: true,
@@ -376,7 +376,7 @@ export default {
     //获取项目名称列表
     this.getProjectNameList();
     // 初始化获取数据列表
-    this.getDataList(this.currentPage, {});
+    // this.getDataList(this.currentPage, {});
   },
   methods: {
     //获取项目名称列表

src/views/sensitive-control/data-view.vue

@@ -196,7 +196,7 @@
       <ul class="history-list">
         <li v-for="item in remarkHistory">
           <p class="date">{{ item.createdTime }}</p>
-          <p class="text">{{ item.remark }}</p>
+          <p class="text">{{ item.name + "-" + item.remark }}</p>
         </li>
       </ul>
     </el-dialog>