修改尺寸计算

prod
吕天方 1 year ago
parent bef259a4a3
commit fa8de19c41

@ -6,7 +6,7 @@ ENV = 'development'
# 金鸡湖现代服务业品牌管理系统/开发环境 # 金鸡湖现代服务业品牌管理系统/开发环境
# VUE_APP_BASE_API = 'http://192.168.0.114:9040' # VUE_APP_BASE_API = 'http://192.168.0.114:9040'
VUE_APP_BASE_API = 'http://192.168.0.105:9040' VUE_APP_BASE_API = 'http://39.101.188.84:9040'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

@ -14,8 +14,13 @@ export default {
autofit.init({ autofit.init({
dh: 919, dh: 919,
dw: 1920, dw: 1920,
el: "body", el: "#app",
resize: true, resize: true,
// ignore:[
// {
// el:".ignoreElement",
// }
// ],
}); });
}, },
metaInfo() { metaInfo() {

@ -33,6 +33,9 @@
overflow-y: auto; overflow-y: auto;
// padding-bottom: 20px; // padding-bottom: 20px;
} }
.el-table::before {
height: 0;
}
.el-table { .el-table {
margin-bottom: 25px; margin-bottom: 25px;
th { th {
@ -528,6 +531,9 @@
.iconfont { .iconfont {
font-size: 65px; font-size: 65px;
} }
.icon-jc-daishenpi1-copy {
color: #979797;
}
.icon-jc-shenpitongguo-copy { .icon-jc-shenpitongguo-copy {
color: #4EB997; color: #4EB997;
} }

@ -34,7 +34,7 @@
</template> </template>
<el-dropdown <el-dropdown
class="avatar-container right-menu-item hover-effect" class="avatar-container right-menu-item hover-effect ignoreElement"
trigger="click" trigger="click"
> >
<div class="avatar-wrapper"> <div class="avatar-wrapper">
@ -110,7 +110,7 @@ export default {
}) })
.then(() => { .then(() => {
this.$store.dispatch("LogOut").then(() => { this.$store.dispatch("LogOut").then(() => {
location.href = "/index"; location.href = "/demo/JinJiHu";
}); });
}) })
.catch(() => {}); .catch(() => {});

@ -6,6 +6,7 @@
:close-on-press-escape="false" :close-on-press-escape="false"
:custom-class="myclass ? 'custom-my-class':''" :custom-class="myclass ? 'custom-my-class':''"
@close="resetCancel" @close="resetCancel"
append-to-body
> >
<slot></slot> <slot></slot>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">

@ -4,16 +4,16 @@
* @Author: JC9527 * @Author: JC9527
* @Date: 2024-03-25 09:07:08 * @Date: 2024-03-25 09:07:08
* @LastEditors: JC9527 * @LastEditors: JC9527
* @LastEditTime: 2024-03-29 09:50:06 * @LastEditTime: 2024-03-29 16:51:22
--> -->
<template> <template>
<div class="L-public-main"> <div class="L-public-main" id="L-size-main">
<div class="L-main"> <div class="L-main">
<header> <header id="L-header">
<el-form :inline="true" :model="formInline" size="small" class="demo-form-inline" ref="queryFrom"> <el-form :inline="true" :model="formInline" size="small" class="demo-form-inline" ref="queryFrom">
<el-col :span="22"> <el-col :span="22">
<el-form-item label="项目分类:"> <el-form-item label="项目分类:">
<el-select v-model="formInline.projectClassify" placeholder="请选择"> <el-select class="ignoreElement" v-model="formInline.projectClassify" placeholder="请选择">
<el-option <el-option
v-for="dict in dict.type.jjh_project_type" v-for="dict in dict.type.jjh_project_type"
:key="dict.value" :key="dict.value"
@ -30,6 +30,7 @@
</el-form-item> </el-form-item>
<el-form-item label="年份:"> <el-form-item label="年份:">
<el-date-picker <el-date-picker
class="ignoreElement"
v-model="formInline.projectYear" v-model="formInline.projectYear"
format="yyyy" format="yyyy"
value-format="yyyy" value-format="yyyy"
@ -38,7 +39,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="状态:"> <el-form-item label="状态:">
<el-select v-model="formInline.status" placeholder="请选择"> <el-select class="ignoreElement" v-model="formInline.status" placeholder="请选择">
<el-option <el-option
v-for="dict in dict.type.jjh_status" v-for="dict in dict.type.jjh_status"
:key="dict.value" :key="dict.value"
@ -58,7 +59,7 @@
</el-form> </el-form>
</header> </header>
<section> <section>
<el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName"> <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" :height="tabHeader" :max-height="tabHeader">
<el-table-column label="项目分类" key="projectClassify" width="250px" prop="projectClassify"> <el-table-column label="项目分类" key="projectClassify" width="250px" prop="projectClassify">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.jjh_project_type" :value="scope.row.projectClassify"/> <dict-tag :options="dict.type.jjh_project_type" :value="scope.row.projectClassify"/>
@ -99,6 +100,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<my-pagination <my-pagination
id="L-pagination"
:total="total" :total="total"
:page="pagination.current" :page="pagination.current"
:limit="pagination.size" :limit="pagination.size"
@ -112,7 +114,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form :model="importFrom" size="small" ref="importFrom" label-width="100px" :rules="rules"> <el-form :model="importFrom" size="small" ref="importFrom" label-width="100px" :rules="rules">
<el-form-item label="项目分类:" class="importFormItem" prop="projectClassify"> <el-form-item label="项目分类:" class="importFormItem" prop="projectClassify">
<el-select v-model="importFrom.projectClassify" placeholder="请选择"> <el-select class="ignoreElement" v-model="importFrom.projectClassify" placeholder="请选择">
<el-option <el-option
v-for="dict in dict.type.jjh_project_type" v-for="dict in dict.type.jjh_project_type"
:key="dict.value" :key="dict.value"
@ -123,6 +125,7 @@
</el-form-item> </el-form-item>
<el-form-item label="年份:" class="importFormItem" prop="projectYear"> <el-form-item label="年份:" class="importFormItem" prop="projectYear">
<el-date-picker <el-date-picker
class="ignoreElement"
v-model="importFrom.projectYear" v-model="importFrom.projectYear"
type="year" type="year"
format="yyyy" format="yyyy"
@ -267,6 +270,7 @@ export default {
// url: process.env.VUE_APP_BASE_API + "/jjh/jProject/export" // url: process.env.VUE_APP_BASE_API + "/jjh/jProject/export"
url: process.env.VUE_APP_BASE_API + "/jjh/jProject/importTemplateProject" url: process.env.VUE_APP_BASE_API + "/jjh/jProject/importTemplateProject"
}, },
tabHeader: undefined,
}; };
}, },
mounted() { mounted() {
@ -274,8 +278,14 @@ export default {
this.formInline.projectClassify = this.$route.query.projectId; this.formInline.projectClassify = this.$route.query.projectId;
this.pagination = { ...this.pagination,...this.formInline }; this.pagination = { ...this.pagination,...this.formInline };
} }
this.cancalDebounce();
window.addEventListener('resize', this.cancalDebounce);
this.getList(); this.getList();
}, },
destroyed() {
window.removeEventListener('resize', this.cancalDebounce);
},
methods:{ methods:{
// //
getList(){ getList(){
@ -396,6 +406,16 @@ export default {
return 'evenNumber-row'; return 'evenNumber-row';
} }
return ''; return '';
},
//
cancalDebounce(){
const element = document.getElementById('L-size-main'); // ID
const header = document.getElementById('L-header'); // ID
const pagination = document.getElementById('L-pagination'); // ID
const elementHeight = element.offsetHeight;
const headerHeight = header.offsetHeight;
const paginationtHeight = pagination.offsetHeight;
this.tabHeader = elementHeight - headerHeight - paginationtHeight - 140;
} }
} }
}; };

@ -17,6 +17,7 @@
placeholder="选择备忘时间"> placeholder="选择备忘时间">
</el-date-picker> --> </el-date-picker> -->
<el-date-picker <el-date-picker
class="ignoreElement"
v-model="memoTime" v-model="memoTime"
format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"

Loading…
Cancel
Save