ソースを参照

联校新增后刷新选中优化;冻结提示添加学校名称等

zhangguohua 1 年間 前
コミット
a6b33b6e94

+ 9 - 292
src/styles/common.scss

@@ -21,8 +21,6 @@ li {
   padding-bottom: 30px;
   overflow-y: hidden;
   background-color: #f0f4fb;
-
-  
 }
 
 .layoutMain {
@@ -128,6 +126,10 @@ body {
 .el-radio__input.is-checked+.el-radio__label {
   color: #2E64FA;
 }
+.el-radio-button.is-active .el-radio-button__original-radio:not(:disabled)+.el-radio-button__inner {
+  background: #2E64FA;
+  border-color: #2E64FA;
+}
 .el-checkbox__input.is-checked+.el-checkbox__label {
   color: #2E64FA;
 }
@@ -575,9 +577,6 @@ button:focus, button:focus-visible {
     line-height: 36px;
     color: #666666;
   }
-  .el-radio-button.is-active .el-radio-button__original-radio:not(:disabled)+.el-radio-button__inner {
-    background: #2E64FA;
-  }
   .el-radio-button__orig-radio:checked + .el-radio-button__inner {
     color: #fff !important;
   }
@@ -884,7 +883,7 @@ button:focus, button:focus-visible {
   //饿了么内容样式覆盖
   .el-dialog__body {
     font-weight: 400;
-    font-size: 14px;
+    font-size: 16px;
     color: #666666;
     padding: 20px;
     width: 100%;
@@ -1563,12 +1562,9 @@ button:focus, button:focus-visible {
 
     .dialog_table {
       width: 100%;
-
-      .el-table--group, .el-table--border
-      {
+      .el-table--group, .el-table--border {
         border-radius: 4px;
       }
-
       //表格顶部标题栏
       .el-table tr th.el-table__cell {
         background-color: #f4f6f8;
@@ -1576,120 +1572,41 @@ button:focus, button:focus-visible {
         color: #333;
         font-weight: 600;
       }
-
       .el-table__empty-block {
         // background-color: red;
         background-image: url("../assets/bg/table_no_data.png");
         background-size: 64px 72px;
         background-position: 50% 50%;
         background-repeat: no-repeat;
-
         .el-table__empty-text {
           display: none;
         }
       }
-
       .el-table__body .el-table__cell {
         padding: 0 !important; //去掉弹窗表格的padding
         height: 42px;
         border-right: 1px solid #e9e9e9;
-
         .el-input--mini .el-input__inner {
           width: 100%;
         }
-
         .el-input-number__decrease {
           height: 16px !important;
           line-height: 16px;
           border-bottom: 1px solid #dcdfe6;
         }
-
         .el-input-number__increase {
           height: 16px !important;
           line-height: 16px;
           border-top: 1px solid #dcdfe6;
         }
-
         .el-input-number {
           width: 100%;
           height: 38px;
         }
-
         .el-input__inner {
           width: 100%;
         }
       }
-
-      .table_row_select
-      {
-        position: relative;
-
-        .select_state
-        {
-          position: absolute;
-          width: 10px;
-          height: 10px;
-          left: 45px;
-          top:12px;
-          z-index: 999;
-        }
-        //表格里的输入框 选择框样式覆盖
-        .el-input__inner {
-          height: 30px !important;
-          line-height: 30px !important;
-          padding-left: 30px;
-        }
-
-        // 下拉选择框 中间箭头上下居中
-        .el-select .el-input .el-select__caret {
-          height: 30px;
-        }
-
-        // 下拉选择框 中间箭头上下居中
-        .el-input__icon {
-          line-height: 30px;
-        }
-
-      }
-
-      .table_row_name {
-        overflow: hidden;
-        /* 隐藏超出容器的内容 */
-        white-space: nowrap;
-        /* 保持文本在一行内 */
-        text-overflow: ellipsis;
-        /* 超出部分显示省略号 */
-      }
-
-      //进度显示
-      .table_row_progress {
-        display: flex;
-        justify-content: flex-start;
-
-        width: 100%;
-
-        .progress_percentage {
-          width: 15%;
-          font-weight: 400;
-          font-size: 14px;
-          color: #666666;
-        }
-
-        .progress_bar {
-          width: 65%;
-        }
-
-        .progress_state {
-          width: 20%;
-
-          .span_number {
-            font-weight: 400;
-            font-size: 14px;
-            color: #666666;
-            margin-left: 10px;
-          }
-        }
-      }
     }
 
     .el-table__header,
@@ -1697,126 +1614,15 @@ button:focus, button:focus-visible {
     .el-table__foote {
       width: 100%;
     }
-
     .el_table {
       box-shadow: 1px 1px 1px #e4e7ed;
       border-radius: 4px;
     }
-
-    // .el-table--border .el-table__cell {
-    //   border-bottom: 1px solid #ebeef5;
-    //   border-right: 0px solid #ebeef5;
-    // }
-
-    .student_detail_info {
-      width: 100%;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      font-weight: 400;
-      font-size: 16px;
-      color: #303133;
-      margin-bottom: 30px;
-      margin-top: 30px;
-
-      .info_title {
-        width: 40%;
-
-        text-align: right;
-        font-weight: 400;
-        font-size: 16px;
-        color: #303133;
-      }
-
-      .info_message {
-        width: 50%;
-        text-align: left;
-        padding-left: 2px;
-
-        font-weight: 500;
-        font-size: 14px;
-        color: #666666;
-      }
-    }
-
-    //弹窗通用搜索区域
-    .center_search {
-      width: 100%;
-      margin: auto;
-
-      padding: 0 0 15px 0;
-    }
-
-    //扫描的图片
-    .dialog_scan_image {
-      width: calc(100% - 40px);
-      height: 497px;
-      background: #f0f4f8;
-      padding: 20px;
-      display: flex;
-      justify-content: flex-start;
-      flex-wrap: wrap;
-      gap: 20px;
-
-      .scan_image_item {
-        width: calc(25% - 15px);
-        height: 139px;
-
-        .image_item_title {
-          display: flex;
-          justify-content: space-between;
-          line-height: 25px;
-
-          .title_left {
-            font-weight: 500;
-            font-size: 14px;
-            color: #303133;
-          }
-
-          .title_right {
-            font-weight: 400;
-            font-size: 14px;
-            color: #666666;
-          }
-        }
-
-        img {
-          width: 100%;
-          height: 100%;
-        }
-      }
-    }
-    .default_pass
-    {
+    .default_pass {
       font-size: 12px;
       color:#666;
     }
-
-    .dialog_example_img
-    {
-      width: 100%;
-      height: 178px;
-      background-image: url("../assets/bg/score_add_example.webp");
-      background-size: 561px 178px;
-      background-repeat: no-repeat;
-      background-position: 0% 50%;
-    }
   }
-
-  //消息提醒内容区
-  .dialog_message {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: 100%;
-    min-height: 99px;
-
-    span {
-      padding: 20px;
-      line-height: 20px;
-    }
-  }
-
   //饿了么底部按钮样式覆盖
   .el-dialog__footer {
     padding: 0 20px;
@@ -1849,19 +1655,16 @@ button:focus, button:focus-visible {
       padding: 0 !important;
       font-size: 14px;
     }
-
     //饿了么按钮样式覆盖
     .el-button--primary {
       width: 68px;
       height: 36px;
       margin-left: 15px;
     }
-
     .el-button--default {
       width: 68px;
       height: 36px;
     }
-
     // 自定义特殊按钮样式
     .no_save_button {
       width: 82px;
@@ -1870,13 +1673,11 @@ button:focus, button:focus-visible {
       border-radius: 4px 4px 4px 4px;
       border: 1px solid #dcdfe6;
     }
-
     .save_button {
       width: 68px;
       height: 36px;
       margin-left: 20px;
     }
-
     .cancel_button {
       width: 68px;
       height: 36px;
@@ -1886,7 +1687,6 @@ button:focus, button:focus-visible {
       margin-left: 20px;
     }
   }
-
   //消息提醒弹窗
   .el-message-box__header {
     padding: 0 !important;
@@ -1896,44 +1696,34 @@ button:focus, button:focus-visible {
     .el-message-box__title {
       height: 48px;
       line-height: 48px;
-
       font-weight: 500;
       font-size: 16px;
       color: #333;
       text-indent: 50px;
-
       background-image: url("../assets/icon/warning_icon.png");
       background-size: 20px 20px;
       background-position: 20px 50%;
       background-repeat: no-repeat;
     }
-
-    .el-message-box__headerbtn
-    {
+    .el-message-box__headerbtn {
       width: 36px;
       height: 36px;
-   
       margin-top: -8px;
       background-image: url("../assets/icon/close-line.png");
       background-position: 100% 50%;
       background-repeat: no-repeat;
       background-size: 24px 24px;
-
-      .el-icon-close
-      {
+      .el-icon-close {
         display: none;
       }
     }
   }
-
   .el-message-box__content {
     min-height: 55px;
     padding: 0px 0px !important;
-
     display: flex;
     justify-content: left;
     align-items: center;
-    
     .el-message-box__message {
       padding: 20px 10px 20px 20px !important;
       font-weight: 400;
@@ -1944,15 +1734,11 @@ button:focus, button:focus-visible {
       overflow-y: auto;
       white-space: normal;
       word-break: break-all;
-
-      
     }
   }
-
   .el-message-box__status {
     display: none !important;
   }
-
   .el-message-box__btns {
     padding: 13px 20px 4px 20px;
     border-top: 1px solid #e4e7ed;
@@ -1964,75 +1750,6 @@ button:focus, button:focus-visible {
       font-size: 14px;
     }
   }
-
-  //给分规则
-  .dialog_group {
-    width:100%;
-    margin: auto;
-    padding-left: 6px;
-    .radio_title {
-      font-weight: 400;
-      font-size: 16px;
-      color: #666666;
-    }
-
-    .el-radio__label
-    {
-      font-size: 16px;
-      font-weight: 400;
-    }
-
-    .radio_group_socre {
-      width: 100%;
-      height: auto;
-      line-height: 50px;
-      font-weight: 400;
-      font-size: 16px;
-      color: #666666;
-
-      .el-input {
-        width: 52px !important;
-        height: 30px !important;
-        padding: 0px !important;
-        // margin-left: 5px;
-        margin-right: 5px;
-      }
-
-      .el-input__inner {
-        width: 52px !important;
-        height: 30px !important;
-        padding: 0px !important;
-        text-align: center;
-      }
-
-      .el-radio__input.is-checked + .el-radio__label {
-        font-weight: 400;
-        font-size: 16px;
-        color: #666;
-      }
-    }
-
-    .radio_group_long_input {
-      line-height: 50px;
-      color: #666;
-
-      .el-input {
-        width: 200px !important;
-        height: 36px !important;
-        padding: 0px !important;
-        // margin-left: 5px;
-        margin-right: 5px;
-      }
-
-      .el-input__inner {
-        width: 200px !important;
-        height: 36px !important;
-        padding: 0px !important;
-        text-align: center;
-      }
-    }
-  }
-
   .el-upload-list {
     display: none;
   }

+ 4 - 2
src/views/examination/index.vue

@@ -139,8 +139,10 @@ onMounted(() => {
   permissions.value = JSON.parse(localStorage.getItem('permissions'))
   GetJoinExamList()
 })
+const checkRowKey = ref(0)
 const handleRowClick = (row: any) => {
   console.log(row)
+  checkRowKey.value = tableData.value.findIndex(item => item.id == row.id)
   selectRow.value = row
   selectListId.value = selectRow.value?.children?.map(item => (item.tenantCode))?? []
 }
@@ -154,10 +156,10 @@ const GetJoinExamList = () => {
   getJoinExamList({ queryStr: schooltName.value }).then((res: any) => {
     if(res.code == 200) {
       tableData.value = res.data
-      selectRow.value = tableData.value[0]
+      selectRow.value = tableData.value[checkRowKey.value]
       selectListId.value = selectRow.value?.children?.map(item => (item.tenantCode))?? []
       nextTick(() => {
-        tableRef.value.setCurrentRow(tableData.value[0]); // 高亮当前行
+        tableRef.value.setCurrentRow(tableData.value[checkRowKey.value]); // 高亮当前行
       });
     }
     tableLoading.value = false

+ 12 - 1
src/views/school/authConfig.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="authData.showDialog" :title="`${authData.schoolName} 权限管理`" width="620px">
+  <el-dialog v-model="authData.showDialog" :title="`${authData.schoolName} 权限管理`" width="680px">
     <div>
       <div class="page_tag">
         <el-radio-group v-model="authType" @change="ChangeTab">
@@ -141,11 +141,22 @@ const SubmitForm = async () => {
 <style lang="scss" scoped>
 .page_tag {
   padding: 0 20px;
+  :deep(.el-radio-button__inner){
+    font-size: 16px !important;
+  }
 }
 .grade_content {
   padding: 0 20px;
   .grade_level {
     margin-bottom: 10px;
+    > .el-checkbox :deep(.el-checkbox__label){
+      font-weight: 600;
+      color: #333;
+    }
+    :deep(.el-checkbox__label){
+      font-size: 16px !important;
+      color: #666;
+    }
   }
 }
 </style>

+ 1 - 1
src/views/school/index.vue

@@ -491,7 +491,7 @@ const RefTable = (val: any) => {
 // 改变用户状态
 const ChangeStatus = (row: any, text: String) => {
   console.log(row)
-  ElMessageBox.confirm(`是否${text}该学校?`, '提示', {
+  ElMessageBox.confirm(`是否${text}${row.tenantName}?`, '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning'