diff --git a/src/views/kc/pktj/pkfgl/pkfgl.vue b/src/views/kc/pktj/pkfgl/pkfgl.vue index 7d7063c..873637a 100644 --- a/src/views/kc/pktj/pkfgl/pkfgl.vue +++ b/src/views/kc/pktj/pkfgl/pkfgl.vue @@ -6,7 +6,8 @@ - + + diff --git a/src/views/kc/pktj/pkmxb/pkmxb.vue b/src/views/kc/pktj/pkmxb/pkmxb.vue index 6062d32..65cde10 100644 --- a/src/views/kc/pktj/pkmxb/pkmxb.vue +++ b/src/views/kc/pktj/pkmxb/pkmxb.vue @@ -9,7 +9,8 @@ - + + @@ -83,6 +84,7 @@ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import { dateFormat } from '/@/utils/common/compUtils'; import viewModalPage from '/@/views/site/tingKeZuJi/components/viewModal.vue'; +import { getSysConfig } from '/@/views/site/utils/index'; const queryParam = ref({}); const toggleSearchStatus = ref(false); @@ -129,9 +131,7 @@ const viewModal = ref(); //进入就加载 onMounted(() => { const format = 'yyyy-MM-dd'; - const startTime = new Date(); - startTime.setTime(startTime.getTime()-60000*60*24*7) - queryParam.value.startTime = dateFormat(startTime, format) + queryParam.value.startTime = dateFormat(getSysConfig().bxqkssj, format) queryParam.value.endTime = dateFormat(new Date(), format) }); diff --git a/src/views/kc/pktj/pktjb/pktjb.vue b/src/views/kc/pktj/pktjb/pktjb.vue index 800071c..8ab5d45 100644 --- a/src/views/kc/pktj/pktjb/pktjb.vue +++ b/src/views/kc/pktj/pktjb/pktjb.vue @@ -6,7 +6,8 @@ - + + @@ -72,6 +73,7 @@ import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './pktjb.api'; import { downloadFile } from '/@/utils/common/renderUtils'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; +import { getSysConfig } from '/@/views/site/utils/index'; const queryParam = ref({}); const toggleSearchStatus = ref(false); @@ -116,9 +118,7 @@ //进入就加载 onMounted(() => { const format = 'yyyy-MM-dd'; - const startTime = new Date(); - startTime.setTime(startTime.getTime()-60000*60*24*7) - queryParam.value.startTime = dateFormat(startTime, format) + queryParam.value.startTime = dateFormat(getSysConfig().bxqkssj, format) queryParam.value.endTime = dateFormat(new Date(), format) }); /** diff --git a/src/views/kc/pktj/pkztj/pkztj.vue b/src/views/kc/pktj/pkztj/pkztj.vue index ec00bf1..4fff15d 100644 --- a/src/views/kc/pktj/pkztj/pkztj.vue +++ b/src/views/kc/pktj/pkztj/pkztj.vue @@ -6,7 +6,8 @@ - + + diff --git a/src/views/kc/szkc/components/XzKechengbiao.data.ts b/src/views/kc/szkc/components/XzKechengbiao.data.ts index 4603063..e099dc5 100644 --- a/src/views/kc/szkc/components/XzKechengbiao.data.ts +++ b/src/views/kc/szkc/components/XzKechengbiao.data.ts @@ -25,13 +25,11 @@ export const columns = ([ { title: '开课单位', align: "left", - width: '100px', key: 'kkdw' }, { title: '课程性质', align: "left", - width: '105px', key: 'kcxz_dictText' }, // { diff --git a/src/views/kc/tktj/kcTingke/KcTingkeList.vue b/src/views/kc/tktj/kcTingke/KcTingkeList.vue index 0822140..1528d3b 100644 --- a/src/views/kc/tktj/kcTingke/KcTingkeList.vue +++ b/src/views/kc/tktj/kcTingke/KcTingkeList.vue @@ -5,7 +5,8 @@ - + + @@ -76,6 +77,7 @@ import { downloadFile } from '/@/utils/common/renderUtils'; import KcTingkeModal from './components/KcTingkeModal.vue' import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; +import { getSysConfig } from '/@/views/site/utils/index'; const queryParam = ref({}); const toggleSearchStatus = ref(false); @@ -120,9 +122,9 @@ //进入就加载 onMounted(() => { const format = 'yyyy-MM-dd'; - const startTime = new Date(); - startTime.setTime(startTime.getTime()-60000*60*24*7) - queryParam.value.startTime = dateFormat(startTime, format) + // const startTime = new Date(); + // startTime.setTime(startTime.getTime()-60000*60*24*7) + queryParam.value.startTime = dateFormat(getSysConfig().bxqkssj, format) queryParam.value.endTime = dateFormat(new Date(), format) }); /** diff --git a/src/views/kc/tktj/kcTingke/kkdw.vue b/src/views/kc/tktj/kcTingke/kkdw.vue index f7d6332..0a3d80d 100644 --- a/src/views/kc/tktj/kcTingke/kkdw.vue +++ b/src/views/kc/tktj/kcTingke/kkdw.vue @@ -5,7 +5,8 @@ - + + @@ -66,6 +67,7 @@ import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './kkdw.api'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import { dateFormat } from '/@/utils/common/compUtils'; +import { getSysConfig } from '/@/views/site/utils/index'; const queryParam = ref({}); const toggleSearchStatus = ref(false); @@ -111,9 +113,9 @@ //进入就加载 onMounted(() => { const format = 'yyyy-MM-dd'; - const startTime = new Date(); - startTime.setTime(startTime.getTime()-60000*60*24*7) - queryParam.value.startTime = dateFormat(startTime, format) + // const startTime = new Date(); + // startTime.setTime(startTime.getTime()-60000*60*24*7) + queryParam.value.startTime = dateFormat(getSysConfig().bxqkssj, format) queryParam.value.endTime = dateFormat(new Date(), format) }); diff --git a/src/views/kc/tktj/tkfgl/tkfgl.vue b/src/views/kc/tktj/tkfgl/tkfgl.vue index 025cf11..222e338 100644 --- a/src/views/kc/tktj/tkfgl/tkfgl.vue +++ b/src/views/kc/tktj/tkfgl/tkfgl.vue @@ -6,7 +6,8 @@ - + + diff --git a/src/views/kc/tktj/tkmx/tkmx.vue b/src/views/kc/tktj/tkmx/tkmx.vue index 5b85d45..a8267ef 100644 --- a/src/views/kc/tktj/tkmx/tkmx.vue +++ b/src/views/kc/tktj/tkmx/tkmx.vue @@ -6,7 +6,8 @@ - + + @@ -62,6 +63,7 @@ import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './tkmx.api'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import { dateFormat } from '/@/utils/common/compUtils'; +import { getSysConfig } from '/@/views/site/utils/index'; const queryParam = ref({}); const toggleSearchStatus = ref(false); @@ -107,9 +109,7 @@ //进入就加载 onMounted(() => { const format = 'yyyy-MM-dd'; - const startTime = new Date(); - startTime.setTime(startTime.getTime()-60000*60*24*7) - queryParam.value.startTime = dateFormat(startTime, format) + queryParam.value.startTime = dateFormat(getSysConfig().bxqkssj, format) queryParam.value.endTime = dateFormat(new Date(), format) }); diff --git a/src/views/kc/tktj/tkztj/tkztj.vue b/src/views/kc/tktj/tkztj/tkztj.vue index 5d3c4bb..99efcde 100644 --- a/src/views/kc/tktj/tkztj/tkztj.vue +++ b/src/views/kc/tktj/tkztj/tkztj.vue @@ -6,7 +6,8 @@ - + + diff --git a/src/views/site/common/header.vue b/src/views/site/common/header.vue index 532d1be..33b083d 100644 --- a/src/views/site/common/header.vue +++ b/src/views/site/common/header.vue @@ -4,22 +4,48 @@
-
+
- @@ -125,7 +151,7 @@ function toIndex(){ right: 1rem; top: 5rem; z-index: 1; - width: 4rem; + width: 100px; .topButton { background: #c2c2c2; margin-bottom: 2rem; @@ -142,6 +168,7 @@ function toIndex(){ line-height: 2.1rem; } .topLinkTextEllipsis { + line-height: 18px; overflow:hidden; white-space: nowrap; text-overflow: ellipsis; @@ -150,11 +177,11 @@ function toIndex(){ .abox { //border-radius: 50%; //background: #1c84c6; - padding: 0.5rem 0.5rem 0.5rem 0; //color: #fff; //order: dotted red; - border: dotted #1c84c6; - color: black; + // padding: 0.5rem 0.5rem 0.5rem 0; + // border: dotted #1c84c6; + // color: black; } } diff --git a/src/views/site/index.vue b/src/views/site/index.vue index 4590cb4..ef17303 100644 --- a/src/views/site/index.vue +++ b/src/views/site/index.vue @@ -14,7 +14,7 @@ - + diff --git a/src/views/site/jrkclb/kclbList.vue b/src/views/site/jrkclb/kclbList.vue index e1843e6..23d8fd2 100644 --- a/src/views/site/jrkclb/kclbList.vue +++ b/src/views/site/jrkclb/kclbList.vue @@ -201,6 +201,6 @@ const saveOrUpdate = (params, isUpdate) => { background-color: #1c84c6;font-weight: 600;color:#fff;border-radius: 5px;line-height: 23px; } .bcClass{ - background-color: #1c84c6;font-weight: 600;border-radius: 5px;line-height: 23px;margin-left: 20px; + background-color: #1c84c6;font-weight: 600;border-radius: 5px;line-height: 23px; } diff --git a/src/views/site/yuYueKeCheng/index.vue b/src/views/site/yuYueKeCheng/index.vue index 0e3e075..f70091a 100644 --- a/src/views/site/yuYueKeCheng/index.vue +++ b/src/views/site/yuYueKeCheng/index.vue @@ -34,7 +34,7 @@
-
+
评价 取消预约
@@ -184,15 +184,14 @@ defineExpose({ } .itemYyButton { background-color: #1c84c6; - float: left; font-weight: 600; border-radius: 5px; } .itemBaoCuoButton { background-color: #1c84c6; - float: right; font-weight: 600; border-radius: 5px; + margin-left: 15px; }