Pārlūkot izejas kodu

UI风格改造coding...

刘洋 1 gadu atpakaļ
vecāks
revīzija
c7cdbc6d16

+ 12 - 0
src/assets/icons/bianji.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-编辑-off</title>
+    <g id="页面-1" stroke="none" stroke-width="1"  fill-rule="evenodd">
+        <g id="09.05-课程管理-知识点" transform="translate(-532, -185)">
+            <g id="edit-1" transform="translate(532, 185)">
+                <rect id="edit-1-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                <path d="M10.8887663,1.70710683 L11.5958738,1 L14.8392525,4.24337864 L14.1321449,4.95048523 L10.8887663,1.70710683 Z M2.35900185,13.8333912 C2.14908578,13.8753738 1.96400901,13.690299 2.00599267,13.480382 L2.72858489,9.8674202 L10.0261869,2.56981814 L13.2695656,5.81319714 L5.97196341,13.1107988 L2.35900185,13.8333912 Z M10.0261869,3.98403144 L3.64978623,10.3604326 L3.19249487,12.6468887 L5.47895122,12.1895971 L11.8553524,5.81319714 L10.0261869,3.98403144 Z M11,11 L11,12 L15,12 L15,11 L11,11 Z M8.5,13 L8.5,14 L15,14 L15,13 L8.5,13 Z"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 12 - 0
src/assets/icons/daochu.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-导出</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill-rule="evenodd">
+        <g id="09.01-课程管理" transform="translate(-406, -209)">
+            <g id="icon-导出" transform="translate(406, 209)">
+                <rect id="upload-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                <path d="M7.50118113,2.91421127 L7.50119781,11.4999733 L8.50119781,11.4999714 L8.50118113,2.91421592 L12.2647667,6.67780113 L12.9718733,5.97069454 L8.35473212,1.3535534 C8.15946998,1.15829126 7.8428875,1.15829126 7.64762535,1.35355339 L3.03048337,5.97069502 L3.03048337,5.97069502 L3.73759019,6.67780209 L7.50118113,2.91421127 Z M2,12.9999723 C2,13.5522566 2.44771534,13.9999723 3,13.9999723 L13,13.9999723 C13.5522842,13.9999723 14,13.5522575 14,12.9999723 L14,10.9999723 L13,10.9999723 L13,12.9999723 L3,12.9999723 L3,10.9999723 L2,10.9999723 L2,12.9999723 Z" id="upload"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 12 - 0
src/assets/icons/refresh.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-重置</title>
+    <g id="页面-1" stroke="none" stroke-width="1"  fill-rule="evenodd">
+        <g id="04.08-用户管理-权限设置" transform="translate(-524, -169)">
+            <g id="icon-重置" transform="translate(524, 169)">
+                <rect id="refresh-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                <path d="M13.253437,7.99868345 L14.2147732,7.99868345 C14.2147741,4.54763269 11.4323964,1.75 8.00015783,1.75 C5.7638154,1.75 3.80336469,2.93771338 2.70870465,4.72001243 L2.70870453,2.64251906 L1.75,2.64251906 L1.74999993,5.74893761 C1.74999993,6.02507998 1.97385756,6.24893761 2.24999993,6.24893761 C2.24999996,6.24893761 2.24999998,6.24893761 2.25,6.24893761 L5.33675885,6.24893713 L5.33675885,6.24893713 L5.33675885,5.28497791 L3.49045432,5.28497815 C4.40906155,3.74210536 6.08691859,2.71133503 8.00015783,2.7113356 C10.8965168,2.7113364 13.253438,5.07360196 13.253437,7.99868345 Z M2.74687386,7.998631 C2.74687305,10.9237127 5.1037941,13.286026 8.0001545,13.286027 C9.91339242,13.286027 11.591249,12.2552587 12.5098562,10.7123852 L10.6632414,10.7123852 L10.6632414,9.74842548 L13.75,9.74842548 C14.0261424,9.74842548 14.25,9.97228311 14.25,10.2484255 L14.25,13.3548441 L14.25,13.3548441 L13.291296,13.3548441 L13.291296,11.2778559 C12.1965759,13.0598733 10.2362852,14.2473631 8.00015402,14.2473631 C4.56791544,14.2473631 1.78553631,11.449683 1.78553822,7.998631 L2.74687386,7.998631 Z" id="refresh" ></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 12 - 0
src/assets/icons/sctk.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-生成题卡</title>
+    <g id="页面-1" stroke="none" stroke-width="1"  fill-rule="evenodd">
+        <g id="07.01-题卡管理" transform="translate(-386, -209)">
+            <g id="icon-生成题卡" transform="translate(386, 209)">
+                <rect id="backtop-rectangle-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                <path d="M5.94410038,9.72019243 L5.22820282,9.02198696 L8.00184727,6.29955626 L10.8006926,9.02923441 L10.0870275,9.72972155 L8.50840902,8.19011497 L8.50846767,11.998848 L7.49761343,11.9989319 L7.49755478,8.19542122 L5.94410038,9.72019243 Z M11.4990234,5.49890137 L11.4990234,4.49890137 L4.49902344,4.49890137 L4.49902344,5.49890137 L11.4990234,5.49890137 Z M1.99902344,2.99890137 L1.99902344,12.9989014 C1.99902344,13.5511856 2.4467383,13.9989014 2.99902344,13.9989014 L12.9990234,13.9989014 C13.5513077,13.9989014 13.9990234,13.5511885 13.9990234,12.9989014 L13.9990234,2.99890137 C13.9990234,2.44661874 13.5513105,1.99890137 12.9990234,1.99890137 L2.99902344,1.99890137 C2.44674063,1.99890137 1.99902344,2.44661641 1.99902344,2.99890137 Z" id="backtop-rectangle" ></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 12 - 0
src/assets/icons/shanchu.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-删除</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill-rule="evenodd">
+        <g id="04.08-用户管理-权限设置" transform="translate(-336, -277)">
+            <g id="icon-删除" transform="translate(336, 277)">
+                <rect id="delete-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                <path d="M6,6 L7,6 L7,12 L6,12 L6,6 Z M9,12 L10,12 L10,6 L9,6 L9,12 Z M14,3 L14,4 L13,4 L13,14 C13,14.5522852 12.5522842,15 12,15 L4,15 C3.44771504,15 3,14.5522842 3,14 L3,4 L2,4 L2,3 L5.5,3 L5.5,1.80000073 C5.5,1.35817304 5.85817218,1 6.30000019,1 L9.69999981,1 C10.1418276,1 10.5,1.35817215 10.5,1.80000013 L10.5,3 L14,3 Z M6.5,2 L9.5,2 L9.5,3 L6.5,3 L6.5,2 Z M4,14 L12,14 L12,4 L4,4 L4,14 Z" id="delete"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 1 - 0
src/assets/icons/shangjiantou.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M512.2048 0.001536c6.60479 0 13.20958 2.457596 18.278372 7.475189l325.836312 325.836311a25.599962 25.599962 0 0 1-36.198346 36.249546L537.599962 87.041405v911.358633a25.599962 25.599962 0 1 1-51.199924 0V87.399805l-282.111576 282.111577a25.599962 25.599962 0 1 1-36.249546-36.198346L493.875227 7.476725A25.497562 25.497562 0 0 1 512.2048 0.001536z"  /></svg>

