diff --git a/src/pages/view/routine/GongZuoLiang/index.vue b/src/pages/view/routine/GongZuoLiang/index.vue
index c347663..a2a84a8 100644
--- a/src/pages/view/routine/GongZuoLiang/index.vue
+++ b/src/pages/view/routine/GongZuoLiang/index.vue
@@ -4,7 +4,10 @@
- {{ pk.kmMc }}
+
+ {{ (pk.njmc || "无年级") + " " + (pk.bjmc || "无班级") + " " + pk.kmMc }}
+ ( 代课 )
+
@@ -29,18 +32,18 @@
无工作量
-
-
+
+
-
- {{ zw.zwMc }}
- {{ zw.ks }}
+
+ {{ zdy.xmMc }}
+ {{ zdy.ks }}
@@ -50,7 +53,7 @@
无工作量
-
+
@@ -84,11 +87,11 @@
校平均工作量
- {{ pjGzl }}
+ {{ gzl.pjks }}
- 达标率
- {{ dbl }}%
+ 工作量比例
+ {{ gzl.bl }}%
@@ -102,38 +105,25 @@ import BasicLayout from "@/components/BasicLayout/Layout.vue";
import { useUserStore } from "@/store/modules/user";
const { getJs } = useUserStore();
-
-
-const pjGzl = ref(1.0);
-const dbl = ref(100.0);
-
-const gzl = ref({
- zks: 20.0
-});
+const gzl = ref({});
const pkList = ref([
{ 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([
- { id: 1, zwMc: "书记", ks: 5.0 },
- { id: 2, zwMc: "校长", ks: 4.0 },
-]);
-
const bzrList = ref([
{ 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 zdyList = ref([
+ { id: 1, xmMc: "书记", ks: 5.0 },
+ { id: 2, xmMc: "校长", ks: 4.0 },
+]);
onMounted(async () => {
- {
- const res = await getJsPjGzlApi();
- pjGzl.value = parseFloat((res.result || '1.0'));
- }
{
const res = await gzlFindPageApi({ jsId: getJs.id });
if (!res.rows || !res.rows.length) {
@@ -141,9 +131,8 @@ onMounted(async () => {
}
gzl.value = res.rows[0] || {};
pkList.value = gzl.value.gzlPkList || [];
- zwList.value = gzl.value.gzlZwList || [];
bzrList.value = gzl.value.gzlBzrList || [];
- dbl.value = gzl.value.zks * 100.0 / pjGzl.value;
+ zdyList.value = gzl.value.gzlZdyList || [];
}
});
diff --git a/src/pages/view/routine/JiaoXueZiYuan/index.vue b/src/pages/view/routine/JiaoXueZiYuan/index.vue
index 4e9ec9e..34324d5 100644
--- a/src/pages/view/routine/JiaoXueZiYuan/index.vue
+++ b/src/pages/view/routine/JiaoXueZiYuan/index.vue
@@ -77,7 +77,7 @@ const categoryList = ref([
const curType = ref();
const curNj = ref();
const curCe = ref();
-const curCategory = ref();
+const curCategory = ref(categoryList.value[0]);
const selectType = (type: any) => {
curType.value = type;
diff --git a/src/pages/view/routine/JiaoXueZiYuan/indexList.vue b/src/pages/view/routine/JiaoXueZiYuan/indexList.vue
index b1651f4..0ef3ccf 100644
--- a/src/pages/view/routine/JiaoXueZiYuan/indexList.vue
+++ b/src/pages/view/routine/JiaoXueZiYuan/indexList.vue
@@ -79,7 +79,7 @@ const clearSearch = () => {
const downloadResouce = (item: any) => {
const finalUrl = imagUrl(item.resourUrl);
const fileName = item.resourName + '.' + item.resSuf;
- downloadForWeb(finalUrl, fileName);
+ download(finalUrl, fileName);
resourcesAddNumByTypeApi({
id: item.id,
type: 'down'