yangjun
/
dbsd_kczx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/mini-org-project/course_information_center_vue 

# Conflicts:
#	src/views/site/tingKeZuJi/list.vue
#	src/views/site/tingKeZuJi/listPkzj.vue
#	src/views/site/tingKeZuJi/pkMore.vue
This commit is contained in:
yangjun 2023-08-09 22:27:59 +08:00
parent c18f120122 3d8e721da0
commit 505b486089
6 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/kc/config/KcExportConfigTpkwcqkjzglx.data.ts
View File

@ -20,12 +20,12 @@ export const columns: BasicColumn[] = [
dataIndex: 'xm'
},
{
title: '听课类型',
title: '听课身份',
align: "center",
dataIndex: 'tklx_dictText'
},
{
title: '身份',
title: '听课类型',
align: "center",
dataIndex: 'sf'
},

4
src/views/kc/config/KcExportConfigTpkwcqkjzglxList.vue
View File

@ -23,8 +23,8 @@
</a-form-item>
</a-col>
<a-col :lg="8">
<a-form-item label="听课类型">
<j-dict-select-tag placeholder="请选择听课类型" v-model:value="queryParam.tklx" dictCode="tpkwcqkjzglx"/>
<a-form-item label="听课身份">
<j-dict-select-tag placeholder="请选择听课身份" v-model:value="queryParam.tklx" dictCode="tpkwcqkjzglx"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">

8
src/views/kc/config/KcExportConfigTpkwcqkjzglxPzList.vue
View File

@ -23,14 +23,14 @@
</a-form-item>
</a-col>
<a-col :lg="8">
<a-form-item label="听课类型">
<j-dict-select-tag placeholder="请选择听课类型" v-model:value="queryParam.tklx" dictCode="tpkwcqkjzglx"/>
<a-form-item label="听课身份">
<j-dict-select-tag placeholder="请选择听课身份" v-model:value="queryParam.tklx" dictCode="tpkwcqkjzglx"/>
</a-form-item>
</a-col>
<a-col :lg="8">
<a-form-item label="身份">
<a-form-item label="听课类型">
<!-- <j-dict-select-tag placeholder="请输入身份" v-model:value="queryParam.tklx" dictCode="tpkwcqkjzglx"/> -->
<j-input placeholder="请输入身份" v-model:value="queryParam.sf"/>
<j-input placeholder="请输入听课类型" v-model:value="queryParam.sf"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">

10
src/views/kc/pktj/pkmxb/pkmxb.vue
View File

@ -70,10 +70,10 @@
<!-- <span v-has="'get:pkmx:info'">{{text}}123123</span> -->
</template>
<template #openDcwjOrSourceName="{ text ,record}">
<span @click="openDcwjxx(record)" v-if="text == 0">门户添加</span>
<span @click="openDcwjxx(record)" v-if="text == 0">课程中心</span>
<span @click="openDcwjxx(record)" v-else-if="text == 1">老系统</span>
<span @click="openDcwjxx(record)" v-else-if="text == 2">政务大厅</span>
<span @click="openDcwjxx(record)" v-else-if="text == 3">后台导入</span>
<span @click="openDcwjxx(record)" v-else-if="text == 2">服务大厅</span>
<span @click="openDcwjxx(record)" v-else-if="text == 3">纸质评价</span>
</template>
</BasicTable>
<!-- 表单区域 -->
@ -178,7 +178,7 @@ const roleListApi = (params) => defHttp.get({ url: Api.roleList, params });
function openDcwjxx(record){
roleListApi({ userid: getUserId()}).then(res => {
let list = res ?? [];
let sfjx = 0;
@ -197,7 +197,7 @@ const roleListApi = (params) => defHttp.get({ url: Api.roleList, params });
}
});
}

11
src/views/kc/statistics/evaluationList/index.vue
View File

@ -41,15 +41,16 @@
</a-col>
<a-col :lg="8">
<a-form-item label="评课身份">
<j-dict-select-tag placeholder="请选择评课身份" v-model:value="queryParam.tksf" style="width: 100%;" dictCode="kc_tksfrzb,ZWMC,ZWMC,true group by ZWMC" />
<!-- <j-dict-select-tag placeholder="请选择评课身份" v-model:value="queryParam.tksf" style="width: 100%;" dictCode="kc_tksfrzb,ZWMC,ZWMC,true group by ZWMC" /> -->
<j-dict-select-tag placeholder="请选择评课身份" style="width: 100%;" v-model:value="queryParam.tksf" dictCode="tpkwcqkjzglx"/>
</a-form-item>
</a-col>
<a-col :lg="8">
<a-form-item label="评课身份">
<!-- <a-col :lg="8">
<a-form-item label="评课身份"> -->
<!-- <a-input placeholder="请输入评课身份" v-model:value="queryParam.tksfLike"/> -->
<j-dict-select-tag placeholder="请选择评课身份" v-model:value="queryParam.tksfLike" style="width: 100%;" dictCode="pjlbtjsf" />
<!-- <j-dict-select-tag placeholder="请选择评课身份" v-model:value="queryParam.tksfLike" style="width: 100%;" dictCode="pjlbtjsf" />
</a-form-item>
</a-col>
</a-col> -->
<a-col :lg="8">
<a-form-item label="评课教师单位">
<a-input placeholder="请输入评课教师单位" v-model:value="queryParam.tkdwmc"/>

4
src/views/site/tingKeZuJi/pkMore.vue
View File

@ -16,10 +16,10 @@
<j-dict-select-tag v-model:value="queryParam.xnxq" dictCode="kc_xqxn_history,title,title,true order by start_time desc" placeholder="请选择学期学年" style="width: 100%;"/>
</a-col>
<!-- <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
<a-date-picker placeholder="请选择开始日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="queryParam.startDate" style="width: 100%" />
<a-date-picker placeholder="请选择开始日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="queryParam.upDate_begin" style="width: 100%" />
</a-col>
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
<a-date-picker placeholder="请选择结束日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="queryParam.endDate" style="width: 100%" />
<a-date-picker placeholder="请选择结束日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="queryParam.upDate_end" style="width: 100%" />
</a-col> -->
<a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }" class="dictBox">
<j-dict-select-tag v-model:value="queryParam.kkdw" dictCode="kc_kkdw_view,kkdw,kkdw" placeholder="请选择院系" style="width: 100%;"/>