diff --git a/src/api/base/gzlApi.ts b/src/api/base/gzlApi.ts
new file mode 100644
index 0000000..eb029cf
--- /dev/null
+++ b/src/api/base/gzlApi.ts
@@ -0,0 +1,19 @@
+// 食堂巡查相关API接口
+import { get, post } from "@/utils/request";
+
+// 获取工作量
+export const gzlFindPageApi = async (params: any) => {
+  return await get("/api/gzl/findPage", params);
+};
+
+// 获取当前学期和周次
+export const gzlGetDqXqAndZcApi = async () => {
+  return await get("/api/gzl/getDqXqAndZc");
+};
+
+/**
+ * 当前学期排课公共配置（排课设置、排课周次、排课时间）
+ */
+export const dqPkApi = async () => {
+  return await get("/mobile/jz/pkkb/dqpk");
+};
diff --git a/src/api/base/server.ts b/src/api/base/server.ts
index 6687e6c..88faa4d 100644
--- a/src/api/base/server.ts
+++ b/src/api/base/server.ts
@@ -222,11 +222,6 @@ export const resourcesAddNumByTypeApi = async (params: any) => {
   return await post("/api/resources/addNumByType", params);
 };
 
-// 获取工作量
-export const gzlFindPageApi = async (params: any) => {
-  return await get("/api/gzl/findPage", params);
-};
-
 // 获取校平均工作量
 export const getJsPjGzlApi = async () => {
   return await get("/api/comConfig/getJsPjGzl");
diff --git a/src/pages/view/homeSchool/BanJiKeBiao.vue b/src/pages/view/homeSchool/BanJiKeBiao.vue
index fd4cabc..b9487b9 100644
--- a/src/pages/view/homeSchool/BanJiKeBiao.vue
+++ b/src/pages/view/homeSchool/BanJiKeBiao.vue
@@ -25,8 +25,8 @@
         <view class="course-container">
           <template v-if="sj.pkkbList && sj.pkkbList.length > 0">
             <view v-for="(pkkb, pkkbIndex) in sj.pkkbList" :key="pkkbIndex"
-              :class="['course-card', getCourseColorClass(pkkb.pkName)]">
-              <text class="course-subject">{{ pkkb.pkName }}</text>
+                              :class="['course-card', getCourseColorClass(pkkb.pkMc)]">
+              <text class="course-subject">{{ pkkb.pkMc }}</text>
               <text class="course-class">{{ pkkb.jsName }}</text>
             </view>
           </template>
diff --git a/src/pages/view/homeSchool/JiaoShiKeBiao.vue b/src/pages/view/homeSchool/JiaoShiKeBiao.vue
index 7ff62c2..a3e36a4 100644
--- a/src/pages/view/homeSchool/JiaoShiKeBiao.vue
+++ b/src/pages/view/homeSchool/JiaoShiKeBiao.vue
@@ -23,8 +23,8 @@
         <view class="course-container">
           <template v-if="sj.pkkbList && sj.pkkbList.length > 0">
             <view v-for="(pkkb, pkkbIndex) in sj.pkkbList" :key="pkkbIndex"
-              :class="['course-card', getCourseColorClass(pkkb.pkName)]">
-              <text class="course-subject">{{ pkkb.pkName }}</text>
+                              :class="['course-card', getCourseColorClass(pkkb.pkMc)]">
+              <text class="course-subject">{{ pkkb.pkMc }}</text>
               <text class="course-class">{{ (pkkb.njmc || "无年级") + " " + (pkkb.bjmc || "无班级") }}</text>
             </view>
           </template>
diff --git a/src/pages/view/hr/jsQj/components/jsQjDetail.vue b/src/pages/view/hr/jsQj/components/jsQjDetail.vue
index e8f165d..b27f44d 100644
--- a/src/pages/view/hr/jsQj/components/jsQjDetail.vue
+++ b/src/pages/view/hr/jsQj/components/jsQjDetail.vue
@@ -64,7 +64,7 @@
         <view class="card-body">
           <view class="info-row">
             <text class="label">排课名称:</text>
-            <text class="value">{{ item.pkName }}</text>
+                            <text class="value">{{ item.pkMc }}</text>
           </view>
           <view class="info-row">
             <text class="label">上课时间:</text>
diff --git a/src/pages/view/hr/jsQj/components/jsQjDkEdit.vue b/src/pages/view/hr/jsQj/components/jsQjDkEdit.vue
index 013741e..363d7d6 100644
--- a/src/pages/view/hr/jsQj/components/jsQjDkEdit.vue
+++ b/src/pages/view/hr/jsQj/components/jsQjDkEdit.vue
@@ -40,7 +40,7 @@
             <view class="card-body">
               <view class="info-row">
                 <text class="label">排课名称:</text>
-                <text class="value">{{ item.pkName }}</text>
+                <text class="value">{{ item.pkMc }}</text>
               </view>
               <view class="info-row">
                 <text class="label">代课老师:</text>
@@ -72,7 +72,7 @@
           <view class="card-body">
             <view class="info-row">
               <text class="label">排课名称:</text>
-              <text class="value">{{ item.pkName }}</text>
+              <text class="value">{{ item.pkMc }}</text>
             </view>
             <view class="info-row">
               <text class="label">上课时间:</text>
@@ -194,7 +194,7 @@ const getPkkbList = async () => {
       item.dkJsName = "";
     }
     kmMap[item.pkId] = kmMap[item.pkId] || {
-      pkName: item.pkName,
+      pkMc: item.pkMc,
       pkId: item.pkId,
     };
     return item;
diff --git a/src/pages/view/hr/jsQj/dkQr.vue b/src/pages/view/hr/jsQj/dkQr.vue
index e9ce623..651a873 100644
--- a/src/pages/view/hr/jsQj/dkQr.vue
+++ b/src/pages/view/hr/jsQj/dkQr.vue
@@ -22,7 +22,7 @@
         <view class="card-body">
           <view class="info-row">
             <text class="label">排课名称:</text>
-            <text class="value">{{ item.pkName }}</text>
+                            <text class="value">{{ item.pkMc }}</text>
           </view>
           <view class="info-row">
             <text class="label">上课时间:</text>
diff --git a/src/pages/view/routine/GongZuoLiang/index.vue b/src/pages/view/routine/GongZuoLiang/index.vue
index a7f6b95..d272403 100644
--- a/src/pages/view/routine/GongZuoLiang/index.vue
+++ b/src/pages/view/routine/GongZuoLiang/index.vue
@@ -1,6 +1,10 @@
 <template>
   <BasicLayout :show-nav-bar="true" :nav-bar-props="{ title: '工作量统计' }">
     <view class="grade-analysis-page">
+      <view class="week-selector" @click="openWeekPicker">
+        <text>{{ curZc?.mc || '选择周次' }}</text>
+        <uni-icons type="right" size="16" color="#fff"></uni-icons>
+      </view>
       <uni-section title="排课工作量" type="line" titleFontSize="16px" padding>
         <view v-if="pkList.length">
           <view class="section-sub-card r-md" v-for="(pk, index) in pkList" :key="index">
@@ -21,7 +25,7 @@
                   </view>
                   <view class="stat-item">
                     <text class="label">周工作量</text>
-                    <text class="value">{{ (pk.xs || 1.0) * (pk.ks || 0.0) }}</text>
+                    <text class="value">{{ formatNumber((pk.xs || 1.0) * (pk.ks || 0.0)) }}</text>
                   </view>
                 </view>
               </view>
@@ -43,7 +47,7 @@
               <view class="table-body">
                 <view class="table-row" v-for="(zw, index) in zwList" :key="index">
                   <view class="td">{{ zw.zwMc }}</view>
-                  <view class="td flex-80">{{ zw.ks }}</view>
+                  <view class="td flex-80">{{ formatNumber(zw.ks) }}</view>
                 </view>
               </view>
             </view>
@@ -66,7 +70,7 @@
                 <view class="table-row" v-for="(zdy, index) in zdyList" :key="index">
                   <view class="td">{{ zdy.xmMc }}</view>
                   <view class="td">{{ zdy.lxMc }}</view>
-                  <view class="td">{{ zdy.ks }}</view>
+                  <view class="td">{{ formatNumber(zdy.ks) }}</view>
                 </view>
               </view>
             </view>
@@ -100,21 +104,42 @@
           <text>无工作量</text>
         </view>
       </uni-section> -->
+    
+      <!-- 周选择弹窗 -->
+      <uni-popup ref="weekPopup" type="bottom" @change="popupChange">
+        <view class="week-picker-popup">
+          <view class="popup-header">
+            <text class="title">选择周</text>
+          </view>
+          <view class="week-list">
+            <scroll-view scroll-y style="max-height: 60vh" :scroll-top="targetScrollTop">
+              <view v-for="(zc, index) in zcList" :key="index" :class="[
+                'week-item',
+                { active: zc.djz === curZc.djz },
+              ]" @click="selectWeek(zc)">
+                <text>{{ zc.mc }}</text>
+                <text v-if="zc.dnDjz === dnDjz" class="current-tag">当前周</text>
+              </view>
+            </scroll-view>
+          </view>
+        </view>
+      </uni-popup>
+    
     </view>
     <template #bottom>
       <view class="bottom-container">
         <view class="stats-grid">
           <view class="stat-item">
             <text class="label">总工作量</text>
