Selaa lähdekoodia

修改评价数据和参数设置的图标样式

lm 1 kuukausi sitten
vanhempi
commit
e0dd1d4828

+ 22 - 0
src/assets/icon/deleteIcon.vue

@@ -0,0 +1,22 @@
+<template>
+    <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <g clip-path="url(#clip0_7_8551)">
+        <path d="M3.21973 3.01758C3.49642 2.83507 3.87407 2.86534 4.11719 3.1084L12.8936 11.8838L12.9844 11.9951C13.1656 12.2708 13.1345 12.6487 12.8916 12.8916C12.6485 13.1347 12.2709 13.1649 11.9941 12.9824L11.8828 12.8916L3.1084 4.11719C2.83074 3.83947 2.8307 3.38609 3.1084 3.1084L3.21973 3.01758Z" 
+            fill="var(--icon-color)" stroke="var(--icon-color)" stroke-width="0.2"/>
+        <path d="M11.9951 3.0166C12.2708 2.83514 12.6486 2.86552 12.8916 3.1084L12.9824 3.21973C13.139 3.457 13.1388 3.76851 12.9824 4.00586L12.8916 4.11719L4.11719 12.8916C3.87418 13.1346 3.49641 13.1657 3.21973 12.9834L3.1084 12.8916C2.83078 12.6139 2.83072 12.1605 3.1084 11.8828L11.8838 3.10645L11.9951 3.0166Z" 
+            fill="var(--icon-color)" stroke="var(--icon-color)" stroke-width="0.2"/>
+        </g>
+        <defs>
+            <clipPath id="clip0_7_8551">
+            <rect width="16" height="16" fill="white"/>
+            </clipPath>
+        </defs>
+    </svg>
+</template>
+
+
+<style lang="scss" scoped>
+svg{
+    --icon-color : #666666;   
+}
+</style>

+ 6 - 0
src/views/reviewManagement/ReviewManagement.vue

@@ -93,7 +93,13 @@
                     <span v-else>-</span>
                 </template>
 
+                <template #evaluationStartDatetime="{row}">
+                    {{ row.evaluationStartDatetime ?  row.evaluationStartDatetime : '-' }}
+                </template>
 
+                <template #evaluationEndDatetime="{row}">
+                    {{ row.evaluationEndDatetime ?  row.evaluationEndDatetime : '-'  }}
+                </template>
 
                 <template #operation="{row}">
                     <div class="table_row_option">

+ 46 - 27
src/views/reviewManagement/stepComponent/evaluationDataComponent/EvaluationDataComponent.vue

@@ -8,7 +8,10 @@
             <el-checkbox v-if="store.state.evaluationManageStepData.evaluationType === 0 " v-model="store.state.evaluationManageStepData.isHeadTeacherInvolved" >班主任参与评价</el-checkbox>
           </div>
           <div class="content_right">
-            <el-button  class="button_border"  @click="OpenAddGradeForm">新增年级</el-button>
+            <el-button  class="button_border button_img_prefix"  @click="OpenAddGradeForm">
+              <img :src="addIcon" alt="">
+              新增年级
+            </el-button>
             <el-button  class="button_background" @click="SaveEvaluationData">完成</el-button>
           </div>
         </div>
@@ -33,19 +36,19 @@
                   <template  v-if="store.state.evaluationManageStepData.evaluationType === 0 ">
                     <el-checkbox v-model="gradeOpt.selectionStatus" >选科</el-checkbox>
                     <div class="selection_params" v-if="gradeOpt.selectionStatus">
-                      <span class="param_text">一共 </span>
+                      <span class="param_text">一共&nbsp;&nbsp;</span>
                       <el-input type="number" 
                         :max="gradeOpt.subjectCount" :min="1" 
                         v-model="gradeOpt.selectionCount"
                         @blur="HandleInputBlur(gradeOpt.subjectCount,gradeOpt,'selectionCount')">
                       </el-input>
-                      <span class="param_text"> 科,需要选择 </span>
+                      <span class="param_text">&nbsp;&nbsp;科,需要选择&nbsp;&nbsp;</span>
                       <el-input type="number" 
                         :max="gradeOpt.subjectCount" :min="1"  
                         v-model="gradeOpt.needCount" 
                         @blur="HandleInputBlur(gradeOpt.selectionCount,gradeOpt,'needCount')">
                       </el-input>
-                      <span class="param_text"> 科</span>
+                      <span class="param_text">&nbsp;&nbsp;科</span>
                     </div>
                   </template>
 
@@ -71,19 +74,16 @@
                 :rules="[]"
               >
                 <div class="tag_list">
-                  <el-tag
-                    v-for="tag in gradeOpt.subjectData"
-                    :key="tag"
-                    closable
-                    :disable-transitions="true"
-                    @close="HandleDeleteOpen(tag,'subject')"
-                  >
+                  <div class="tag_itm" v-for="tag in gradeOpt.subjectData" :key="tag">
                     {{ tag.name }}
