zhangjie 3 년 전
부모
커밋
700f167ccb

+ 14 - 23
card/assets/styles/card-design.scss

@@ -99,20 +99,20 @@
 
     .element-item-topic-number {
       position: absolute;
-      left: -28px;
+      left: -22px;
       top: 0;
-      width: 24px;
-      height: 24px;
+      width: 20px;
+      height: 20px;
       z-index: 99;
-      line-height: 24px;
-      font-size: 14px;
+      line-height: 20px;
+      font-size: 12px;
       text-align: center;
       background-color: $--color-primary;
       color: #fff;
       border-radius: 50% 0 50% 50%;
       cursor: pointer;
       &:hover {
-        background-color: $--color-success;
+        background-color: $--color-primary-light;
       }
     }
     // 编辑时,小题扩展答题区之间用虚线
@@ -261,7 +261,7 @@
       width: 100%;
       left: 0;
       top: 14px;
-      border-bottom: 1px solid $--color-text-gray-2;
+      border-bottom: 1px dashed $--color-text-gray;
       z-index: 2;
     }
 
@@ -270,7 +270,7 @@
       top: 0;
       z-index: 8;
       padding: 0 10px;
-      color: $--color-text-gray-2;
+      color: $--color-text-gray;
 
       &::after {
         content: "";
@@ -289,7 +289,7 @@
         height: 30px;
         width: 30px;
         border-radius: 50%;
-        border: 2px solid $--color-text-gray-2;
+        border: 2px solid $--color-text-gray;
         line-height: 26px;
         font-weight: bold;
         z-index: 8;
@@ -415,12 +415,11 @@
   justify-content: space-between;
 
   .control-right {
-    width: 400px;
+    width: 240px;
     text-align: right;
     flex-grow: 0;
     .el-button {
-      width: 100px;
-      border-radius: 10px;
+      width: 60px;
     }
   }
   .control-left {
@@ -428,14 +427,6 @@
     overflow-y: hidden;
     overflow-x: auto;
     flex-grow: 2;
-
-    .el-button {
-      width: 80px;
-      color: #bbb;
-      font-weight: bold;
-      background: rgba(245, 245, 245, 1);
-      border-radius: 10px;
-    }
   }
 }
 
@@ -475,8 +466,8 @@
     color: $--color-text-dark-1;
   }
   .column-btn {
-    width: 32px;
-    padding: 8px 0;
+    width: 28px;
+    padding: 5px 0;
     .icon {
       margin-top: -2px;
     }
@@ -508,7 +499,7 @@
       text-align: center;
       font-size: 12px;
       border-radius: 5px;
-      background-color: $--color-primary-light;
+      background-color: $--color-primary;
       color: #fff;
     }
   }

+ 1 - 1
card/components/PagePropEdit.vue

@@ -49,7 +49,7 @@
           >启用</el-checkbox
         >
       </el-form-item>
-      <el-form-item label="大题序号">
+      <el-form-item label="大题">
         <ul class="topicno-list" v-if="topicSeries.length">
           <li>{{ topicSeries.length }}</li>
         </ul>

+ 3 - 2
card/views/CardDesign.vue

@@ -77,11 +77,11 @@
     <div class="design-main">
       <!-- menus -->
       <div class="design-control">
-        <div class="control-left">
+        <div class="control-left tab-btns">
           <el-button
             v-for="(page, pageNo) in pages"
             :key="pageNo"
-            :class="{ 'btn-white': curPageNo === pageNo }"
+            :type="curPageNo === pageNo ? 'primary' : 'default'"
             @click="swithPage(pageNo)"
             >第{{ pageNo + 1 }}页</el-button
           >
@@ -95,6 +95,7 @@
             >预览</el-button
           >
           <el-button
+            type="primary"
             :loading="isSubmit"
             :disabled="canSave || !pages.length"
             @click="toSave"

+ 1 - 1
src/assets/styles/element-ui-costom.scss