-            <text class="value primary">{{ gzl.zks }}</text>
+            <text class="value primary">{{ formatNumber(gzl.zks) }}</text>
           </view>
           <view class="stat-item">
             <text class="label">校平均工作量</text>
-            <text class="value success">{{ gzl.pjks }}</text>
+            <text class="value success">{{ formatNumber(gzl.pjks) }}</text>
           </view>
           <view class="stat-item">
             <text class="label">工作量比例</text>
-            <text class="value">{{ gzl.bl }}%</text>
+            <text class="value">{{ formatNumber(gzl.bl) }}%</text>
           </view>
         </view>
       </view>
@@ -123,44 +148,158 @@
 </template>
 
 <script lang="ts" setup>
-import { gzlFindPageApi, getJsPjGzlApi } from "@/api/base/server";
+import { ref, onMounted, nextTick } from "vue";
+import { gzlFindPageApi } from "@/api/base/gzlApi";
 import BasicLayout from "@/components/BasicLayout/Layout.vue";
 import { useUserStore } from "@/store/modules/user";
+import { useCommonStore } from "@/store/modules/common";
+import dayjs from "dayjs";
+import "dayjs/locale/zh-cn";
+import weekOfYear from "dayjs/plugin/weekOfYear";
+import isoWeek from "dayjs/plugin/isoWeek";
+
+dayjs.locale("zh-cn");
+dayjs.extend(weekOfYear);
+dayjs.extend(isoWeek);
+
 const { getJs } = useUserStore();