+ 13 - 0
src/assets/icons/tkgzgl.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-题卡规则管理</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill-rule="evenodd">
+        <g id="07.01-题卡管理" transform="translate(-260, -209)">
+            <g id="root.list" transform="translate(260, 209)">
+                <rect id="root.list-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                <rect id="矩形" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                <path d="M14.5,13 C14.5,13.552285 14.0522842,14 13.5,14 L2.5,14 C1.94771522,14 1.5,13.552285 1.5,13 L1.5,3 C1.5,2.44771525 1.94771525,2 2.5,2 L13.5,2 C14.0522847,2 14.5,2.44771525 14.5,3 L14.5,13 L14.5,13 Z M4,4.5 L4,5.5 L12,5.5 L12,4.5 L4,4.5 Z M4,7 L4,8 L10,8 L10,7 L4,7 Z" id="root-list" fill-opacity="0.9" ></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 1 - 0
src/assets/icons/xiajiantou.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M512.2048 1024H512a25.4976 25.4976 0 0 1-18.1248-7.4752L168.0384 690.688a25.6 25.6 0 0 1 36.2496-36.2496l282.112 282.112V25.6a25.6 25.6 0 0 1 51.2 0v911.36l282.5216-282.5216a25.6 25.6 0 1 1 36.1984 36.2496l-325.8368 325.8368a25.4976 25.4976 0 0 1-18.2784 7.4752z"  /></svg>

