Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

.env.development

@@ -3,6 +3,7 @@ ENV = 'development'
 
 # 名学金榜学习系统/生产环境
 VUE_APP_BASE_API = 'https://front.mingxuejinbang.com/prod-api'
+#VUE_APP_BASE_API = 'http://192.168.0.106:1024/prod-api'
 #VUE_APP_BASE_API = '/prod-api'
 VUE_APP_MOBILE = "https://h5.mingxuejinbang.com"
 

public/mock/electiveStatus.json

@@ -0,0 +1,57 @@
+{
+  "year": 2021,
+  "roundId": 1,
+  "roundName": "第X次选科",
+  "groupIds": "1,2,3,4,5,6",
+  "roundGroups": [
+    {
+      "groupId": 1,
+      "classCount": 2,
+      "limitPerson": false,
+      "rankOut": false,
+      "personCount": 100
+    },
+    {
+      "groupId": 2,
+      "classCount": 5,
+      "limitPerson": false,
+      "rankOut": false,
+      "personCount": 250
+    },
+    {
+      "groupId": 3,
+      "classCount": 3,
+      "limitPerson": false,
+      "rankOut": false,
+      "personCount": 150
+    },
+    {
+      "groupId": 4,
+      "classCount": 3,
+      "limitPerson": false,
+      "rankOut": false,
+      "personCount": 150
+    },
+    {
+      "groupId": 5,
+      "classCount": 5,
+      "limitPerson": false,
+      "rankOut": false,
+      "personCount": 250
+    },
+    {
+      "groupId": 6,
+      "classCount": 5,
+      "limitPerson": false,
+      "rankOut": false,
+      "personCount": 250
+    }
+  ],
+  "allMatched": true,
+  "currentGeneration": 7,
+  "disenrollCount": 0,
+  "enablePushNextDMGeneration": true,
+  "allowDMAlgorithm": true,
+  "doneDMAlgorithm": true,
+  "allowForce": true
+}

public/mock/electiveSummary.json

