将选科设置配成独立页面

src/views/permission/components/group-query-dialog.vue → src/views/elective/publish/components/group-query-dialog.vue

@@ -13,7 +13,7 @@
   </el-dialog>
 </template>
 <script>
-import GroupSubjectQuery from'./group-subject-query'
+import GroupSubjectQuery from '../../../permission/components/group-subject-query'
 export default {
   name: 'GroupQueryDialog',
   components: {

src/views/permission/components/round-settings.vue → src/views/elective/publish/components/round-settings.vue

@@ -1,31 +1,28 @@
 <template>
-  <div>
-    <el-button type="primary" @click="settingsVisible=true" icon="el-icon-setting" size="small">打开选科设置</el-button>
-    <el-drawer :visible.sync="settingsVisible" title="选科设置" size="80%">
-      <mx-condition ref="condition" :query-params="queryParams" :require-fields="requireFields" @query="handleQuery"
-                    @invalid="handleInvalidQuery"></mx-condition>
-      <div class="mt20 pl20 pr20">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" class="mb5" @click="handleSettingAdd">新增
-        </el-button>
-        <mx-table :prop-defines="tableDefines" :rows="dataList">
-          <template #actions="{row}">
-            <el-button type="text" @click="handleSettingEdit(row)">
-              <i class="el-icon-edit"></i>编辑
-            </el-button>
-            <el-button type="text" @click="handleSettingDelete(row)">
-              <i class="el-icon-delete"></i>删除
-            </el-button>
-          </template>
-        </mx-table>
-        <pagination v-show="total>queryParams.pageSize" :total="total" :limit.sync="queryParams.pageSize"
-                    :page.sync="queryParams.pageNum" @pagination="handleQuery"></pagination>
-      </div>
-    </el-drawer>
+  <el-card>
+    <mx-condition ref="condition" :query-params="queryParams" :require-fields="requireFields" @query="handleQuery"
+                  @invalid="handleInvalidQuery"></mx-condition>
+    <div class="mt20 pl20 pr20">
+      <el-button type="primary" plain icon="el-icon-plus" size="mini" class="mb5" @click="handleSettingAdd">新增
+      </el-button>
+      <mx-table :prop-defines="tableDefines" :rows="dataList">
+        <template #actions="{row}">
+          <el-button type="text" @click="handleSettingEdit(row)">
+            <i class="el-icon-edit"></i>编辑
+          </el-button>
+          <el-button type="text" @click="handleSettingDelete(row)">
+            <i class="el-icon-delete"></i>删除
+          </el-button>
+        </template>
+      </mx-table>
+      <pagination v-show="total>queryParams.pageSize" :total="total" :limit.sync="queryParams.pageSize"
+                  :page.sync="queryParams.pageNum" @pagination="handleQuery"></pagination>
+    </div>
     <el-drawer v-if="stepsVisible" :visible.sync="stepsVisible" :title="modifyTitle" :append-to-body="true" size="70%">
       <round-setting-steps :settingModel="settingModel" :default-active-step="activeStep" :year-options="yearOptions"
                            @do-post="handleSubmit"></round-setting-steps>
     </el-drawer>
-  </div>
+  </el-card>
 </template>
 
 <script>
@@ -41,7 +38,7 @@ import {
   saveScoreImportConfig,
   updateRound
 } from '@/api/webApi/selection'
-import RoundSettingSteps from '@/views/permission/components/steps/round-setting-steps'
+import RoundSettingSteps from '@/views/elective/publish/components/steps/round-setting-steps'
 
 export default {
   mixins: [selectTranslateMixin, RoundModelConvert],
@@ -50,7 +47,6 @@ export default {
   data() {
     return {
       // drawer
-      settingsVisible: false,
       stepsVisible: false,
       activeStep: 0,
       // query list

src/views/permission/components/steps/fauclty/faculty-result.vue → src/views/elective/publish/components/steps/fauclty/faculty-result.vue

@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import OverUnderBadge from '@/views/permission/components/steps/fauclty/over-under-badge'
+import OverUnderBadge from '@/views/elective/publish/components/steps/fauclty/over-under-badge'
 export default {
   name: 'faculty-result',
   components: { OverUnderBadge },

src/views/permission/components/steps/round-setting-group-models.vue → src/views/elective/publish/components/steps/round-setting-group-models.vue

@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import RoundSettingGroup from '@/views/permission/components/steps/round-setting-group'
+import RoundSettingGroup from '@/views/elective/publish/components/steps/round-setting-group'
 
 export default {
   name: 'round-setting-group-models',

src/views/permission/components/steps/round-setting-group.vue → src/views/elective/publish/components/steps/round-setting-group.vue

@@ -94,11 +94,11 @@
 <script>
 import ChooseSubjectDialog from '@/views/system/user/profile/components/choose-subject-dialog'
 import selectTranslateMixin from '@/components/Cache/modules/mx-select-translate-mixin'
-import RoundScoreQuery from '@/views/permission/components/round-score-query'
-import FacultyForms from '@/views/permission/components/steps/fauclty/faculty-forms'
+import RoundScoreQuery from '@/views/elective/publish/components/round-score-query'
+import FacultyForms from '@/views/elective/publish/components/steps/fauclty/faculty-forms'
 import RoundModelConvert from '../round-model-convert'
 import { calculateFaculties, generateFaculties } from '@/api/webApi/selection'
-import FacultyResult from '@/views/permission/components/steps/fauclty/faculty-result'
+import FacultyResult from '@/views/elective/publish/components/steps/fauclty/faculty-result'
 import GroupQueryDialog from '../group-query-dialog'
 
 export default {

src/views/permission/components/steps/round-setting-steps.vue → src/views/elective/publish/components/steps/round-setting-steps.vue

@@ -23,11 +23,11 @@
 </template>
 
 <script>
-import RoundSettingScore from '@/views/permission/components/steps/round-setting-score'
-import RoundSettingWeight from '@/views/permission/components/steps/round-setting-weight'
-import RoundSettingGroup from '@/views/permission/components/steps/round-setting-group'
-import RoundSettingPublish from '@/views/permission/components/steps/round-setting-publish'
-import RoundSettingGroupModels from '@/views/permission/components/steps/round-setting-group-models'
+import RoundSettingScore from '@/views/elective/publish/components/steps/round-setting-score'
+import RoundSettingWeight from '@/views/elective/publish/components/steps/round-setting-weight'
+import RoundSettingGroup from '@/views/elective/publish/components/steps/round-setting-group'
+import RoundSettingPublish from '@/views/elective/publish/components/steps/round-setting-publish'
+import RoundSettingGroupModels from '@/views/elective/publish/components/steps/round-setting-group-models'
 import config from '@/common/mx-config'
 
 export default {

src/views/elective/publish/index.vue

@@ -0,0 +1,17 @@
+<template>
+  <div class="app-container">
+    <round-settings></round-settings>
+  </div>
+</template>
+
+<script>
+import RoundSettings from '@/views/elective/publish/components/round-settings'
+export default {
+  name: 'ElectivePublishIndex',
+  components: { RoundSettings }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/permission/components/round-settings-entry.vue

@@ -0,0 +1,25 @@
+<template>
+  <div>
+    <el-button type="primary" @click="settingsVisible=true" icon="el-icon-setting" size="small">打开选科设置</el-button>
+    <el-drawer :visible.sync="settingsVisible" title="选科设置" size="80%">
+      <round-settings></round-settings>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import RoundSettings from '@/views/elective/publish/components/round-settings'
+export default {
+  name: 'round-settings-entry',
+  components: { RoundSettings },
+  data() {
+    return {
+      settingsVisible: false
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/system/user/profile/round-report.vue

@@ -4,7 +4,7 @@
       <template #header>
         <div class="fx-row fx-bet-cen">
           <div class="fx-row">
-            <round-settings v-if="isFrontMaster" class="mr10"></round-settings>
+            <round-settings-entry v-if="isFrontMaster" class="mr10"></round-settings-entry>
             <round-history></round-history>
           </div>
           <span>选科管理</span>
@@ -60,17 +60,17 @@
 </template>
 
 <script>
-import RoundSettings from '@/views/permission/components/round-settings'
 import RoundHistory from '@/views/system/user/profile/components/round-history'
 import MxCondition from '@/components/MxCondition/mx-condition'
 import { mapGetters } from 'vuex'
 import { getSelectDetail, getSelectReport, sendSelectedNotice } from '@/api/webApi/selection'
 import MxChart from '@/components/MxChart/index'
 import MxTableDynamic from '@/components/MxTableDynamic/index'
+import RoundSettingsEntry from '@/views/permission/components/round-settings-entry'
 
 export default {
   name: 'round-select-manage',
-  components: { MxTableDynamic, MxChart, MxCondition, RoundHistory, RoundSettings },
+  components: { RoundSettingsEntry, MxTableDynamic, MxChart, MxCondition, RoundHistory },
   data() {
     return {
       requireFields: ['year', 'roundId'],