+const { getDqPkZcList, getDqXqAndZc } = useCommonStore();
+
+// 这是当年的第几周
+const dnDjz = ref(dayjs().isoWeek());
+
+// 当前选中周次
+const curZc = ref<any>({});
+// 周次列表
+const zcList = ref<any>([]);
+
+// 周选择相关
+const showWeekPicker = ref(false);
+const weekPopup = ref<any>(null);
+const targetScrollTop = ref(0);
 
 const gzl = ref<any>({});
 
-const pkList = ref<any[]>([
-  { id: 1, kmMc: "语文", xs: 1.0, ks: 5.0 },
-  { id: 2, kmMc: "数学", xs: 1.0, ks: 4.0 },
-  { id: 3, kmMc: "英语", xs: 1.0, ks: 3.0 },
-]);
-const zwList = ref<any[]>([
-  { id: 1, zwMc: "书记", ks: 5.0 },
-  { id: 2, zwMc: "校长", ks: 4.0 },
-]);
-const bzrList = ref<any[]>([
-  { id: 1, njmc: "一年级", bjmc: "1班", zb: 0.33, ks: 2.0 },
-  { id: 2, njmc: "二年级", bjmc: "1班", zb: 0.5, ks: 3.0 },
-  { id: 3, njmc: "二年级", bjmc: "2班", zb: 1.0, ks: 6.0 },
-]);
+const pkList = ref<any[]>([]);
+const zwList = ref<any[]>([]);
+const bzrList = ref<any[]>([]);
+const zdyList = ref<any[]>([]);
 