@@ -0,0 +1,2294 @@
+[
+  {
+    "roundId": 1,
+    "generation": 1,
+    "categories": [
+      [
+        {
+          "category": "actualCount",
+          "queryCode": "邹桂英",
+          "displayName": "已报名",
+          "detailName": "报名组合",
+          "values": [
+            {
+              "groupId": 1,
+              "value": 142,
+              "color": "B",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            },
+            {
+              "groupId": 2,
+              "value": 235,
+              "color": "B",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            },
+            {
+              "groupId": 3,
+              "value": 258,
+              "color": "B",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            },
+            {
+              "groupId": 4,
+              "value": 147,
+              "color": "B",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            },
+            {
+              "groupId": 5,
+              "value": 325,
+              "color": "B",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            },
+            {
+              "groupId": 6,
+              "value": 198,
+              "color": "B",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            }
+          ]
+        },
+        {
+          "category": "unfinishedCount",
+          "queryCode": "黄磊",
+          "displayName": "未报名",
+          "detailName": "",
+          "values": [
+            {
+              "groupId": 0,
+              "value": 7,
+              "color": "",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            }
+          ]
+        }
+      ],
+      [
+        {
+          "category": "actualCount",
+          "queryCode": "高军",
+          "displayName": "已报名",
+          "detailName": "报名组合",
+          "values": [
+            {
+              "groupId": 1,
+              "value": 176,
+              "color": "B",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            },
+            {
+              "groupId": 2,
+              "value": 175,
+              "color": "B",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            },
+            {
+              "groupId": 3,
+              "value": 348,
+              "color": "B",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            },
+            {
+              "groupId": 4,
+              "value": 226,
+              "color": "B",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            },
+            {
+              "groupId": 5,
+              "value": 134,
+              "color": "B",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            },
+            {
+              "groupId": 6,
+              "value": 398,
+              "color": "B",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            }
+          ]
+        },
+        {
+          "category": "unfinishedCount",
+          "queryCode": "范平",
+          "displayName": "未报名",
+          "detailName": "",
+          "values": [
+            {
+              "groupId": 0,
+              "value": 2,
+              "color": "",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            }
+          ]
+        }
+      ],
+      [
+        {
+          "category": "actualCount",
+          "queryCode": "姚娜",
+          "displayName": "已报名",
+          "detailName": "报名组合",
+          "values": [
+            {
+              "groupId": 1,
+              "value": 281,
+              "color": "B",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            },
+            {
+              "groupId": 2,
+              "value": 347,
+              "color": "B",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            },
+            {
+              "groupId": 3,
+              "value": 175,
+              "color": "B",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            },
+            {
+              "groupId": 4,
+              "value": 200,
+              "color": "B",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            },
+            {
+              "groupId": 5,
+              "value": 207,
+              "color": "B",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            },
+            {
+              "groupId": 6,
+              "value": 377,
+              "color": "B",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            }
+          ]
+        },
+        {
+          "category": "unfinishedCount",
+          "queryCode": "袁静",
+          "displayName": "未报名",
+          "detailName": "",
+          "values": [
+            {
+              "groupId": 0,
+              "value": 10,
+              "color": "",
+              "bold": false,
+              "star": false,
+              "disabled": false
+            }
+          ]
+        }
+      ]
+    ]
+  },
+  {
+    "roundId": 1,
+    "generation": 2,
+    "categories": [
+      {
+        "category": "indicateCount",
+        "displayName": "指标",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 199,
+            "color": "",
+            "bold": false,
+            "star": true,
+            "queryCode": "abc",
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 382,
+            "color": "",
+            "bold": false,
+            "star": true,
+            "queryCode": "abc",
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 204,
+            "color": "",
+            "bold": false,
+            "star": true,
+            "queryCode": "abc",
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 379,
+            "color": "",
+            "bold": false,
+            "star": true,
+            "queryCode": "abc",
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 155,
+            "color": "",
+            "bold": false,
+            "star": true,
+            "queryCode": "abc",
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 139,
+            "color": "",
+            "bold": false,
+            "star": true,
+            "queryCode": "abc",
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "approvedCount",
+        "queryCode": "雷娟",
+        "displayName": "录取人数",
+        "detailName": "录取组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 309,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 261,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 295,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 146,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 321,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 399,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "adjustCount",
+        "queryCode": "顾刚",
+        "displayName": "调剂人数",
+        "detailName": "调剂组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 222,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 160,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 135,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 348,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 134,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 353,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "matchedCount",
+        "queryCode": "薛桂英",
+        "displayName": "专业符合",
+        "detailName": "推荐组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 293,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 375,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 187,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 160,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 133,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 127,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "nonmatchedCount",
+        "queryCode": "常明",
+        "displayName": "专业不符",
+        "detailName": "推荐组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 285,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 266,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 327,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 172,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 300,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 158,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      }
+    ],
+    "accumulates": [
+      {
+        "category": "approvedCount",
+        "queryCode": "刘秀英",
+        "displayName": "正常录取",
+        "detailName": "录取组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 224,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 197,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 134,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 168,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 297,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 141,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "forcedCount",
+        "queryCode": "常平",
+        "displayName": "调剂录取",
+        "detailName": "调剂组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 4,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 10,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 4,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 9,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 2,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 0,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "roundId": 1,
+    "generation": 3,
+    "categories": [
+      {
+        "category": "matchedApproved",
+        "queryCode": "顾洋",
+        "displayName": "专业符合同意",
+        "detailName": "报名组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 191,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 229,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 293,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 399,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 236,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 260,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "matchedNotOptional",
+        "queryCode": "陆磊",
+        "displayName": "专业符合改选",
+        "detailName": "报名组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 296,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 209,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 344,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 306,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 285,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 177,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "matchedRejected",
+        "queryCode": "石洋",
+        "displayName": "专业符合拒绝",
+        "detailName": "拒绝组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 210,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 258,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 161,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 360,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 182,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 354,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "matchedNonaction",
+        "queryCode": "周磊",
+        "displayName": "专业符合未填",
+        "detailName": "推荐组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 256,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 312,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 199,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 253,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 370,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 241,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "matchedRankout",
+        "queryCode": "姜丽",
+        "displayName": "专业符合被挤出",
+        "detailName": "报名组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 175,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 245,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 156,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 277,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 368,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 311,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "nonmatchedApproved",
+        "queryCode": "夏艳",
+        "displayName": "专业符合已填",
+        "detailName": "报名组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 388,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 300,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 360,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 229,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 277,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 296,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "nonmatchedRejected",
+        "queryCode": "蔡秀兰",
+        "displayName": "不可调剂拒绝",
+        "detailName": "报名组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 318,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 295,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 220,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 369,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 267,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 391,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "nonmatchedNonaction",
+        "queryCode": "陈秀英",
+        "displayName": "不可调剂未填",
+        "detailName": "报名组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 321,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 358,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 136,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 373,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 358,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 312,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "roundId": 1,
+    "generation": 4,
+    "categories": [
+      {
+        "category": "approvedCount",
+        "queryCode": "崔平",
+        "displayName": "补录录取",
+        "detailName": "录取组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 218,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 192,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 337,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 157,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 237,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 374,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "forcedCount",
+        "queryCode": "傅芳",
+        "displayName": "调剂录取",
+        "detailName": "录取组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 366,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 299,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 203,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 240,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 181,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 297,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "matchedCount",
+        "queryCode": "董桂英",
+        "displayName": "可调剂人数",
+        "detailName": "调剂组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 262,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 362,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 371,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 324,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 309,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 375,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "nonmatchedCount",
+        "queryCode": "易霞",
+        "displayName": "不可调剂人数",
+        "detailName": "报名组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 395,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 190,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 218,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 356,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 126,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 153,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      }
+    ],
+    "accumulates": [
+      {
+        "category": "approvedCount",
+        "queryCode": "徐涛",
+        "displayName": "正常录取",
+        "detailName": "录取组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 181,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 245,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 216,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 259,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 286,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 165,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "forcedCount",
+        "queryCode": "吕涛",
+        "displayName": "调剂录取",
+        "detailName": "调剂组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 8,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 0,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 4,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 1,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 1,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 6,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "roundId": 1,
+    "generation": 5,
+    "categories": [
+      {
+        "category": "matchedApproved",
+        "queryCode": "贾艳",
+        "displayName": "专业符合同意",
+        "detailName": "报名组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 160,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 381,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 180,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 242,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 194,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 199,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "matchedNotOptional",
+        "queryCode": "钱娜",
+        "displayName": "专业符合改选",
+        "detailName": "报名组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 363,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 213,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 146,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 390,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 208,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 345,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "matchedRejected",
+        "queryCode": "余明",
+        "displayName": "专业符合拒绝",
+        "detailName": "拒绝组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 354,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 369,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 394,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 231,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 396,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 249,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "matchedNonaction",
+        "queryCode": "邱刚",
+        "displayName": "专业符合未填",
+        "detailName": "推荐组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 373,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 366,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 123,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 303,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 322,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 251,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "matchedRankout",
+        "queryCode": "马磊",
+        "displayName": "专业符合被挤出",
+        "detailName": "报名组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 196,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 291,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 223,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 225,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 228,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 199,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "nonmatchedApproved",
+        "queryCode": "韩超",
+        "displayName": "专业符合已填",
+        "detailName": "报名组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 122,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 132,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 130,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 145,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 129,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 262,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "nonmatchedRejected",
+        "queryCode": "段静",
+        "displayName": "不可调剂拒绝",
+        "detailName": "报名组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 208,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 167,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 306,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 288,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 299,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 294,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "nonmatchedNonaction",
+        "queryCode": "赖秀兰",
+        "displayName": "不可调剂未填",
+        "detailName": "报名组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 177,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 167,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 339,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 329,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 310,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 244,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "roundId": 1,
+    "generation": 6,
+    "categories": [
+      {
+        "category": "approvedCount",
+        "queryCode": "武芳",
+        "displayName": "补录录取",
+        "detailName": "录取组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 304,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 332,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 167,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 123,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 151,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 298,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "forcedCount",
+        "queryCode": "陈霞",
+        "displayName": "调剂录取",
+        "detailName": "录取组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 298,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 203,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 201,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 283,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 138,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 333,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      }
+    ],
+    "accumulates": [
+      {
+        "category": "approvedCount",
+        "queryCode": "陈芳",
+        "displayName": "正常录取",
+        "detailName": "录取组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 263,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 235,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 178,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 158,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 147,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 269,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "forcedCount",
+        "queryCode": "丁勇",
+        "displayName": "调剂录取",
+        "detailName": "调剂组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 9,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 4,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 6,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 1,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 4,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 2,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "roundId": 1,
+    "generation": 7,
+    "categories": [
+      {
+        "category": "forcedCount",
+        "queryCode": "陈秀英",
+        "displayName": "调剂录取",
+        "detailName": "录取组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 277,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 352,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 297,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 393,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 178,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 150,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      }
+    ],
+    "accumulates": [
+      {
+        "category": "approvedCount",
+        "queryCode": "石磊",
+        "displayName": "正常录取",
+        "detailName": "录取组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 278,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 149,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 286,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 150,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 151,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 252,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      },
+      {
+        "category": "forcedCount",
+        "queryCode": "杨洋",
+        "displayName": "调剂录取",
+        "detailName": "调剂组合",
+        "values": [
+          {
+            "groupId": 1,
+            "value": 7,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 2,
+            "value": 5,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 3,
+            "value": 0,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 4,
+            "value": 9,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 5,
+            "value": 5,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          },
+          {
+            "groupId": 6,
+            "value": 2,
+            "color": "",
+            "bold": false,
+            "star": false,
+            "disabled": false
+          }
+        ]
+      }
+    ]
+  }
+]

src/api/webApi/elective/generation.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function getElectiveStatus(params) {
   return request({
-    url: '/mock/front/elective/generation/getElectiveStatus',
+    url: '/front/elective/generation/getElectiveStatus',
     method: 'get',
     params
   })
@@ -10,7 +10,7 @@ export function getElectiveStatus(params) {
 
 export function getElectiveSummary(params) {
   return request({
-    url: '/mock/front/elective/generation/getElectiveSummary',
+    url: '/front/elective/generation/getElectiveSummary',
     method: 'get',
     params
   })
@@ -18,7 +18,7 @@ export function getElectiveSummary(params) {
 
 export function getElectiveGenerationDetails(params) {
   return request({
-    url: '/mock/front/elective/generation/getElectiveGenerationDetails',
+    url: '/front/elective/generation/getElectiveGenerationDetails',
     method: 'get',
     params
   })
@@ -26,7 +26,7 @@ export function getElectiveGenerationDetails(params) {
 
 export function getGenerationOptionalMajorsBatch(params) {
   return request({
-    url: '/mock/front/elective/generation/getGenerationOptionalMajorsBatch',
+    url: '/front/elective/generation/getGenerationOptionalMajorsBatch',
     method: 'get',
     params
   })

src/components/dynamic-table/index.vue

@@ -0,0 +1,37 @@
+<template>
+  <el-table ref="table" v-bind="$attrs" v-on="$listeners">
+    <el-table-column v-for="(column,idx) in visibleColumns" :key="idx" v-bind="col">
+      <template v-if="column.slotHeader" #header="{$index}">
+        <slot :name="column.slotHeader" v-bind="{ column, $index}">
+          {{ column.label }}
+        </slot>
+      </template>
+      <template v-if="column.slotBody" #default="{row, $index}">
+        <slot :name="column.slotBody" v-bind="{row, column, $index, value: row[column.prop]}">
+          {{ row[column.prop] }}
+        </slot>
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+
+<script>
+export default {
+  name: 'dynamic-table',
+  props: {
+    columns: { type: Array, default: () => [{ prop: '', slotBody: '', slotHeader: '' }] }
+  },
+  computed: {
+    visibleColumns() {
+      return this.columns.filter(col => col.hidden !== true)
+    },
+    tableCore() {
+      return this.$refs.table
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/elective/generation/components/elective-generation-flow-log.vue

@@ -48,7 +48,7 @@ export default {
         // fill rows
         rows.forEach(row => {
           const g = row.opt.value
-          const gHistories = this.histories.filter(h => h.generation == g)
+          const gHistories = this.histories.filter(h => h.generation == g && h.groupId == group.groupId)
           row[key] = {
             text: gHistories.map(h => h.description).join('/'),
             histories: gHistories,

src/views/elective/generation/components/elective-generation-table.vue

@@ -1,12 +1,12 @@
 <template>
   <mx-table ref="table" :prop-defines="resolvedTable.columns" :rows="resolvedTable.rows" border>
-    <template #elective-cell="{value, label}">
-      <el-popover trigger="hover" :disabled="value&&value.disabled"
+    <template #elective-cell="{value, label, prop}">
+      <el-popover trigger="hover" :disabled="(value&&value.disabled)||!!!prop.queryCode"
                   popper-class="zero-padding-popover">
         <div class="fx-column">
           <el-button plain type="text" @click="goDetails(value, label)">查看名单</el-button>
         </div>
-        <div slot="reference" :style="getCellStyles(value)">
+        <div slot="reference" v-if="value" :style="getCellStyles(value)">
           <span v-if="value.star">*</span>
           <span>{{ value && value.value }}</span>
         </div>
@@ -106,7 +106,7 @@ export default {
         if (shouldMerge) ext.ignoreGroupCategories.push(data.queryCode)
       }
 
-      columnsRef[prop] = { label: name, slot: 'elective-cell', fixed: fixed }
+      columnsRef[prop] = { label: name, slot: 'elective-cell', fixed: fixed, queryCode: data.queryCode }
       if (!shouldMerge) {
         data.values.forEach(val => {
           const row = rowsRef.find(row => row.groupId == val.groupId)