Explorar el Código

删除查询时工种的全部选项

yellowtaotao hace 3 años
padre
commit
0a2b13cd0f

+ 91 - 69
package-lock.json

@@ -1899,12 +1899,39 @@
           "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995547052&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
+          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "camelcase": {
           "version": "5.3.1",
           "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-5.3.1.tgz?cache=0&sync_timestamp=1603921882890&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcamelcase%2Fdownload%2Fcamelcase-5.3.1.tgz",
           "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA=",
           "dev": true
         },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npm.taobao.org/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.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
+          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
+          "dev": true,
+          "optional": true
+        },
         "css-loader": {
           "version": "3.6.0",
           "resolved": "https://registry.nlark.com/css-loader/download/css-loader-3.6.0.tgz?cache=0&sync_timestamp=1626725891008&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcss-loader%2Fdownload%2Fcss-loader-3.6.0.tgz",
@@ -1946,6 +1973,13 @@
             "universalify": "^0.1.0"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz",
+          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+          "dev": true,
+          "optional": true
+        },
         "json5": {
           "version": "1.0.1",
           "resolved": "https://registry.nlark.com/json5/download/json5-1.0.1.tgz",
@@ -1987,6 +2021,63 @@
             "minipass": "^3.1.1"
           }
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1626703400240&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
+          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.5.0",
+          "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.5.0.tgz?cache=0&sync_timestamp=1628666767864&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.5.0.tgz",
+          "integrity": "sha1-CcTgcSRmiZ40uZpoZSTxkWX7KJI=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          },
+          "dependencies": {
+            "chalk": {
+              "version": "4.1.2",
+              "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646655305&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz",
+              "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+              }
+            },
+            "json5": {
+              "version": "2.2.0",
+              "resolved": "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz?cache=0&sync_timestamp=1612146875530&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson5%2Fdownload%2Fjson5-2.2.0.tgz",
+              "integrity": "sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minimist": "^1.2.5"
+              }
+            },
+            "loader-utils": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
+              "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^2.1.2"
+              }
+            }
+          }
+        },
         "webpack-bundle-analyzer": {
           "version": "3.9.0",
           "resolved": "https://registry.nlark.com/webpack-bundle-analyzer/download/webpack-bundle-analyzer-3.9.0.tgz",
@@ -12438,75 +12529,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.5.0",
-      "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.5.0.tgz?cache=0&sync_timestamp=1628666767864&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.5.0.tgz",
-      "integrity": "sha1-CcTgcSRmiZ40uZpoZSTxkWX7KJI=",
-      "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.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995547052&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
-          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646655305&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-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.npm.taobao.org/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.npm.taobao.org/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",
-          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-          "dev": true,
-          "optional": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1626703455199&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
-          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-ref": {
       "version": "2.0.0",
       "resolved": "https://registry.npm.taobao.org/vue-ref/download/vue-ref-2.0.0.tgz",

+ 1 - 4
src/views/answerManagement/answerManagementSpecial.vue

@@ -279,10 +279,7 @@ export default {
     //初始化数据
     initDataFun() {
       // 工种类别
-      this.engineeringWorkList = [
-        { name: '不限', id: '' },
-        ...this.GET_ENGINEERING_WORK_LIST,
-      ];
+      this.engineeringWorkList = [...this.GET_ENGINEERING_WORK_LIST];
       this.engineeringWork = this.engineeringWorkList[0].id;
       // 试题类型列表-父类
       this.typeConditionParentList = [

+ 1 - 1
src/views/articleManagement/articleCreate.vue

@@ -273,7 +273,7 @@ export default {
       await this.$_http
         .get(this.$_API.INTERFACE_GET_ENGINEERINGWORK_LIST)
         .then((res) => {
-          this.engineerTypeArray = [{ name: '不限', id: '' }, ...res.data];
+          this.engineerTypeArray = [...res.data];
           this.engineerType = this.engineerTypeArray[0];
         });
     },

+ 1 - 1
src/views/articleManagement/videoCreate.vue

@@ -298,7 +298,7 @@ export default {
       await this.$_http
         .get(this.$_API.INTERFACE_GET_ENGINEERINGWORK_LIST)
         .then((res) => {
-          this.engineerTypeArray = [{ name: '不限', id: '' }, ...res.data];
+          this.engineerTypeArray = [...res.data];
           this.engineerType = this.engineerTypeArray[0];
         });
     },

+ 1 - 4
src/views/examManagement/examAutomaticVolumeFormation.vue

@@ -562,10 +562,7 @@ export default {
       this.examTypeList = [...EXAM_TYPE];
       this.examDetailData.examCategory = this.examTypeList[0].code;
       // 工种类别
-      this.engineeringWorkList = [
-        { name: '全部', id: '' },
-        ...this.GET_ENGINEERING_WORK_LIST,
-      ];
+      this.engineeringWorkList = [...this.GET_ENGINEERING_WORK_LIST];
       this.examDetailData.engineeringWork = this.engineeringWorkList[0].id;
       // 试题类型-父类
       this.questionTypeConditionParent = [

+ 4 - 8
src/views/examManagement/examManualVolumeFormation.vue

@@ -606,10 +606,9 @@ export default {
       this.examTypeList = [...EXAM_TYPE];
       this.examDetailData.examCategory = this.examTypeList[0].code;
       // 工种类别
-      this.engineeringWorkList = [
-        { name: '全部', id: '' },
-        ...this.GET_ENGINEERING_WORK_LIST,
-      ];
+      this.engineeringWorkList = [...this.GET_ENGINEERING_WORK_LIST];
+      // 所选工种
+      this.bank_engineeringWorkChooseValue = this.engineeringWorkList[0].id;
       this.examDetailData.engineeringWork = this.engineeringWorkList[0].id;
       this.initCurrentTableFun(); // 初始化当前试题列表相关数据
       this.initBankTableFun(); // 初始化题库试题列表相关数据
@@ -870,10 +869,7 @@ export default {
         ...this.GET_EXAM_QUESTION_TYPE_CONDITION_PARENT,
       ];
       // 工种类别
-      this.bank_engineeringWorkList = [
-        { name: '全部', id: '' },
-        ...this.GET_ENGINEERING_WORK_LIST,
-      ];
+      this.bank_engineeringWorkList = [...this.GET_ENGINEERING_WORK_LIST];
       // 表单的列的配置参数
       this.bank_columns = [
         // {

+ 3 - 4
src/views/examQuestionManagement/examQusetionCreateGapFilling.vue

@@ -221,10 +221,9 @@ export default {
         ...this.GET_EXAM_QUESTION_TYPE_CONDITION_PARENT,
       ];
       // 工种类别
-      this.engineeringWorkList = [
-        { name: '不限', id: '' },
-        ...this.GET_ENGINEERING_WORK_LIST,
-      ];
+      this.engineeringWorkList = [...this.GET_ENGINEERING_WORK_LIST];
+      // 所选工种
+      this.engineeringWorkChooseValue = this.engineeringWorkList[0].id;
       if (this.$route.query.id) {
         this.getExamQuestionDetailFun(this.$route.query.id); // 查询:试题的详情
       } else {

+ 3 - 4
src/views/examQuestionManagement/examQusetionCreateMultiple.vue

@@ -247,10 +247,9 @@ export default {
         ...this.GET_EXAM_QUESTION_TYPE_CONDITION_PARENT,
       ];
       // 工种类别
-      this.engineeringWorkList = [
-        { name: '不限', id: '' },
-        ...this.GET_ENGINEERING_WORK_LIST,
-      ];
+      this.engineeringWorkList = [...this.GET_ENGINEERING_WORK_LIST];
+      // 所选工种
+      this.engineeringWorkChooseValue = this.engineeringWorkList[0].id;
       if (this.$route.query.id) {
         this.getExamQuestionDetailFun(this.$route.query.id); // 查询:试题的详情
       } else {

+ 3 - 4
src/views/examQuestionManagement/examQusetionCreateSingle.vue

@@ -263,10 +263,9 @@ export default {
         ...this.GET_EXAM_QUESTION_TYPE_CONDITION_PARENT,
       ];
       // 工种类别
-      this.engineeringWorkList = [
-        { name: '不限', id: '' },
-        ...this.GET_ENGINEERING_WORK_LIST,
-      ];
+      this.engineeringWorkList = [...this.GET_ENGINEERING_WORK_LIST];
+      // 所选工种
+      this.engineeringWorkChooseValue = this.engineeringWorkList[0].id;
       if (this.$route.query.id) {
         this.getExamQuestionDetailFun(this.$route.query.id); // 查询:试题的详情
       } else {

+ 3 - 4
src/views/examQuestionManagement/examQusetionCreateTrueOrFalse.vue

@@ -238,10 +238,9 @@ export default {
         ...this.GET_EXAM_QUESTION_TYPE_CONDITION_PARENT,
       ];
       // 工种类别
-      this.engineeringWorkList = [
-        { name: '不限', id: '' },
-        ...this.GET_ENGINEERING_WORK_LIST,
-      ];
+      this.engineeringWorkList = [...this.GET_ENGINEERING_WORK_LIST];
+      // 所选工种
+      this.engineeringWorkChooseValue = this.engineeringWorkList[0].id;
       if (this.$route.query.id) {
         this.getExamQuestionDetailFun(this.$route.query.id); // 查询:试题的详情
       } else {