-                  </el-tag>
+                    <component @click="HandleDeleteOpen(tag,'subject')" :is="deleteIcon" 
+                        :style="{'--icon-color':'#2E64FA'}"></component>
+                  </div>
 
-                  <el-button class="button_border"
+                  <el-button class="button_border  button_img_prefix"
                     @click="OpenAddSubjectForm(gradeOpt,'subject')">
-                    + 新增
+                    <img :src="addIcon" alt="">
+                    新增
                   </el-button>
                 </div>
               </el-form-item>
@@ -97,19 +97,16 @@
                 :rules="[]"
               >
                 <div class="tag_list">
-                  <el-tag
-                    v-for="tag in gradeOpt.selectSubjectData"
-                    :key="tag"
-                    closable
-                    :disable-transitions="true"
-                    @close="HandleDeleteOpen(tag,'selectedSubject')"
-                  >
-                    {{ tag.name   }}
-                  </el-tag>
+                  <div class="tag_itm" v-for="tag in gradeOpt.selectSubjectData" :key="tag">
+                    {{ tag.name }}
+                    <component @click="HandleDeleteOpen(tag,'selectedSubject')" :is="deleteIcon" 
+                          :style="{'--icon-color':'#2E64FA'}"></component>
+                  </div>
                   
-                  <el-button class="button_border"
+                  <el-button class="button_border  button_img_prefix"
                     @click="OpenAddSubjectForm(gradeOpt,'selectedSubject')">
-                    + 新增
+                    <img :src="addIcon" alt="" style="color:red">
+                    新增
                   </el-button>
                 </div>
               </el-form-item>
@@ -265,6 +262,9 @@ import {
 import { ElMessage } from 'element-plus';
 import router from '@/router';
 
+import addIcon from '@/assets/icon/add.svg'
+import deleteIcon from '@/assets/icon/deleteIcon.vue'
+
 interface subjectOrClassDataItm {
    id:string, 
    name:string
@@ -736,13 +736,15 @@ onMounted(async() => {
 
 
 <style lang="scss" scoped>
-/* 右侧内容区样式 */
+/* 内容区样式 */
 .step_1_content {
   flex: 1;
   display: flex;
   flex-direction: column;
   overflow: hidden;
 
+
+
   .option_container{
     display: flex;
     flex-direction: column;
@@ -778,7 +780,7 @@ onMounted(async() => {
           gap: 16px;
           align-items: center;
 
-          :deep(.el-tag){
+          .tag_itm {
             border:solid #2E64FA 1px;
             background-color: white;
             color:#2E64FA;
@@ -786,6 +788,10 @@ onMounted(async() => {
             padding:0px 12px;
             height:36px;
             cursor: pointer;
+            display: flex;
+            align-items: center;
+            gap:4px;
+            border-radius: 4px;
           }
 
 
@@ -846,6 +852,19 @@ onMounted(async() => {
       }
     }
   }
+
+  .button_img_prefix {
+    >span{
+      img{
+        width: 14px !important;
+        height: 14px !important;
+        margin-right: 4px;
+      }
+    }
+  }
+
+
+
 }
 
 .subject_add_form_dialog{

+ 15 - 1
src/views/reviewManagement/stepComponent/parameterSettingComponent/ParameterSettingComponent.vue

@@ -68,7 +68,10 @@
             </template>
         </Table>
         <div class="page_jg_20"></div>
-        <div v-if="isEdit" class="add_subject_option" @click="OpenSubjectCompositionForm"> + 增加科目组合</div>
+        <div v-if="isEdit" class="add_subject_option" @click="OpenSubjectCompositionForm">
+            <img :src="addIcon" alt="">
+            增加科目组合
+        </div>
     </div>
 
     <FormDialog 
@@ -112,6 +115,10 @@ import {
 import { ElMessage } from 'element-plus';
 import Dialog from '@/baseComponents/Dialog.vue';
 
+
+import addIcon from '@/assets/icon/add.svg'
+
+
 const route = useRoute()
 const router = useRouter()
 const store = useStore()
@@ -370,6 +377,12 @@ onMounted(async ()=>{
 
 .add_subject_option{
     flex-grow: 0 !important;
+    
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap:8px;
+
     background: rgba(46,100,250,0.1);
     border-radius: 6px 6px 6px 6px;
     text-align: center;
@@ -377,6 +390,7 @@ onMounted(async ()=>{
     color:#2e64fa;
     font-size: 14px;
     cursor: pointer;
+
 }
 
 .low_score_delete_ratio{

+ 2 - 2
src/views/reviewManagement/table.ts

@@ -72,7 +72,7 @@ export const questionnaireTableColumns = ref([
         width: '180',
         fixed: '',
         align: 'center',
-        custom: false,
+        custom: true,
         hidden: false,
     },
     {
@@ -81,7 +81,7 @@ export const questionnaireTableColumns = ref([
         width: '180',
         fixed: '',
         align: 'center',
-        custom: false,
+        custom: true,
         hidden: false,
     },
     {