From 6bac627c5d902722f41fa1f2b7d212028f4d2eab Mon Sep 17 00:00:00 2001
From: s1431_z_w <15596413+s1431zw@user.noreply.gitee.com>
Date: Wed, 20 Aug 2025 19:35:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9B=BE=E4=B8=AD?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/flowable/task/myProcess/index.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/flowable/task/myProcess/index.vue b/src/views/flowable/task/myProcess/index.vue
index f339691..75fcb63 100644
--- a/src/views/flowable/task/myProcess/index.vue
+++ b/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>
 

From 0fca5bd2ec3e56f163a0259ddd6953f01735ca42 Mon Sep 17 00:00:00 2001
From: s1431_z_w <15596413+s1431zw@user.noreply.gitee.com>
Date: Thu, 21 Aug 2025 18:13:03 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=89=B4=E5=AE=9A=E8=AF=84=E8=AF=AD?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/comprehensive/identifytexs.js         |  8 ++++
 src/views/Home/comps/fdy-undo.vue             |  7 ++++
 .../comprehensive/identifytexs/index.vue      | 37 +++++++++++++++----
 src/views/comprehensive/remarkstext/index.vue | 35 +++++++++++++++---
 4 files changed, 74 insertions(+), 13 deletions(-)

diff --git a/src/api/comprehensive/identifytexs.js b/src/api/comprehensive/identifytexs.js
index 70ddb63..9f26edd 100644
--- a/src/api/comprehensive/identifytexs.js
+++ b/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'
+  })
+}
diff --git a/src/views/Home/comps/fdy-undo.vue b/src/views/Home/comps/fdy-undo.vue
index b93186a..56f21e8 100644
--- a/src/views/Home/comps/fdy-undo.vue
+++ b/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"
+                },
             ],
 
 
diff --git a/src/views/comprehensive/identifytexs/index.vue b/src/views/comprehensive/identifytexs/index.vue
index 51d69a5..00bbf4d 100644
--- a/src/views/comprehensive/identifytexs/index.vue
+++ b/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 => {
-        dept.children.forEach(major => {
-          major.children.forEach(c => { delete c.children })
-        })
+      if(this.cascaderData.length > 0) {
+        this.xflag = true;
+        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() {
diff --git a/src/views/comprehensive/remarkstext/index.vue b/src/views/comprehensive/remarkstext/index.vue
index 754d366..49806f2 100644
--- a/src/views/comprehensive/remarkstext/index.vue
+++ b/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 => {
-        dept.children.forEach(major => {
-          major.children.forEach(c => { delete c.children })
-        })
+      if(this.cascaderData.length > 0) {
+        this.xflag = true
+        return;
+      }
+      const ress = await treeStudent()
+        this.cascaderData = ress.data
+          this.cascaderData.forEach(dept => {
+          dept.children.forEach(major => {
+            major.children.forEach(c => { delete c.children })
+          })
       });
     },
     // 获取学年信息

From 167859bd89d562e53e7f31aaf6961056dd71edef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A6=85=E9=A5=BC?= <2815246336@qq.com>
Date: Tue, 26 Aug 2025 10:00:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9ai=E6=82=AC=E5=81=9C?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Aichat/ChatPopup.vue |  8 ++++----
 src/layout/index.vue                       | 23 ++++------------------
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/src/layout/components/Aichat/ChatPopup.vue b/src/layout/components/Aichat/ChatPopup.vue
index 75ab020..46518e5 100644
--- a/src/layout/components/Aichat/ChatPopup.vue
+++ b/src/layout/components/Aichat/ChatPopup.vue
@@ -1706,10 +1706,10 @@ export default {
 /* 聊天弹窗容器 */
 .chat-popup {
   position: fixed;
-  bottom: 45px;
-  right: 60px;
-  width: 400px;
-  height: 600px;
+  bottom: 9vh;
+  right: 5vw;
+  width: 40vw;
+  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);
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 336810e..34a71f0 100644
--- a/src/layout/index.vue
+++ b/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;
-  height: 40px;
+  width: 5vw;
+  height: 7vh;
   background-color: #409eff;
   border-radius: 50%;
   display: flex;