+ 6 - 6
src/assets/styles/base.scss

@@ -126,12 +126,12 @@ body {
   // border-radius: 20px;
   border-radius: 8px;
   padding: 16px;
-  .icon-btn-group{
-    padding:0 6px 10px 6px;
-    .svg-btn{
-      &:not(:first-child){
-        margin-left:10px;
-      }
+}
+.icon-btn-group{
+  padding:0 6px 10px 6px;
+  .svg-btn{
+    &:not(:first-child){
+      margin-left:10px;
     }
   }
 }

+ 2 - 3
src/components/SvgBtn.vue

@@ -36,7 +36,7 @@ export default {
   },
   computed: {
     svgColor() {
-      return this.disabled ? "#aaa" : this.isHover ? "#262626" : "#595959";
+      return this.disabled ? "#bfbfbf" : this.isHover ? "#262626" : "#595959";
     },
     bgColor() {
       return this.isHover ? this.hoverBgColor || "#f0f0f0" : "transparent";
@@ -72,14 +72,13 @@ export default {
   &.disabled {
     cursor: not-allowed;
     .svg-btn-text {
-      color: #aaa;
+      color: #bfbfbf;
     }
   }
   .svg-btn-text {
     margin-left: 3px;
     // color: #262626;
     position: relative;
-    top: -1px;
   }
 }
 </style>

+ 6 - 1
src/components/svgIcon/index.vue

@@ -1,6 +1,11 @@
 <template>
   <div
-    :style="{ width: width, height: height, display: 'inline-block' }"
+    :style="{
+      width: width,
+      height: height,
+      display: 'inline-block',
+      lineHeight: 1,
+    }"
     class="svg-icon-btn"
   >
     <svg :style="{ width: width, height: height }">

+ 15 - 8
src/modules/card/views/CardManage.vue

@@ -5,7 +5,7 @@
     element-loading-text="请稍后..."
   >
     <div class="part-box">
-      <h2 class="part-box-title">题卡管理</h2>
+      <!-- <h2 class="part-box-title">题卡管理</h2> -->
       <!-- 搜索 -->
       <el-form class="part-filter-form" inline :model="searchForm">
         <el-form-item label="课程">
@@ -41,7 +41,7 @@
         </el-form-item>
       </el-form>
 
-      <div class="part-box-action">
+      <!-- <div class="part-box-action">
         <div v-if="!onlyAssignTeacher">
           <el-button
             type="primary"
@@ -79,10 +79,17 @@
             >数据包下载
           </el-button>
         </div>
-      </div>
+      </div> -->
     </div>
 
     <div class="part-box">
+      <div class="icon-btn-group">
+        <svg-btn name="tkgzgl" @click="toCardRule">题卡规则管理</svg-btn>
+        <svg-btn name="sctk" @click="toExportPaperStruct">生成题卡</svg-btn>
+        <svg-btn name="daoru" @click="toBatchDownloadCardPdf">下载题卡</svg-btn>
+        <svg-btn name="daoru" @click="toBatchDownloadPackage">下载数据</svg-btn>
+        <svg-btn name="shanchu" @click="toBatchDelete">删除</svg-btn>
+      </div>
       <!-- 页面列表 -->
       <el-table
         ref="table"
@@ -136,16 +143,16 @@
           <template slot-scope="scope">
             <el-button
               v-if="!onlyAssignTeacher"
-              size="mini"
-              :type="scope.row.enable ? 'danger' : 'primary'"
-              plain
+              size="medium"
+              type="text"
+              :class="{ danger: scope.row.enable }"
               @click="toEnable(scope.row)"
             >
               {{ scope.row.enable ? "禁用" : "启用" }}
             </el-button>
             <el-dropdown>
-              <el-button type="primary" plain size="mini">
-                更多<i class="el-icon-more el-icon--right"></i>
+              <el-button type="text" size="medium" class="normal">
+                更多<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown" class="action-dropdown">
                 <el-dropdown-item v-if="!onlyAssignTeacher">

+ 33 - 14
src/modules/paper-export/views/PaperTemplateManage.vue

@@ -18,19 +18,26 @@
         </el-form-item>
       </el-form>
 
-      <div class="part-box-action">
+      <!-- <div class="part-box-action">
         <div></div>
         <el-button type="primary" plain icon="icon icon-edit" @click="toCreate"
           >新建
         </el-button>
-      </div>
+      </div> -->
     </div>
 
     <div class="part-box">
+      <div class="icon-btn-group">
+        <svg-btn name="xinzeng" @click="toCreate">新增</svg-btn>
+      </div>
       <!-- 页面列表 -->
       <el-table ref="table" :data="tableData">
         <el-table-column prop="name" label="模版名称"> </el-table-column>
-        <el-table-column prop="creatorName" label="创建人"></el-table-column>
+        <el-table-column
+          prop="creatorName"
+          label="创建人"
+          width="120"
+        ></el-table-column>
         <el-table-column prop="type" label="模板类型" width="120">
           <span slot-scope="scope">{{
             scope.row.type | paperTempalteTypeFilter
@@ -68,24 +75,32 @@
         <el-table-column width="220" label="操作">
           <template slot-scope="scope">
             <el-button
-              size="mini"
-              type="primary"
-              plain
+              size="medium"
+              type="text"
+              class="normal"
               @click="toEdit(scope.row)"
               >编辑
             </el-button>
-            <el-button
+            <!-- <el-button
               size="mini"
               :type="scope.row.enable ? 'danger' : 'primary'"
               plain
               @click="toEnable(scope.row)"
             >
               {{ scope.row.enable ? "禁用" : "启用" }}
+            </el-button> -->
+            <el-button
+              size="medium"
+              type="text"
+              :class="{ danger: scope.row.enable }"
+              @click="toEnable(scope.row)"
+            >
+              {{ scope.row.enable ? "禁用" : "启用" }}
             </el-button>
             <el-button
-              size="mini"
-              type="danger"
-              plain
+              size="medium"
+              type="text"
+              class="normal"
               @click="toDelete(scope.row)"
               >删除
             </el-button>
@@ -179,7 +194,7 @@ export default {
       const action = row.enable ? "禁用" : "启用";
       const confirm = await this.$confirm(
         `确定要${action}该试卷模板吗?`,
-        "提示",
+        "系统通知",
         {
           type: "warning",
         }
@@ -201,9 +216,13 @@ export default {
       });
     },
     async toDelete(row) {
-      const confirm = await this.$confirm(`确定要删除该试卷模板吗?`, "提示", {
-        type: "warning",
-      }).catch(() => {});
+      const confirm = await this.$confirm(
+        `确定要删除该试卷模板吗?`,
+        "系统通知",
+        {
+          type: "warning",
+        }
+      ).catch(() => {});
       if (confirm !== "confirm") return;
 
       await paperTemplateDeleteApi([row.id]);

+ 38 - 32
src/modules/questions/views/Course.vue

@@ -32,7 +32,7 @@
         </el-form-item>
       </el-form>
 
-      <div class="part-box-action">
+      <!-- <div class="part-box-action">
         <div>
           <el-button
             type="danger"
@@ -65,10 +65,23 @@
           @click="insertCourse"
           >新增</el-button
         >
-      </div>
+      </div> -->
     </div>
 
     <div class="part-box">
+      <div class="icon-btn-group">
+        <svg-btn
+          name="xinzeng"
+          v-if="authButtons.includes('index_course-add_course')"
+          @click="insertCourse"
+          >新增</svg-btn
+        >
+        <svg-btn name="daoru" @click="importCourse">导入</svg-btn>
+        <svg-btn name="daochu" @click="exportCourse">导出</svg-btn>
+        <svg-btn name="shanchu" :disabled="noBatchSelected" @click="deleteByIds"
+          >删除</svg-btn
+        >
+      </div>
       <!-- 页面列表 -->
       <!-- FIXME: element-ui style bug https://github.com/ElemeFE/element/issues/16167 -->
       <el-table :data="tableData" resizable @selection-change="selectChange">
@@ -97,28 +110,28 @@
                 关联专业
               </el-button> -->
             <el-button
-              size="mini"
-              type="primary"
-              plain
+              size="medium"
+              type="text"
+              class="normal"
               @click="editCourse(scope.row)"
             >
               编辑
             </el-button>
             <el-button
-              size="mini"
-              plain
-              type="danger"
-              @click="deleteById(scope.row)"
+              size="medium"
+              type="text"
+              class="normal"
+              @click="toKnowledge(scope.row)"
             >
-              删除
+              知识点
             </el-button>
             <el-button
-              size="mini"
-              plain
-              type="danger"
-              @click="toKnowledge(scope.row)"
+              size="medium"
+              type="text"
+              class="normal"
+              @click="deleteById(scope.row)"
             >
-              知识点
+              删除
             </el-button>
           </div>
         </el-table-column>
@@ -140,7 +153,7 @@
     <!-- 添加或新增课程弹出框 -->
     <el-dialog
       title="课程"
-      width="630px"
+      width="450px"
       :visible.sync="courseDialog"
       :modal="true"
       append-to-body
@@ -149,8 +162,6 @@
     >
       <el-form
         ref="courseForm"
-        :inline="true"
-        inline-message
         class="form-tight"
         :model="courseForm"
         :rules="rules"
@@ -159,7 +170,6 @@
         <el-form-item label="课程名称" prop="name">
           <el-input
             v-model="courseForm.name"
-            class="dialog-input-width"
             auto-complete="off"
             placeholder="请输入课程名称"
           />
@@ -168,18 +178,13 @@
         <el-form-item label="课程代码" prop="code">
           <el-input
             v-model="courseForm.code"
-            class="dialog-input-width"
             auto-complete="off"
             placeholder="请输入课程代码"
           />
         </el-form-item>
         <br />
         <el-form-item label="层次" prop="level">
-          <el-select
-            v-model="courseForm.level"
-            class="dialog-input-width"
-            placeholder="请选择"
-          >
+          <el-select v-model="courseForm.level" placeholder="请选择">
             <el-option
               v-for="item in levelList"
               :key="item.value"
@@ -230,10 +235,11 @@ import { mapState, mapGetters } from "vuex";
 import { courseExportApi } from "../api";
 import { downloadByApi } from "@/plugins/download";
 import ImportFileDialog from "@/components/ImportFileDialog.vue";
+import SvgBtn from "@/components/SvgBtn.vue";
 
 export default {
   name: "Course",
-  components: { ImportFileDialog },
+  components: { ImportFileDialog, SvgBtn },
   data() {
     return {
       formSearch: {
@@ -522,7 +528,7 @@ export default {
     },
     //删除单个数据
     deleteById(row) {
-      this.$confirm("是否删除该课程?", "提示", {
+      this.$confirm("是否删除该课程?", "系统通知", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -555,7 +561,7 @@ export default {
           message: "请选择要删除的课程",
         });
       } else {
-        this.$confirm("是否删除这些课程?", "提示", {
+        this.$confirm("确定要删除所选课程吗?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "error",
@@ -584,7 +590,7 @@ export default {
           message: "请选择要启用的课程",
         });
       } else {
-        this.$confirm("是否启用这些课程?", "提示", {
+        this.$confirm("确定要启用所选课程吗?", "系统通知", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
@@ -601,7 +607,7 @@ export default {
       }
     },
     enableById(row) {
-      this.$confirm("是否启用该课程?", "提示", {
+      this.$confirm("是否启用该课程?", "系统通知", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -624,7 +630,7 @@ export default {
           message: "请选择要禁用的课程",
         });
       } else {
-        this.$confirm("是否禁用这些课程?", "提示", {
+        this.$confirm("确定要禁用所选课程吗?", "系统通知", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "error",
@@ -642,7 +648,7 @@ export default {
     },
     //禁用
     disableById(row) {
-      this.$confirm("是否禁用该课程?", "提示", {
+      this.$confirm("是否禁用该课程?", "系统通知", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "error",

+ 55 - 41
src/modules/questions/views/ExportTemplate.vue

@@ -44,13 +44,16 @@
           <el-button type="primary" @click="handleSearchBtn">查询</el-button>
         </el-form-item>
       </el-form>
-      <div class="part-box-action">
+      <!-- <div class="part-box-action">
         <el-button type="primary" icon="icon icon-plus-white" @click="addFile"
           >新增</el-button
         >
-      </div>
+      </div> -->
     </div>
     <div class="part-box">
+      <div class="icon-btn-group">
+        <svg-btn name="xinzeng" @click="addFile">新增</svg-btn>
+      </div>
       <!-- 页面列表 -->
       <el-table :data="tableData" resizable>
         <el-table-column prop="fileName" label="模板名称"> </el-table-column>
@@ -89,35 +92,34 @@
         <el-table-column :context="_self" label="操作" width="220">
           <div slot-scope="scope">
             <el-button
-              size="mini"
-              type="primary"
-              plain
+              size="medium"
+              type="text"
               @click="downFile(scope.row)"
+              class="normal"
             >
               下载
             </el-button>
             <el-button
               v-if="!scope.row.enable"
-              size="mini"
-              type="primary"
-              plain
+              size="medium"
+              type="text"
               @click="enable(scope.row)"
             >
               启用
             </el-button>
             <el-button
               v-if="scope.row.enable"
-              size="mini"
-              type="danger"
-              plain
+              size="medium"
+              type="text"
+              class="danger"
               @click="disenable(scope.row)"
             >
               禁用
             </el-button>
             <el-button
-              size="mini"
-              type="danger"
-              plain
+              size="medium"
+              type="text"
+              class="normal"
               @click="deleteFile(scope.row)"
             >
               删除
@@ -323,37 +325,49 @@ export default {
       window.location.href = row.fullFilePath;
     },
     enable(row) {
-      var url =
-        QUESTION_API +
-        "/exportTemplate/enable/" +
-        this.formSearch.rootOrgId +
-        "/" +
-        row.id;
-      this.$httpWithMsg.put(url).then(() => {
-        this.$notify({
-          type: "success",
-          message: "启用成功!",
-        });
-        this.searchForm();
-      });
+      this.$confirm("确定要启用该模板吗?", "系统通知", {
+        type: "warning",
+      })
+        .then(() => {
+          var url =
+            QUESTION_API +
+            "/exportTemplate/enable/" +
+            this.formSearch.rootOrgId +
+            "/" +
+            row.id;
+          this.$httpWithMsg.put(url).then(() => {
+            this.$notify({
+              type: "success",
+              message: "启用成功!",
+            });
+            this.searchForm();
+          });
+        })
+        .catch(() => {});
     },
     disenable(row) {
-      var url =
-        QUESTION_API +
-        "/exportTemplate/disenable/" +
-        this.formSearch.rootOrgId +
-        "/" +
-        row.id;
-      this.$httpWithMsg.put(url).then(() => {
-        this.$notify({
-          type: "success",
-          message: "禁用成功!",
-        });
-        this.searchForm();
-      });
+      this.$confirm("确定要禁用该模板吗?", "系统通知", {
+        type: "warning",
+      })
+        .then(() => {
+          var url =
+            QUESTION_API +
+            "/exportTemplate/disenable/" +
+            this.formSearch.rootOrgId +
+            "/" +
+            row.id;
+          this.$httpWithMsg.put(url).then(() => {
+            this.$notify({
+              type: "success",
+              message: "禁用成功!",
+            });
+            this.searchForm();
+          });
+        })
+        .catch(() => {});
     },
     deleteFile(row) {
-      this.$confirm("确定删除?", "提示", {
+      this.$confirm("确定要禁用该模板吗?", "系统通知", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",

+ 11 - 2
src/modules/questions/views/PropertyInfo.vue

@@ -31,13 +31,22 @@
       </el-form> -->
 
       <div class="part-box-action">
-        <div>
+        <div class="icon-btn-group">
+          <svg-btn name="xinzeng">新增同级</svg-btn>
+          <svg-btn name="xinzeng">新增子级</svg-btn>
+          <svg-btn name="bianji">编辑</svg-btn>
+          <svg-btn name="shanchu">删除</svg-btn>
+          <svg-btn name="shangjiantou">上移</svg-btn>
+          <svg-btn name="xiajiantou">下移</svg-btn>
+        </div>
+        <!-- <div>
           <el-button
             type="primary"
             icon="icon icon-plus-white"
             @click="insertParent"
             >新增一级</el-button
           >
+
           <el-button
             type="primary"
             icon="icon icon-plus-white"
@@ -77,7 +86,7 @@
             @click="moveDown"
             >下移</el-button
           >
-        </div>
+        </div> -->
         <div>
           <el-button type="danger" plain icon="icon icon-back" @click="back"
             >返回</el-button

+ 49 - 17
src/modules/questions/views/data_previllege.vue

@@ -16,42 +16,58 @@
         </div>
         <el-form
           ref="form"
-          :inline="true"
           :model="form"
           inline-message
           class="form-tight"
           label-position="left"
         >
-          <el-form-item label="审核权限" label-width="120px">
+          <el-form-item label="审核权限" label-width="80px">
             <el-radio-group v-model="form.auditAuthority" class="input">
               <el-radio label="FIRST">初级</el-radio>
               <el-radio label="SECOND">中级</el-radio>
               <el-radio label="THIRD">高级</el-radio>
-            </el-radio-group></el-form-item
-          >
-          <el-form-item style="margin-left: 60px">
-            <el-button type="danger" plain size="small" @click="clear"
-              >清空</el-button
+            </el-radio-group>
+            <svg-btn
+              name="refresh"
+              color="#6D5FF6"
+              @click="clear"
+              style="margin-left: 60px; vertical-align: middle"
+              >重置</svg-btn
             >
           </el-form-item>
+          <!-- <el-form-item style="margin-left: 60px"> -->
+          <!-- <el-button type="danger" plain size="small" @click="clear"
+              >清空</el-button
+            > -->
+
+          <!-- </el-form-item> -->
+          <el-form-item label="关联课程" label-width="80px">
+            <el-switch
+              v-model="form.defaultStatusCourse"
+              active-text="全部课程"
+              @change="(enabled) => saveDefaultStatus('Course', enabled)"
+            ></el-switch>
+          </el-form-item>
         </el-form>
       </div>
-      <div class="part-tabs">
+      <!-- <div class="part-tabs">
         <div class="part-tabs-item is-active" @click="activeName = 'tab1'">
           <div class="part-tabs-name">关联课程</div>
         </div>
-      </div>
+      </div> -->
     </div>
     <div class="privilege-part privilege-body">
       <div v-if="activeName === 'tab1'">
         <div class="box-justify">
-          <el-switch
-            v-model="form.defaultStatusCourse"
-            active-text="全部课程"
-            @change="(enabled) => saveDefaultStatus('Course', enabled)"
-          ></el-switch>
-          <div v-if="!form.defaultStatusCourse">
-            <el-button
+          <div v-if="!form.defaultStatusCourse" class="svg-btn-group">
+            <svg-btn name="xinzeng" @click="addCourse">新增</svg-btn>
+            <svg-btn
+              name="shanchu"
+              :disabled="noBatchSelectedCourse"
+              @click="deleteBatch('Course')"
+              >删除</svg-btn
+            >
+            <!-- <el-button
               size="small"
               type="danger"
               icon="icon icon-delete-white"
@@ -65,7 +81,7 @@
               icon="icon icon-plus-white"
               @click="addCourse"
               >添加</el-button
-            >
+            > -->
           </div>
         </div>
         <div v-if="!form.defaultStatusCourse" class="privilege-table">
@@ -294,6 +310,15 @@ export default {
       }
     },
     async deleteBatch(type) {
+      this.$confirm("确定要删除选中课程吗?", "系统通知", {
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteHandler(type);
+        })
+        .catch(() => {});
+    },
+    async deleteHandler(type) {
       const refIds = this.$refs["table" + type].selection.map((v) => v.refId);
 
       try {
@@ -329,3 +354,10 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.data-privilege {
+  .part-box-header {
+    border-bottom: none;
+  }
+}
+</style>

+ 2 - 2
src/modules/questions/views/user.vue

@@ -964,7 +964,7 @@ export default {
     },
     //重置密码
     resetPass(row) {
-      this.$confirm("是否重置密码?", "提示", {
+      this.$confirm("确定要重置选中用户的密码吗?", "系统通知", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -974,7 +974,7 @@ export default {
           this.$httpWithMsg.put(url).then(() => {
             this.$notify({
               type: "success",
-              message: "重置成功!",
+              message: "密码重置成功!",
             });
             return this.search();
           });