首页的优化，修改界面bug

src/layout/sidebar/SidevarItem.vue

@@ -152,7 +152,7 @@
                 activeIndex == '/wanzai/trackSearch' ||
                 activeIndex == '/wanzai/trafficRecord' ||
                 activeIndex == '/wanzai/attendanceRecord' ||
-                activeIndex == '/wanzai/safety'
+                activeIndex == '/wanzai/faceRecord'
               "
               iconName="track_s"
               class="iconClass"

src/router/index.js

@@ -182,7 +182,14 @@ router.beforeEach(async (to, from, next) => {
 
   let hasRoutes = store.state.user.hasRoutes;
   if(to.path == "/wanzai/home"){
-    next()
+    if (
+      sessionStorage.getItem("token") &&
+      sessionStorage.getItem("userhead") 
+    ) {
+      next()
+    }else{
+      next(`/login`);
+    }
   }else{
     if (
       sessionStorage.getItem("token") &&

src/views/apply/apply.vue

@@ -61,6 +61,7 @@
                 <!-- <div class="look" @click="applyClick(scope.row)">打开项目</div> -->
                 <div class="look" @click="editClick(scope.row)">编辑</div>
                 <el-popconfirm
+                  v-if="scope.row.appid!='wx2fc3f45732fae5d3'"
                   width="220"
                   confirm-button-text="确认"
                   cancel-button-text="取消"
@@ -393,8 +394,8 @@ const getList = async () => {
     },
     params: data,
   });
-  console.log(res, "应用管理分页数据");
   if (res.data.code == 200) {
+    console.log(res, JSON.parse(eds.decryptDes(res.data.data)),"应用管理分页数据");
     loading.value = false;
     tableData.list = JSON.parse(eds.decryptDes(res.data.data)).list;
     total.value = JSON.parse(eds.decryptDes(res.data.data)).totalCount;

src/views/attendanceRecord/attendanceRecord.vue

@@ -433,6 +433,7 @@ const adminClassDataList = async () => {
     searchInput.grade=data.gradeId
     searchInput.class=data.classId
   }
+  getList()
 };
 // 管理员 改变年级选择
 const gradeChange = (value) => {
@@ -680,7 +681,7 @@ const getAdminId=async ()=>{
 
 onBeforeMount(async () => {
   api.value = store.state.user.api;
-  getList();
+  // getList();
   getAdminId();
 });
 onUnmounted(() => {

src/views/faceRecord/faceRecord.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="content-box">
     <div class="left">
-      <span class="cameratxt">人脸记录</span>
+      <span class="cameratxt">监控抓拍</span>
     </div>
-    <div class="scrollId" >
+    <div class="scrollId">
       <div class="middle">
         <div class="filter">
           <div class="condition">
@@ -24,7 +24,7 @@
           >
             查询</el-button
           >
-          <div class="condition" v-if="classId==0">
+          <div class="condition" v-if="classId == 0">
             <span class="title">年级 : </span>
             <el-select
               v-model="searchInput.grade"
@@ -33,16 +33,12 @@
               @change="gradeChange"
               :clearable="true"
             >
-              <el-option
-                v-for="i in gradeData"
-                :label="i.name"
-                :value="i.id"
-              >
+              <el-option v-for="i in gradeData" :label="i.name" :value="i.id">
               </el-option>
             </el-select>
           </div>
           <!-- 班级 -->
-          <div class="condition" v-if="classId==0">
+          <div class="condition" v-if="classId == 0">
             <span class="title">班级 : </span>
             <el-tooltip
               class="box-item"
@@ -66,36 +62,28 @@
             </el-tooltip>
           </div>
           <!-- 年级 -->
-          <div class="condition" v-if="classId!=0">
+          <div class="condition" v-if="classId != 0">
             <span class="title">年级 : </span>
             <el-select
               v-model="searchInput.grade"
               placeholder="请选择年级"
               style="width: 160px"
             >
-              <el-option
-                v-for="i in gradeData"
-                :label="i.name"
-                :value="i.id"
-              >
+              <el-option v-for="i in gradeData" :label="i.name" :value="i.id">
               </el-option>
             </el-select>
           </div>
           <!-- 班级 -->
-          <div class="condition" v-if="classId!=0">
+          <div class="condition" v-if="classId != 0">
             <span class="title">班级 : </span>
-              <el-select
-                v-model="searchInput.class"
-                placeholder="请选择班级"
-                style="width: 160px"
-                @change="searchBtn"
-              >
-                <el-option
-                  v-for="i in classData"
-                  :label="i.name"
-                  :value="i.id"
-                />
-              </el-select>
+            <el-select
+              v-model="searchInput.class"
+              placeholder="请选择班级"
+              style="width: 160px"
+              @change="searchBtn"
+            >
+              <el-option v-for="i in classData" :label="i.name" :value="i.id" />
+            </el-select>
           </div>
           <!-- 时间 -->
           <div class="condition">
@@ -104,7 +92,7 @@
               v-model="searchInput.createTime"
               type="datetimerange"
               unlink-panels
-              :clearable='true'
+              :clearable="true"
               range-separator="-"
               start-placeholder="起始时间"
               end-placeholder="结束时间"
@@ -158,9 +146,9 @@
           <el-table-column align="center" prop="className" label="班级" />
           <el-table-column align="center" prop="location" label="地点" />
           <el-table-column align="center" prop="cardNo" label="图像">
-            <template #default={row}>
+            <template #default="{ row }">
               <div v-viewer>
-                <img :src="row.image" style="width:60px;height:60px"/>
+                <img :src="row.image" style="width: 60px; height: 60px" />
               </div>
             </template>
           </el-table-column>
@@ -202,8 +190,20 @@
       >
         <div class="switch">
           <p>按照身份推送 ：</p>
-          <el-checkbox v-model="editChecked1" label="家长" :true-value="1" :false-value="2" size="large" />
-          <el-checkbox v-model="editChecked2" label="班主任" :true-value="1" :false-value="2" size="large" />
+          <el-checkbox
+            v-model="editChecked1"
+            label="家长"
+            :true-value="1"
+            :false-value="2"
+            size="large"
+          />
+          <el-checkbox
+            v-model="editChecked2"
+            label="班主任"
+            :true-value="1"
+            :false-value="2"
+            size="large"
+          />
         </div>
         <div class="options">
           <el-button
@@ -227,13 +227,12 @@
           :autoplay="false"
           trigger
         >
-          <el-carousel-item  >
+          <el-carousel-item>
             <img :src="showImg" alt="" />
           </el-carousel-item>
         </el-carousel>
       </div>
     </div>
-   
   </div>
 </template>
 
@@ -260,7 +259,7 @@ const api = ref("");
 const router = useRouter();
 // 表格数据
 const loading = ref(false);
-const classId=ref() // 获取所管理的班级的id（0是所有班级）
+const classId = ref(); // 获取所管理的班级的id（0是所有班级）
 const tableData = reactive({
   list: [],
 });
@@ -286,18 +285,18 @@ const studentData = reactive({
   total: ref(5), // 当前总数
 });
 const bgImg = ref(false);
-const showImg=ref('')
+const showImg = ref("");
 
 // 推送人设置
-const editVisible=ref(false)
-const editId=ref()
-const editChecked1=ref(2)// 家长
-const editChecked2=ref(2)// 班主任
+const editVisible = ref(false);
+const editId = ref();
+const editChecked1 = ref(2); // 家长
+const editChecked2 = ref(2); // 班主任
 
 // 年级数据下拉
 const adminClassDataList = async () => {
-  console.log(classId.value==1);
-  if(classId.value==0){
+  console.log(classId.value == 1);
+  if (classId.value == 0) {
     let grade = await axios({
       method: "get",
       url: api.value + "/wanzai/api/smartGrade/querySmartGrades",
@@ -313,7 +312,7 @@ const adminClassDataList = async () => {
       "年级下拉数据"
     );
     gradeData.value = JSON.parse(eds.decryptDes(grade.data.data));
-  }else{
+  } else {
     let grade = await axios({
       method: "get",
       url: api.value + "/wanzai/api/smartClass/getClassId",
@@ -322,7 +321,7 @@ const adminClassDataList = async () => {
         user_head: sessionStorage.getItem("userhead"),
       },
       params: {
-        schoolClass:classId.value
+        schoolClass: classId.value,
       },
     });
     console.log(
@@ -331,17 +330,22 @@ const adminClassDataList = async () => {
       "年级下拉数据"
     );
     let data = JSON.parse(eds.decryptDes(grade.data.data));
-    gradeData.value=[{
-      name:data.gradeName,
-      id:data.gradeId
-    }]
-    classData.value=[{
-      name:data.className,
-      id:data.classId
-    }]
-    searchInput.grade=data.gradeId
-    searchInput.class=data.classId
+    gradeData.value = [
+      {
+        name: data.gradeName,
+        id: data.gradeId,
+      },
+    ];
+    classData.value = [
+      {
+        name: data.className,
+        id: data.classId,
+      },
+    ];
+    searchInput.grade = data.gradeId;
+    searchInput.class = data.classId;
   }
+  getList()
 };
 // 管理员 改变年级选择
 const gradeChange = (value) => {
@@ -350,7 +354,7 @@ const gradeChange = (value) => {
     adminClassInfoList(value);
   } else {
     classData.value = [];
-    searchInput.class=""
+    searchInput.class = "";
   }
   getList();
 };
@@ -370,11 +374,7 @@ const adminClassInfoList = async (value) => {
   });
 
   if (res.data.code == 200) {
-    console.log(
-      res,
-      JSON.parse(eds.decryptDes(res.data.data)),
-      "班级下拉数据"
-    );
+    console.log(res, JSON.parse(eds.decryptDes(res.data.data)), "班级下拉数据");
     classData.value = JSON.parse(eds.decryptDes(res.data.data));
   } else {
     classData.value = [];
@@ -388,12 +388,12 @@ const getList = async () => {
     currentPage: studentData.currentPage,
     pageCount: studentData.pageSize,
     keyWord: searchInput.keyWord, // 用户名称
-    gradeId:searchInput.grade,
-    classId:searchInput.class,
+    gradeId: searchInput.grade,
+    classId: searchInput.class,
   };
-  if(searchInput.createTime){
+  if (searchInput.createTime) {
     data.startTime = searchInput.createTime[0];
-    data.endTime = searchInput.createTime[1]
+    data.endTime = searchInput.createTime[1];
   }
   let res = await axios({
     method: "get",
@@ -426,8 +426,8 @@ const searchBtn = lodash.debounce(async () => {
 }, 300);
 
 // 推送人设置
-const editClick =async () =>{
-  editVisible.value=true
+const editClick = async () => {
+  editVisible.value = true;
   let res = await axios({
     method: "get",
     url: api.value + "/wanzai/api/smartPushConfig/list",
@@ -438,16 +438,16 @@ const editClick =async () =>{
   });
   console.log(res, JSON.parse(eds.decryptDes(res.data.data)), "推送配置");
   if (res.data.code == 200) {
-    let data = JSON.parse(eds.decryptDes(res.data.data))
-    editId.value=data.id
-    editChecked1.value=data.parentsPush
-    editChecked2.value=data.chargeTeacherPush
-  } 
-}
-const editConfirm=async ()=>{
+    let data = JSON.parse(eds.decryptDes(res.data.data));
+    editId.value = data.id;
+    editChecked1.value = data.parentsPush;
+    editChecked2.value = data.chargeTeacherPush;
+  }
+};
+const editConfirm = async () => {
   let data = {
     id: editId.value,
-    parentsPush:  editChecked1.value,
+    parentsPush: editChecked1.value,
     chargeTeacherPush: editChecked2.value, // 用户名称
   };
   let res = await axios({
@@ -461,7 +461,7 @@ const editConfirm=async ()=>{
   });
   console.log(res, "确定推送");
   if (res.data.code == 200) {
-    editVisible.value=false
+    editVisible.value = false;
     ElMessage({
       type: "success",
       showClose: true,
@@ -476,21 +476,21 @@ const editConfirm=async ()=>{
       center: true,
     });
   }
-}
-const editCancel=()=>{
-  editVisible.value=false
-}
+};
+const editCancel = () => {
+  editVisible.value = false;
+};
 
 //导出功能 (-----------------------------------------------------------------)
 const importExcel = async () => {
   let data = {
     keyWord: searchInput.keyWord, // 用户名称
-    gradeId:searchInput.grade,
-    classId:searchInput.class,
+    gradeId: searchInput.grade,
+    classId: searchInput.class,
   };
-  if(searchInput.createTime){
+  if (searchInput.createTime) {
     data.startTime = searchInput.createTime[0];
-    data.endTime = searchInput.createTime[1]
+    data.endTime = searchInput.createTime[1];
   }
   let res = await axios({
     method: "get",
@@ -538,10 +538,10 @@ const tableRowClassName = ({ row, rowIndex }) => {
   }
   return "";
 };
-const handleSizeChange=(value)=>{
-  studentData.pageSize=value
-  getList()
-}
+const handleSizeChange = (value) => {
+  studentData.pageSize = value;
+  getList();
+};
 // 分页
 const handleCurrentChange = (value) => {
   studentData.currentPage = value;
@@ -560,7 +560,7 @@ const teacherPageChange = (value) => {
   getList();
 };
 // 判断为班主任 还是 超级管理员
-const getAdminId=async ()=>{
+const getAdminId = async () => {
   // 获取所管理的班级的id（0是所有班级）
   let res = await axios({
     method: "get",
@@ -569,21 +569,25 @@ const getAdminId=async ()=>{
       token: sessionStorage.getItem("token"),
       user_head: sessionStorage.getItem("userhead"),
     },
-    params:{
-      userHead:sessionStorage.getItem("userhead")
+    params: {
+      userHead: sessionStorage.getItem("userhead"),
     },
   });
-  console.log(res,JSON.parse(eds.decryptDes(res.data.data)),"获取所管理的班级的id（0是所有班级）");
+  console.log(
+    res,
+    JSON.parse(eds.decryptDes(res.data.data)),
+    "获取所管理的班级的id（0是所有班级）"
+  );
   if (res.data.code == 200) {
-    let classIds=JSON.parse(eds.decryptDes(res.data.data)).schoolClass
-    classId.value = classIds
-     adminClassDataList()
-  } 
-}
+    let classIds = JSON.parse(eds.decryptDes(res.data.data)).schoolClass;
+    classId.value = classIds;
+    adminClassDataList();
+  }
+};
 
 onBeforeMount(async () => {
   api.value = store.state.user.api;
-  getList();
+  // getList();
   getAdminId();
 });
 onUnmounted(() => {
@@ -712,7 +716,6 @@ onUnmounted(() => {
           margin-right: 10px;
         }
       }
-
     }
 
     .footer {
@@ -854,69 +857,69 @@ onUnmounted(() => {
       }
     }
     :deep(.editDialog) {
-    //   height: 420px;
-    border-radius: 11px;
-    .el-dialog__header {
-      border-radius: 11px 11px 0 0;
-      background: rgba(237, 241, 245, 1);
-      font-weight: 600;
-      margin: 0;
-      .el-dialog__headerbtn {
-        outline: none;
-      }
-    }
-    .el-dialog__body {
-      padding: 0 30px;
-      height: 300px;
-      .switch {
-        margin: 10px 0;
-        p {
-          font-size: 17px;
-          margin-right: 10px;
+      //   height: 420px;
+      border-radius: 11px;
+      .el-dialog__header {
+        border-radius: 11px 11px 0 0;
+        background: rgba(237, 241, 245, 1);
+        font-weight: 600;
+        margin: 0;
+        .el-dialog__headerbtn {
+          outline: none;
         }
       }
-      .attention {
-        color: rgb(238, 190, 119);
-      }
-      .options {
-        margin: 160px 20px 20px 0;
-        width: 100%;
-        display: flex;
-        flex-direction: row-reverse;
-        .queding {
-          color: #fff;
-          margin-left: 15px;
+      .el-dialog__body {
+        padding: 0 30px;
+        height: 300px;
+        .switch {
+          margin: 10px 0;
+          p {
+            font-size: 17px;
+            margin-right: 10px;
+          }
+        }
+        .attention {
+          color: rgb(238, 190, 119);
+        }
+        .options {
+          margin: 160px 20px 20px 0;
+          width: 100%;
+          display: flex;
+          flex-direction: row-reverse;
+          .queding {
+            color: #fff;
+            margin-left: 15px;
+          }
         }
       }
     }
-  }
     .bgImg {
-    position: absolute;
-    left: 0;
-    top: 0;
-    z-index: 99999999;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(255, 255, 255, 0.8);
-    :deep(.el-carousel__arrow){
-      display:none;
-    }
-    // border-radius: 50px;
-    :deep(.el-carousel__container) {
+      position: absolute;
+      left: 0;
+      top: 0;
+      z-index: 99999999;
       width: 100%;
-      height: calc(100vh);
+      height: 100%;
+      background-color: rgba(255, 255, 255, 0.8);
+      :deep(.el-carousel__arrow) {
+        display: none;
+      }
+      // border-radius: 50px;
+      :deep(.el-carousel__container) {
+        width: 100%;
+        height: calc(100vh);
 
-      .el-carousel__item {
-        display: flex;
-        justify-content: center;
+        .el-carousel__item {
+          display: flex;
+          justify-content: center;
 
-        img {
-          height: 100%;
+          img {
+            height: 100%;
+          }
         }
       }
     }
   }
-  }
 }
 
 .el-input {

src/views/grades/grades.vue

@@ -79,7 +79,16 @@
           <el-table-column align="center" prop="gradeNo" label="年级序号" />
           <el-table-column align="center" prop="gradeNo" label="关联学科">
             <template #default="{ row }">
-              <span>{{ row.subjectName }}</span>
+              <el-tag
+              class="tag"
+              type="primary"
+              style="margin: 2px 5px;"
+              v-for="(item, index) in row.subjectStrs"
+              :key="index"
+            >
+              {{ item }}
+            </el-tag>
+              <!-- <span>{{ row.subjectName }}</span> -->
             </template>
           </el-table-column>
           <el-table-column align="center" prop="createTime" label="创建时间">
@@ -93,20 +102,20 @@
             <template #default="scope">
               <div class="edit">
                 <div class="look" @click="editClick(scope.row)">编辑</div>
-                <!-- <el-popconfirm
+                <el-popconfirm
                   width="220"
                   confirm-button-text="确认"
                   cancel-button-text="取消"
                   :icon="InfoFilled"
                   icon-color="#f89626"
-                  title="是否删除此身份?"
+                  title="是否删除此年级?"
                   @confirm="del(scope.row)"
                   @cancel="cancelEvent"
                 >
                   <template #reference>
                     <div class="del">删除</div>
                   </template>
-                </el-popconfirm> -->
+                </el-popconfirm>
               </div>
             </template>
           </el-table-column>

src/views/home/home.vue

@@ -116,12 +116,56 @@
       <div class="cartogram">
         <!--7 班级考勤 -->
         <div class="annulus" ref="annulus">
-          <div class="title">班级考勤</div>
+          <div class="bar">
+            <div class="title">班级考勤</div>
+            <el-select
+              v-model="searchInput.class"
+              placeholder="请选择班级"
+              style="width: 160px;margin-right: 10px;"
+              filterable
+              remote
+              remote-show-suffix
+              :remote-method="classDataMethod"
+              @change="classClick"
+              :clearable="false"
+            >
+              <el-option
+                v-for="i in classData"
+                :label="`${i.className}`"
+                :value="i.id"
+              />
+            </el-select>
+            <el-date-picker
+              v-model="searchInput.date"
+              type="date"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              placeholder="请输入日期"
+              :size="size"
+              :clearable="false"
+            />
+          </div>
           <div id="class"></div>
         </div>
         <!--8 最受欢迎老师TOP6 -->
         <div class="annulus">
-          <div class="title">最受欢迎老师TOP6</div>
+          <div class="bar">
+            <div class="title">最受欢迎老师TOP6</div>
+            <el-select
+              v-model="searchInput.termId"
+              class="sel"
+              placeholder="请选择学期"
+              style="width: 250px"
+              @change="greetTeaClick"
+              :clearable="true"
+            >
+              <el-option
+                :label="i.name"
+                :value="i.id"
+                v-for="i in semesterData"
+              />
+            </el-select>
+          </div>
           <div class="teacher">
             <ul>
               <li v-for="(i, index) in greetTeaData">
@@ -269,8 +313,17 @@ const echarts3 = ref();
 const echarts4 = ref();
 // 班级考勤
 const echarts5 = ref();
+const userType = ref();
+const classData = ref(); // 班级数据
+
+const searchInput = reactive({
+  class: "",// 班级考勤  班级筛选
+  date:dayjs().format('YYYY-MM-DD'),
+  termId:''// 最受欢迎老师 班级筛选
+});
 // 最受欢迎老师TOP6
 const greetTeaData = ref();
+const semesterData=ref()
 // 资源大数据
 // const echarts6 = ref();
 
@@ -280,7 +333,6 @@ const getList = async () => {
   cartogram2();
   doorForbidClick();
   behaviorClick();
-  classClick();
   greetTeaClick();
   // resourceClick();
   let res = await axios({
@@ -311,12 +363,13 @@ const applyList = async () => {
     },
     params: data,
   });
-  console.log(
-    res,
-    JSON.parse(eds.decryptDes(res.data.data)).list,
-    "应用管理分页数据"
-  );
+
   if (res.data.code == 200) {
+    console.log(
+      res,
+      JSON.parse(eds.decryptDes(res.data.data)).list,
+      "应用管理分页数据"
+    );
     let data = JSON.parse(eds.decryptDes(res.data.data)).list;
     applyData.value = data.filter((item) => {
       return item.category == "管理后台";
@@ -941,6 +994,10 @@ const behaviorClick = async () => {
 const classClick = async () => {
   // 基于准备好的dom，初始化echarts实例
   // 圆环统计图
+  let resFlag={
+    date:searchInput.date,
+    classId:searchInput.class
+  }
   let res = await axios({
     method: "get",
     url: api.value + "/wanzai/api/smartAttendance/queryAttendanceList",
@@ -948,8 +1005,10 @@ const classClick = async () => {
       token: sessionStorage.getItem("token"),
       user_head: sessionStorage.getItem("userhead"),
     },
+    params:resFlag
   });
   console.log(res, JSON.parse(eds.decryptDes(res.data.data)), "圆环 班级考勤");
+  // console.log(res, "圆环 班级考勤");
   let colorSel = [
     "rgba(67, 181, 244, 1)",
     "rgba(137, 207, 245, 1)",
@@ -1016,7 +1075,9 @@ const greetTeaClick = async () => {
       token: sessionStorage.getItem("token"),
       user_head: sessionStorage.getItem("userhead"),
     },
-    params: data,
+    params: {
+      termId:searchInput.termId
+    },
   });
   console.log(
     res,
@@ -1121,10 +1182,83 @@ const resizeChart = () => {
   // 班级考勤
   echarts5.value.resize();
 };
+// 判断为班主任 还是 超级管理员
+const userTypeChange = async (value) => {
+  let res = await axios({
+    method: "get",
+    url: api.value + "/wanzai/api/smartAuthorGroup/getClassById",
+    headers: {
+      token: sessionStorage.getItem("token"),
+      user_head: sessionStorage.getItem("userhead"),
+    },
+    params: {
+      userHead: sessionStorage.getItem("userhead"),
+    },
+  });
+  console.log(res, JSON.parse(eds.decryptDes(res.data.data)),'断为班主任 还是 超级管理员');
+  if (res.data.code == 200) {
+    userType.value = JSON.parse(eds.decryptDes(res.data.data)).schoolClass;
+    classList();
+  }
+};
+// 班级数据
+const classList = async (val = "") => {
+  let res = await axios({
+    method: "get",
+    url: api.value + "/wanzai/api/smartClass/getSchoolClasses",
+    headers: {
+      token: sessionStorage.getItem("token"),
+      user_head: sessionStorage.getItem("userhead"),
+    },
+    params: {
+      schoolClass: userType.value,
+      className: val,
+    },
+  });
+  console.log(res, JSON.parse(eds.decryptDes(res.data.data)), "班级数据");
+  // classData.value = JSON.parse(eds.decryptDes(res.data.data));
+  // searchInput.class=classData.value[0].id
+  let classList=JSON.parse(eds.decryptDes(res.data.data))
+  if(userType.value==0){
+    classData.value = classList;
+    if(!searchInput.class){
+      searchInput.class=classData.value[0].id
+    }
+  }else{
+    classData.value=[{className:classList.className,id:classList.id}]
+    searchInput.class=classList.id
+  }
+  classClick();
+};
+const classDataMethod = async (query) => {
+  if (query) {
+    classList(query);
+  } else {
+    classList();
+  }
+};
 
+// 获取学期下拉
+const semesterList = async () => {
+  let semester = await axios({
+    method: "get",
+    url: api.value + "/wanzai/api/smartScore/querySmartSemesters",
+    headers: {
+      token: sessionStorage.getItem("token"),
+      user_head: sessionStorage.getItem("userhead"),
+    },
+    // params: data,
+  });
+  console.log(
+    semester,
+    JSON.parse(eds.decryptDes(semester.data.data)),
+    "学期下拉数据"
+  );
+  semesterData.value = JSON.parse(eds.decryptDes(semester.data.data));
+};
 onMounted(async () => {
   api.value = store.state.user.api;
-  
+
   window.addEventListener("resize", () => {
     resizeChart();
   });
@@ -1180,6 +1314,8 @@ onMounted(async () => {
     }
   }
   getList();
+  userTypeChange();
+  semesterList();
   // let userhead = "1B0430E15102ADC65C43E475AC697D9A";
   // let token =
   //   "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MTMyMzQ2NDQsImNhcmRObyI6IjAwMDAwMSIsImlhdCI6MTcxMzE0ODI0NH0.jxuGCqDkqzRa3poVNQq5aoSrKGDCZauXFLVKrB4M87s";
@@ -1304,9 +1440,13 @@ onUnmounted(() => {
         background-color: #fff;
         box-shadow: 0px 3px 10px rgba(0, 97, 255, 0.2);
         position: relative;
-
+        .bar{
+          display: flex;
+          // justify-content: center;
+          align-items: center;
+        }
         .title {
-          margin: 10px 30px;
+          margin: 10px 20px;
           color: #000;
           font-weight: 700;
           font-size: 20px;

src/views/leave/leave.vue

@@ -45,7 +45,7 @@
             remote-show-suffix
             :remote-method="classDataMethod"
             @change="searchBtn"
-            :clearable="true"
+            :clearable="userType==0?true:false"
           >
             <el-option
               v-for="i in classData"
@@ -208,8 +208,8 @@
           <el-switch
             style="--el-switch-on-color: rgba(41, 109, 227, 1)"
             v-model="editSwitch"
-            :active-value="1"
-            :inactive-value="0"
+            :active-value="0"
+            :inactive-value="1"
           />
         </div>
         <span class="attention"
@@ -361,7 +361,7 @@ const userTypeChange = async (value) => {
   console.log(res, JSON.parse(eds.decryptDes(res.data.data)));
   if (res.data.code == 200) {
     userType.value = JSON.parse(eds.decryptDes(res.data.data)).schoolClass;
-    classList();
+    classList()
   }
 };
 // 班级数据
@@ -379,7 +379,14 @@ const classList = async (val = "") => {
     },
   });
   console.log(res, JSON.parse(eds.decryptDes(res.data.data)), "班级数据");
-  classData.value = JSON.parse(eds.decryptDes(res.data.data));
+  let classList=JSON.parse(eds.decryptDes(res.data.data))
+  if(userType.value==0){
+    classData.value = classList;
+  }else{
+    classData.value=[{className:classList.className,id:classList.id}]
+    searchInput.class=classList.id
+  }
+  getList()
 };
 const classDataMethod = async (query) => {
   if (query) {
@@ -569,8 +576,8 @@ const handleCurrentChange = (value) => {
 
 onBeforeMount(async () => {
   api.value = store.state.user.api;
-  getList();
   userTypeChange();
+  // getList();
 });
 onUnmounted(() => {
   // document.removeEventListener("keyup", Enters);

src/views/roles/roles.vue

@@ -243,6 +243,13 @@
               >
                 选择部门
               </div>
+              <!-- <div class="rolesSel" v-if="row.departmentViewJson[0].name=='万载县第三中学'">
+                <el-tag
+                  class="tag"
+                >
+                万载县第三中学
+                </el-tag>
+              </div> -->
               <div class="rolesSel">
                 <el-tag
                   class="tag"

src/views/safety/safety.vue

@@ -582,6 +582,7 @@ const imgClick = (row) => {
 // 推送人设置弹窗 （----------------------------------------------）
 const pushSetting = async () => {
   pushSetVisible.value = true;
+  pushSetInput.value = "";
   pushData(); // 推送人员数据
   PushedData(); // 已推送人员
   pushDataScroll(); //推送人滚动加载数据
@@ -615,6 +616,7 @@ const pushData = async () => {
     // if (pushSetTree.value) {
     //   pushSetTree.value.scrollTop = 0;
     // }
+
     if (pushSetDatas.value && pushSetLiCount.value) {
       nextTick(() => {
         pushSetTree.value.setCheckedNodes(pushSetLiCount.value);
@@ -690,7 +692,6 @@ const pushDataScroll = () => {
   });
 };
 
-
 // 已推送人员
 const PushedData = async () => {
   let res = await axios({
@@ -721,16 +722,19 @@ const PushedData = async () => {
 };
 // 勾选人员
 const checkPushSet = (data, nodes) => {
-  // console.log(nodes);
-  pushSetLiCount.value = [];
-  // 选中勾选的房间赋值给count
-  nodes.checkedNodes.forEach((item, index) => {
-    if (!item.children) {
-      // console.log(item);
-      pushSetLiCount.value.push(item);
-    }
+  console.log(data, nodes);
+  console.log(pushSetTree.value.getCheckedNodes());
+
+  let flag = pushSetLiCount.value.some((i) => {
+    return data.id == i.id;
   });
-  console.log(pushSetLiCount.value);
+  if (flag) {
+    pushSetLiCount.value = pushSetLiCount.value.filter((i) => {
+      return i.id != data.id;
+    });
+  }else{
+    pushSetLiCount.value.push(data)
+  }
 };
 // 右边叉掉推送人员
 const cancelLiCheck = (i) => {
@@ -1324,4 +1328,3 @@ onUnmounted(() => {
   width: 192px;
 }
 </style>
-

src/views/teacher/teacher.vue

@@ -900,7 +900,9 @@ const getList = async () => {
       },
       data: formData,
     });
-    console.log(ress, JSON.parse(eds.decryptDes(ress.data.data)), "评分对比");
+    console.log(ress,'评分对比');
+    // console.log(ress, JSON.parse(eds.decryptDes(ress.data.data)), "评分对比");
+    
     if (ress.data.code == 200) {
       if (ress.data.data) {
         teacherComparison.name = [];

src/views/trackSearch/trackSearch.vue

@@ -23,7 +23,7 @@
               v-for="item in gradeData"
               :key="item.id"
               :label="item.name"
-              :value="item.name"
+              :value="item.id"
             >
               <span style="float: left">{{ item.name }}</span>
             </el-option>
@@ -65,9 +65,9 @@
           placement="top"
         >
           <el-card>
-            <h4>{{ i.gradeName }} / {{ i.className }} / {{ i.name }}</h4>
-            <p>{{ i.location }}</p>
-            <div v-viewer>
+            <h4>{{ i.location }}</h4>
+            <p>{{ i.name }}</p>
+            <div v-viewer v-if="i.image">
               <img :src="i.image" alt="" />
             </div>
           </el-card>
@@ -324,7 +324,7 @@ const getList = async () => {
   let data = {
     currentPage: currentPage.value,
     pageCount: pageCount.value,
-    keyWord: searchInput.keyWord,
+    userId: searchInput.keyWord,
   };
   if (searchInput.createTime) {
     data.startTime = searchInput.createTime[0];
@@ -332,18 +332,18 @@ const getList = async () => {
   }
   let res = await axios({
     method: "get",
-    url: api.value + "/wanzai/api/smartFaceDiscern/faceManagement",
+    url: api.value + "/wanzai/api/smartFaceDiscern/selectTrack",
     headers: {
       token: sessionStorage.getItem("token"),
       user_head: sessionStorage.getItem("userhead"),
     },
     params: data,
   });
-  console.log(res, JSON.parse(eds.decryptDes(res.data.data)), "轨迹查询");
   if (res.data.code == 200) {
+    console.log(res, JSON.parse(eds.decryptDes(res.data.data)), "轨迹查询");
     loading.value = false;
-    tableData.list = JSON.parse(eds.decryptDes(res.data.data)).list;
-    total.value = JSON.parse(eds.decryptDes(res.data.data)).totalCount;
+    tableData.list = JSON.parse(eds.decryptDes(res.data.data));
+    // total.value = JSON.parse(eds.decryptDes(res.data.data)).totalCount;
   } else {
     ElMessage({
       type: "error",
@@ -613,8 +613,8 @@ onUnmounted(() => {
     align-items: center;
     justify-content: center;
     .map {
-      width: 100%;
-      height: calc(100% - 30px);
+      width: 1620px;
+      height: 715px;
       overflow: hidden;
       background: url("@/assets/trackImg.jpg");
       background-repeat: no-repeat; //是否平铺

src/views/trafficRecord/trafficRecord.vue

@@ -14,7 +14,7 @@
               @clear="searchBtn"
               v-model.trim="searchInput.keyWord"
               class="sel"
-              placeholder="请输入学生姓名或学号"
+              placeholder="请输入姓名或学号"
             />
           </div>
           <el-button
@@ -206,10 +206,10 @@
           </el-table-column>
           <el-table-column align="center" prop="openType" label="识别分组">
             <template #default="{ row }">
-              <span v-if="row.openType == 1">白名单对比</span>
-              <span v-if="row.openType == 2">人证比对</span>
-              <span v-if="row.openType == 3">IC卡比对</span>
-              <span v-if="row.openType == 4">职工二维码</span>
+              <span v-if="row.openType == 0">白名单对比</span>
+              <span v-if="row.openType == 1">人证比对</span>
+              <span v-if="row.openType == 2">IC卡比对</span>
+              <span v-if="row.openType == 5">职工二维码</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -429,6 +429,7 @@ const adminClassDataList = async () => {
     searchInput.grade = data.gradeId;
     searchInput.class = data.classId;
   }
+  getList();
 };
 // 管理员 改变年级选择
 const gradeChange = (value) => {
@@ -682,7 +683,7 @@ const getAdminId = async () => {
 
 onBeforeMount(async () => {
   api.value = store.state.user.api;
-  getList();
+  // getList();
   getAdminId();
 });
 onUnmounted(() => {

src/views/user/user.vue

@@ -1898,9 +1898,9 @@ const getList = async () => {
     params: data,
   });
   // console.log(res);
-  console.log(res, JSON.parse(eds.decryptDes(res.data.data)), "用户列表");
-
+  
   if (res.data.code == 200) {
+    console.log(res, JSON.parse(eds.decryptDes(res.data.data)), "用户列表");
     loading.value = false;
     let datas = JSON.parse(eds.decryptDes(res.data.data));
     tableData.list = datas.list;
@@ -1929,8 +1929,8 @@ const getDepartment = async () => {
     },
     params: data,
   });
-  console.log(res, JSON.parse(eds.decryptDes(res.data.data)), "部门树形数据");
   if (res.data.code == 200) {
+    console.log(res, JSON.parse(eds.decryptDes(res.data.data)), "部门树形数据");
     loading.value = false;
     if (treeNodeId.value && treeNodeName.value) {
     } else {
@@ -2761,11 +2761,11 @@ const downLoadtempUpdate = async () => {
     },
     // params: data,
   });
-  console.log(
-    res,
-    JSON.parse(eds.decryptDes(res.data.data)),
-    "批量更新模板下载"
-  );
+  // console.log(
+  //   res,
+  //   JSON.parse(eds.decryptDes(res.data.data)),
+  //   "批量更新模板下载"
+  // );
 
   if (res.data.code == 200) {
     var downloadPath = JSON.parse(eds.decryptDes(res.data.data));
@@ -2853,8 +2853,8 @@ const DelRecordClick = async () => {
     },
     params: data,
   });
-  console.log(res, JSON.parse(eds.decryptDes(res.data.data)), "删除记录分页");
   if (res.data.code == 200) {
+    console.log(res, JSON.parse(eds.decryptDes(res.data.data)), "删除记录分页");
     delRecordDatas.value = JSON.parse(eds.decryptDes(res.data.data)).list;
     delRecordTotal.value = JSON.parse(eds.decryptDes(res.data.data)).totalCount;
   } else {
@@ -2912,11 +2912,11 @@ const downLoadtempAdd = async (flag) => {
       },
       // params: data,
     });
-    console.log(
-      res,
-      JSON.parse(eds.decryptDes(res.data.data)),
-      "批量导入学生模板下载"
-    );
+    // console.log(
+    //   res,
+    //   JSON.parse(eds.decryptDes(res.data.data)),
+    //   "批量导入学生模板下载"
+    // );
 
     if (res.data.code == 200) {
       var downloadPath = JSON.parse(eds.decryptDes(res.data.data));
@@ -2954,11 +2954,11 @@ const downLoadtempAdd = async (flag) => {
       },
       // params: data,
     });
-    console.log(
-      res,
-      JSON.parse(eds.decryptDes(res.data.data)),
-      "批量导入教师模板下载"
-    );
+    // console.log(
+    //   res,
+    //   JSON.parse(eds.decryptDes(res.data.data)),
+    //   "批量导入教师模板下载"
+    // );
 
     if (res.data.code == 200) {
       var downloadPath = JSON.parse(eds.decryptDes(res.data.data));