Merge branch 'pre-release' into 'release'

Pre release

See merge request !34
This commit is contained in:
huangshengfa
2022-12-27 21:14:17 +08:00
6 changed files with 21 additions and 6 deletions

View File

@@ -2,4 +2,7 @@ NODE_ENV=prod
VUE_APP_BASE=/manage
VUE_APP_BASE_API=/manageApi
VUE_APP_BOE_API_URL=https://u-pre.boe.com
VUE_APP_BOE_API_URL=https://u.boe.com
VUE_APP_IFRAME_URL=https://u.boe.com/pc/iframe
VUE_APP_IFRAME_STUDENT_URL=https://u.boe.com/pc/loading

View File

@@ -44,7 +44,7 @@ export default defineComponent({
const store = useStore();
const isLogin = ref(false);
// console.log("router", router.getRoutes(), route);
console.log("版本1.07------------");
console.log("版本1.09------------");
const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink);
});

View File

@@ -105,7 +105,7 @@
<iframe
id="iframe"
style="width: 100%; height: 100%"
:src="iframeUrl + '/exam/papers'"
:src="iframeUrl + '/exam/papers?addnew=true'"
name="myframe"
sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
></iframe>

View File

@@ -28,8 +28,10 @@
<a-form-item label="姓名">
<a-input
v-model:value="nameSearch.keyword"
style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
@change="peopleName"
/>
<a-button
type="primary"
@@ -653,9 +655,19 @@ const auditChangePagination = (page) => {
searchAudi();
};
//重置
function peopleName(name) {
console.log('people-name', name.target.value)
nameSearch.value.keyword = name.target.value;
}
const resetStu = () => {
deleteDepSelect();
nameSearch.value = {keyword: "", page: 1, pageSize: 10};
nameSearch.value.keyword = "";
nameSearch.value.page = 1;
nameSearch.value.pageSize = 10;
nameSearch.value.departId = null
stuTreeExpandedKeys.value = []
stuTreeSelectKeys.value = []
stuReset()
};
//清空选择部门信息

View File

@@ -1167,7 +1167,7 @@ export default {
key: "opacation",
width: "20%",
align: "center",
// fixed: "right",
fixed: "right",
scopedSlots: { customRender: "action" }, //引入的插槽
customRender: (text) => {
// console.log(text);

View File

@@ -1394,7 +1394,7 @@ export default {
key: "operation",
width: 300,
align: "center",
// fixed: "right",
fixed: "right",
customRender: (value) => {
// console.log("value", value.record.type, value.record.status);
return (