样式调整

src/layout/components/header.vue

@@ -31,17 +31,17 @@
         ref="editPassWordForm"
       >
         <el-form-item label="原密码" prop="passWord">
-          <el-input v-model="editPassWordData.passWord" type="password" placeholder="请输入原密码" />
+          <el-input v-model="editPassWordData.passWord" type="password" show-password placeholder="请输入原密码" />
         </el-form-item>
         <el-form-item label="新密码" prop="newPassWord">
-          <el-input v-model="editPassWordData.newPassWord" type="password" placeholder="请输入新密码" />
+          <el-input v-model="editPassWordData.newPassWord" type="password" show-password placeholder="请输入新密码" />
         </el-form-item>
         <el-form-item label="确认密码" prop="confirmNewPassWord">
-          <el-input v-model="editPassWordData.confirmNewPassWord" type="password" placeholder="请输入确认新密码" />
+          <el-input v-model="editPassWordData.confirmNewPassWord" type="password" show-password placeholder="请输入确认新密码" />
         </el-form-item>
       </el-form>
       <template #footer>
-        <el-button class="button_border_grag cancel" @click="dialogShow = false">取 消</el-button>
+        <el-button class="button_border_gray cancel" @click="dialogShow = false">取 消</el-button>
         <el-button class="button_background" :loading="submitLoading" @click="confirmPassWord(editPassWordForm)">确 定</el-button>
       </template>
     </el-dialog>

src/styles/common.scss

