hzya
/
middleground_code_v2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复周三测试提出的住数据bug

This commit is contained in:
hyt 2024-06-28 08:38:48 +08:00
parent a1d3e34009
commit aee09418c5
12 changed files with 308 additions and 361 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/App.vue
View File

@ -79,9 +79,9 @@ export default {
} }
// 全局滚动条样式调整 // 全局滚动条样式调整
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 10px; width: 5px;
/*滚动条宽度*/ /*滚动条宽度*/
height: 10px; height: 5px;
/*滚动条高度*/ /*滚动条高度*/
} }
@ -106,26 +106,13 @@ export default {
</style> </style>
<style lang="scss"> <style lang="scss">
.el-table__header-wrapper { .el-table__header-wrapper {
border-radius: 10px !important;
background: #f7f7f7 !important; background: #f7f7f7 !important;
} }
.el-table__body-wrapper {
// border-radius: 15px !important;
// margin-top: 5px;
}
.el-table__body {
padding-top: 5px;
}
.el-table { .el-table {
width: 100%; width: 100%;
margin-bottom: 20px;
&::before { &::before {
display: none; display: none;
} }
.el-table__body {
//-webkit-border-horizontal-spacing: 13px; // 水平间距
-webkit-border-vertical-spacing: 7px; // 垂直间距 设置的是行间距
}
//以下代码是实现边框效果 //以下代码是实现边框效果
thead th { thead th {
font-size: 14px; font-size: 14px;
@ -141,21 +128,20 @@ export default {
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
padding: 10px 0; padding: 10px 0;
border-top: 1px solid rgba(0, 0, 0, 0.1) !important; border-top: 0px solid rgba(0, 0, 0, 0.1) !important;
border-bottom: 1px solid rgba(0, 0, 0, 0.1) !important; border-bottom: 1px solid rgba(0, 0, 0, 0.1) !important;
background: #fff;
&:first-child { &:first-child {
border-left: 1px solid rgba(0, 0, 0, 0.1) !important; border-left: 0px solid rgba(0, 0, 0, 0.1) !important;
// border-radius: 5px 0 0 5px; // border-radius: 5px 0 0 5px;
border-radius: 10px 0 0 10px;
} }
} }
.el-table__row > td { .el-table__row > td {
font-size: 12px; font-size: 12px;
color: #333333; color: #333333;
&:last-child { &:last-child {
border-right: 1px solid rgba(0, 0, 0, 0.1) !important; border-right: 0px solid rgba(0, 0, 0, 0.1) !important;
// border-radius: 0 5px 5px 0; // border-radius: 0 5px 5px 0;
border-radius: 0 10px 10px 0;
right: 1px; right: 1px;
} }
} }

6
src/components/base/baseRightDialog/index.vue
View File

@ -17,12 +17,12 @@
<div flex="cross:center main:justify" class="rightConcat"> <div flex="cross:center main:justify" class="rightConcat">
<span style="font-size: 16px">{{ title }}</span> <span style="font-size: 16px">{{ title }}</span>
<span v-if="footerShow" flex="main:right"> <span v-if="footerShow" flex="main:right">
<el-button @click="handleClose" v-if="closeShow">取 消</el-button> <el-button @click="handleClose" v-if="closeShow">关 闭</el-button>
<el-button <el-button
type="primary" type="primary"
@click="handleConfirmClick" @click="handleConfirmClick"
v-if="submitShow" v-if="submitShow"
>确 定</el-button >保 存</el-button
> >
</span> </span>
<slot name="buttonPlus"></slot> <slot name="buttonPlus"></slot>
@ -110,7 +110,7 @@ export default {
/* padding-bottom:16px; */ /* padding-bottom:16px; */
padding: 16px 0; padding: 16px 0;
overflow-y: auto; overflow-y: auto;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #eee;
margin-bottom: 20px; margin-bottom: 20px;
} }
</style> </style>

1
src/views/integrationOptionV2/index.vue
View File

@ -351,6 +351,7 @@ export default {
// }) // })
//主表处理 //主表处理
console.log(res, 'res') console.log(res, 'res')
//将所有tableColumn预处理
res.attribute.listList.forEach(item => { res.attribute.listList.forEach(item => {
this.mainTableName = item.dbName this.mainTableName = item.dbName
item.ruleList.forEach(ele => { item.ruleList.forEach(ele => {

8
src/views/masterDataOptions/compoments/baseNewForm.vue
View File

@ -25,7 +25,7 @@
> >
<el-form-item <el-form-item
:prop="row.id" :prop="row.id"
:style="`display: flex;margin-bottom: ${marginBottom}px;padding:0 20px`" :style="`display: flex;margin-bottom: ${marginBottom}px;padding:0 10px`"
v-if="row.show != false" v-if="row.show != false"
:class="rules[row.id] ? 'ruleFormClass ' : ''" :class="rules[row.id] ? 'ruleFormClass ' : ''"
:rules=" :rules="
@ -812,7 +812,7 @@ export default {
} }
.el-form-item--medium .el-form-item__content { .el-form-item--medium .el-form-item__content {
/* line-height: 36px; */ line-height: 20px !important;
flex: 1; flex: 1;
} }
@ -823,13 +823,13 @@ export default {
</style> </style>
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep .el-form-item__label { ::v-deep .el-form-item__label {
padding: 0 0 5px !important; padding: 0 0 0px !important;
} }
.label { .label {
/* @include fontBase(16px, #333333) ; */ /* @include fontBase(16px, #333333) ; */
color: #999; color: #999;
font-size: 13px; font-size: 14px !important;
display: block; display: block;
width: 180px; width: 180px;
// text-align: left; // text-align: left;

12
src/views/masterDataOptions/dataOrigin/index.vue
View File

@ -549,7 +549,7 @@ export default {
font-weight: 600; font-weight: 600;
font-size: 18px; font-size: 18px;
color: #333333; color: #333333;
line-height: 25px; line-height: 20px;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
} }
@ -560,7 +560,7 @@ export default {
border-right: 1px solid #EBEBEB;; border-right: 1px solid #EBEBEB;;
.rule { .rule {
margin-top: 30px; margin-top: 20px;
display: flex; display: flex;
align-items: center; align-items: center;
width: 100%; width: 100%;
@ -584,8 +584,8 @@ export default {
.btn { .btn {
margin-left: 15px; margin-left: 15px;
cursor: pointer; cursor: pointer;
width: 24px; width: 25px;
height: 24px; height: 25px;
background: #EBEBED; background: #EBEBED;
border-radius: 6px; border-radius: 6px;
display: flex; display: flex;
@ -593,8 +593,8 @@ export default {
align-items: center; align-items: center;
> img { > img {
width: 10px; width: 15px;
height: 10px; height: 15px;
} }
} }
} }

2
src/views/masterDataOptions/dataOrigin/mainTable.vue
View File

@ -6,7 +6,7 @@
:isFunBtn="false" :isFunBtn="false"
:formRow="mainOptionRow" :formRow="mainOptionRow"
:ruleForm="mainOptionForm" :ruleForm="mainOptionForm"
:labelPosition="'left'" :labelPosition="'top'"
@onSubmit="mainOptionOnSubmit" @onSubmit="mainOptionOnSubmit"
> >
</baseNewForm> </baseNewForm>

10
src/views/masterDataOptions/dataOrigin/sonTable.vue
View File

@ -7,7 +7,7 @@
:isFunBtn="false" :isFunBtn="false"
:formRow="optionFormRow" :formRow="optionFormRow"
:ruleForm="optionRuleForm" :ruleForm="optionRuleForm"
:labelPosition="'left'" :labelPosition="'top'"
@onSelect="selectChangeHanlde" @onSelect="selectChangeHanlde"
@inputBlur="optionFormInputBlur" @inputBlur="optionFormInputBlur"
@onSubmit="optionOnSubmit" @onSubmit="optionOnSubmit"
@ -19,7 +19,7 @@
:isFunBtn="false" :isFunBtn="false"
:formRow="typeOptionFormRow" :formRow="typeOptionFormRow"
:ruleForm="typeOptionRuleForm" :ruleForm="typeOptionRuleForm"
:labelPosition="'left'" :labelPosition="'top'"
@onSelect="typeSelectChangeHanlde" @onSelect="typeSelectChangeHanlde"
@onSubmit="typeOptionOnSubmit" @onSubmit="typeOptionOnSubmit"
> >
@ -30,7 +30,7 @@
:isFunBtn="false" :isFunBtn="false"
:formRow="propertyFormRow" :formRow="propertyFormRow"
:ruleForm="propertyRuleForm" :ruleForm="propertyRuleForm"
:labelPosition="'left'" :labelPosition="'top'"
@onSubmit="propertyOnSubmit" @onSubmit="propertyOnSubmit"
> >
@ -715,8 +715,8 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.smtitle { .smtitle {
color: #000; color: #333;
font-weight: 600; font-weight: 400;
padding: 20px 0; padding: 20px 0;
border-top: 1px solid #EBEBEB; border-top: 1px solid #EBEBEB;
} }

27
src/views/masterDataOptions/displayInfo/index.vue
View File

@ -1,8 +1,5 @@
<template> <template>
<div class="displayInfo"> <div class="displayInfo" v-loading="mainLoading">
<div class="main" v-loading="mainLoading">
<div class="typeSetting"> <div class="typeSetting">
<div class="btn"> <div class="btn">
<div class="chunk"> <div class="chunk">
@ -178,7 +175,6 @@
</div> </div>
</div> </div>
</div>
<!-- --> <!-- -->
<base-right-dialog <base-right-dialog
ref="mainTableAddtDialog" ref="mainTableAddtDialog"
@ -445,9 +441,9 @@ export default {
.displayInfo { .displayInfo {
background-color: #fbfbfb; background-color: #fbfbfb;
width: 100%;
position: relative; position: relative;
margin-left: 5px; margin-left: 5px;
width: 99%;
> .btn { > .btn {
display: flex; display: flex;
@ -458,13 +454,12 @@ export default {
} }
} }
> .main {
margin-top: 10px;
.typeSetting { .typeSetting {
background-color: #fff; background-color: #fff;
padding: 15px 10px; padding: 15px 10px;
margin-bottom: 10px; margin-bottom: 10px;
border-radius: 16px; border-radius: 16px;
width: 100%;
> .btn { > .btn {
display: flex; display: flex;
@ -493,21 +488,22 @@ export default {
} }
} }
.main { .main {
border-radius: 16px; border-radius: 16px;
background-color: #fff; background-color: #fff;
overflow: auto;
padding: 15px 10px; padding: 15px 10px;
width: 100%;
overflow: auto;
> .content { .content {
margin-top: 1vh; margin-top: 1vh;
width: 2100px; display: flex;
align-items: center;
width: 2000px;
.showItem { .showItem {
display: inline-block; flex: 1;
width: 340px; margin-left: 15px;
margin-left: 8px;
height: 58vh; height: 58vh;
background: #FFFFFF; background: #FFFFFF;
border-radius: 8px; border-radius: 8px;
@ -594,7 +590,6 @@ export default {
} }
} }
}
} }
</style> </style>

63
src/views/masterDataOptions/index.vue
View File

@ -18,7 +18,8 @@
</div> </div>
</div> </div>
</div> </div>
<div class="right"> <div class="right" style="display: flex;align-items: center">
<div style="margin-right: 5px;color: #333;font-size: 12px">共 <span>{{tableData.length}}个主数据</span></div>
<!-- <el-button type="primary" icon="el-icon-plus" @click="addApp">新增</el-button>--> <!-- <el-button type="primary" icon="el-icon-plus" @click="addApp">新增</el-button>-->
<el-button type="primary" icon="el-icon-plus" @click="tableButtonHandle({},{type:'new'})">新增</el-button> <el-button type="primary" icon="el-icon-plus" @click="tableButtonHandle({},{type:'new'})">新增</el-button>
</div> </div>
@ -68,43 +69,6 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <BaseTable ref="mainTable" :tableData="tableData" :tableColumn="tableColumn" :funData="funData"-->
<!-- :funWidth="funWidth" :showIndex="true" :tabLoading="mainTabLoading" @onFunc="tableButtonHandle"-->
<!-- :tableHeight="'70vh'" :border="false">-->
<!-- <template v-slot:mdmName="{ row }">-->
<!-- <div class="nameCard">-->
<!-- <div class="image" v-loading="row.imgLoading">-->
<!-- <template v-if="row.imgUrl">-->
<!-- <img :src="row.imgUrl" alt=""/>-->
<!-- </template>-->
<!-- <template v-else>-->
<!-- <img src="./images/icon.png">-->
<!-- </template>-->
<!-- </div>-->
<!-- <div class="nameInfo">-->
<!-- <div class="name">{{ row.mdmName }}</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </template>-->
<!-- <template v-slot:accessMode="{ row }">-->
<!-- <div class="taskClasses">-->
<!-- <span :class="`state${item}`" v-for="(item,index) in JSON.parse(row.accessMode)"-->
<!-- :key="index">{{ methods_dist[item] }}</span>-->
<!-- </div>-->
<!-- </template>-->
<!-- <template v-slot:interfaceStatus="{ row }">-->
<!-- <el-switch active-value="1" inactive-value="2" active-color="#60c958" v-model="row.interfaceStatus"-->
<!-- disabled></el-switch>-->
<!-- </template>-->
<!-- <template v-slot:dbStatus="{ row }">-->
<!-- <el-switch active-value="1" inactive-value="2" active-color="#60c958" v-model="row.dbStatus"-->
<!-- disabled></el-switch>-->
<!-- </template>-->
<!-- <template v-slot:appStatus="{ row }">-->
<!-- <el-switch active-value="1" inactive-value="2" active-color="#60c958" v-model="row.appStatus"-->
<!-- @change="(val)=>appStatusChange(val,row)"></el-switch>-->
<!-- </template>-->
<!-- </BaseTable>-->
</main> </main>
<footer> <footer>
<!-- <basePage :pageModel="pageModel" @update:pageModel="currentChangeHandle"></basePage>--> <!-- <basePage :pageModel="pageModel" @update:pageModel="currentChangeHandle"></basePage>-->
@ -376,26 +340,28 @@ export default {
.tableChunk { .tableChunk {
width: 30%; width: 30%;
margin-bottom: 30px; margin-bottom: 15px;
margin-left: 2.5%; margin-left: 2.5%;
border-radius: 24px; border-radius: 24px;
border: 2px solid #E5E5E5; border: 1px solid #E5E5E5;
padding-bottom: 20px; padding-bottom: 10px;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
.topInfo { .topInfo {
display: flex; display: flex;
margin: 20px 0 0 26px; margin: 15px 0 0 15px;
.left { .left {
.icon { .icon {
width: 88px; width: 70px;
height: 88px; height: 70px;
border-radius: 16px; border-radius: 16px;
border: 1px solid #F0F0F2; border: 1px solid #F0F0F2;
padding: 14px; padding: 14px;
display: flex;
justify-content: center;
align-items: center;
> img { > img {
width: 60px; width: 60px;
height: 60px; height: 60px;
@ -422,7 +388,7 @@ export default {
> .name { > .name {
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 24px; font-size: 18px;
color: #333333; color: #333333;
line-height: 33px; line-height: 33px;
text-align: left; text-align: left;
@ -431,7 +397,6 @@ export default {
} }
.tableType { .tableType {
margin-top: 11px;
width: 38px; width: 38px;
height: 24px; height: 24px;
background: #1478F6; background: #1478F6;
@ -448,7 +413,7 @@ export default {
.tableContent { .tableContent {
margin-top: 5px; margin-top: 5px;
width: 95%; width: 95%;
height: 60px; height: 40px;
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 14px; font-size: 14px;
@ -458,7 +423,7 @@ export default {
font-style: normal; font-style: normal;
display: -webkit-box; /*作为弹性伸缩盒子模型显示。*/ display: -webkit-box; /*作为弹性伸缩盒子模型显示。*/
-webkit-box-orient: vertical; /*作为弹性伸缩盒子模型显示。*/ -webkit-box-orient: vertical; /*作为弹性伸缩盒子模型显示。*/
-webkit-line-clamp: 3; //*显示的行*/ -webkit-line-clamp: 2; //*显示的行*/
overflow: hidden; /*溢出隐藏*/ overflow: hidden; /*溢出隐藏*/
/* 对于连字情况或者纯字母，可以解决 */ /* 对于连字情况或者纯字母，可以解决 */
word-break: break-all; word-break: break-all;

7
src/views/masterDataOptions/masterDataAdd.vue
View File

@ -307,13 +307,12 @@ export default {
margin-left: 5px; margin-left: 5px;
.title { .title {
margin-bottom: 20px; margin-bottom: 10px;
margin-left: 32px; margin-left: 32px;
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 600; font-weight: 600;
font-size: 18px; font-size: 18px;
color: #333333; color: #333333;
line-height: 25px;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
} }
@ -327,7 +326,7 @@ export default {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
align-items: center; align-items: center;
padding: 15px 10px; padding: 15px 10px 3px;
.chunkList { .chunkList {
display: flex; display: flex;
@ -386,7 +385,7 @@ export default {
> .upload { > .upload {
background-color: #fff; background-color: #fff;
border-radius: 16px; border-radius: 16px;
padding: 24px 30px; padding: 12px 30px 0px;
> .title { > .title {
font-size: 18px; font-size: 18px;

21
src/views/masterDataOptions/settingMenu.vue
View File

@ -135,7 +135,7 @@ export default {
.menu { .menu {
position: fixed; position: fixed;
width: 11%; width: 180px;
height: 90vh; height: 90vh;
//margin-right: 1%; //margin-right: 1%;
background-color: #fff; background-color: #fff;
@ -143,7 +143,7 @@ export default {
overflow: auto; overflow: auto;
.appInfo { .appInfo {
padding: 16px 0; padding: 10px 0;
border-bottom: 1px solid #f3f3f3; border-bottom: 1px solid #f3f3f3;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -184,7 +184,7 @@ export default {
align-items: center; align-items: center;
.item { .item {
margin-bottom: 24px; margin-bottom: 20px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -192,8 +192,8 @@ export default {
align-items: center; align-items: center;
> .icon { > .icon {
width: 64px; width: 50px;
height: 64px; height: 50px;
text-align: center; text-align: center;
border-radius: 12px; border-radius: 12px;
display: flex; display: flex;
@ -202,7 +202,7 @@ export default {
> .iconfont { > .iconfont {
font-weight: 300; font-weight: 300;
font-size: 37px; font-size: 35px;
color: #000; color: #000;
} }
@ -216,9 +216,9 @@ export default {
} }
> .title { > .title {
margin-top: 11px; margin-top: 10px;
color: #333333; color: #333333;
font-size: 18px; font-size: 16px;
font-weight: 600; font-weight: 600;
user-select: none; user-select: none;
} }
@ -235,8 +235,9 @@ export default {
} }
.content { .content {
margin-left: 11.5%; margin-left: 180px;
width: 88%; flex: 1;
width: calc(100% - 190px);
border-radius: 16px; border-radius: 16px;
} }
} }

4
vue.config.js
View File

@ -39,9 +39,9 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://hzya.ufyct.com:9067/`, target: `http://hzya.ufyct.com:9067/`,
// target: `http://127.0.0.1:9081/`, // target: `http://127.0.0.1:9081/`,
target: `http://192.168.2.78:9999`, // target: `http://192.168.2.78:9999`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "", ["^" + process.env.VUE_APP_BASE_API]: "",