Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

package.json

@@ -14,13 +14,14 @@
     "@riophae/vue-treeselect": "^0.4.0",
     "ali-oss": "^6.12.0",
     "axios": "^0.18.1",
+    "benz-amr-recorder": "^1.1.3",
     "browser-md5-file": "^1.0.0",
     "co": "^4.6.0",
     "core-js": "^3.6.5",
     "cos-js-sdk-v5": "^1.1.5",
     "echarts": "^5.1.2",
     "element-ui": "^2.14.1",
-    "html2canvas": "^1.0.0",
+    "html2canvas": "^1.3.2",
     "js-md5": "^0.7.3",
     "lockr": "^0.8.5",
     "lrz": "^4.9.41",

src/pages/exam/examEdit.vue

-<style>
-  .examPaper_Top {
-    width: 100%;
-    width: 100%;
-    height: 83px;
-    border-bottom: 1px solid #d9d9d9;
-    background: #f0f0f0;
-    min-width: 1280px;
-    display: flex;
-    align-items: center;
-  }
-
-  .Exam-main {
-    width: 100%;
-    height: auto !important;
-    overflow: hidden;
-    margin-top: 34px;
-    min-width: 1280px;
-  }
-
-  .Exam-left {
-    width: 328px;
-    border-right: 1px solid #d9d9d9;
-    border-bottom: 1px solid #d9d9d9;
-    border-radius: 3px;
-    border-top: 1px solid #d9d9d9;
-    background: #f0f0f0;
-    padding-top: 20px;
-    padding-bottom: 0px;
-  }
-
-  .f1 {
-    float: left;
-  }
-
-  .Exam-right {
-    width: 880px;
-    min-height: 795px;
-    background: #fff;
-    padding: 0px 20px 0 0px;
-    border-radius: 3px;
-    overflow-y: auto;
-    border: 1px solid #d9d9d9;
-    margin-left: 38px;
-  }
-
-  .Left-ptitel {
-    font-size: 14px;
-    color: #777;
-    padding-left: 18px;
-  }
-
-  .Left-ptitel span {
-    font-size: 14px;
-    color: #333;
-  }
-
-  .Left-ptitel i {
-    color: #c90000;
-    font-style: normal;
-  }
-
-  .Left-list {
-    width: 328px;
-    border-top: 1px solid #d9d9d9;
-  }
-  .List-ul{
-    margin:0;
-    padding:0;
-  }
-  .List-ul li {
-    height: 33px;
-    border-bottom: 1px solid #f3f3f3;
-    list-style-type:none;
-  }
-
-  .List-ul-li-checked {
-    background: #a6a6a6;
-    color: #333;
-    width: 328px;
-  }
-.List-ul li a {
-    display: block;
-    padding-left: 25px;
-    line-height: 33px;
-    font-size: 12px;
-    height: 33px;
-    border-bottom: 1px solid #f3f3f3;
-    color: #555;
-    text-decoration: none;
-}
-
-.List-ul-li-checked b {
-    color: #000;
-}
-.Showbtn {
-    display: block;
-    width: 90px;
-    float: right;
-    padding-top: 8px;
-    z-index: 1000;
-}
-</style>
-<template>
-  <div class="examPaper">
-    <div class="examPaper_Top">
-      <div style="width:80%;display:flex;">
-        <div style="width:40%;margin:0 20px;">
-          <q-input filled label="标题" />
-        </div>
-        <div style="width:20%;">
-          <q-select filled option-value="Id" option-label="Name" :options="easyList" emit-value map-options label="难度"
-            use-input clearable />
-        </div>
-      </div>
-      <div style="width:20%;text-align:right;">
-        <q-btn color="accent" size="sm" class="q-mr-md" label="预览" />
-        <q-btn color="accent" size="sm" class="q-mr-md" label="保存并返回" />
-      </div>
-    </div>
-    <div class="Exam-main">
-      <div class="Exam-left f1">
-        <p class="Left-ptitel">
-          <span>题量：<i>10</i></span>
-          <span>  总分：<i>50.0</i></span>
-        </p>
-        <div class="Left-list" style="height:740px;overflow:auto;">
-          <div class="List-con1">
-            <ul class="List-ul">
-              <li class="">
-                  <a href="#">
-                    <b>(<label>1</label>)</b>
-                    <b>ここは郵便局です</b>
-                    <span class="Showbtn"></span>
-                  </a>
-              </li>
-            </ul>
-          </div>
-        </div>
-      </div>
-      <div class="Exam-right f1">
-        <span></span>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-  import {
-    GetPaper
-  } from '../../api/teacher/index';
-  export default {
-    meta: {
-      title: "考试"
-    },
-    data() {
-      return {
-        easyList: [{
-          Id: 1,
-          Name: '难'
-        }, {
-          Id: 2,
-          Name: '中'
-        }, {
-          Id: 3,
-          Name: '易'
-        }],
-        msg: {
-          PaperId: 1
-        }
-      }
-    },
-    created() {
-
-    },
-    mounted() {
-      this.GetPaperTimu()
-    },
-    methods: {
-      //获取题目
-      GetPaperTimu() {
-        GetPaper(this.msg).then(res => {
-          console.log(res, '数据');
-        })
-      }
-    }
-  }
-
-</script>