@@ -101,7 +101,7 @@ body {
 }
 .el-button.button_border_gray {
   background: #fff;
-  border: 1px solid  #BBBBBB;
+  border: 1px solid #DCDFE6;
   color: #BBBBBB;
   &:hover {
     background: none;
@@ -124,13 +124,53 @@ body {
 .el-radio__input.is-checked+.el-radio__label {
   color: #2E64FA;
 }
+.el-checkbox__input.is-checked+.el-checkbox__label {
+  color: #2E64FA;
+}
 .el-select-dropdown__item.is-selected {
   color: #2E64FA;
 }
 .el-dropdown-menu__item:not(.is-disabled):focus, .el-dropdown-menu__item:not(.is-disabled):hover {
   color: #2E64FA;
 }
-
+button:focus, button:focus-visible {
+  outline: none;
+}
+.el-picker-panel__icon-btn:focus-visible {
+  color: #2E64FA;
+}
+.el-picker-panel__icon-btn:hover {
+  color: #2E64FA;
+}
+.el-date-picker__header-label:hover {
+  color: #2E64FA;
+}
+.el-date-table td.available:hover {
+  color: #2E64FA;
+}
+.el-date-table, .el-year-table, .el-month-table  {
+  td.today .el-date-table-cell__text {
+    color: #2E64FA;
+  }
+  td .el-date-table-cell__text:hover {
+    color: #2E64FA;
+  }
+  td.current:not(.disabled) .el-date-table-cell__text {
+    background-color: #2E64FA;
+  }
+}
+.el-message-box__btns .el-button:active {
+  color: #606266;
+  border-color: #DCDFE6; 
+  background: none;
+}
+.el-message-box__btns .el-button:hover {
+  border-color: #DCDFE6;
+}
+.el-message-box__headerbtn:focus .el-message-box__close, 
+.el-message-box__headerbtn:hover .el-message-box__close {
+  color: #999;
+}
 
 
 
@@ -1447,6 +1487,8 @@ body {
       display: flex;
       gap: 10px;
       width: auto;
+      height: 36px;
+      line-height: 36px;
       font-weight: 400;
       font-size: 14px;
       color: #666666;
@@ -1531,6 +1573,8 @@ body {
     .content_right 
     {
       width: auto;
+      height: 36px;
+      line-height: 36px;
       display: flex;
       justify-content: flex-end;
       gap: 10px;
@@ -1663,6 +1707,10 @@ body {
   .el-dialog {
     padding: 0;
   }
+  .el-dialog__headerbtn:focus .el-dialog__close, 
+  .el-dialog__headerbtn:hover .el-dialog__close {
+    color: #999;
+  }
   .el-dialog__header {
     width: 100%;
     height: 48px;
@@ -1714,6 +1762,9 @@ body {
     .el-date-editor.el-input, .el-date-editor.el-input__wrapper {
       width: 140px;
     }
+    .el-form .el-form-item:last-child {
+      margin-bottom: 0;
+    }
   }
 
   .max_height_540 {

src/views/examination/index.vue

@@ -17,7 +17,7 @@
         <div class="page_table">
           <el-table :data="tableData" stripe v-loading="tableLoading" element-loading-text="拼命加载中……" 
             element-loading-spinner="el-icon-loading" element-loading-background="#ffffff" @row-click="handleRowClick">
-              <el-table-column align="center">
+              <el-table-column align="center" v-if="tableData.length">
                 <template #default="{ row }">
                   <el-radio v-model="selectRow.id" :value="row.id"></el-radio>
                 </template>
@@ -53,16 +53,16 @@
         <div class="page_search">
           <div class="search_content">
             <div class="content_left">
-              {{ selectRow.tenantName }} 下辖学校：{{ selectRow.childrenCount }}
+              {{ selectRow?.tenantName }} 下辖学校：{{ selectRow?.childrenCount || '-' }}
             </div>
-            <div class="content_right">
+            <div class="content_right" v-if="selectRow?.tenantName">
               <el-button class="button_background" @click="addSchool">新增学校</el-button>
             </div>
           </div>
         </div>
         <div class="page_jg_20"></div>
         <div class="page_table">
-          <el-table :data="selectRow.children" stripe v-loading="tableLoading" element-loading-text="拼命加载中……" 
+          <el-table :data="selectRow?.children" stripe v-loading="tableLoading" element-loading-text="拼命加载中……" 
             element-loading-spinner="el-icon-loading" element-loading-background="#ffffff">
               <el-table-column type="index" label="序号" align="center" />
               <el-table-column prop="tenantCode" label="学校编号" align="center" />

src/views/school/index.vue

@@ -62,12 +62,16 @@
           element-loading-spinner="el-icon-loading" element-loading-background="#ffffff">
             <el-table-column type="index" label="序号" fixed="left" align="center" />
             <el-table-column prop="tenantCode" label="学校编号" width="80" fixed="left" align="center" show-overflow-tooltip />
-            <el-table-column prop="tenantName" label="学校名称"  fixed="left" align="center" show-overflow-tooltip>
+            <el-table-column prop="tenantName" label="学校名称" width="160" fixed="left" align="center" show-overflow-tooltip>
               <template #default="{row}">
-                <span @click="GoTeach(row)" style="color: #2E64FA; cursor: pointer;">{{ row.tenantName }}</span>
+                <span @click="GoTeach(row)" class="text_color_blue" :class="row.status == 0 ? 'disabled_text' : ''">{{ row.tenantName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="abbreviation" label="学校简称" width="120" align="center" show-overflow-tooltip>
+              <template #default="{ row }">
+                {{ row.abbreviation ||  '-' }}
               </template>
             </el-table-column>
-            <el-table-column prop="abbreviation" label="学校简称" width="160" align="center" show-overflow-tooltip />
             <el-table-column prop="cityAndAreaName" label="区域" width="160" align="center" show-overflow-tooltip>
               <template #default="{ row }">
                 {{ row.cityAndAreaName ||  '-' }}
@@ -103,16 +107,16 @@
             <el-table-column label="操作" width="280" fixed="right" align="center">
               <template #default="{ row }">
                 <div class="table_row_option">
-                  <span v-if="row.status == 0" class="button_delete" @click="ChangeStatus(row)">
+                  <span v-if="row.status == 0" class="button_delete" @click="ChangeStatus(row, '解冻')">
                     解冻
                   </span>
-                  <span v-else class="button_editor text_color_orange" @click="ChangeStatus(row)">
+                  <span v-else class="button_editor text_color_orange" @click="ChangeStatus(row, '冻结')">
                     冻结
                   </span>
                   <span class="button_editor" @click="EditUser(row)">编辑</span>
                   <span class="button_editor" @click="OpenAuth(row)">权限</span>
                   <span class="button_editor" @click="resetPassWord(row)">重置密码</span>
-                  <span class="button_editor" @click="GoTeach(row)">进入学校</span>
+                  <span class="button_editor" :class="row.status == 0 ? 'disabled_text' : ''" @click="GoTeach(row)">进入学校</span>
                 </div>
               </template>
             </el-table-column>
@@ -136,6 +140,7 @@ import AuthConfig from '@/views/school/authConfig.vue'
 import SubjectList from '@/views/school/subjectList.vue'
 import ResetPassword from '@/components/resetPassword.vue'
 import { Search } from '@element-plus/icons-vue'
+import { ElMessageBox, ElMessage } from 'element-plus'
 import { getSchoolNumber, getSchoolList, changeStatus } from '@/api/school'
 import { ref, reactive, provide, onMounted } from 'vue'
 interface UserNumber {
@@ -150,6 +155,7 @@ const userNumber = ref<UserNumber>({
   experienceUser: 0,
   freezeUser: 0
 })
+// 定义列表数据类型
 interface User {
   tenantCode: String;
   tenantName: String;
@@ -164,6 +170,7 @@ interface User {
   sysUserName:  String;
   cityAndAreaName:  String;
 }
+// 初始化列表数据
 const tableData = ref<User[]>([])
 
 const schoolTypeSelect = ref<string>(" ")
@@ -176,19 +183,21 @@ const dialogData = reactive({
   tenantName: ''
 })
 const subjectShowDialog = ref(false)
+// 编辑权限传递参数
 const authData = reactive({
   showDialog: false,
   id: '',
   schoolName: '',
   tenantCode: ''
 })
+// 重置密码弹窗数据
 const passwordDialog = reactive({
   dialogShow: false,
-  id: '',
-  type: '',
-  name: '',
-  label: '',
-  remark: ''
+  id: '', // 学校id
+  type: '', // 学校状态
+  name: '', // 学校名称
+  label: '', // 名称label
+  remark: '' // 提示语
 }) // 重置密码弹窗数据
 provide('showDialog', showDialog) // 新增用户弹窗是否展示
 provide('dialogData', dialogData) // 新增用户弹窗数据
@@ -226,10 +235,10 @@ const OpenSubject = () => {
 }
 // 筛选项数据
 const searchData = ref({
-  provinceCode: '',
-  cityCode: '',
-  type: '',
-  userId: ''
+  provinceCode: '', // 省份
+  cityCode: '', // 市
+  type: '', // 状态(正式/体验)
+  userId: '' // 运维人员
 })
 // 筛选项查询
 const FnSearch = (data: any) => {
@@ -274,21 +283,31 @@ const RefTable = (val: any) => {
   GetSchoolList()
 }
 // 改变用户状态
-const ChangeStatus = (row: any) => {
+const ChangeStatus = (row: any, text: String) => {
   console.log(row)
-  changeStatus({
-    id: row.id,
-    status: row.status == 0 ? 1 : 0
-  }).then((res: any) => {
-    if(res.code == 200) {
-      GetSchoolList()
-    }
+  ElMessageBox.confirm(`是否${text}该学校？`, '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(async () => {
+    changeStatus({
+      id: row.id,
+      status: row.status == 0 ? 1 : 0
+    }).then((res: any) => {
+      if(res.code == 200) {
+        ElMessage.success(res.msg)
+        GetSchoolList()
+      }
+    })
   })
 }
+// 进入学校
 const GoTeach = (row: any) => {
+  if(row.status == 0) return
   let accessToken = localStorage.getItem('token')
   window.open(`https://www.k12100.com/#/otherLogin?schoolId=${row.id}&adminToken=${accessToken}`)
 }
+// 重置密码
 const resetPassWord = (row: any) => {
   passwordDialog.dialogShow = true
   passwordDialog.id = row.id
@@ -297,6 +316,7 @@ const resetPassWord = (row: any) => {
   passwordDialog.label = '学校名称'
   passwordDialog.remark = '学校编号'
 }
+// 刷新
 const Refresh = () => {
   schoolTypeSelect.value = " "
   schoolNameCode.value = ""
@@ -371,4 +391,12 @@ const Refresh = () => {
 .button_editor.text_color_red {
   color: #F56C6C;
 }
+.text_color_blue {
+  color: #2E64FA;
+  cursor: pointer;
+}
+.disabled_text {
+  color: #666; 
+  cursor: not-allowed;
+}
 </style>