@@ -197,7 +197,7 @@
   margin-left: 10px;
 }
 .el-button + .el-button {
-  margin-left: 18px;
+  margin-left: 10px;
 }
 .el-button--text + .el-button--text {
   margin-left: 5px;

+ 1 - 1
src/modules/admin/views/AdminUserManage.vue

@@ -13,7 +13,7 @@
         <el-form-item label="启用/禁用:" label-width="90px">
           <el-select
             v-model="filter.enable"
-            style="width: 110px;"
+            style="width: 120px;"
             placeholder="启用/禁用"
             clearable
           >

+ 1 - 1
src/modules/base/views/CardRuleManage.vue

@@ -23,7 +23,7 @@
           <el-form-item label="启用/禁用:" label-width="90px">
             <el-select
               v-model="filter.enable"
-              style="width: 110px;"
+              style="width: 120px;"
               placeholder="启用/禁用"
               clearable
             >

+ 3 - 3
src/modules/base/views/CourseManage.vue

@@ -7,7 +7,7 @@
             <el-input
               style="width: 142px;"
               v-model.trim="filter.courseName"
-              placeholder="请输入内容"
+              placeholder="课程名称"
               clearable
             ></el-input>
           </el-form-item>
@@ -17,8 +17,8 @@
               type="datetimerange"
               :picker-options="pickerOptions"
               range-separator="至"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
+              start-placeholder="创建开始时间"
+              end-placeholder="创建结束时间"
               value-format="timestamp"
               align="right"
               unlink-panels

+ 1 - 2
src/modules/base/views/PrintPlanPushManage.vue

@@ -5,11 +5,10 @@
         <el-form-item label="印刷计划:">
           <print-plan-select
             v-model.trim="filter.printPlanId"
-            placeholder="请选择"
+            placeholder="印刷计划"
             clearable
           ></print-plan-select>
         </el-form-item>
-        <el-form-item label="考试计划:"> </el-form-item>
         <el-form-item label-width="0px">
           <el-button type="primary" @click="search">查询</el-button>
         </el-form-item>

+ 2 - 2
src/modules/base/views/RoleManage.vue

@@ -7,14 +7,14 @@
             <el-input
               style="width: 200px;"
               v-model.trim="filter.name"
-              placeholder="请输入内容"
+              placeholder="角色名称"
               clearable
             ></el-input>
           </el-form-item>
           <!-- <el-form-item label="启用/禁用:" label-width="90px">
           <el-select
             v-model="filter.enable"
-            style="width: 100px;"
+            style="width: 120px;"
             placeholder="请选择"
             clearable
           >

+ 1 - 1
src/modules/base/views/TemplateManage.vue

@@ -27,7 +27,7 @@
           <el-form-item label="启用/禁用:" label-width="90px">
             <el-select
               v-model="filter.enable"
-              style="width: 110px;"
+              style="width: 120px;"
               placeholder="启用/禁用"
               clearable
             >

+ 1 - 1
src/modules/base/views/UserManage.vue

@@ -38,7 +38,7 @@
           <el-form-item label="启用/禁用:" label-width="90px">
             <el-select
               v-model="filter.enable"
-              style="width: 110px;"
+              style="width: 120px;"
               placeholder="启用/禁用"
               clearable
             >

+ 12 - 2
src/modules/exam/views/DataTaskManage.vue

@@ -4,7 +4,12 @@
       <el-form ref="FilterForm" label-position="left" label-width="55px" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
           <el-form-item label="状态:">
-            <el-select v-model="filter.status" placeholder="状态" clearable>
+            <el-select
+              v-model="filter.status"
+              placeholder="状态"
+              clearable
+              style="width: 120px;"
+            >
               <el-option
                 v-for="(val, key) in DATA_TASK_STATUS"
                 :key="key"
@@ -24,7 +29,12 @@
             </el-select>
           </el-form-item>
           <el-form-item label="数据结果:" label-width="85px">
-            <el-select v-model="filter.result" placeholder="数据结果" clearable>
+            <el-select
+              v-model="filter.result"
+              placeholder="数据结果"
+              clearable
+              style="width: 120px;"
+            >
               <el-option
                 v-for="(val, key) in DATA_TASK_RESULT"
                 :key="key"

+ 1 - 1
src/modules/exam/views/ExamTaskManage.vue

@@ -73,7 +73,7 @@
           <el-form-item label="启用/禁用:" label-width="90px">
             <el-select
               v-model="filter.enable"
-              style="width: 142px;"
+              style="width: 120px;"
               placeholder="启用/禁用"
               clearable
             >

+ 1 - 1
src/modules/print/views/PlanLinkPaper.vue

@@ -6,7 +6,7 @@
           <el-form-item label="关联状态:">
             <el-select
               v-model="filter.relateType"
-              style="width: 100px;"
+              style="width: 120px;"
               placeholder="关联状态"
               clearable
             >