Home Explore Help
Sign In
liuquanxin
/
adminBigData
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

更新配置 等

dengshaobo 1 year ago
parent
22a1015fc2
commit
d313e9183c
8 changed files with 32 additions and 27 deletions
Unified View Show Diff Stats
  1. 1 1
      .env.production
  2. 1 1
      index.html
  3. 2 2
      src/router/index.ts
  4. 2 2
      src/style.css
  5. 6 5
      src/styles/common.scss
  6. 1 1
      src/views/login/login.vue
  7. 18 14
      src/views/school/index.vue
  8. 1 1
      vite.config.ts

+ 1 - 1
.env.production
View File 

@@ -1 +1 @@
 
-VITE_API_BASE_URL = "https://admin.k12100.net/admin/adminApi"
 
+VITE_API_BASE_URL = "https://admin.k12100.com/admin/"

+ 1 - 1
index.html
View File 

@@ -1,5 +1,5 @@
 
 <!doctype html>
 
 <!doctype html>
 
-<html lang="en">
 
+<html >
 
   <head>
 
   <head>
 
     <meta charset="UTF-8" />
 
     <meta charset="UTF-8" />
 
     <link rel="icon" type="image/svg+xml" href="/favicon.ico" />
 
     <link rel="icon" type="image/svg+xml" href="/favicon.ico" />

+ 2 - 2
src/router/index.ts
View File 

@@ -1,4 +1,4 @@
 
-import { createRouter, createWebHistory } from 'vue-router'
 
+import { createRouter, createWebHistory,createWebHashHistory  } from 'vue-router'
 
 import type { RouteRecordRaw } from 'vue-router'
 
 import type { RouteRecordRaw } from 'vue-router'
 
 import Layout from '@/layout/index.vue'
 
 import Layout from '@/layout/index.vue'
 
 
 
@@ -45,7 +45,7 @@ const routes: Array<RouteRecordRaw> = [
 
 ]
 
 ]
 
 
 
 const router = createRouter({
 
 const router = createRouter({
 
-  history: createWebHistory(),
 
+  history: createWebHashHistory(),
 
   routes
 
   routes
 
 })
 
 })

+ 2 - 2
src/style.css
View File 

@@ -1,5 +1,5 @@
 
 :root {
 
 :root {
 
-  font-family: system-ui, Avenir, Helvetica, Arial, sans-serif;
 
+
 
   line-height: 1.5;
 
   line-height: 1.5;
 
   font-weight: 400;
 
   font-weight: 400;
 
 
 
@@ -41,7 +41,7 @@ button {
 
   padding: 0.6em 1.2em;
 
   padding: 0.6em 1.2em;
 
   font-size: 1em;
 
   font-size: 1em;
 
   font-weight: 500;
 
   font-weight: 500;
 
-  font-family: inherit;
 
+  /* font-family: inherit; */
 
   background-color: #1a1a1a;
 
   background-color: #1a1a1a;
 
   cursor: pointer;
 
   cursor: pointer;
 
   transition: border-color 0.25s;
 
   transition: border-color 0.25s;

+ 6 - 5
src/styles/common.scss
View File 

@@ -38,9 +38,9 @@ body {
 
   width: 100%;
 
   width: 100%;
 
   height: 100%;
 
   height: 100%;
 
   overflow: hidden;
 
   overflow: hidden;
 
-  font-family: Inter, -apple-system, BlinkMacSystemFont, PingFang SC,
 
-    Hiragino Sans GB, noto sans, Helvetica Neue, Helvetica,
 
-    Arial, sans-serif;
 
+  -webkit-font-smoothing: antialiased;//控制字体在 WebKit 浏览器（如 Chrome、Safari）中的抗锯齿方式。antialiased 表示使用“无锯齿”的字体渲染方式，使文字更清晰平滑，尤其适用于浅色或白色背景上的深色字体。
 
+  text-rendering: optimizeLegibility;//告诉浏览器优先考虑文字的可读性而不是渲染速度或几何精度
 
+
 
 }
 
 }
 
 // .module_content {
 
 // .module_content {
 
 //   padding: 16px;
 
 //   padding: 16px;
 
@@ -180,7 +180,7 @@ body {
 
 }
 
 }
 
 
 
 .vxe-table {
 
 .vxe-table {
 
-  font-family: revert;
 
+  // font-family: revert;
 
   /* 不设置 font-family，浏览器使用默认字体 */
 
   /* 不设置 font-family，浏览器使用默认字体 */
 
 }
 
 }
 
 
 
@@ -804,6 +804,7 @@ body {
 
 }
 
 }
 
 //状态
 
 //状态
 
 .table_row_status {
 
 .table_row_status {
 
+  // font-family:"Microsoft YaHei", "PingFang SC", "Hiragino Sans GB", "WenQuanYi Zen Hei", sans-serif;
 
   font-weight: 400;
 
   font-weight: 400;
 
   font-size: 14px;
 
   font-size: 14px;
 
   color: #666666;
 
   color: #666666;
 
@@ -3212,7 +3213,7 @@ body {
 
   justify-content: center;
 
   justify-content: center;
 
   align-items: center;
 
   align-items: center;
 
   gap: 10px;
 
   gap: 10px;
 
-
 
+  
   .move_icon {
 
   .move_icon {
 
     width: 36px;
 
     width: 36px;
 
     height: 36px;
 
     height: 36px;

+ 1 - 1
src/views/login/login.vue
View File 

@@ -267,7 +267,7 @@ const SubmitLogin = () => {
 
     }
 
     }
 
   }).catch((err) => {
 
   }).catch((err) => {
 
       loadingLogin.value = false
 
       loadingLogin.value = false
 
-      ElMessage.error('登录失败!'+err);
 
+
 
       console.error(err)
 
       console.error(err)
 
   })
 
   })
 
 }
 
 }

