Merge remote-tracking branch 'origin/main'

src/api/comprehensive/identifytexs.js

@@ -42,3 +42,11 @@ export function delIdentifytexs(id) {
     method: 'post'
   })
 }
+
+// 班级信息列表
+export function deptDataList() {
+  return request({
+    url: '/comprehensive/identifytexs/deptdata',
+    method: 'get'
+  })
+}

src/layout/components/Aichat/ChatPopup.vue

@@ -1706,10 +1706,10 @@ export default {
 /* 聊天弹窗容器 */
 .chat-popup {
   position: fixed;
-  bottom: 45px;
+  bottom: 9vh;
-  right: 60px;
+  right: 5vw;
-  width: 400px;
+  width: 40vw;
-  height: 600px;
+  height: 80vh;
   background: #fff;
   border-radius: 16px;
   box-shadow: 0 20px 60px rgba(0, 0, 0, 0.15), 0 8px 32px rgba(0, 0, 0, 0.1);

src/layout/index.vue

@@ -21,7 +21,7 @@
       <!-- 其他页面内容 -->
       <!-- 触发按钮，控制弹窗显示隐藏 -->
       <div class="ai-hover" @click="toggleAI">
-        <span v-if="!showAI" style="font-size: 14px; font-weight: bold;">AI</span>
+        <span v-if="!showAI" style="font-size: 30px; font-weight: bold;">AI</span>
         <i v-else class="el-icon-close" style="font-size: 20px;"></i>
       </div>
       <!-- 聊天弹窗，通过 v-if 控制显隐 -->
@@ -192,22 +192,7 @@ export default {
 }
 
 
-// ai悬停
+
-.ai-hover {
-  position: fixed;
-  bottom: 20px;
-  right: 20px;
-  z-index: 999;
-  width: 50px;
-  height: 50px;
-  border-radius: 50%;
-  background-color: #409eff;
-  color: #fff;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  cursor: pointer;
-}
 
 //AI
 .ai-hover {
@@ -215,8 +200,8 @@ export default {
   right: 20px;
   bottom: 20px;
   /* 和弹窗拉开距离 */
-  width: 40px;
+  width: 5vw;
-  height: 40px;
+  height: 7vh;
   background-color: #409eff;
   border-radius: 50%;
   display: flex;

src/views/Home/comps/fdy-undo.vue

@@ -125,6 +125,13 @@ export default {
                     value: 0,
                     url: "hard/zsg/fdy"
                 },
+                //邵政文
+                {
+                    label: "辅导员·住宿费用确认审核",
+                    name: "zsfy",
+                    value: 0,
+                    url: "/dormitory/new/FdyConfirm"
+                },
             ],
 
 

src/views/comprehensive/identifytexs/index.vue

@@ -4,7 +4,22 @@
       <el-form-item label="学号" prop="studentCode">
         <el-input v-model="queryParams.studentCode" placeholder="请输入学号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="班级" prop="deptId">
+      <el-form-item label="班级" prop="classId" v-if="xflag">
+        <el-select 
+          v-model="queryParams.classId" 
+          placeholder="请选择班级" 
+          clearable 
+          filterable 
+          style="width: 300px;">
+          <el-option
+            v-for="item in cascaderData"
+            :key="item.classId"
+            :label="item.className"
+            :value="item.classId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="班级" prop="deptId" v-else>
         <el-cascader v-model="queryParams.classId" ref="cas" style="width: 500px;" :options="cascaderData"
           :props="{ checkStrictly: false }" @change="handleChange" clearable filterable></el-cascader>
       </el-form-item>
@@ -479,7 +494,7 @@
 </template>
 
 <script>
-import { listIdentifytexs, getIdentifytexs, delIdentifytexs, addIdentifytexs, updateIdentifytexs } from "@/api/comprehensive/identifytexs";
+import { listIdentifytexs, getIdentifytexs, delIdentifytexs, addIdentifytexs, updateIdentifytexs, deptDataList } from "@/api/comprehensive/identifytexs";
 import { treeStudent } from "@/api/stuCQS/basedata/student";
 import { listQiyongYear as listYear } from "@/api/stuCQS/basedata/year";
 import * as XLSX from 'xlsx';
@@ -519,6 +534,7 @@ export default {
       biaoJi: null,
       excelName: null,
       redingData: false,
+      xflag: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -595,13 +611,20 @@ export default {
     },
     // 获取级联数据
     async getCascaderData() {
-      const res = await treeStudent()
+      const res = await deptDataList()
       this.cascaderData = res.data
-      this.cascaderData.forEach(dept => {
+      if(this.cascaderData.length > 0) {
-        dept.children.forEach(major => {
+        this.xflag = true;
-          major.children.forEach(c => { delete c.children })
+        return;
-        })
+      }
+      const ress = await treeStudent()
+        this.cascaderData = ress.data
+          this.cascaderData.forEach(dept => {
+          dept.children.forEach(major => {
+            major.children.forEach(c => { delete c.children })
+          })
       });
+      //console.log(this.cascaderData, "班级数据");
     },
     // 获取学年信息
     async listAllStuYear() {

src/views/comprehensive/remarkstext/index.vue

@@ -4,7 +4,22 @@
       <el-form-item label="学号" prop="studentCode">
         <el-input v-model="queryParams.studentCode" placeholder="请输入学号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="班级" prop="deptId">
+      <el-form-item label="班级" prop="classId" v-if="xflag">
+        <el-select 
+          v-model="queryParams.classId" 
+          placeholder="请选择班级" 
+          clearable 
+          filterable 
+          style="width: 300px;">
+          <el-option
+            v-for="item in cascaderData"
+            :key="item.classId"
+            :label="item.className"
+            :value="item.classId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="班级" prop="deptId" v-else>
         <el-cascader v-model="queryParams.classId" ref="cas" style="width: 500px;" :options="cascaderData"
           :props="{ checkStrictly: false }" @change="handleChange" clearable filterable></el-cascader>
       </el-form-item>
@@ -388,6 +403,7 @@
 <script>
 import { listRemarkstext, getRemarkstext, delRemarkstext, addRemarkstext, updateRemarkstext } from "@/api/comprehensive/remarkstext";
 import { treeStudent } from "@/api/stuCQS/basedata/student";
+import { deptDataList } from "@/api/comprehensive/identifytexs";
 import { listQiyongYear as listYear } from "@/api/stuCQS/basedata/year";
 import * as XLSX from 'xlsx';
 import { excelDateToJSDate } from '@/utils/index';
@@ -426,6 +442,7 @@ export default {
       excelName: null,
       mode: 'add',
       redingdata: false,
+      xflag: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -492,12 +509,18 @@ export default {
     },
     // 获取级联数据
     async getCascaderData() {
-      const res = await treeStudent()
+      const res = await deptDataList()
       this.cascaderData = res.data
-      this.cascaderData.forEach(dept => {
+      if(this.cascaderData.length > 0) {
-        dept.children.forEach(major => {
+        this.xflag = true
-          major.children.forEach(c => { delete c.children })
+        return;
-        })
+      }
+      const ress = await treeStudent()
+        this.cascaderData = ress.data
+          this.cascaderData.forEach(dept => {
+          dept.children.forEach(major => {
+            major.children.forEach(c => { delete c.children })
+          })
       });
     },
     // 获取学年信息

src/views/flowable/task/myProcess/index.vue

@@ -42,7 +42,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -64,7 +64,7 @@
           v-hasPermi="['system:deployment:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -90,12 +90,12 @@
         prop="procDefName"
         :show-overflow-tooltip="true"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="流程类别"
         align="center"
         prop="category"
         width="100px"
-      />
+      /> -->
       <!-- <el-table-column label="流程版本" align="center" width="80px">
         <template slot-scope="scope">
           <el-tag size="medium">v{{ scope.row.procDefVersion }}</el-tag>
@@ -159,6 +159,7 @@
             >删除</el-button
           >
         </template>
+        <a href=""></a>
       </el-table-column>
     </el-table>