diff --git a/src/api/base/server.ts b/src/api/base/server.ts
index ba91eb8..d158eb5 100644
--- a/src/api/base/server.ts
+++ b/src/api/base/server.ts
@@ -194,24 +194,24 @@ export const xsJzListByXsIdApi = async (params: any) => {
return await get("/api/jz/getListByXsId", params);
};
-// 教学资源树形
-export const typesFindTreeApi = async () => {
- return await get("/api/types/qryTreeReturn");
+// 资源目录树形
+export const zymlFindTreeApi = async () => {
+ return await get("/api/zyml/qryTreeReturn");
};
-// 根据资源类型获取教学资源树形
-export const typesFindTreeByZylxApi = async (params: any) => {
- return await get("/api/types/qryTreeByZylx", params);
+// 根据资源类型获取资源目录树形
+export const zymlFindTreeByZylxApi = async (params: any) => {
+ return await get("/api/zyml/qryTreeByZylx", params);
};
-// 获取资源分页
-export const resourcesFindPageApi = async (params: any) => {
- return await get("/api/resources/findPage", params);
+// 获取资源明细分页
+export const zymxFindPageApi = async (params: any) => {
+ return await get("/api/zymx/findPage", params);
};
-// 根据资源类型获取资源分页
-export const resourcesFindPageByZylxApi = async (params: any) => {
- return await get("/api/resources/findPageByZylx", params);
+// 根据资源类型获取资源明细分页
+export const zymxFindPageByZylxApi = async (params: any) => {
+ return await get("/api/zymx/findPageByZylx", params);
};
// 教师积分查询
@@ -224,12 +224,12 @@ export const inspectItemFindAllApi = async (params: any) => {
return await get("/api/inspectItem/findAlls", params);
};
-export const resourcesSaveApi = async (params: any) => {
- return await post("/api/resources/save", params);
+export const zymxSaveApi = async (params: any) => {
+ return await post("/api/zymx/save", params);
};
-export const resourcesAddNumByTypeApi = async (params: any) => {
- return await post("/api/resources/addNumByType", params);
+export const zymxAddNumByTypeApi = async (params: any) => {
+ return await post("/api/zymx/addNumByType", params);
};
// 获取校平均工作量
@@ -346,3 +346,10 @@ export const clearUserOpenIdApi = async (params: { userId: string }) => {
export const jsdXkkcPhotoSaveApi = async (params: any) => {
return await post("/mobile/js/xk/photo/save", params);
};
+
+/**
+ * 根据父节点查询字典数据
+ */
+export const dicFindByPidApi = async (params: { pid: string }) => {
+ return await get("/api/dic/findByPid", params);
+};
\ No newline at end of file
diff --git a/src/components/BasicPicker/Picker.vue b/src/components/BasicPicker/Picker.vue
index d46bbcb..e4de712 100644
--- a/src/components/BasicPicker/Picker.vue
+++ b/src/components/BasicPicker/Picker.vue
@@ -30,9 +30,7 @@
- 确定
+ 确定
@@ -165,4 +163,22 @@ picker-view-column {
display: block !important;
text-align: center;
}
+
+.confirm-button {
+ width: 90%;
+ margin: 10px auto;
+ padding: 12px 0;
+ background-color: #007bff;
+ color: #fff;
+ text-align: center;
+ border-radius: 8px;
+ font-size: 16px;
+ font-weight: 500;
+ cursor: pointer;
+ transition: background-color 0.3s;
+
+ &:active {
+ background-color: #0056b3;
+ }
+}
diff --git a/src/components/BasicPicker/TimePicker/DatetimePicker.vue b/src/components/BasicPicker/TimePicker/DatetimePicker.vue
index 946ee9b..571dcc5 100644
--- a/src/components/BasicPicker/TimePicker/DatetimePicker.vue
+++ b/src/components/BasicPicker/TimePicker/DatetimePicker.vue
@@ -16,7 +16,7 @@
- 确定
+ 确定
@@ -487,10 +487,27 @@ export default {
.center {
padding-bottom: var(--window-bottom);
-
}
.picker-view {
height: 400rpx;
}
+
+.confirm-button {
+ width: 90%;
+ margin: 10px auto;
+ padding: 12px 0;
+ background-color: #007bff;
+ color: #fff;
+ text-align: center;
+ border-radius: 8px;
+ font-size: 16px;
+ font-weight: 500;
+ cursor: pointer;
+ transition: background-color 0.3s;
+
+ &:active {
+ background-color: #0056b3;
+ }
+}
diff --git a/src/pages.json b/src/pages.json
index ce6d5d0..b9586f5 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -872,21 +872,28 @@
}
},
{
- "path": "pages/view/routine/kefuxuncha/zbList",
+ "path": "pages/view/routine/zbxc/xcPbList",
"style": {
"navigationBarTitleText": "值周巡查",
"enablePullDownRefresh": false
}
},
{
- "path": "pages/view/routine/kefuxuncha/zbDetail",
+ "path": "pages/view/routine/zbxc/zbList",
+ "style": {
+ "navigationBarTitleText": "值周巡查列表",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/view/routine/zbxc/zbDetail",
"style": {
"navigationBarTitleText": "值周巡查详情",
"enablePullDownRefresh": false
}
},
{
- "path": "pages/view/routine/kefuxuncha/zbRecord",
+ "path": "pages/view/routine/zbxc/zbRecord",
"style": {
"navigationBarTitleText": "值周巡查记录",
"enablePullDownRefresh": false
diff --git a/src/pages/base/service/index.vue b/src/pages/base/service/index.vue
index 2e4f6d4..4be6616 100644
--- a/src/pages/base/service/index.vue
+++ b/src/pages/base/service/index.vue
@@ -455,7 +455,14 @@ const sections = reactive([
permissionKey: "routine-yrcg", // 一日常规权限编码
path: "/pages/view/quantitativeAssessment/index/index",
},
-
+ {
+ id: "r19",
+ icon: "zbxc",
+ text: "值周巡查",
+ show: true,
+ permissionKey: "routine-zbxc", // 课服巡查权限编码
+ path: "/pages/view/routine/zbxc/xcPbList",
+ },
],
},
{
diff --git a/src/pages/base/xs/qj/detailPush.vue b/src/pages/base/xs/qj/detailPush.vue
index f3f8c19..b79735d 100644
--- a/src/pages/base/xs/qj/detailPush.vue
+++ b/src/pages/base/xs/qj/detailPush.vue
@@ -20,6 +20,14 @@
+
+ 学生姓名:
+ {{ qjData.xsxm }}
+
+
+ 所在班级:
+ {{ qjData.bc }}
+
请假类型:
{{ qjData.qjlx }}
diff --git a/src/pages/system/launchPage/launchPage.vue b/src/pages/system/launchPage/launchPage.vue
index 0114ff4..f132cc5 100644
--- a/src/pages/system/launchPage/launchPage.vue
+++ b/src/pages/system/launchPage/launchPage.vue
@@ -1,26 +1,26 @@
+
+
diff --git a/src/pages/view/routine/kefuxuncha/zbDetail.vue b/src/pages/view/routine/zbxc/zbDetail.vue
similarity index 99%
rename from src/pages/view/routine/kefuxuncha/zbDetail.vue
rename to src/pages/view/routine/zbxc/zbDetail.vue
index 9f4560a..5eeb2e0 100644
--- a/src/pages/view/routine/kefuxuncha/zbDetail.vue
+++ b/src/pages/view/routine/zbxc/zbDetail.vue
@@ -137,8 +137,8 @@
(null);
-// 格式化时间
+// 格式化时间(只显示日期,不显示时和分)
const formatTime = (timestamp: string) => {
if (!timestamp) return '';
- return dayjs(timestamp).format('MM-DD HH:mm');
+ return dayjs(timestamp).format('MM-DD');
};
// 加载巡查项目
diff --git a/src/pages/view/routine/kefuxuncha/zbList.vue b/src/pages/view/routine/zbxc/zbList.vue
similarity index 98%
rename from src/pages/view/routine/kefuxuncha/zbList.vue
rename to src/pages/view/routine/zbxc/zbList.vue
index 3ec3cb8..f580e36 100644
--- a/src/pages/view/routine/kefuxuncha/zbList.vue
+++ b/src/pages/view/routine/zbxc/zbList.vue
@@ -135,11 +135,11 @@ const getDutyDisplayName = (zb: any) => {
return displayName || '值周教师';
};
-// 格式化值周时间
+// 格式化值周时间(只显示日期,不显示时和分)
const formatDutyTime = (zb: any) => {
if (zb.zbkstime && zb.zbjstime) {
- const startTime = dayjs(zb.zbkstime).format('MM-DD HH:mm');
- const endTime = dayjs(zb.zbjstime).format('MM-DD HH:mm');
+ const startTime = dayjs(zb.zbkstime).format('MM-DD');
+ const endTime = dayjs(zb.zbjstime).format('MM-DD');
return `${startTime} ~ ${endTime}`;
}
return '暂无';
@@ -384,7 +384,7 @@ const goXc = async (zb: any) => {
dataStore.setData(combinedData);
uni.navigateTo({
- url: `/pages/view/routine/kefuxuncha/zbDetail`,
+ url: `/pages/view/routine/zbxc/zbDetail`,
});
};
@@ -413,7 +413,7 @@ const goRecord = (zb: any) => {
dataStore.setData(combinedData);
uni.navigateTo({
- url: `/pages/view/routine/kefuxuncha/zbRecord`,
+ url: `/pages/view/routine/zbxc/zbRecord`,
});
};
diff --git a/src/pages/view/routine/kefuxuncha/zbRecord.vue b/src/pages/view/routine/zbxc/zbRecord.vue
similarity index 100%
rename from src/pages/view/routine/kefuxuncha/zbRecord.vue
rename to src/pages/view/routine/zbxc/zbRecord.vue
diff --git a/src/static/base/home/zbxc.png b/src/static/base/home/zbxc.png
new file mode 100644
index 0000000..ffd3781
Binary files /dev/null and b/src/static/base/home/zbxc.png differ