Просмотр исходного кода

implement createChecking and deleteChecking

zyy 4 лет назад
Родитель
Сommit
af1f913042
3 измененных файлов с 111 добавлено и 95 удалено
  1. 52 81
      package-lock.json
  2. 1 1
      src/components/QuestionCard/PrimaryQuestionCard.vue
  3. 58 13
      src/views/Bok/Main/Check.vue

+ 52 - 81
package-lock.json

@@ -2052,6 +2052,17 @@
             "array-uniq": "^1.0.1"
           }
         },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmmirror.com/chalk/download/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
         "cliui": {
           "version": "6.0.0",
           "resolved": "https://registry.nlark.com/cliui/download/cliui-6.0.0.tgz",
@@ -2174,6 +2185,13 @@
             "pify": "^4.0.1"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/has-flag/download/has-flag-4.0.0.tgz",
+          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+          "dev": true,
+          "optional": true
+        },
         "ignore": {
           "version": "4.0.6",
           "resolved": "https://registry.nlark.com/ignore/download/ignore-4.0.6.tgz",
@@ -2186,6 +2204,18 @@
           "integrity": "sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0=",
           "dev": true
         },
+        "loader-utils": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz",
+          "integrity": "sha1-1uO0+4GHByGuTghoqxHdY4NowSk=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "make-dir": {
           "version": "2.1.0",
           "resolved": "https://registry.nlark.com/make-dir/download/make-dir-2.1.0.tgz",
@@ -2280,6 +2310,16 @@
             "ansi-regex": "^5.0.1"
           }
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmmirror.com/supports-color/download/supports-color-7.2.0.tgz",
+          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
         "terser": {
           "version": "4.8.0",
           "resolved": "https://registry.npmmirror.com/terser/download/terser-4.8.0.tgz",
@@ -2308,6 +2348,18 @@
             "worker-farm": "^1.7.0"
           }
         },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.8.3",
+          "resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.3.tgz",
+          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
+        },
         "webpack-bundle-analyzer": {
           "version": "3.9.0",
           "resolved": "https://registry.npmmirror.com/webpack-bundle-analyzer/download/webpack-bundle-analyzer-3.9.0.tgz?cache=0&sync_timestamp=1634020242901&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-bundle-analyzer%2Fdownload%2Fwebpack-bundle-analyzer-3.9.0.tgz",
@@ -13731,87 +13783,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.8.3",
-      "resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.3.tgz",
-      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmmirror.com/ansi-styles/download/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmmirror.com/chalk/download/chalk-4.1.2.tgz",
-          "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmmirror.com/color-convert/download/color-convert-2.0.1.tgz",
-          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.nlark.com/color-name/download/color-name-1.1.4.tgz",
-          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626716578584&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
-          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz",
-          "integrity": "sha1-1uO0+4GHByGuTghoqxHdY4NowSk=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmmirror.com/supports-color/download/supports-color-7.2.0.tgz",
-          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-router": {
       "version": "4.0.12",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.12.tgz",

+ 1 - 1
src/components/QuestionCard/PrimaryQuestionCard.vue

@@ -237,7 +237,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.questionVO.lastModifiedTime = new Date();
-        this.questionVO.state = "DELETED";
+        this.questionVO.state = "DELETING";
         let record = {
           userId: store.state.user.id,
           operationType: "Delete",

+ 58 - 13
src/views/Bok/Main/Check.vue

@@ -24,7 +24,7 @@
         />
       </el-tab-pane>
 
-      <el-tab-pane label="新建审核" name="creating">
+      <el-tab-pane label="新建审核" name="checking">
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange(createCurrentPage, createQuestionList, 'CHECKING')"
@@ -71,7 +71,7 @@
 <!--        &lt;!&ndash;todo: 设计RefuseQuestionCard并且在这里应用&ndash;&gt;-->
 <!--      </el-tab-pane>-->
 
-      <el-tab-pane label="删除审核" name="executing">
+      <el-tab-pane label="删除审核" name="deleting">
         <!--todo: 设计DeleteQuestionCard并且在这里应用-->
         <el-pagination
           @size-change="handleSizeChange"
@@ -222,7 +222,7 @@ export default {
               })
               break;
         // 新建审核
-        case "creating":
+        case "checking":
           // todo: 用真代码替换mockjs
           // this.$api.getStateQuestion(tab.props.name.toUpperCase(), 0, this.pageSize)
           //   .then(res => {
@@ -235,10 +235,32 @@ export default {
           //   .catch(err => {
           //     console.log(err);
           //   })
-          mockApi.mockGetCreateQuestion().then().catch(err => {
-            _this.createQuestionList = err.data
-            _this.createTotalNum = err.data.length
-          })
+          //新建审核实现:
+          _this.createQuestionList=[];
+          _this.$api.getStateQuestion(tab.props.name.toUpperCase(), 0, this.pageSize)
+              .then(async res => {
+                console.log("getStateQuestion-checking");
+                const create_list = res.data.result.content;
+                let creating_num = 0;
+                
+                for (const createListElement of create_list) {
+                
+                  creating_num += 1;
+                  console.log(createListElement);
+                  let item = createListElement;
+                  
+                  this.createQuestionList.push(item);
+                  
+                }
+                this.createTotalNum = creating_num;
+              }).catch(err => {
+              console.log(err);
+            })
+
+          // mockApi.mockGetCreateQuestion().then().catch(err => {
+          //   _this.createQuestionList = err.data
+          //   _this.createTotalNum = err.data.length
+          // })
           break;
         // 更新审核
         case "updating":
@@ -281,12 +303,35 @@ export default {
         //   })
         //   break;
         // 删除审核
-        case "executing":
-          mockApi.mockGetExecuteQuestion().then().catch(err => {
-            console.log(err)
-            _this.executeTotalNum = err.data.length;
-            _this.executeQuestionList = err.data
-          })
+        case "deleting":
+          _this.executeQuestionList=[];
+          _this.$api.getStateQuestion(tab.props.name.toUpperCase(), 0, this.pageSize)
+              .then(async res => {
+                console.log("getStateQuestion-deleting");
+                const execute_list = res.data.result.content;
+                let execute_num = 0;
+                
+                for (const executeListElement of execute_list) {
+                
+                  execute_num += 1;
+                  console.log(executeListElement);
+                  let item = executeListElement;
+                  
+                  this.executeQuestionList.push(item);
+                  
+                }
+                this.executeTotalNum = execute_num;
+              }).catch(err => {
+              console.log(err);
+            })
+
+
+
+          // mockApi.mockGetExecuteQuestion().then().catch(err => {
+          //   console.log(err)
+          //   _this.executeTotalNum = err.data.length;
+          //   _this.executeQuestionList = err.data
+          // })
           break;
         // case "deleted":
         //   mockApi.mockGetExecuteQuestion().then().catch(err => {