志愿记录列表

src/router/index.js

@@ -569,14 +569,6 @@ export const constantRoutes = [{
           title: '一分一段'
         }
       },
-      {
-        path: '/career/zhiyuanSimulateOne',
-        component: (resolve) => require(['@/views/career/zhiyuan/zhiyuanSimulateOne'], resolve),
-        name: 'zhiyuanSimulateOne',
-        meta: {
-          title: '投档线'
-        }
-      },
       {
         path: '/career/ShiftLine',
         component: (resolve) => require(['@/views/career/zhiyuan/ShiftLine'], resolve),
@@ -594,8 +586,8 @@ export const constantRoutes = [{
         }
       },
       {
-        path: '/career/VolunteerList',
-        component: (resolve) => require(['@/views/career/components/VolunteerList'], resolve),
+        path: '/career/zhiyuan/VolunteerList',
+        component: (resolve) => require(['@/views/career/zhiyuan/components/volunteerList'], resolve),
         name: 'VolunteerList',
         meta: {
           title: '模拟志愿-填报记录'

src/views/career/components/VolunteerList.vue

@@ -1,89 +0,0 @@
-<template>
-  <div style="padding: 24px 0; background-color: #f7f7f7">
-    <el-image style="width:100%" :src="require('@/assets/images/bg_zhiyuantianbao.png')"></el-image>
-    <div style="margin-top: 20px;">
-      <el-table :data="tableData" border v-loading="loading" style="min-height: 300px;">
-        <el-table-column prop="id" label="ID" align="center"></el-table-column>
-        <el-table-column prop="name" label="名称" align="center"></el-table-column>
-        <el-table-column prop="createTime" label="填报时间" align="center"></el-table-column>
-        <el-table-column prop="batchName" label="填报批次" align="center"></el-table-column>
-        <el-table-column prop="" label="志愿概要" align="center">
-          <template slot-scope="scope">
-            <div style="line-height:30px;" v-for="(item,index) in scope.row.summary" :key="index">{{ item }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center">
-          <template slot-scope="scope">
-            <el-link :underline="false" type="primary" @click="goDetails(scope.row)">详情</el-link>
-            <el-link :underline="false" type="danger" style="margin-left: 7px;" @click="delTableList(scope.row)"> 删除
-            </el-link>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination :total="examRecordTotal" :autoScroll="false" @pagination="onChangePage"
-                  :page.sync="tableParams.pageNum"
-                  :limit.sync="tableParams.pageSize"
-      ></pagination>
-    </div>
-  </div>
-</template>
-
-<script>
-import { delZytbRecord, selectZytbRecord } from '@/api/webApi/career-other'
-
-export default {
-  name: 'VolunteerList',
-  data() {
-    return {
-      examRecordTotal: 0,
-      tableParams: {
-        pageSize: 20,
-        pageNum: 1
-      },
-      tableData: [],
-      loading: false
-    }
-  },
-  created() {
-    this.getZytbRecord()
-  },
-  methods: {
-    goDetails(data) {
-      this.$router.push({ name: 'RecordDetail', params: { data: data } })
-    },
-    delTableList(data) {
-      console.log(data)
-      this.$confirm(`是否确定删除-${data.name} ？`, '提示', {
-        confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', closeOnClickModal: false
-      }).then(() => {
-        const params = {
-          id: data.id
-        }
-        delZytbRecord(params).then(res => {
-          this.getZytbRecord()
-          this.msgSuccess('删除成功')
-        })
-      }).catch(() => {
-      })
-
-    },
-    getZytbRecord() {
-      this.loading = true
-      selectZytbRecord(this.tableParams).then(res => {
-        this.examRecordTotal = res.total
-        this.loading = false
-        this.tableData = res.rows
-      })
-    },
-    onChangePage(page) {
-      this.tableParams.pageSize = page.limit
-      this.tableParams.pageNum = page.page
-      this.getZytbRecord()
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/views/career/components/preferenceForm.vue

@@ -2,7 +2,7 @@
   <volunteer-list></volunteer-list>
 </template>
 <script>
-import VolunteerList from "./VolunteerList.vue"
+import VolunteerList from "../zhiyuan/components/volunteerList.vue"
 export default {
   components: { VolunteerList },
   data() {

src/views/career/preference/index.vue

@@ -1 +0,0 @@
-

src/views/career/zhiyuan/NewSimulatedVolunteer.vue

@@ -93,7 +93,7 @@ export default {
   },
   methods:{
     toReport() {
-      this.$router.push('/career/VolunteerList')
+      this.$router.push({ name:'VolunteerList' })
     },
     save() {
       console.log('保存志愿')

src/views/career/zhiyuan/components/select-volunteer.vue

@@ -1,196 +0,0 @@
-<template>
-  <el-dialog
-    :visible.sync="show"
-    width="80%"
-    :close-on-click-modal="false"
-     :before-close="close"
-  >
-
-    <div class="zhiyuan-filter">
-      <div class="header">
-        <h3 class="f-666">您的选考科目为：历史,生物,政治， 请手动选择志愿</h3>
-      </div>
-      <div class="filters">
-        <div class="filter">
-          <div class="filter_name">热门城市：</div>
-          <div class="items fx-row">
-            <div class="no_limited">
-              <!--  no_limited 隐藏 选中框  -->
-              <el-checkbox @change="change('city',$event)"  v-model="cityIsAll" >不限</el-checkbox>
-            </div>
-            <el-checkbox-group v-model="filter_form.checkedCities">
-              <el-checkbox v-for="city in cities" :label="city" :key="city">{{city}}</el-checkbox>
-            </el-checkbox-group>
-          </div>
-        </div>
-        <div class="filter">
-          <div class="filter_name">院校省份：</div>
-          <div class="items fx-row">
-            <div class="no_limited">
-              <el-checkbox @change="change('province',$event)"  v-model="provinceIsAll" >不限</el-checkbox>
-            </div>
-            <el-checkbox-group v-model="filter_form.provinces">
-              <el-checkbox v-for="city in provinces" :label="city" :key="city">{{city}}</el-checkbox>
-            </el-checkbox-group>
-          </div>
-        </div>
-        <div class="filter">
-          <div class="filter_name">专业类别：</div>
-          <div class="items fx-row">
-            <div class="no_limited">
-              <el-checkbox @change="change('major',$event)"  v-model="majorIsAll" >不限</el-checkbox>
-            </div>
-            <el-radio-group v-model="filter_form.major">
-              <el-radio v-for="city in majors" :label="city" :key="city">{{city}}</el-radio>
-            </el-radio-group>
-          </div>
-        </div>
-        <div class="filter">
-          <div class="filter_name">意向专业：</div>
-          <div class="items">
-            <div>
-              <el-autocomplete class="inline-input mr10" v-model="major" placeholder="搜索意向专业"></el-autocomplete>
-              <el-button plain size="mini" icon="el-icon-add">添加</el-button>
-            </div>
-          </div>
-        </div>
-        <div class="filter">
-          <div class="filter_name">更多筛选：</div>
-          <div class="items">
-            <div class="more">
-              <span >
-                <el-button plain size="mini">志愿梯度</el-button>
-              </span>
-              <span>
-                <el-button plain size="mini">院校类型</el-button>
-              </span><span>
-                <el-button plain size="mini">院校特色</el-button>
-              </span><span>
-                <el-button plain size="mini">办学类型</el-button>
-              </span>
-            </div>
-          </div>
-        </div>
-        <div class="filter">
-          <div class="filter_name">搜索专业：</div>
-          <div class="items">
-            <div>
-              <el-autocomplete class="inline-input mr10" v-model="major" placeholder="请输入专业名词或者专业关键词"></el-autocomplete>
-              <el-button plain size="mini" icon="el-icon-add">搜索</el-button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="zhiyuan-list">
-
-    </div>
-<!--    <span @click="close">关闭</span>-->
-  </el-dialog>
-</template>
-<script>
-export default {
-  model:{
-    prop: 'show',
-    event: 'close'
-  },
-  props: {
-    show: { type: Boolean },
-  },
-  data() {
-    return {
-      cities:  ['北京', '上海', '深圳', '广州', '杭州', '南京', '武汉', '西安', '长沙', '重庆', '南充'],
-      provinces:['湖南','安徽','福建','沈阳','山东','山西','甘肃','广东','广西','重庆','上海','黑龙江','吉林','辽宁','西藏','新疆'],
-      majors: ['哲学','经济学','法学','教育学','文学','历史学','理学','工学','农学','医学','管理学','艺术学'],
-      filter_form: {
-        checkedCities:[],
-        provinces: [],
-        major: ''
-      },
-      major: ''
-    }
-  },
-  computed: {
-    cityIsAll:{
-      get() {
-        return !this.filter_form.checkedCities.length
-      },
-      set(){}
-    },
-    provinceIsAll:{
-      get() {
-        return !this.filter_form.provinces.length
-      },
-      set(){}
-    },
-    majorIsAll:{
-      get() {
-        return !this.filter_form.major
-      },
-      set(){}
-    }
-  },
-  methods:{
-    close(){
-      this.$emit('close',false);
-    },
-    change(val,$event) {
-      if($event) {
-        if(val == 'city') {
-          this.filter_form.checkedCities = []
-        }
-        if(val == 'province') {
-          this.filter_form.provinces = []
-        }
-        if(val == 'major') {
-          this.filter_form.major = ''
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.more span {
-  margin-right: 10px;
-}
-.filters{
-  padding: 0 20px;
-  border: 1px solid #eee;
-}
-.filter_name{
-   box-sizing: border-box;
-   width: 70px;
-   line-height: 20px;
-   flex: none;
-   padding: 6px 0 6px 0;
-   margin-right: 10px;
- }
-.zhiyuan-filter .filters .filter .items .no_limited{
-  margin-right: 10px;
-}
-.zhiyuan-filter .filters .filter .items .no_limited >>> .el-checkbox__input {
-  display: none;
-}
-.filters .filter{
-  padding: 10px  0;
-  display: flex;
-  border-bottom: 1px solid #eee;
-}
-
-.zhiyuan-filter .filters .filter >>> .el-checkbox, .zhiyuan-filter .filters .filter >>> .el-radio {
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  height: 32px;
-  padding: 8px 8px;
-  margin: 0;
-}
->>>  .el-input--medium .el-input__inner{
-  height: 30px;
-  line-height: 30px;
-}
->>> .el-input{
-  width: 260px;
-}
-</style>

src/views/career/zhiyuan/components/volunteerList.vue

@@ -0,0 +1,125 @@
+<template>
+  <div class="mt20">
+    <evaluation-title
+      navBackButton
+      title="志愿填报记录"
+      :navAction="backIndex"
+    ></evaluation-title>
+    <mx-table :rows="tableData" :propDefines="propDefines" style="min-height: 400px;border:1px solid #f2f2f2">
+      <template #temp="{row}">
+        <el-link :underline="false" type="primary" @click="goDetails(row)">详情</el-link>
+        <el-link :underline="false" type="danger" style="margin-left: 7px;" @click="delTableList(row)"> 删除
+        </el-link>
+      </template>
+    </mx-table>
+<!--    <el-table :data="tableData" border v-loading="loading" style="min-height: 400px;">-->
+<!--      <el-table-column prop="id" label="ID" align="center"></el-table-column>-->
+<!--      <el-table-column prop="name" label="名称" align="center"></el-table-column>-->
+<!--      <el-table-column prop="createTime" label="填报时间" align="center"></el-table-column>-->
+<!--      <el-table-column prop="batchName" label="填报批次" align="center"></el-table-column>-->
+<!--      <el-table-column prop="" label="志愿概要" align="center">-->
+<!--        <template slot-scope="scope">-->
+<!--          <div style="line-height:30px;" v-for="(item,index) in scope.row.summary" :key="index">{{ item }}</div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="操作" align="center">-->
+<!--        <template slot-scope="scope">-->
+
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--    </el-table>-->
+    <pagination :total="examRecordTotal" :autoScroll="false" @pagination="onChangePage"
+                :page.sync="tableParams.pageNum"
+                :limit.sync="tableParams.pageSize"
+    ></pagination>
+  </div>
+</template>
+
+<script>
+import { delZytbRecord, selectZytbRecord } from '@/api/webApi/career-other'
+
+export default {
+  name: 'VolunteerList',
+  data() {
+    return {
+      propDefines:{
+        index:{
+          label:'序号',
+          type: 'index'
+        },
+        name:{
+          label:'志愿表名称',
+        },
+        batchName:{
+          label:'批次',
+        },
+        subject:{
+          label:'科目',
+        },
+        score:{
+          label:'成绩',
+        },
+        createTime:{
+          label:'填报时间',
+        },
+        temp:{
+          label:'操作',
+          slot:'temp'
+        }
+      },
+      examRecordTotal: 0,
+      tableParams: {
+        pageSize: 20,
+        pageNum: 1
+      },
+      tableData: [],
+      loading: false
+    }
+  },
+  created() {
+    this.getZytbRecord()
+  },
+  methods: {
+    backIndex() {
+      this.$router.go(-1)
+    },
+    goDetails(data) {
+      this.$router.push({ name: 'RecordDetail', params: { data: data } })
+    },
+    delTableList(data) {
+      console.log(data)
+      this.$confirm(`是否确定删除-${data.name} ？`, '提示', {
+        confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', closeOnClickModal: false
+      }).then(() => {
+        const params = {
+          id: data.id
+        }
+        delZytbRecord(params).then(res => {
+          this.getZytbRecord()
+          this.msgSuccess('删除成功')
+        })
+      }).catch(() => {
+      })
+
+    },
+    getZytbRecord() {
+      this.loading = true
+      console.log(this.tableParams)
+      selectZytbRecord(this.tableParams).then(res => {
+        this.examRecordTotal = res.total
+        this.loading = false
+        this.tableData = res.rows
+      })
+    },
+    onChangePage(page) {
+      this.tableParams.pageSize = page.limit
+      this.tableParams.pageNum = page.page
+      this.getZytbRecord()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/career/zhiyuan/zhiyuanSimulateOne.vue

@@ -1,35 +0,0 @@
-<template>
-  <div class="zhiyuantianbao_1">
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    msg: {
-      type: String,
-      default: "",
-    }
-  },
-};
-</script>
-<style lang="scss" scoped>
-.navigation_top {
-  position: relative;
-  margin-bottom: 10px;
-  margin-top: 10px;
-  height: 113px;
-}
-.navigation_top p {
-  color: #8CA07E;
-  font-size: 14px;
-  padding-top: 70px;
-  margin-left: 42px;
-  z-index: 1;
-  position: relative;
-}
-.navigation_top img {
-  position: absolute;
-  left: -7px;
-  top: 0;
-}
-</style>

src/views/questioncenter/bestpaper.vue

@@ -30,7 +30,7 @@
           </el-radio-group>
         </div>
         <div style="margin-bottom: 16px">
-          <span style="width: 28px">地区</span>
+          <span >地区</span>
           <el-radio-group v-model="form.area" size="mini" @change="toggleAreas">
             <el-radio-button :label="item" v-for="(item, index) in areasList" :key="index">{{ item }}</el-radio-button>
           </el-radio-group>

src/views/questioncenter/generating.vue

@@ -1337,7 +1337,6 @@ export default {
 
 .generating_container >>> .radio_contianer .el-radio-button .el-radio-button__inner {
   border-radius: 16px;
-  border-bottom: 5px;
 }
 
 .generating_container >>> .split_page .el-pager > li {