src/pages/exam/examManagement.vue

-<style>
-  .OtherCourseNum {
-    display: inline-block;
-    width: 25px;
-    height: 25px;
-    text-align: center;
-    line-height: 25px;
-    border: 1px solid #2961FE;
-    border-radius: 50%;
-    cursor: pointer;
-    color: #2961FE;
-  }
-
-  .OCourseTable {
-    width: 400px;
-    text-align: center;
-  }
-
-  .OCourseTable tr td {
-    height: 40px;
-  }
-
-  .OCourseTable tr th {
-    height: 40px;
-    background-color: rgb(238, 238, 239);
-  }
-
-</style>
-<template>
-  <div class="page-body">
-    <div class="page-search row items-center">
-      <div class="col row wrap q-mr-lg q-col-gutter-md">
-        <!-- <div class="col-3">
-          <q-select @input="getList" standout="bg-primary text-white" option-value="Id" option-label="Name"
-            v-model="msg.tikuName" :options="tikuList" emit-value map-options label="所属题库" />
-        </div> -->
-        <div class="col-3">
-          <q-input @change="getList" clearable filled v-model="msg.PaperName" @clear="getList" maxlength="20"
-            label="输入试卷名称、组卷人查找" />
-        </div>
-      </div>
-    </div>
-    <div class="page-content">
-      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
-        class="sticky-column-table sticky-right-column-table" separator="none" :data="dataList" :columns="columns"
-        row-key="name">
-        <template v-slot:top="props">
-          <div class="col-2 q-table__title">试卷管理</div>
-          <q-space />
-          <q-btn color="accent" size="sm" class="q-mr-md" label="组卷" />
-        </template>
-        <template v-slot:bottom>
-          <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
-            :input="true" @input="changePage" />
-        </template>
-        <template v-slot:body-cell-PaperId="props">
-          <q-td :props="props" style="width:100px;">
-            <q-btn flat size="xs" color="primary" style="font-weight:400" label="封存" />
-            <q-btn flat size="xs" color="primary" style="font-weight:400" label="预览" />
-            <q-btn flat size="xs" color="primary" style="font-weight:400" @click="goExameEdit(props.row)" label="编辑" />
-            <q-btn flat size="xs" color="primary" style="font-weight:400" label="复制" />
-            <q-btn flat size="xs" color="primary" style="font-weight:400" label="发布考试" />
-            <q-btn flat size="xs" color="primary" style="font-weight:400" label="分配管理" />
-            <q-btn flat size="xs" color="primary" style="font-weight:400" label="删除" />
-            <q-btn flat size="xs" color="primary" style="font-weight:400" label="详情" />
-          </q-td>
-        </template>
-      </q-table>
-    </div>
-  </div>
-</template>
-<script>
-  import {
-    GetPaperPage
-  } from '../../api/teacher/index';
-  //获取校区列表
-  export default {
-    meta: {
-      title: "考试管理"
-    },
-    data() {
-      return {
-        data: [],
-        msg: {
-          pageIndex: 1,
-          pageSize: 12,
-          rowsPerPage: 12,
-          PaperName: '' //题库名
-        },
-        pageCount: 0,
-        loading: false,
-        tikuList: [{
-          Id: 0,
-          Name: '全部'
-        }, {
-          Id: 1,
-          Name: '测试题库'
-        }, {
-          Id: 2,
-          Name: '质量管理与可靠性'
-        }],
-        dataList: [],
-        columns: [
-          //   {
-          //     name: 'PaperId',
-          //     label: '序号',
-          //     field: 'PaperId',
-          //     align: 'left',
-          //   },
-          {
-            name: 'PaperName',
-            label: '试卷名称',
-            field: 'PaperName',
-            align: 'left'
-          },
-          {
-            name: 'CreateTimeStr',
-            label: '创建时间',
-            field: 'CreateTimeStr',
-            align: 'left'
-          },
-
-          {
-            name: 'CreateByName',
-            label: '创建人',
-            field: 'CreateByName',
-            align: 'left'
-          },
-          {
-            name: 'PaperId',
-            label: '操作',
-            field: 'PaperId'
-          }
-        ],
-      }
-    },
-    created() {},
-    mounted() {
-      this.getList();
-    },
-    methods: {
-      //翻页
-      changePage(val) {
-        this.msg.pageIndex = val;
-        this.getList()
-      },
-      //获取菜单分页列表
-      getList() {
-        this.loading = true;
-        this.dataList = [];
-        GetPaperPage(this.msg).then(res => {
-          this.loading = false;
-          this.dataList = res.Data.PageData;
-          this.pageCount = res.Data.PageCount;
-        }).catch(() => {
-          this.loading = false
-        })
-      },
-      //刷新页面
-      refreshPage() {
-        this.getList();
-      },
-      //点击编辑 跳转
-      goExameEdit(item) {
-        console.log("item",item);
-        this.OpenNewUrl('/exam/examEdit', {
-          Id: item.PaperId
-        })
-      }
-    }
-  }
-</script>
-<style lang="sass">
-  @import url('~assets/css/table.sass')
-
-</style>