+ 18 - 14
src/views/school/index.vue
View File 

@@ -62,26 +62,26 @@
 
           element-loading-spinner="el-icon-loading" element-loading-background="#ffffff">
 
           element-loading-spinner="el-icon-loading" element-loading-background="#ffffff">
 
             <el-table-column type="index" label="序号" fixed="left" align="center" />
 
             <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="tenantCode" label="学校编号" width="80" fixed="left" align="center" show-overflow-tooltip />
 
-            <el-table-column prop="tenantName" label="学校名称" width="150" fixed="left" align="center" show-overflow-tooltip>
 
+            <el-table-column prop="tenantName" label="学校名称"  fixed="left" align="center" show-overflow-tooltip>
 
               <template #default="{row}">
 
               <template #default="{row}">
 
                 <span @click="GoTeach(row)" style="color: #2E64FA; cursor: pointer;">{{ row.tenantName }}</span>
 
                 <span @click="GoTeach(row)" style="color: #2E64FA; cursor: pointer;">{{ row.tenantName }}</span>
 
               </template>
 
               </template>
 
             </el-table-column>
 
             </el-table-column>
 
-            <el-table-column prop="abbreviation" label="学校简称" width="100" align="center" show-overflow-tooltip />
 
-            <el-table-column prop="cityAndAreaName" label="区域" align="center" show-overflow-tooltip>
 
+            <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 }">
 
               <template #default="{ row }">
 
                 {{ row.cityAndAreaName ||  '-' }}
 
                 {{ row.cityAndAreaName ||  '-' }}
 
               </template>
 
               </template>
 
             </el-table-column>
 
             </el-table-column>
 
-            <el-table-column prop="schoolType" label="账号类型" align="center">
 
+            <el-table-column prop="schoolType" label="账号类型" width="100" align="center">
 
               <template #default="{ row }">
 
               <template #default="{ row }">
 
                 {{ row.schoolType == 0 ? '单校版' : row.schoolType == 1 ? '联考版' :  '-' }}
 
                 {{ row.schoolType == 0 ? '单校版' : row.schoolType == 1 ? '联考版' :  '-' }}
 
               </template>
 
               </template>
 
             </el-table-column>
 
             </el-table-column>
 
             <el-table-column prop="startDate" label="开始时间" width="100" align="center" show-overflow-tooltip />
 
             <el-table-column prop="startDate" label="开始时间" width="100" align="center" show-overflow-tooltip />
 
             <el-table-column prop="endDate" label="结束时间" width="100" align="center" show-overflow-tooltip />
 
             <el-table-column prop="endDate" label="结束时间" width="100" align="center" show-overflow-tooltip />
 
