This commit is contained in:
yangjun 2024-05-23 18:09:39 +08:00
commit c2926ef2a9
22 changed files with 207 additions and 179 deletions

View File

@ -1,5 +1,5 @@
<template> <template>
<div style="background: #fff;height: 600px;padding: 10px 0;overflow-y: auto;overflow-x: hidden;"> <div style="background: #fff;height: calc(100vh - 255px);overflow-y: auto;overflow-x: hidden;padding: 10px 0;">
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -30,7 +30,7 @@
</a-form> </a-form>
</div> </div>
<a-row> <a-row>
<a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;"> <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
<div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div> <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
<a-card style="height: 280px;"> <a-card style="height: 280px;">
<div class="rotate" :style="classFun(item.qpublish)">{{item.qpublish =='0'? '待发布':'已发布'}}</div> <div class="rotate" :style="classFun(item.qpublish)">{{item.qpublish =='0'? '待发布':'已发布'}}</div>
@ -210,8 +210,7 @@
function handleFabu(record: Recordable) { function handleFabu(record: Recordable) {
defHttp.get({ url: '/wjxWjxx/wjxWjxx/fbwj', params: { id: record.id,wjlx: "6" } }).then(res => { defHttp.get({ url: '/wjxWjxx/wjxWjxx/fbwj', params: { id: record.id,wjlx: "6" } }).then(res => {
total.value = 1; total.value = 1;
pageNo.value = 0; handlePageChange(1);
reload();
}); });
} }
/** /**
@ -241,16 +240,15 @@
*/ */
function handleSuccess() { function handleSuccess() {
total.value = 1; total.value = 1;
pageNo.value = 0; handlePageChange(1);
reload();
} }
/** /**
* 查询 * 查询
*/ */
function searchQuery() { function searchQuery() {
pageNo.value = 0; total.value = 1;
reload(); handlePageChange(1);
} }
/** /**
@ -284,6 +282,7 @@
<style lang="less" scoped> <style lang="less" scoped>
.jeecg-basic-table-form-container { .jeecg-basic-table-form-container {
padding: 0; padding: 0;
width: 99%;
.table-page-search-submitButtons { .table-page-search-submitButtons {
display: block; display: block;
margin-bottom: 24px; margin-bottom: 24px;

View File

@ -1,5 +1,5 @@
<template> <template>
<div style="background: #fff;height: 600px;padding: 10px 0;overflow-y: auto;overflow-x: hidden;"> <div style="background: #fff;height: calc(100vh - 255px);overflow-y: auto;overflow-x: hidden;padding: 10px 0;">
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -34,7 +34,7 @@
</a-form> </a-form>
</div> </div>
<a-row> <a-row>
<a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;"> <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
<div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div> <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
<a-card style="height: 280px;"> <a-card style="height: 280px;">
<div class="rotate" :style="classFun(item.qpublish)">{{item.qpublish_dictText}}</div> <div class="rotate" :style="classFun(item.qpublish)">{{item.qpublish_dictText}}</div>
@ -304,6 +304,7 @@
<style lang="less" scoped> <style lang="less" scoped>
.jeecg-basic-table-form-container { .jeecg-basic-table-form-container {
padding: 0; padding: 0;
width:99%;
.table-page-search-submitButtons { .table-page-search-submitButtons {
display: block; display: block;
margin-bottom: 24px; margin-bottom: 24px;

View File

@ -1,5 +1,5 @@
<template> <template>
<div style="background: #fff;height: 97%;margin: 10px 0;"> <div style="background: #fff;height: calc(100vh - 225px);overflow-y: auto;overflow-x: hidden;margin: 10px 0;">
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -31,7 +31,7 @@
</a-form> </a-form>
</div> </div>
<a-row> <a-row>
<a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;"> <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
<div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div> <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
<a-card style="height: 210px;"> <a-card style="height: 210px;">
<div class="rotate" :style="classFun(item.flag)">{{getStatus(item.flag)}}</div> <div class="rotate" :style="classFun(item.flag)">{{getStatus(item.flag)}}</div>
@ -152,16 +152,15 @@
*/ */
function handleSuccess() { function handleSuccess() {
total.value = 1; total.value = 1;
pageNo.value = 0; handlePageChange(1);
reload();
} }
/** /**
* 查询 * 查询
*/ */
function searchQuery() { function searchQuery() {
pageNo.value = 0; total.value = 1;
reload(); handlePageChange(1);
} }
/** /**
@ -207,6 +206,7 @@
<style lang="less" scoped> <style lang="less" scoped>
.jeecg-basic-table-form-container { .jeecg-basic-table-form-container {
padding: 0; padding: 0;
width: 99%;
.table-page-search-submitButtons { .table-page-search-submitButtons {
display: block; display: block;
margin-bottom: 24px; margin-bottom: 24px;

View File

@ -1,5 +1,5 @@
<template> <template>
<div style="background: #fff;height: 97%;margin: 10px 0;"> <div style="background: #fff;height: calc(100vh - 255px);overflow-y: auto;overflow-x: hidden;margin: 10px 0;">
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -30,7 +30,7 @@
</a-form> </a-form>
</div> </div>
<a-row> <a-row>
<a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;"> <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
<div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div> <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
<a-card style="height: 280px;"> <a-card style="height: 280px;">
<div class="rotate" :style="classFun(item.qpublish)">{{item.qpublish =='0'? '待发布':'已发布'}}</div> <div class="rotate" :style="classFun(item.qpublish)">{{item.qpublish =='0'? '待发布':'已发布'}}</div>
@ -207,8 +207,7 @@
function handleFabu(record: Recordable) { function handleFabu(record: Recordable) {
defHttp.get({ url: '/wjxWjxx/wjxWjxx/fbwj', params: { id: record.id,wjlx: "1" } }).then(res => { defHttp.get({ url: '/wjxWjxx/wjxWjxx/fbwj', params: { id: record.id,wjlx: "1" } }).then(res => {
total.value = 1; total.value = 1;
pageNo.value = 0; handlePageChange(1);
reload();
}); });
} }
/** /**
@ -238,16 +237,15 @@
*/ */
function handleSuccess() { function handleSuccess() {
total.value = 1; total.value = 1;
pageNo.value = 0; handlePageChange(1);
reload();
} }
/** /**
* 查询 * 查询
*/ */
function searchQuery() { function searchQuery() {
pageNo.value = 0; total.value = 1;
reload(); handlePageChange(1);
} }
/** /**
@ -281,6 +279,7 @@
<style lang="less" scoped> <style lang="less" scoped>
.jeecg-basic-table-form-container { .jeecg-basic-table-form-container {
padding: 0; padding: 0;
width: 99%;
.table-page-search-submitButtons { .table-page-search-submitButtons {
display: block; display: block;
margin-bottom: 24px; margin-bottom: 24px;

View File

@ -1,5 +1,5 @@
<template> <template>
<div style="background: #fff;height: 97%;margin: 10px 0;"> <div style="background: #fff;height: calc(100vh - 255px);overflow-y: auto;overflow-x: hidden;margin: 10px 0;">
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -32,7 +32,7 @@
</a-form> </a-form>
</div> </div>
<a-row> <a-row>
<a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;"> <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
<div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div> <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
<a-card style="height: 280px;"> <a-card style="height: 280px;">
<div class="rotate" :style="classFun(item.qpublish)">{{item.qpublish_dictText}}</div> <div class="rotate" :style="classFun(item.qpublish)">{{item.qpublish_dictText}}</div>
@ -295,6 +295,7 @@
<style lang="less" scoped> <style lang="less" scoped>
.jeecg-basic-table-form-container { .jeecg-basic-table-form-container {
padding: 0; padding: 0;
width:99%;
.table-page-search-submitButtons { .table-page-search-submitButtons {
display: block; display: block;
margin-bottom: 24px; margin-bottom: 24px;

View File

@ -1,5 +1,5 @@
<template> <template>
<div style="background: #fff;height: 97%;margin: 10px 0;"> <div style="background: #fff;height: calc(100vh - 225px);overflow-y: auto;overflow-x: hidden;margin: 10px 0;">
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -31,7 +31,7 @@
</a-form> </a-form>
</div> </div>
<a-row> <a-row>
<a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;"> <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
<div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div> <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
<a-card style="height: 210px;"> <a-card style="height: 210px;">
<div class="rotate" :style="classFun(item.flag)">{{getStatus(item.flag)}}</div> <div class="rotate" :style="classFun(item.flag)">{{getStatus(item.flag)}}</div>
@ -152,16 +152,15 @@
*/ */
function handleSuccess() { function handleSuccess() {
total.value = 1; total.value = 1;
pageNo.value = 0; handlePageChange(1);
reload();
} }
/** /**
* 查询 * 查询
*/ */
function searchQuery() { function searchQuery() {
pageNo.value = 0; total.value = 1;
reload(); handlePageChange(1);
} }
/** /**
@ -207,6 +206,7 @@
<style lang="less" scoped> <style lang="less" scoped>
.jeecg-basic-table-form-container { .jeecg-basic-table-form-container {
padding: 0; padding: 0;
width: 99%;
.table-page-search-submitButtons { .table-page-search-submitButtons {
display: block; display: block;
margin-bottom: 24px; margin-bottom: 24px;

View File

@ -1,5 +1,5 @@
<template> <template>
<div style="margin-top:10px;background:#fff;height:630px;overflow:auto;"> <div style="margin-top:10px;background:#fff;height: calc(100vh - 225px);overflow:auto;">
<a-card> <a-card>
<div> <div>
<a-row> <a-row>
@ -42,7 +42,7 @@
<a-col :span="24" v-for="(item,index) in cjwtSource" :key="index"> <a-col :span="24" v-for="(item,index) in cjwtSource" :key="index">
<a-row> <a-row>
<a-col :span="24"> <a-col :span="24">
<span style="float: left;">{{index+1}}.{{item.question}}</span> <span style="float: left;">{{(pageNo-1)*pageSize+index+1}}.{{item.question}}</span>
<span style="float: right;"> <span style="float: right;">
<a title="修改" @click="handleEdit(item)"><Icon icon="ant-design:form-outlined" /></a> <a title="修改" @click="handleEdit(item)"><Icon icon="ant-design:form-outlined" /></a>
<a-divider type="vertical" style="height: 30px; background-color: #7cb305" /> <a-divider type="vertical" style="height: 30px; background-color: #7cb305" />
@ -146,14 +146,14 @@ const baseApiUrl = globSetting.domainUrl;
function openPdf(record){ function openPdf(record){
var url2 = getFileAccessHttpUrl(record.pdfPath) var url2 = getFileAccessHttpUrl(record.pdfPath)
console.log(`🚀 ~ openPdf ~ url2:`, url2) // console.log(`🚀 ~ openPdf ~ url2:`, url2)
let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2); let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
window.open(url,"_blank") window.open(url,"_blank")
} }
function openJxrlPdf(record){ function openJxrlPdf(record){
var url2 = getFileAccessHttpUrl(record.jxrlPdfPath) var url2 = getFileAccessHttpUrl(record.jxrlPdfPath)
console.log(`🚀 ~ openPdf ~ url2:`, url2) // console.log(`🚀 ~ openPdf ~ url2:`, url2)
let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2); let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
window.open(url,"_blank") window.open(url,"_blank")
} }
@ -162,7 +162,7 @@ const baseApiUrl = globSetting.domainUrl;
// //
function handleCjwtOk() { function handleCjwtOk() {
console.log('--------cjwt ok -----------') // console.log('--------cjwt ok -----------')
cjwtData(1); cjwtData(1);
} }
@ -172,11 +172,12 @@ const baseApiUrl = globSetting.domainUrl;
} }
function cjwtData(arg){ function cjwtData(arg){
pageNo.value = arg;
defHttp.get({ url: '/zyCjwt/zyCjwt/list', params: { pageSize: 3,pageNo:arg, rwbh:rwbh,xqxn:xqxn,column:'createTime',order:'desc' } }).then((res) => { defHttp.get({ url: '/zyCjwt/zyCjwt/list', params: { pageSize: 3,pageNo:arg, rwbh:rwbh,xqxn:xqxn,column:'createTime',order:'desc' } }).then((res) => {
console.log(`🚀 ~ defHttp.get ~ res:`, res) // console.log(`🚀 ~ defHttp.get ~ res:`, res)
cjwtSource.value = res.records; cjwtSource.value = res.records;
total.value = res.total; total.value = res.total;
console.log(`🚀 ~ defHttp.get ~ cjwtSource:`, cjwtSource) // console.log(`🚀 ~ defHttp.get ~ cjwtSource:`, cjwtSource)
}); });
} }
// //
@ -192,13 +193,13 @@ const baseApiUrl = globSetting.domainUrl;
var model = jxdgInfo.value; var model = jxdgInfo.value;
model.rwbh = rwbh; model.rwbh = rwbh;
model.xqxn = xqxn; model.xqxn = xqxn;
console.log(`🚀 ~ addKcjsHandle ~ model:`, model) // console.log(`🚀 ~ addKcjsHandle ~ model:`, model)
if(model.id){ if(model.id){
if(type=='1'){ if(type=='1'){
model.filePath = ''; model.filePath = '';
} }
defHttp.post({ url: '/zyJxdg/zyJxdg/edit', params: model }).then((res) => { defHttp.post({ url: '/zyJxdg/zyJxdg/edit', params: model }).then((res) => {
console.log(`🚀 ~ defHttp.post 111~ res:`, res) // console.log(`🚀 ~ defHttp.post 111~ res:`, res)
getKcjsJxdg(); getKcjsJxdg();
}); });
}else{ }else{
@ -206,7 +207,7 @@ const baseApiUrl = globSetting.domainUrl;
model.filePath = ''; model.filePath = '';
} }
defHttp.post({ url: '/zyJxdg/zyJxdg/add', params: model }).then((res) => { defHttp.post({ url: '/zyJxdg/zyJxdg/add', params: model }).then((res) => {
console.log(`🚀 ~ defHttp.post 222~ res:`, res) // console.log(`🚀 ~ defHttp.post 222~ res:`, res)
getKcjsJxdg(); getKcjsJxdg();
}); });
} }

View File

@ -1,11 +1,11 @@
<template> <template>
<div id="siteMain" style="min-height: calc(100vh - 160px);"> <div id="siteMain" style="min-height: calc(100vh - 205px);">
<a-row> <a-row>
<a-col :span="24"> <a-col :span="24">
<a-menu <a-menu
v-model:openKeys="openKeys" v-model:openKeys="openKeys"
v-model:selectedKeys="selectedKeys" v-model:selectedKeys="selectedKeys"
style="width: 98%;min-height: calc(100vh - 142px);margin: 10px 0;" style="width: 98%;min-height: calc(100vh - 225px);margin: 10px 0;"
mode="inline" mode="inline"
> >
<a-sub-menu key="sub1"> <a-sub-menu key="sub1">

View File

@ -1,10 +1,10 @@
<template> <template>
<div id="siteMain" style="min-height: calc(100vh - 160px);"> <div id="siteMain" style="min-height: calc(100vh - 205px);">
<a-row> <a-row>
<a-col :span="24"> <a-col :span="24">
<a-menu <a-menu
v-model:selectedKeys="selectedKeys" v-model:selectedKeys="selectedKeys"
style="width: 98%;min-height: calc(100vh - 142px);margin: 10px 0;" style="width: 98%;min-height: calc(100vh - 225px);margin: 10px 0;"
mode="inline" mode="inline"
> >
<a-sub-menu key="sub1"> <a-sub-menu key="sub1">

View File

@ -1,10 +1,10 @@
<template> <template>
<div id="siteMain" style="height: 640px;"> <div id="siteMain" style="min-height: calc(100vh - 205px);">
<a-row> <a-row>
<a-col :span="24"> <a-col :span="24">
<a-menu <a-menu
v-model:selectedKeys="selectedKeys" v-model:selectedKeys="selectedKeys"
style="width: 98%;height:640px; margin: 10px 0;" style="width: 98%;min-height: calc(100vh - 225px); margin: 10px 0;"
mode="inline" mode="inline"
> >
<a-sub-menu key="sub1"> <a-sub-menu key="sub1">

View File

@ -1,5 +1,5 @@
<template> <template>
<div style="margin-top:10px;background:#fff;height:642px;overflow:auto;"> <div style="margin-top:10px;background:#fff;height: calc(100vh - 225px);overflow: auto;">
<a-card> <a-card>
<div> <div>
<a-row> <a-row>
@ -44,7 +44,7 @@
<a-col :span="24" v-for="(item,index) in cjwtSource" :key="index"> <a-col :span="24" v-for="(item,index) in cjwtSource" :key="index">
<a-row> <a-row>
<a-col :span="24"> <a-col :span="24">
<span style="float: left;">{{index+1}}.{{item.question}}</span> <span style="float: left;">{{(pageNo-1)*pageSize+index+1}}.{{item.question}}</span>
</a-col> </a-col>
<a-col :span="24"><span><Icon icon="ant-design:caret-right-outlined" />{{item.answer}}</span></a-col> <a-col :span="24"><span><Icon icon="ant-design:caret-right-outlined" />{{item.answer}}</span></a-col>
<a-col :span="24"> <a-col :span="24">
@ -143,14 +143,14 @@ const baseApiUrl = globSetting.domainUrl;
function openPdf(record){ function openPdf(record){
var url2 = getFileAccessHttpUrl(record.pdfPath) var url2 = getFileAccessHttpUrl(record.pdfPath)
console.log(`🚀 ~ openPdf ~ url2:`, url2) // console.log(`🚀 ~ openPdf ~ url2:`, url2)
let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2); let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
window.open(url,"_blank") window.open(url,"_blank")
} }
function openJxrlPdf(record){ function openJxrlPdf(record){
var url2 = getFileAccessHttpUrl(record.jxrlPdfPath) var url2 = getFileAccessHttpUrl(record.jxrlPdfPath)
console.log(`🚀 ~ openPdf ~ url2:`, url2) // console.log(`🚀 ~ openPdf ~ url2:`, url2)
let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2); let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
window.open(url,"_blank") window.open(url,"_blank")
} }
@ -158,7 +158,7 @@ function openJxrlPdf(record){
// //
function handleCjwtOk() { function handleCjwtOk() {
console.log('--------cjwt ok -----------') // console.log('--------cjwt ok -----------')
cjwtData(1); cjwtData(1);
} }
@ -168,16 +168,18 @@ function openJxrlPdf(record){
} }
function cjwtData(arg){ function cjwtData(arg){
defHttp.get({ url: '/zyCjwt/zyCjwt/list', params: { pageSize: 3,pageNo:arg, rwbh:rwbh,xqxn:xqxn } }).then((res) => { pageNo.value = arg;
console.log(`🚀 ~ defHttp.get ~ res:`, res) defHttp.get({ url: '/zyCjwt/zyCjwt/list', params: { pageSize: 3,pageNo:arg, rwbh:rwbh,xqxn:xqxn,column:'createTime',order:'desc' } }).then((res) => {
// console.log(`🚀 ~ defHttp.get ~ res:`, res)
cjwtSource.value = res.records; cjwtSource.value = res.records;
console.log(`🚀 ~ defHttp.get ~ cjwtSource:`, cjwtSource) total.value = res.total;
// console.log(`🚀 ~ defHttp.get ~ cjwtSource:`, cjwtSource)
}); });
} }
// //
function getKcjsJxdg(){ function getKcjsJxdg(){
defHttp.get({ url: '/zyJxdg/zyJxdg/getKcjsJxdg', params: { rwbh:rwbh} }).then((res) => { defHttp.get({ url: '/zyJxdg/zyJxdg/getKcjsJxdg', params: { rwbh:rwbh} }).then((res) => {
console.log(`🚀 1111111111111~ getKcjsJxdg ~ res:`, res) // console.log(`🚀 1111111111111~ getKcjsJxdg ~ res:`, res)
if(res){ if(res){
jxdgInfo.value = res; jxdgInfo.value = res;
} }
@ -188,13 +190,13 @@ function openJxrlPdf(record){
var model = jxdgInfo.value; var model = jxdgInfo.value;
model.rwbh = rwbh; model.rwbh = rwbh;
model.xqxn = xqxn; model.xqxn = xqxn;
console.log(`🚀 ~ addKcjsHandle ~ model:`, model) // console.log(`🚀 ~ addKcjsHandle ~ model:`, model)
if(model.id){ if(model.id){
if(type=='1'){ if(type=='1'){
model.filePath = ''; model.filePath = '';
} }
defHttp.post({ url: '/zyJxdg/zyJxdg/edit', params: model }).then((res) => { defHttp.post({ url: '/zyJxdg/zyJxdg/edit', params: model }).then((res) => {
console.log(`🚀 ~ defHttp.post 111~ res:`, res) // console.log(`🚀 ~ defHttp.post 111~ res:`, res)
getKcjsJxdg(); getKcjsJxdg();
}); });
}else{ }else{
@ -202,7 +204,7 @@ function openJxrlPdf(record){
model.filePath = ''; model.filePath = '';
} }
defHttp.post({ url: '/zyJxdg/zyJxdg/add', params: model }).then((res) => { defHttp.post({ url: '/zyJxdg/zyJxdg/add', params: model }).then((res) => {
console.log(`🚀 ~ defHttp.post 222~ res:`, res) // console.log(`🚀 ~ defHttp.post 222~ res:`, res)
getKcjsJxdg(); getKcjsJxdg();
}); });
} }

View File

@ -475,10 +475,12 @@
<style lang="less" scoped> <style lang="less" scoped>
.max { .max {
height: calc(-132px + 100vh); height: calc(100vh - 225px);
//height: calc(-132px + 100vh);
// min-height: calc(-132px + 100vh); // min-height: calc(-132px + 100vh);
// max-height: calc(-132px + 100vh); // max-height: calc(-132px + 100vh);
overflow: hidden; overflow: auto;
//overflow: hidden;
.maxDiv { .maxDiv {
height: calc(100% - 94px); height: calc(100% - 94px);
overflow-y: auto; overflow-y: auto;

View File

@ -459,10 +459,12 @@
<style lang="less" scoped> <style lang="less" scoped>
.max { .max {
height: calc(-132px + 100vh); height: calc(100vh - 225px);
//height: calc(-132px + 100vh);
// min-height: calc(-132px + 100vh); // min-height: calc(-132px + 100vh);
// max-height: calc(-132px + 100vh); // max-height: calc(-132px + 100vh);
overflow: hidden; overflow: auto;
//overflow: hidden;
.maxDiv { .maxDiv {
height: calc(100% - 94px); height: calc(100% - 94px);
overflow-y: auto; overflow-y: auto;

View File

@ -1,5 +1,5 @@
<template> <template>
<div style="background: #fff;height:642px;margin-top:10px;"> <div style="background: #fff;height: calc(100vh - 225px);overflow-y: auto;overflow-x: hidden;margin-top:10px;">
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -26,7 +26,6 @@
<a-collapse-panel :key="index" > <a-collapse-panel :key="index" >
<template #header> <template #header>
<sapn style="font-size: 16px; font-weight: bold;">{{index+1}}.{{item.title}}</sapn> <sapn style="font-size: 16px; font-weight: bold;">{{index+1}}.{{item.title}}</sapn>
</template> </template>
<div v-html="item.content"></div> <div v-html="item.content"></div>
<!-- <setting-outlined /> --> <!-- <setting-outlined /> -->
@ -84,7 +83,8 @@
* 查询 * 查询
*/ */
function searchQuery() { function searchQuery() {
reload(1); total.value = 1;
handlePageChange(1);
} }
/** /**
@ -95,21 +95,21 @@
queryParam.value.rwbh = rwbh; queryParam.value.rwbh = rwbh;
queryParam.value.xqxn = xqxn; queryParam.value.xqxn = xqxn;
queryParam.value.ggStatus='1'; queryParam.value.ggStatus='1';
// total.value = 1;
reload(1); handlePageChange(1);
} }
// //
function handlePageChange(page: number) { function handlePageChange(page: number) {
reload(page); pageNo.value = page;
reload();
} }
//
onMounted(() => {
reload(1);
});
function reload(arg){ function reload(){
queryParam.pageNo = arg; queryParam.value.pageNo = pageNo;
queryParam.value.pageSize = pageSize;
queryParam.value.rwbh = rwbh;
queryParam.value.xqxn = xqxn;
console.log(`🚀 ~ reload ~ queryParam:`, queryParam) console.log(`🚀 ~ reload ~ queryParam:`, queryParam)
defHttp.get({ url: '/zyGonggao/zyGonggao/list', params: queryParam.value }).then((res) => { defHttp.get({ url: '/zyGonggao/zyGonggao/list', params: queryParam.value }).then((res) => {
console.log(res); console.log(res);
@ -120,12 +120,17 @@
}); });
} }
//
onMounted(() => {
searchQuery();
});
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.jeecg-basic-table-form-container { .jeecg-basic-table-form-container {
padding: 0;
width:99%;
.table-page-search-submitButtons { .table-page-search-submitButtons {
display: block; display: block;
margin-bottom: 24px; margin-bottom: 24px;

View File

@ -1,5 +1,5 @@
<template> <template>
<div style="background: #fff;min-height:97.5%;margin-top:10px;"> <div style="background: #fff;height: calc(100vh - 225px);overflow-y: auto;overflow-x: hidden;margin-top:10px;">
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container" style="border-bottom: 2px solid #f0f0f0;"> <div class="jeecg-basic-table-form-container" style="border-bottom: 2px solid #f0f0f0;">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" style="padding: 20px 10px 0px 10px;"> <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" style="padding: 20px 10px 0px 10px;">
@ -195,16 +195,15 @@
*/ */
function handleSuccess() { function handleSuccess() {
total.value = 1; total.value = 1;
pageNo.value = 0; handlePageChange(1);
reload()
} }
/** /**
* 查询 * 查询
*/ */
function searchQuery() { function searchQuery() {
pageNo.value = 0; total.value = 1;
reload(); handlePageChange(1);
} }
/** /**
@ -246,6 +245,8 @@
<style lang="less" scoped> <style lang="less" scoped>
.jeecg-basic-table-form-container { .jeecg-basic-table-form-container {
padding: 0;
width:99%;
.table-page-search-submitButtons { .table-page-search-submitButtons {
display: block; display: block;
margin-bottom: 24px; margin-bottom: 24px;

View File

@ -1,5 +1,5 @@
<template> <template>
<div style="background: #fff;height: 97%;margin: 10px 0;"> <div style="background: #fff;height: calc(100vh - 225px);overflow-y: auto;overflow-x: hidden;margin: 10px 0;">
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -31,7 +31,7 @@
</a-form> </a-form>
</div> </div>
<a-row> <a-row>
<a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;"> <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
<div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div> <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
<a-card style="height: 240px;border: 1px solid rgb(28, 132, 198);"> <a-card style="height: 240px;border: 1px solid rgb(28, 132, 198);">
<div class="rotate" :style="classFun(item)">{{callText(item)}}</div> <div class="rotate" :style="classFun(item)">{{callText(item)}}</div>
@ -177,7 +177,8 @@
* 成功回调 * 成功回调
*/ */
function handleSuccess() { function handleSuccess() {
reload() total.value = 1;
handlePageChange(1);
} }
@ -185,7 +186,8 @@
* 查询 * 查询
*/ */
function searchQuery() { function searchQuery() {
reload(); total.value = 1;
handlePageChange(1);
} }
/** /**
@ -194,7 +196,8 @@
function searchReset() { function searchReset() {
queryParam.value = {}; queryParam.value = {};
// //
reload(); total.value = 1;
handlePageChange(1);
} }
function reload(){ function reload(){
@ -217,7 +220,7 @@
function handlePageChange(record){ function handlePageChange(record){
pageNo.value = record; pageNo.value = record;
searchQuery(); reload();
} }
onMounted(() => { onMounted(() => {
@ -229,6 +232,7 @@
<style lang="less" scoped> <style lang="less" scoped>
.jeecg-basic-table-form-container { .jeecg-basic-table-form-container {
padding: 0; padding: 0;
width: 99%;
.table-page-search-submitButtons { .table-page-search-submitButtons {
display: block; display: block;
margin-bottom: 24px; margin-bottom: 24px;

View File

@ -1,5 +1,5 @@
<template> <template>
<div style="background: #fff;height: 97%;margin: 10px 0;"> <div style="background: #fff;height: calc(100vh - 225px);overflow-y: auto;margin: 10px 0;">
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -37,7 +37,7 @@
</a-form> </a-form>
</div> </div>
<a-row> <a-row>
<a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;"> <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
<div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div> <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
<a-card style="height: 210px;border: 1px solid rgb(28, 132, 198);"> <a-card style="height: 210px;border: 1px solid rgb(28, 132, 198);">
<div class="rotate" >{{item.zyStatus_dictText}}</div> <div class="rotate" >{{item.zyStatus_dictText}}</div>
@ -190,7 +190,8 @@
* 成功回调 * 成功回调
*/ */
function handleSuccess() { function handleSuccess() {
reload() total.value = 1;
handlePageChange(1);
} }
@ -198,7 +199,8 @@
* 查询 * 查询
*/ */
function searchQuery() { function searchQuery() {
reload(); total.value = 1;
handlePageChange(1);
} }
/** /**
@ -207,7 +209,8 @@
function searchReset() { function searchReset() {
queryParam.value = {}; queryParam.value = {};
// //
reload(); total.value = 1;
handlePageChange(1);
} }
function reload(){ function reload(){
@ -230,7 +233,7 @@
function handlePageChange(record){ function handlePageChange(record){
pageNo.value = record; pageNo.value = record;
searchQuery(); reload();
} }
onMounted(() => { onMounted(() => {
@ -242,6 +245,7 @@
<style lang="less" scoped> <style lang="less" scoped>
.jeecg-basic-table-form-container { .jeecg-basic-table-form-container {
padding: 0; padding: 0;
width: 99%;
.table-page-search-submitButtons { .table-page-search-submitButtons {
display: block; display: block;
margin-bottom: 24px; margin-bottom: 24px;

View File

@ -1,5 +1,5 @@
<template> <template>
<div style="background: #fff;height: 97%;margin: 10px 0;"> <div style="background: #fff;height: calc(100vh - 255px);overflow-y: auto;margin: 10px 0;">
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -26,7 +26,7 @@
</a-form> </a-form>
</div> </div>
<a-row> <a-row>
<a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;"> <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
<div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div> <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
<a-card style="height: 240px;border: 1px solid rgb(28, 132, 198);"> <a-card style="height: 240px;border: 1px solid rgb(28, 132, 198);">
<div class="rotate" :style="classFun(item.zyStatus)">{{item.zyStatus_dictText}}</div> <div class="rotate" :style="classFun(item.zyStatus)">{{item.zyStatus_dictText}}</div>
@ -187,7 +187,8 @@
* 成功回调 * 成功回调
*/ */
function handleSuccess() { function handleSuccess() {
reload() total.value = 1;
handlePageChange(1);
} }
function handleZySuccess(zyid){ function handleZySuccess(zyid){
@ -204,7 +205,8 @@
* 查询 * 查询
*/ */
function searchQuery() { function searchQuery() {
reload(); total.value = 1;
handlePageChange(1);
} }
/** /**
@ -212,8 +214,8 @@
*/ */
function searchReset() { function searchReset() {
queryParam.value = {}; queryParam.value = {};
// total.value = 1;
reload(); handlePageChange(1);
} }
function reload(){ function reload(){
@ -236,7 +238,7 @@
function handlePageChange(record){ function handlePageChange(record){
pageNo.value = record; pageNo.value = record;
searchQuery(); reload();
} }
onMounted(() => { onMounted(() => {
@ -248,6 +250,7 @@
<style lang="less" scoped> <style lang="less" scoped>
.jeecg-basic-table-form-container { .jeecg-basic-table-form-container {
padding: 0; padding: 0;
width: 99%;
.table-page-search-submitButtons { .table-page-search-submitButtons {
display: block; display: block;
margin-bottom: 24px; margin-bottom: 24px;

View File

@ -1,10 +1,10 @@
<template> <template>
<div style="background: #fff;height: 97%;margin: 10px 0;"> <div style="background: #fff;height: calc(100vh - 255px);overflow-y: auto;margin: 10px 0;">
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :lg="8"> <a-col :lg="7">
<a-form-item label="作业名称"> <a-form-item label="作业名称">
<j-input placeholder="请输入作业名称" v-model:value="queryParam.title"></j-input> <j-input placeholder="请输入作业名称" v-model:value="queryParam.title"></j-input>
</a-form-item> </a-form-item>
@ -14,7 +14,7 @@
<j-dict-select-tag placeholder="请选择类型" v-model:value="queryParam.zyType" dictCode="zy_type"/> <j-dict-select-tag placeholder="请选择类型" v-model:value="queryParam.zyType" dictCode="zy_type"/>
</a-form-item> </a-form-item>
</a-col> --> </a-col> -->
<a-col :lg="8"> <a-col :lg="7">
<a-form-item label="状态"> <a-form-item label="状态">
<j-dict-select-tag placeholder="请选择状态" v-model:value="queryParam.zyStatus" dictCode="zy_status"/> <j-dict-select-tag placeholder="请选择状态" v-model:value="queryParam.zyStatus" dictCode="zy_status"/>
</a-form-item> </a-form-item>
@ -36,8 +36,8 @@
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
<a-row> <a-row style="overflow:hidden;">
<a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;"> <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
<div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div> <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
<a-card style="height: 290px;border: 1px solid rgb(28, 132, 198);"> <a-card style="height: 290px;border: 1px solid rgb(28, 132, 198);">
<div class="rotate" :style="classFun(item.zyStatus)">{{item.zyStatus_dictText}}</div> <div class="rotate" :style="classFun(item.zyStatus)">{{item.zyStatus_dictText}}</div>
@ -213,7 +213,6 @@ import dayjs from 'dayjs';
function handleZySuccess(zyid){ function handleZySuccess(zyid){
setTimeout(()=>{handleSuccess()}, 1500); setTimeout(()=>{handleSuccess()}, 1500);
var url = "/zyInfo/zyInfo/editStudent"; var url = "/zyInfo/zyInfo/editStudent";
defHttp.get({ url: url, params:{id:zyid} }).then((res) => { defHttp.get({ url: url, params:{id:zyid} }).then((res) => {
}); });
@ -270,6 +269,7 @@ import dayjs from 'dayjs';
<style lang="less" scoped> <style lang="less" scoped>
.jeecg-basic-table-form-container { .jeecg-basic-table-form-container {
padding: 0; padding: 0;
width: 99%;
.table-page-search-submitButtons { .table-page-search-submitButtons {
display: block; display: block;
margin-bottom: 24px; margin-bottom: 24px;

View File

@ -1,5 +1,5 @@
<template> <template>
<div style="margin-top:10px;background:#fff;"> <div style="margin-top:10px;background:#fff;height: calc(100vh - 225px);overflow-y: auto;overflow-x: hidden;">
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container" > <div class="jeecg-basic-table-form-container" >
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -171,6 +171,8 @@
<style lang="less" scoped> <style lang="less" scoped>
.jeecg-basic-table-form-container { .jeecg-basic-table-form-container {
padding: 0;
width:99%;
.table-page-search-submitButtons { .table-page-search-submitButtons {
display: block; display: block;
margin-bottom: 24px; margin-bottom: 24px;

View File

@ -1,5 +1,5 @@
<template> <template>
<div style="margin-top:10px;background:#fff;"> <div style="margin-top:10px;background:#fff;height: calc(100vh - 225px);overflow-y: auto;overflow-x: hidden;">
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container" > <div class="jeecg-basic-table-form-container" >
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -180,6 +180,8 @@
<style lang="less" scoped> <style lang="less" scoped>
.jeecg-basic-table-form-container { .jeecg-basic-table-form-container {
padding: 0;
width:99%;
.table-page-search-submitButtons { .table-page-search-submitButtons {
display: block; display: block;
margin-bottom: 24px; margin-bottom: 24px;