-const zdyList = ref<any[]>([
-  { id: 1, xmMc: "书记", ks: 5.0 },
-  { id: 2, xmMc: "校长", ks: 4.0 },
-]);
-
-onMounted(async () => {
-  {
-    const res = await gzlFindPageApi({ jsId: getJs.id });
+// 数据加载函数
+const loadGzlData = async () => {
+  try {
+    console.log(curZc.value);
+    const res = await gzlFindPageApi({ 
+      jsId: getJs.id,
+      zc: curZc.value.djz // 传递选中的周次
+    });
+    
     if (!res.rows || !res.rows.length) {
+      gzl.value = {};
+      pkList.value = [];
+      zwList.value = [];
+      bzrList.value = [];
+      zdyList.value = [];
       return;
     }
+    
     gzl.value = res.rows[0] || {};
     pkList.value = gzl.value.gzlPkList || [];
     zwList.value = gzl.value.gzlZwList || [];
     bzrList.value = gzl.value.gzlBzrList || [];
     zdyList.value = gzl.value.gzlZdyList || [];
+  } catch (error) {
+    console.error("加载工作量数据失败:", error);
+  }
+};
+
+// 格式化数字函数：最多2位小数，清理末尾的0
+const formatNumber = (value: number | string | undefined | null): string => {
+  if (value === undefined || value === null || value === '') {
+    return '0';
+  }
+  
+  const num = parseFloat(value.toString());
+  if (isNaN(num)) {
+    return '0';
+  }
+  
+  // 先格式化为2位小数
+  const formatted = num.toFixed(2);
+  
+  // 清理末尾的0
+  return formatted.replace(/\.?0+$/, '');
+};
+
+// 打开周选择弹窗
+const openWeekPicker = async () => {
+  showWeekPicker.value = true;
+  // 打开弹窗
+  await nextTick();
+  if (weekPopup.value) {
+    weekPopup.value.open("bottom");
+  } else {
+    console.error("Week popup ref is not available.");
+  }
+};
+
+// 关闭周选择弹窗
+const closeWeekPicker = () => {
+  if (weekPopup.value) {
+    weekPopup.value.close();
+  }
+};
+
+// 弹窗状态变化
+const popupChange = (e: { show: boolean }) => {
+  if (!e.show) {
+    showWeekPicker.value = false;
+  }
+};
+
+// 选择周
+const selectWeek = async (zc: any) => {
+  if (curZc.value && zc && zc.djz === curZc.value.djz) {
+    // 如果点击的是当前已选中的周，则只关闭弹窗
+    closeWeekPicker();
+    return;
+  }
+  
+  // 更新选中的周次
+  curZc.value = zc;
+  
+  // 关闭弹窗
+  closeWeekPicker();
+  
+  // 重新加载数据
+  await loadGzlData();
+};
+
+onMounted(async () => {
+  try {
+    // 获取当前学期和周次信息
+    const res = await getDqXqAndZc();
+    const zcListData = await getDqPkZcList();
+    
+    // 设置周次列表
+    zcList.value = zcListData || [];
+    
+    // 找到当前周次
+    let currentZc = zcListData?.find((item: any) => item.zc === res.zc);
+    if (!currentZc && zcListData && zcListData.length > 0) {
+      currentZc = zcListData[0];
+    }
+    
+    // 设置当前选中的周次，确保有默认值
+    curZc.value = currentZc || { mc: '选择周次', djz: 0, zc: 0 };
+    
+    // 加载初始数据
+    await loadGzlData();
+  } catch (error) {
+    console.error("初始化失败:", error);
+    // 设置默认值，避免undefined错误
+    curZc.value = { mc: '选择周次', djz: 0, zc: 0 };
+    zcList.value = [];
   }
 });
 </script>
@@ -171,6 +310,18 @@ onMounted(async () => {
   padding-bottom: 20rpx;
 }
 
+.week-selector {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 12px 15px;
+  background-color: #4477ee;
+  color: #ffffff;
+  font-size: 15px;
+  margin: 20rpx;
+  border-radius: 8px;
+}
+
 // --- Section Styling ---
 .uni-section {
   background-color: #fff;
@@ -316,4 +467,54 @@ onMounted(async () => {
   padding: 15px;
   margin-top: 8px;
 }
+
+/* 周选择弹窗样式 */
+.week-picker-popup {
+  background-color: #fff;
+  border-radius: 16px 16px 0 0;
+  padding-bottom: 20px;
+
+  .popup-header {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 15px;
+    border-bottom: 1px solid #f0f0f0;
+    position: relative;
+
+    .title {
+      font-size: 16px;
+      font-weight: 500;
+      color: #333;
+    }
+  }
+
+  .week-list {
+    padding: 10px 0;
+
+    .week-item {
+      height: 53.5px; // 设置固定高度
+      display: flex;
+      justify-content: space-between;
+      align-items: center; // 确保垂直居中
+      padding: 0 15px; // 调整 padding 以适应固定高度，移除上下 padding
+      border-bottom: 1px solid #f5f5f5;
+      box-sizing: border-box;
+
+      &.active {
+        background-color: #f0f7ff;
+        color: #4477ee;
+      }
+
+      .current-tag {
+        font-size: 12px;
+        color: #fff;
+        background-color: #4477ee;
+        padding: 2px 6px;
+        border-radius: 10px;
+        white-space: nowrap; // 防止标签换行
+      }
+    }
+  }
+}
 </style>
diff --git a/src/store/modules/common.ts b/src/store/modules/common.ts
index 5c4d363..1296ce2 100644
--- a/src/store/modules/common.ts
+++ b/src/store/modules/common.ts
@@ -6,6 +6,7 @@ import {
   zwGetListByLxApi,
 } from "@/api/base/common";
 import { jsdJsdkbApi, jsdKsccApi } from "@/api/base/server";
+import { dqPkApi, gzlGetDqXqAndZcApi } from "@/api/base/gzlApi";
 import { defineStore } from "pinia";
 
 interface CommonState {
@@ -79,6 +80,29 @@ export const useCommonStore = defineStore({
         this.data.kscc[params.bjId] = await jsdKsccApi(params);
       }
       return Promise.resolve(this.data.kscc[params.bjId]);
+    },  
+    async getDqPk(): Promise<any> {
+      if (!this.data.dqpk) {
+        const res = await dqPkApi();
+        if (res && res.resultCode === 1) {
+          this.data.dqpk = res.result;
+        }
+      }
+      return Promise.resolve(this.data.dqpk);
+    },
+    async getDqPkZcList(): Promise<any> {
+      const dqpk = await this.getDqPk();
+      const ret = dqpk.zcList || [];
+      return Promise.resolve(ret);
+    },
+    async getDqXqAndZc(): Promise<any> {
+      if (!this.data.dqXqAndZc) { 
+        const res = await gzlGetDqXqAndZcApi();
+        if (res && res.resultCode === 1) {
+          this.data.dqXqAndZc = res.result;
+        }
+      }
+      return Promise.resolve(this.data.dqXqAndZc);
     },
     // 清除班级考试场次缓存
     clearKsccCache(bjId?: string) {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 7f822c7..e325e31 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -176,6 +176,9 @@ export const useUserStore = defineStore({
       if (value[AUTH_KEY]) {
         this.setToken(value[AUTH_KEY]);
       }
+      // 为了避免数据加载异常。这里清理一下缓存
+      useDicStore().setData({});
+      useCommonStore().setData({});
 
       // 检查用户数据中是否已经包含权限信息
       if (value.auth && Array.isArray(value.auth) && value.auth.length > 0) {