-            <el-table-column prop="dateDiffDayS" label="剩余天数" align="center" />
 
-            <el-table-column prop="type" label="状态" align="center">
 
+            <el-table-column prop="dateDiffDayS" label="剩余天数" width="100" align="center" />
 
+            <el-table-column prop="type" label="状态" width="80" align="center">
 
               <template #default="{ row }">
 
               <template #default="{ row }">
 
                 <div class="table_row_status">
 
                 <div class="table_row_status">
 
                   <!-- 冻结 -->
 
                   <!-- 冻结 -->
 
@@ -95,7 +95,7 @@
 
                 </div>
 
                 </div>
 
               </template>
 
               </template>
 
             </el-table-column>
 
             </el-table-column>
 
-            <el-table-column prop="sysUserName" label="运维人员" align="center" show-overflow-tooltip>
 
+            <el-table-column prop="sysUserName" width="120" label="运维人员" align="center" show-overflow-tooltip>
 
               <template #default="{ row }">
 
               <template #default="{ row }">
 
                 {{ row.sysUserName ||  '-' }}
 
                 {{ row.sysUserName ||  '-' }}
 
               </template>
 
               </template>
 
@@ -103,12 +103,16 @@
 
             <el-table-column label="操作" width="280" fixed="right" align="center">
 
             <el-table-column label="操作" width="280" fixed="right" align="center">
 
               <template #default="{ row }">
 
               <template #default="{ row }">
 
                 <div class="table_row_option">
 
                 <div class="table_row_option">
 
-                  <div v-if="row.status == 0" class="button_delete" @click="ChangeStatus(row)">解冻</div>
 
-                  <div v-else class="button_editor text_color_orange" @click="ChangeStatus(row)">冻结</div>
 
-                  <div class="button_editor" @click="EditUser(row)">编辑</div>
 
-                  <div class="button_editor" @click="OpenAuth(row)">权限</div>
 
-                  <div class="button_editor" @click="resetPassWord(row)">重置密码</div>
 
-                  <div class="button_editor" @click="GoTeach(row)">进入学校</div>
 
+                  <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>
 
+                  <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>
 
                 </div>
 
                 </div>
 
               </template>
 
               </template>
 
             </el-table-column>
 
             </el-table-column>
 
@@ -283,7 +287,7 @@ const ChangeStatus = (row: any) => {
 
 }
 
 }
 
 const GoTeach = (row: any) => {
 
 const GoTeach = (row: any) => {
 
   let accessToken = localStorage.getItem('token')
 
   let accessToken = localStorage.getItem('token')
 
-  window.open(`https://admin.k12100.net/#/otherLogin?schoolId=${row.id}&adminToken=${accessToken}`)
 
+  window.open(`https://www.k12100.com/#/otherLogin?schoolId=${row.id}&adminToken=${accessToken}`)
 
 }
 
 }
 
 const resetPassWord = (row: any) => {
 
 const resetPassWord = (row: any) => {
 
   passwordDialog.dialogShow = true
 
   passwordDialog.dialogShow = true

+ 1 - 1
vite.config.ts
View File 

@@ -21,7 +21,7 @@ export default defineConfig({
 
       //   rewrite:path => path.replace(/^\/api/, '')
 
       //   rewrite:path => path.replace(/^\/api/, '')
 
       // },
 
       // },
 
       '/adminApi':{
 
       '/adminApi':{
 
-        target:'https://admin.k12100.net/admin/adminApi',
 
+        target:'https://admin.k12100.com/admin/adminApi',
 
         // target:'http://192.168.1.61:47002/adminApi',
 
         // target:'http://192.168.1.61:47002/adminApi',
 
         changeOrigin:true,
 
         changeOrigin:true,
 
         rewrite:path => path.replace(/^\/adminApi/, '')
 
         rewrite:path => path.replace(/^\/adminApi/, '')