diff --git a/.env.development b/.env.development index 01a48a9..7e922b9 100644 --- a/.env.development +++ b/.env.development @@ -10,8 +10,10 @@ VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http #后台接口全路径地址(必填) VITE_GLOB_DOMAIN_URL=http://localhost:8080/jeecg-boot/ +#VITE_GLOB_DOMAIN_URL=http://localhost:9999 #后台接口父地址(必填) VITE_GLOB_API_URL=http://localhost:8080/jeecg-boot/ +#VITE_GLOB_API_URL=http://localhost:9999 # 接口前缀 VITE_GLOB_API_URL_PREFIX= diff --git a/index.html b/index.html index ef61a19..1d18061 100644 --- a/index.html +++ b/index.html @@ -167,7 +167,8 @@ - --> diff --git a/src/views/yx/yxArticle/YxArticle.data.ts b/src/views/yx/yxArticle/YxArticle.data.ts index d0ef650..bda9be2 100644 --- a/src/views/yx/yxArticle/YxArticle.data.ts +++ b/src/views/yx/yxArticle/YxArticle.data.ts @@ -10,8 +10,11 @@ export const columns: BasicColumn[] = [ dataIndex: 'title' }, { - title: '文章类型(1.招生章程)', + title: '文章类型', align: "center", + customRender:({text}) =>{ + return !text?"":(text==='1'?'招生章程':text==='2'?'高考动态':'校内资讯') + }, dataIndex: 'type' }, { diff --git a/src/views/yx/yxArticle/components/YxArticleForm.vue b/src/views/yx/yxArticle/components/YxArticleForm.vue index d8a3b23..2aa1e15 100644 --- a/src/views/yx/yxArticle/components/YxArticleForm.vue +++ b/src/views/yx/yxArticle/components/YxArticleForm.vue @@ -9,9 +9,12 @@ - - + + + 招生章程 + 高考动态 + 校内资讯 + @@ -84,7 +87,7 @@ const emit = defineEmits(['register', 'ok']); const formData = reactive>({ id: '', title: '', - type: '', + type: '1', schoolId: '', schoolName: '', author: '', diff --git a/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnroll.data.ts b/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnroll.data.ts index 5f45055..b22d272 100644 --- a/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnroll.data.ts +++ b/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnroll.data.ts @@ -1,144 +1,123 @@ import {BasicColumn} from '/@/components/Table'; import {FormSchema} from '/@/components/Table'; -import {rules} from '/@/utils/helper/validator'; -import {render} from '/@/utils/common/renderUtils'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ - { + { title: '学校代码', - align: "center", - dataIndex: 'schoolCode', - width: 150 - }, - { + align:"center", + dataIndex: 'schoolCode' + }, + { title: '院校代码', - align: "center", - dataIndex: 'institutionCode', - width: 150 - }, - { + align:"center", + dataIndex: 'institutionCode' + }, + { title: '学校名称', - align: "center", - dataIndex: 'schoolName', - width: 150 - }, - { + align:"center", + dataIndex: 'schoolName' + }, + { title: '专业代码', - align: "center", - dataIndex: 'majorCode', - width: 150 - }, - { + align:"center", + dataIndex: 'majorCode' + }, + { title: '专业名称', - align: "center", - dataIndex: 'majorName', - width: 150 - }, - { + align:"center", + dataIndex: 'majorName' + }, + { title: '专业类型', - align: "center", - dataIndex: 'majorType', - width: 150 - }, - { + align:"center", + dataIndex: 'majorType' + }, + { title: '专业类别子级', - align: "center", - dataIndex: 'majorTypeChild', - width: 150 - }, - { + align:"center", + dataIndex: 'majorTypeChild' + }, + { title: '年份', - align: "center", - dataIndex: 'year', - width: 150 - }, - { + align:"center", + dataIndex: 'year' + }, + { title: '科类(文科/理科)', - align: "center", - dataIndex: 'category', - width: 150 - }, - { + align:"center", + dataIndex: 'category' + }, + { title: '录取方式', - align: "center", - dataIndex: 'rulesEnrollProbability', - width: 150 - }, - { + align:"center", + dataIndex: 'rulesEnrollProbability' + }, + { title: '录取概率计算规则运算符', - align: "center", - dataIndex: 'probabilityOperator', - width: 150 - }, - { + align:"center", + dataIndex: 'probabilityOperator' + }, + { title: '省控线', - align: "center", - dataIndex: 'controlLine', - width: 150 - }, - { + align:"center", + dataIndex: 'controlLine' + }, + { title: '录取线', - align: "center", - dataIndex: 'admissionLine', - width: 150 - }, - { + align:"center", + dataIndex: 'admissionLine' + }, + { title: '招生人数', - align: "center", - dataIndex: 'enrollNum', - width: 150 - }, - { + align:"center", + dataIndex: 'enrollNum' + }, + { title: '实际投档人数', - align: "center", - dataIndex: 'actualPitcherNum', - width: 150 - }, - { + align:"center", + dataIndex: 'actualPitcherNum' + }, + { title: '录取数', - align: "center", - dataIndex: 'admissionNum', - width: 150 - }, - { + align:"center", + dataIndex: 'admissionNum' + }, + { title: '一志愿录取数', - align: "center", - dataIndex: 'oneVolunteerAdmissionNum', - width: 150 - }, - { + align:"center", + dataIndex: 'oneVolunteerAdmissionNum' + }, + { title: '最低分数差', - align: "center", - dataIndex: 'scoreLineDifference', - width: 150 - }, - { + align:"center", + dataIndex: 'scoreLineDifference' + }, + { title: '备注', - align: "center", - dataIndex: 'detail', - width: 150 - }, - { + align:"center", + dataIndex: 'detail' + }, + { title: '批次', - align: "center", - dataIndex: 'batch', - width: 150 - }, - { + align:"center", + dataIndex: 'batch' + }, + { title: '招生代码', - align: "center", - dataIndex: 'enrollmentCode', - width: 150 - }, - { + align:"center", + dataIndex: 'enrollmentCode' + }, + { title: '是否使用主项成绩', - align: "center", - dataIndex: 'checkMaster', - width: 150 - }, + align:"center", + dataIndex: 'checkMaster' + }, ]; //查询数据 -export const searchFormSchema: FormSchema[] = []; +export const searchFormSchema: FormSchema[] = [ +]; //表单数据 export const formSchema: FormSchema[] = [ { @@ -251,21 +230,22 @@ export const formSchema: FormSchema[] = [ field: 'checkMaster', component: 'Input', }, - // TODO 主键隐藏字段,目前写死为ID - { - label: '', - field: 'id', - component: 'Input', - show: false - }, + // TODO 主键隐藏字段,目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false + }, ]; + /** - * 流程表单调用这个方法获取formSchema - * @param param - */ -export function getBpmFormSchema(_formData): FormSchema[] { +* 流程表单调用这个方法获取formSchema +* @param param +*/ +export function getBpmFormSchema(_formData): FormSchema[]{ // 默认和原始表单保持一致 如果流程中配置了权限数据,这里需要单独处理formSchema return formSchema; -} +} \ No newline at end of file diff --git a/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnrollList-edit0.vue b/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnrollList-edit0.vue new file mode 100644 index 0000000..7a3be80 --- /dev/null +++ b/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnrollList-edit0.vue @@ -0,0 +1,315 @@ + + diff --git a/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnrollList-old.vue b/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnrollList-old.vue new file mode 100644 index 0000000..cc5fc32 --- /dev/null +++ b/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnrollList-old.vue @@ -0,0 +1,173 @@ + + + + + diff --git a/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnrollList-s.vue b/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnrollList-s.vue deleted file mode 100644 index 10e2779..0000000 --- a/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnrollList-s.vue +++ /dev/null @@ -1,223 +0,0 @@ - - - - - diff --git a/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnrollList.vue b/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnrollList.vue index cc5fc32..5bc845e 100644 --- a/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnrollList.vue +++ b/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnrollList.vue @@ -1,173 +1,557 @@ - - + diff --git a/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnrollLists.vue b/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnrollLists.vue new file mode 100644 index 0000000..e1ca39b --- /dev/null +++ b/src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnrollLists.vue @@ -0,0 +1,432 @@ + + + + + diff --git a/src/views/yx/yxHistoryScoreControlLine/YxHistoryScoreControlLineList-old.vue b/src/views/yx/yxHistoryScoreControlLine/YxHistoryScoreControlLineList-old.vue new file mode 100644 index 0000000..e7d4781 --- /dev/null +++ b/src/views/yx/yxHistoryScoreControlLine/YxHistoryScoreControlLineList-old.vue @@ -0,0 +1,173 @@ + + + + + \ No newline at end of file diff --git a/src/views/yx/yxSchoolMajor/YxSchoolMajor.data.ts b/src/views/yx/yxSchoolMajor/YxSchoolMajor.data.ts index 85d25ed..f101bd7 100644 --- a/src/views/yx/yxSchoolMajor/YxSchoolMajor.data.ts +++ b/src/views/yx/yxSchoolMajor/YxSchoolMajor.data.ts @@ -5,41 +5,125 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '学校', + title: '学校代码', align:"center", - dataIndex: 'schoolCode_dictText' + dataIndex: 'schoolCode' }, { - title: '专业', + title: '专业代码', align:"center", - dataIndex: 'majorCode_dictText' + dataIndex: 'majorCode' + }, + { + title: '专业名称', + align:"center", + dataIndex: 'majorName' + }, + { + title: '招生代码', + align:"center", + dataIndex: 'enrollmentCode' }, { title: '学费', align:"center", dataIndex: 'tuition' }, - - { - title: '批次', - align:"center", - dataIndex: 'batch' - }, - { - title: '(文科)专业代码', - align:"center", - dataIndex: 'artsMajorCode' - }, - { - title: '(理科)专业代码', - align:"center", - dataIndex: 'scienceMajorCode' - }, { title: '备注', align:"center", dataIndex: 'detail' }, + { + title: '科类(文科/理科)', + align:"center", + dataIndex: 'category' + }, + { + title: '录取方式', + align:"center", + dataIndex: 'rulesEnrollProbability' + }, + { + title: '批次', + align:"center", + dataIndex: 'batch' + }, + { + title: '录取概率计算规则运算符', + align:"center", + dataIndex: 'probabilityOperator' + }, + { + title: '文化分省控线', + align:"center", + dataIndex: 'culturalControlLine' + }, + { + title: '专项分数线', + align:"center", + dataIndex: 'specialControlLine' + }, + { + title: '专业类型', + align:"center", + dataIndex: 'majorType' + }, + { + title: '二级专业类型', + align:"center", + dataIndex: 'majorTypeChild' + }, + { + title: '计划招生人数', + align:"center", + dataIndex: 'planNum' + }, + { + title: '是否使用主项成绩', + align:"center", + dataIndex: 'checkMaster' + }, + { + title: '主考科目', + align:"center", + dataIndex: 'mainSubjects' + }, + { + title: '学制', + align:"center", + dataIndex: 'semester' + }, + { + title: '院校限制', + align:"center", + dataIndex: 'limitation' + }, + { + title: '文化分数限制', + align:"center", + dataIndex: 'culturalScoreLimitation' + }, + { + title: '专业分数限制', + align:"center", + dataIndex: 'professionalScoreLimitation' + }, + { + title: '语文成绩限制', + align:"center", + dataIndex: 'chineseScoreLimitation' + }, + { + title: '英语成绩限制', + align:"center", + dataIndex: 'englishScoreLimitation' + }, + { + title: '录取方式缩写', + align:"center", + dataIndex: 'rulesEnrollProbabilitySx' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -47,28 +131,24 @@ export const searchFormSchema: FormSchema[] = [ //表单数据 export const formSchema: FormSchema[] = [ { - label: '学校', + label: '学校代码', field: 'schoolCode', - component: 'JSearchSelect', - colProps: { sm: 24 }, - componentProps: { - dict: 'yx_school,school_name,school_code', - }, - dynamicRules: () => { - return [{ required: true, message: '请选择学校!' }]; - }, + component: 'Input', }, { - label: '专业', + label: '专业代码', field: 'majorCode', - colProps: { sm: 24 }, - component: 'JSearchSelect', - componentProps: { - dict: 'yx_major,major_name,major_code', - }, - dynamicRules: () => { - return [{ required: true, message: '请选择专业!' }]; - } + component: 'Input', + }, + { + label: '专业名称', + field: 'majorName', + component: 'Input', + }, + { + label: '招生代码', + field: 'enrollmentCode', + component: 'Input', }, { label: '学费', @@ -76,59 +156,111 @@ export const formSchema: FormSchema[] = [ component: 'InputNumber', }, { - label: '文科-省控线', - field: 'artsControlLine', - component: 'InputNumber', + label: '备注', + field: 'detail', + component: 'Input', }, { - label: '理科-省控线', - field: 'scienceControlLine', - component: 'InputNumber', - }, - { - label:'专项分数线', - field:'specialControlLine', - component: 'InputNumber', + label: '科类(文科/理科)', + field: 'category', + component: 'Input', }, { label: '录取方式', field: 'rulesEnrollProbability', component: 'Input', }, - { - label: '录取概率计算规则运算符', - field: 'probabilityOperator', - component: 'Input', - }, - { - label: '备注', - field: 'detail', - component: 'Input', - }, { label: '批次', field: 'batch', component: 'Input', }, { - label: '(文科)专业代码', - field: 'artsMajorCode', + label: '录取概率计算规则运算符', + field: 'probabilityOperator', component: 'Input', }, { - label: '(理科)专业代码', - field: 'scienceMajorCode', + label: '文化分省控线', + field: 'culturalControlLine', + component: 'InputNumber', + }, + { + label: '专项分数线', + field: 'specialControlLine', + component: 'InputNumber', + }, + { + label: '专业类型', + field: 'majorType', + component: 'Input', + }, + { + label: '二级专业类型', + field: 'majorTypeChild', + component: 'Input', + }, + { + label: '计划招生人数', + field: 'planNum', + component: 'InputNumber', + }, + { + label: '是否使用主项成绩', + field: 'checkMaster', + component: 'Input', + }, + { + label: '主考科目', + field: 'mainSubjects', + component: 'Input', + }, + { + label: '学制', + field: 'semester', + component: 'Input', + }, + { + label: '院校限制', + field: 'limitation', + component: 'Input', + }, + { + label: '文化分数限制', + field: 'culturalScoreLimitation', + component: 'InputNumber', + }, + { + label: '专业分数限制', + field: 'professionalScoreLimitation', + component: 'InputNumber', + }, + { + label: '语文成绩限制', + field: 'chineseScoreLimitation', + component: 'InputNumber', + }, + { + label: '英语成绩限制', + field: 'englishScoreLimitation', + component: 'InputNumber', + }, + { + label: '录取方式缩写', + field: 'rulesEnrollProbabilitySx', component: 'Input', }, // TODO 主键隐藏字段,目前写死为ID - { - label: '', - field: 'id', - component: 'Input', - show: false - }, + { + label: '', + field: 'id', + component: 'Input', + show: false + }, ]; + + /** * 流程表单调用这个方法获取formSchema * @param param @@ -136,4 +268,4 @@ export const formSchema: FormSchema[] = [ export function getBpmFormSchema(_formData): FormSchema[]{ // 默认和原始表单保持一致 如果流程中配置了权限数据,这里需要单独处理formSchema return formSchema; -} +} \ No newline at end of file diff --git a/src/views/yx/yxSchoolMajor/YxSchoolMajorList-old.vue b/src/views/yx/yxSchoolMajor/YxSchoolMajorList-old.vue new file mode 100644 index 0000000..be2e58b --- /dev/null +++ b/src/views/yx/yxSchoolMajor/YxSchoolMajorList-old.vue @@ -0,0 +1,175 @@ + + + + + diff --git a/src/views/yx/yxSchoolMajor/YxSchoolMajorList.vue b/src/views/yx/yxSchoolMajor/YxSchoolMajorList.vue index be2e58b..6b46134 100644 --- a/src/views/yx/yxSchoolMajor/YxSchoolMajorList.vue +++ b/src/views/yx/yxSchoolMajor/YxSchoolMajorList.vue @@ -1,175 +1,470 @@ - - + diff --git a/src/views/yx/yxSchoolMajor/components/YxSchoolMajorForm.vue b/src/views/yx/yxSchoolMajor/components/YxSchoolMajorForm.vue index 5cb0b0e..348bc5f 100644 --- a/src/views/yx/yxSchoolMajor/components/YxSchoolMajorForm.vue +++ b/src/views/yx/yxSchoolMajor/components/YxSchoolMajorForm.vue @@ -2,7 +2,7 @@
- 提 交 + 提 交
@@ -67,4 +67,4 @@ } } }); - + \ No newline at end of file diff --git a/src/views/yx/yxVipCard/YxVipCard.data.ts b/src/views/yx/yxVipCard/YxVipCard.data.ts index 9b8a4b7..218ca3c 100644 --- a/src/views/yx/yxVipCard/YxVipCard.data.ts +++ b/src/views/yx/yxVipCard/YxVipCard.data.ts @@ -9,14 +9,19 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'cardNum' }, - { + { + title: '有效时长(天)', + dataIndex: 'validTime', + align: 'center', + }, + /*{ title: '有效日期', align:"center", dataIndex: 'validDate', customRender:({text}) =>{ return !text?"":(text.length>10?text.substr(0,10):text) }, - }, + },*/ { title: '对应商品', align:"center", @@ -37,12 +42,20 @@ export const formSchema: FormSchema[] = [ label: '卡号', field: 'cardNum', component: 'Input', + componentProps:{ + disabled: true + }, }, { + label: '有效时长(天)', + field: 'validTime', + component: 'InputNumber', + }, + /*{ label: '有效日期', field: 'validDate', component: 'DatePicker', - }, + },*/ { label: '对应商品', field: 'skuCode', diff --git a/src/views/yx/yxVipCard/YxVipCardList.vue b/src/views/yx/yxVipCard/YxVipCardList.vue index 824b761..0118853 100644 --- a/src/views/yx/yxVipCard/YxVipCardList.vue +++ b/src/views/yx/yxVipCard/YxVipCardList.vue @@ -160,12 +160,12 @@ function getTableAction(record) { } ] } else { - return [ - { - label: '详情', - onClick: handleDetail.bind(null, record), - } - ] + return [ + { + label: '详情', + onClick: handleDetail.bind(null, record), + } + ] } } diff --git a/src/views/yx/yxVipCard/YxVipCardList2.vue b/src/views/yx/yxVipCard/YxVipCardList2.vue new file mode 100644 index 0000000..0118853 --- /dev/null +++ b/src/views/yx/yxVipCard/YxVipCardList2.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/wechat/header.png b/wechat/header.png new file mode 100644 index 0000000..c47b37b Binary files /dev/null and b/wechat/header.png differ diff --git a/wechat/test.html b/wechat/test.html new file mode 100644 index 0000000..db1d658 --- /dev/null +++ b/wechat/test.html @@ -0,0 +1,63 @@ + + + + + + + 微信账单详情明细 + + + +
+ +
+
+
+ +
+

微信账单详情明细

+ + + + + + + + + + + + + + + + + + + + +
交易时间交易类型交易金额(元)交易描述
2022-01-01 08:30:00消费50.00购物
2022-01-02 13:45:00收入100.00转账
+
+ + diff --git a/wechat/test2.html b/wechat/test2.html new file mode 100644 index 0000000..28957b6 --- /dev/null +++ b/wechat/test2.html @@ -0,0 +1,60 @@ + + + + + + + + + +
+
+ +
+
+
+ +
+ +
+ +
+ +
+
+ + diff --git a/wechat/取消.png b/wechat/取消.png new file mode 100644 index 0000000..7665a52 Binary files /dev/null and b/wechat/取消.png differ