elective ai report

src/components/MxCondition/condition-mixins-data.js

@@ -372,7 +372,8 @@ export default {
         value: this.model[condition.key],
         title: condition.title,
         list: displayList,
-        template: condition.template
+        template: condition.template,
+        groupName: condition.groupName
       }
       this.conditionsOutputTemporary[condition.key] = wrappedList
     },

src/components/MxCondition/condition-object-base.js

@@ -8,7 +8,8 @@ export default {
 	allLabel: '所有',
 	modelAsParam: false, // isDependencyReady，getList是否使用整个model为参数
 	neverCache: false, // 是否永不缓存
-	disableAllByForce: false, // 强制不添加所有，比如时间范围，选所有没有意义
+	disableAllByForce: false, // 强制不添加所有，比如时间范围，选所有没有意义,
+  groupName: '', // 分组显示，未配置不分组，同组条件显示在同一行
 
 	// 标准方法
 	isDependencyReady: function(param) {

src/components/MxCondition/mx-condition.vue

@@ -4,7 +4,7 @@
       <el-form-item :prop="group.key" :label="group.title" class="form-item-condition">
         <mx-condition-button-group v-if="!group.template" :condition="group" @conditionChanged="conditionChangedAction">
         </mx-condition-button-group>
-        <slot name="group.template" :condition="group"></slot>
+        <slot :name="group.template" :condition="group"></slot>
       </el-form-item>
     </template>
   </el-form>
@@ -44,6 +44,11 @@ export default {
       fillRequiresWhenInit: true
     }
   },
+  computed: {
+    groupedConditions() {
+      return this.conditionsOutput?.groupBy(c => c.groupName || c.key) || []
+    }
+  },
   methods: {
     conditionChangedAction(key, value) {
       this.conditionChanged(key, value)

src/components/Province/index.vue

@@ -71,8 +71,7 @@
         provinceData: [],
         cityData: [],
         areaData: [],
-        schoolData: [{code: 1, name: '学校一'}, {code: 2, name: '学校二'}]
-
+        schoolData: []
       }
     },
     created() {

src/views/elective/select/components/elective-ai-report-dialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog v-if="dialogVisible" :visible.sync="dialogVisible" append-to-body title="选科过程报告" width="70%">
-    <elective-ai-report generation="generation"></elective-ai-report>
+    <elective-ai-report :generation="generation"></elective-ai-report>
     <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="dialogVisible =false">确 定</el-button>
       </span>