From 39db01fb57567c34041ad7b0e040651dd53177f0 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 18 Apr 2023 23:54:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- .env.production | 4 +- src/utils/dateUtil.ts | 49 ++++++ src/views/site/index.vue | 124 +++++++-------- src/views/site/jrkclb/kclbList.vue | 35 +++-- src/views/site/studentJlrkb/index.vue | 174 +++++++++++++++++++++ src/views/site/studentJrkb/index copy.vue | 140 +++++++++++++++++ src/views/site/studentJrkb/index.vue | 161 ++++++++++++++++++++ src/views/site/studentJrkb/kclbList.vue | 177 ++++++++++++++++++++++ src/views/site/studentJrkb/kclbRkb.vue | 145 ++++++++++++++++++ src/views/site/studentJrkb/kclbXyjk.vue | 125 +++++++++++++++ src/views/site/studentJrkb/kclbZzsk.vue | 131 ++++++++++++++++ src/views/site/tongJi/index.vue | 4 +- src/views/site/utils/index.ts | 6 +- 14 files changed, 1194 insertions(+), 85 deletions(-) create mode 100644 src/views/site/studentJlrkb/index.vue create mode 100644 src/views/site/studentJrkb/index copy.vue create mode 100644 src/views/site/studentJrkb/index.vue create mode 100644 src/views/site/studentJrkb/kclbList.vue create mode 100644 src/views/site/studentJrkb/kclbRkb.vue create mode 100644 src/views/site/studentJrkb/kclbXyjk.vue create mode 100644 src/views/site/studentJrkb/kclbZzsk.vue diff --git a/.env.development b/.env.development index c6526c4..d1f566b 100644 --- a/.env.development +++ b/.env.development @@ -8,13 +8,13 @@ VITE_PUBLIC_PATH = / VITE_PROXY = [["/jeecgboot","http://localhost:8090/jeecg-boot"],["/upload","http://localhost:3300/upload"]] # 控制台不输出 -VITE_DROP_CONSOLE = false +VITE_DROP_CONSOLE = true #后台接口父地址(必填) VITE_GLOB_API_URL=/jeecgboot #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=http://localhost:8090/jeecg-boot +VITE_GLOB_DOMAIN_URL=http://localhost:8080/jeecg-boot # 接口前缀 VITE_GLOB_API_URL_PREFIX= diff --git a/.env.production b/.env.production index cf274d8..e34d82e 100644 --- a/.env.production +++ b/.env.production @@ -16,10 +16,10 @@ VITE_BUILD_COMPRESS = 'gzip' VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false #后台接口父地址(必填) -VITE_GLOB_API_URL=/jeecgboot +VITE_GLOB_API_URL=/jeecg-boot #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=http://210.47.17.166/jeecg-boot +VITE_GLOB_DOMAIN_URL=http://bylwcs.nenu.edu.cn/jeecg-boot # 接口父路径前缀 VITE_GLOB_API_URL_PREFIX= diff --git a/src/utils/dateUtil.ts b/src/utils/dateUtil.ts index d20338a..933358a 100644 --- a/src/utils/dateUtil.ts +++ b/src/utils/dateUtil.ts @@ -13,5 +13,54 @@ export function formatToDateTime(date: dayjs.ConfigType | undefined = undefined, export function formatToDate(date: dayjs.ConfigType | undefined = undefined, format = DATE_FORMAT): string { return dayjs(date).format(format); } +/** + * 计算日期加几天 + * @param date 计算的日期 + * @param days 加几天 + */ +export function formatAddDate(date,days){ + var dates = new Date(date) + dates.setDate(dates.getDate()+days) + var year = dates.getFullYear() + var month = dates.getMonth()+1 + var day = dates.getDate() + if(month<9) + { + month="0"+month + } + if(day<9) + { + day="0"+day + } + var time = year +'-'+month+'-'+day + return time +} + +/** + * 获取今天星期几 + * @param date 时间 + */ +export function formatToWeekOne(date: dayjs.ConfigType | undefined = undefined): string { + console.log(`🚀 ~ file: dateUtil.ts:18 ~ formatToWeekOne ~ date:`, date) + let xqj = date.getDay() + console.log(`🚀 ~ file: dateUtil.ts:19 ~ formatToWeekOne ~ xqj:`, xqj) + let xqjtitle = ""; + if(xqj==1){ + xqjtitle = "星期一"; + }else if(xqj==2){ + xqjtitle = "星期二"; + }else if(xqj==3){ + xqjtitle = "星期三"; + }else if(xqj==4){ + xqjtitle = "星期四"; + }else if(xqj==5){ + xqjtitle = "星期五"; + }else if(xqj==6){ + xqjtitle = "星期六"; + }else if(xqj==0){ + xqjtitle = "星期日"; + } + return xqjtitle; +} export const dateUtil = dayjs; diff --git a/src/views/site/index.vue b/src/views/site/index.vue index 7b4dde9..0a6e857 100644 --- a/src/views/site/index.vue +++ b/src/views/site/index.vue @@ -1,78 +1,60 @@ @@ -97,6 +79,12 @@ import kclbXyjk from '/@/views/site/jrkclb/kclbXyjk.vue'; import kclbRkb from '/@/views/site/jrkclb/kclbRkb.vue'; + + import StudentJrkbPage from '/@/views/site/studentJrkb/index.vue'; + import StudentJlrkbPage from '/@/views/site/studentJlrkb/index.vue'; + + import { getUserSf } from '/@/views/site/utils/index'; + const activeKey = ref('1'); const zzskModeal = ref(); const xyjkModeal = ref(); diff --git a/src/views/site/jrkclb/kclbList.vue b/src/views/site/jrkclb/kclbList.vue index 5e48095..4404a07 100644 --- a/src/views/site/jrkclb/kclbList.vue +++ b/src/views/site/jrkclb/kclbList.vue @@ -36,10 +36,18 @@ {{ item.skdd }} - - 听课 - 评价 - 报错 + + + + 听课 + + + 评价 + + + 报错 + + @@ -54,6 +62,7 @@ + @@ -63,18 +72,21 @@ import { defHttp } from '/@/utils/http/axios'; import { useMessage } from '/@/hooks/web/useMessage'; import KcErrorreportIndexModal from '/@/views/kc/kcErrorreport/components/KcErrorreportIndexModal.vue' import { getUserId } from '/@/views/site/utils/index'; +import addModalPage from '/@/views/site/tingKeZuJi/components/addModal.vue'; //用户相关 import { useUserStore } from '/@/store/modules/user'; const userStore = useUserStore(); const kcErrorreportIndexModal = ref(); +const tingKeZuJiAddModal = ref(); const emit = defineEmits(['setTotal']); const { createMessage } = useMessage(); const confirmLoading = ref(false); -let listData = ref([]);let listType = ref(String); +let listData = ref([]); +let listType = ref(String); const list = (params) => defHttp.get({ url: '/ktgl/kcKetangbiao/getKclblist', params }); const props = defineProps({ queryParam:{type:Object} @@ -82,9 +94,9 @@ const props = defineProps({ //监听条件变化 watch(() => props.queryParam, async (newRow, oldRow) => { - // var newRowa = ref({}); - // newRowa = newRow - // listType = newRowa.type + var newRowa = ref({}); + newRowa = newRow + listType = newRowa.type },{ deep: true }); //查询数据 function rkbLoadData() { @@ -118,7 +130,10 @@ async function funYuyue(record){ }); } - +function funpingjia(record){ + var item = {ketangbiaoid:record.id} + tingKeZuJiAddModal.value.view(item) +} /** * 报错事件 */ @@ -154,7 +169,7 @@ const saveOrUpdate = (params, isUpdate) => { background: #6cafda;float: left;font-weight: 600;color:#fff;border-radius: 5px;line-height: 23px; } .yyClass{ - background-color: #1c84c6;float: left;font-weight: 600;color:#fff;border-radius: 5px;line-height: 23px; + background-color: #1c84c6;font-weight: 600;color:#fff;border-radius: 5px;line-height: 23px; } .bcClass{ background-color: #1c84c6;float: right;font-weight: 600;border-radius: 5px;line-height: 23px; diff --git a/src/views/site/studentJlrkb/index.vue b/src/views/site/studentJlrkb/index.vue new file mode 100644 index 0000000..88e571d --- /dev/null +++ b/src/views/site/studentJlrkb/index.vue @@ -0,0 +1,174 @@ + + + \ No newline at end of file diff --git a/src/views/site/studentJrkb/index copy.vue b/src/views/site/studentJrkb/index copy.vue new file mode 100644 index 0000000..9312f3e --- /dev/null +++ b/src/views/site/studentJrkb/index copy.vue @@ -0,0 +1,140 @@ + + + \ No newline at end of file diff --git a/src/views/site/studentJrkb/index.vue b/src/views/site/studentJrkb/index.vue new file mode 100644 index 0000000..95c3cfc --- /dev/null +++ b/src/views/site/studentJrkb/index.vue @@ -0,0 +1,161 @@ + + + \ No newline at end of file diff --git a/src/views/site/studentJrkb/kclbList.vue b/src/views/site/studentJrkb/kclbList.vue new file mode 100644 index 0000000..ff9e81f --- /dev/null +++ b/src/views/site/studentJrkb/kclbList.vue @@ -0,0 +1,177 @@ + + + + + diff --git a/src/views/site/studentJrkb/kclbRkb.vue b/src/views/site/studentJrkb/kclbRkb.vue new file mode 100644 index 0000000..fcaa2e9 --- /dev/null +++ b/src/views/site/studentJrkb/kclbRkb.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/src/views/site/studentJrkb/kclbXyjk.vue b/src/views/site/studentJrkb/kclbXyjk.vue new file mode 100644 index 0000000..5807dc9 --- /dev/null +++ b/src/views/site/studentJrkb/kclbXyjk.vue @@ -0,0 +1,125 @@ + + + + diff --git a/src/views/site/studentJrkb/kclbZzsk.vue b/src/views/site/studentJrkb/kclbZzsk.vue new file mode 100644 index 0000000..20e3a73 --- /dev/null +++ b/src/views/site/studentJrkb/kclbZzsk.vue @@ -0,0 +1,131 @@ + + + + diff --git a/src/views/site/tongJi/index.vue b/src/views/site/tongJi/index.vue index fa1bf5e..71d5850 100644 --- a/src/views/site/tongJi/index.vue +++ b/src/views/site/tongJi/index.vue @@ -57,7 +57,7 @@
-
{{ tjData?.yiKaiKeTang?.btkktnum??0 }}
+
{{ tjData?.yiKaiKeTangNew?.btkktnum??0 }}
@@ -67,7 +67,7 @@
-
{{ tjData?.yiKaiKeTang?.tkrcnum??0 }}
+
{{ tjData?.yiKaiKeTangNew?.tkrcnum??0 }}
diff --git a/src/views/site/utils/index.ts b/src/views/site/utils/index.ts index 229f7db..741697c 100644 --- a/src/views/site/utils/index.ts +++ b/src/views/site/utils/index.ts @@ -1,7 +1,11 @@ import { defHttp } from '/@/utils/http/axios'; export const getUserId = () => { - return '2016900057'; + return '2022010920'; +} + +export const getUserSf = () => { + return 'S'; }