diff --git a/src/App.vue b/src/App.vue
index 579a59a..99488e0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -107,6 +107,43 @@ export default {
}
</style>
<style lang="scss">
+//所有删除、设置按钮
+.settingBtn {
+ cursor: pointer;
+ width: 24px;
+ height: 24px;
+ background: #EBEBED;
+ border-radius: 6px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ > img {
+ width: 14px !important;
+ height: 14px !important;
+ }
+}
+
+.deleBtn {
+ cursor: pointer;
+ margin-left: 10px;
+ width: 24px;
+ height: 24px;
+ background: #EBEBED;
+ border-radius: 6px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ > img {
+ width: 14px !important;
+ height: 14px !important;
+ }
+}
+//所有单元格字号
+.cell{
+ font-size: 14px !important;
+}
.el-form-item__content {
display: block !important;
}
@@ -122,7 +159,8 @@ export default {
/* 定义滚动条样式 */
.scrollable-box {
- overflow: hidden;
+ overflow: auto;
+ box-sizing: border-box;
}
.scrollable-box:hover {
diff --git a/src/assets/XZReportDesigner/static/params/params.css b/src/assets/XZReportDesigner/static/params/params.css
index c8954d4..825537e 100644
--- a/src/assets/XZReportDesigner/static/params/params.css
+++ b/src/assets/XZReportDesigner/static/params/params.css
@@ -566,7 +566,7 @@ body {
background: #FFFFFF;
font-family: 'Lato', 'Helvetica Neue', Arial, Helvetica, sans-serif;
font-size: 14px;
- line-height: 1.4285em;
+
/* color: rgba(0, 0, 0, 0.87); */
color: #58657d;
font-smoothing: antialiased;
@@ -629,10 +629,6 @@ h5:last-child {
Text
*******************************/
-p {
- margin: 0em 0em 1em;
- line-height: 1.4285em;
-}
p:first-child {
margin-top: 0em;
@@ -25197,7 +25193,7 @@ Floated Menu / Item
margin: 1em 0em;
background: #F8F8F9;
padding: 1em 1.5em;
- line-height: 1.4285em;
+
color: rgba(0, 0, 0, 0.87);
transition: opacity 0.1s ease, color 0.1s ease, background 0.1s ease, box-shadow 0.1s ease;
border-radius: 0.28571429rem;
@@ -28798,7 +28794,7 @@ a.ui.card:hover,
border-left: none;
font-size: 1em;
max-width: 500px;
- line-height: 1.4285em;
+
}
/*--------------
@@ -29078,7 +29074,7 @@ a.ui.card:hover,
margin-top: 0.6em;
max-width: auto;
font-size: 1em;
- line-height: 1.4285em;
+
color: rgba(0, 0, 0, 0.87);
}
@@ -33740,7 +33736,7 @@ a.ui.nag {
min-width: min-content;
z-index: 1900;
border: 1px solid #D4D4D5;
- line-height: 1.4285em;
+
max-width: 250px;
background: #FFFFFF;
padding: 0.833em 1em;
@@ -33814,7 +33810,7 @@ a.ui.nag {
white-space: nowrap;
font-size: 1rem;
border: 1px solid #D4D4D5;
- line-height: 1.4285em;
+
max-width: none;
background: #FFFFFF;
padding: 0.833em 1em;
diff --git a/src/assets/XZReportDesigner/static/params/static/semantic/semantic.css b/src/assets/XZReportDesigner/static/params/static/semantic/semantic.css
index 0182abf..1048dc1 100644
--- a/src/assets/XZReportDesigner/static/params/static/semantic/semantic.css
+++ b/src/assets/XZReportDesigner/static/params/static/semantic/semantic.css
@@ -566,7 +566,7 @@ body {
background: #FFFFFF;
font-family: 'Lato', 'Helvetica Neue', Arial, Helvetica, sans-serif;
font-size: 14px;
- line-height: 1.4285em;
+
/* color: rgba(0, 0, 0, 0.87); */
color: #58657d;
font-smoothing: antialiased;
@@ -631,7 +631,7 @@ h5:last-child {
p {
margin: 0em 0em 1em;
- line-height: 1.4285em;
+
}
p:first-child {
@@ -25197,7 +25197,7 @@ Floated Menu / Item
margin: 1em 0em;
background: #F8F8F9;
padding: 1em 1.5em;
- line-height: 1.4285em;
+
color: rgba(0, 0, 0, 0.87);
transition: opacity 0.1s ease, color 0.1s ease, background 0.1s ease, box-shadow 0.1s ease;
border-radius: 0.28571429rem;
@@ -28798,7 +28798,7 @@ a.ui.card:hover,
border-left: none;
font-size: 1em;
max-width: 500px;
- line-height: 1.4285em;
+
}
/*--------------
@@ -29078,7 +29078,7 @@ a.ui.card:hover,
margin-top: 0.6em;
max-width: auto;
font-size: 1em;
- line-height: 1.4285em;
+
color: rgba(0, 0, 0, 0.87);
}
@@ -33740,7 +33740,7 @@ a.ui.nag {
min-width: min-content;
z-index: 1900;
border: 1px solid #D4D4D5;
- line-height: 1.4285em;
+
max-width: 250px;
background: #FFFFFF;
padding: 0.833em 1em;
@@ -33814,7 +33814,7 @@ a.ui.nag {
white-space: nowrap;
font-size: 1rem;
border: 1px solid #D4D4D5;
- line-height: 1.4285em;
+
max-width: none;
background: #FFFFFF;
padding: 0.833em 1em;
@@ -38773,4 +38773,4 @@ body.pushable > .pusher {
/*******************************
Site Overrides
-*******************************/
\ No newline at end of file
+*******************************/
diff --git a/src/assets/XZReportDesigner/xzreportdesigner.css b/src/assets/XZReportDesigner/xzreportdesigner.css
index f51927e..ad7f06e 100644
--- a/src/assets/XZReportDesigner/xzreportdesigner.css
+++ b/src/assets/XZReportDesigner/xzreportdesigner.css
@@ -652,7 +652,7 @@ body {
background: #FFFFFF;
font-family: 'Lato', 'Helvetica Neue', Arial, Helvetica, sans-serif;
font-size: 14px;
- line-height: 1.4285em;
+
/* color: rgba(0, 0, 0, 0.87); */
color: #58657d;
font-smoothing: antialiased;
@@ -717,7 +717,7 @@ h5:last-child {
p {
margin: 0em 0em 1em;
- line-height: 1.4285em;
+
}
p:first-child {
@@ -25283,7 +25283,7 @@ Floated Menu / Item
margin: 1em 0em;
background: #F8F8F9;
padding: 1em 1.5em;
- line-height: 1.4285em;
+
color: rgba(0, 0, 0, 0.87);
transition: opacity 0.1s ease, color 0.1s ease, background 0.1s ease, box-shadow 0.1s ease;
border-radius: 0.28571429rem;
@@ -28884,7 +28884,7 @@ a.ui.card:hover,
border-left: none;
font-size: 1em;
max-width: 500px;
- line-height: 1.4285em;
+
}
/*--------------
@@ -29164,7 +29164,7 @@ a.ui.card:hover,
margin-top: 0.6em;
max-width: auto;
font-size: 1em;
- line-height: 1.4285em;
+
color: rgba(0, 0, 0, 0.87);
}
@@ -33826,7 +33826,7 @@ a.ui.nag {
min-width: min-content;
z-index: 1900;
border: 1px solid #D4D4D5;
- line-height: 1.4285em;
+
max-width: 250px;
background: #FFFFFF;
padding: 0.833em 1em;
@@ -33900,7 +33900,7 @@ a.ui.nag {
white-space: nowrap;
font-size: 1rem;
border: 1px solid #D4D4D5;
- line-height: 1.4285em;
+
max-width: none;
background: #FFFFFF;
padding: 0.833em 1em;
@@ -46970,7 +46970,7 @@ body {
background: #FFFFFF;
font-family: 'Lato', 'Helvetica Neue', Arial, Helvetica, sans-serif;
font-size: 14px;
- line-height: 1.4285em;
+
/* color: rgba(0, 0, 0, 0.87); */
color: #58657d;
font-smoothing: antialiased;
@@ -47035,7 +47035,7 @@ h5:last-child {
p {
margin: 0em 0em 1em;
- line-height: 1.4285em;
+
}
p:first-child {
@@ -71601,7 +71601,7 @@ Floated Menu / Item
margin: 1em 0em;
background: #F8F8F9;
padding: 1em 1.5em;
- line-height: 1.4285em;
+
color: rgba(0, 0, 0, 0.87);
transition: opacity 0.1s ease, color 0.1s ease, background 0.1s ease, box-shadow 0.1s ease;
border-radius: 0.28571429rem;
@@ -75202,7 +75202,7 @@ a.ui.card:hover,
border-left: none;
font-size: 1em;
max-width: 500px;
- line-height: 1.4285em;
+
}
/*--------------
@@ -75482,7 +75482,7 @@ a.ui.card:hover,
margin-top: 0.6em;
max-width: auto;
font-size: 1em;
- line-height: 1.4285em;
+
color: rgba(0, 0, 0, 0.87);
}
@@ -80144,7 +80144,7 @@ a.ui.nag {
min-width: min-content;
z-index: 1900;
border: 1px solid #D4D4D5;
- line-height: 1.4285em;
+
max-width: 250px;
background: #FFFFFF;
padding: 0.833em 1em;
@@ -80218,7 +80218,7 @@ a.ui.nag {
white-space: nowrap;
font-size: 1rem;
border: 1px solid #D4D4D5;
- line-height: 1.4285em;
+
max-width: none;
background: #FFFFFF;
padding: 0.833em 1em;
@@ -86574,7 +86574,7 @@ div[is="ui-button"] {
border: 0;
}
-.ui-button:hover,
+.ui-button:hover,
[is="ui-button"]:hover {
color: var(--ui-white, #fff);
text-decoration: none;
@@ -86846,7 +86846,7 @@ input[data-type="normal"].loading {
padding: 0;
vertical-align: middle;
border: 0;
- border-radius: var(--ui-radius, 4px);
+ border-radius: var(--ui-radius, 4px);
background-color: rgba(25, 28, 34, 0.2);
outline: none;
cursor: pointer;
@@ -86881,7 +86881,7 @@ _::-moz-color-swatch {
position: absolute;
width: 241px;
padding: 10px 12px;
- border-radius: var(--ui-radius, 4px);
+ border-radius: var(--ui-radius, 4px);
background-color: var(--ui-light, #f7f9fa);
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25);
font-size: var(--ui-font, 14px);
@@ -86929,7 +86929,7 @@ _::-moz-color-swatch {
border-radius: 50%;
}
.ui-color-switch[data-mode="more"]::before {
- background: radial-gradient(closest-side, white, transparent),
+ background: radial-gradient(closest-side, white, transparent),
conic-gradient(red, magenta, blue, aqua, lime, yellow, red);
border-radius: 50%;
}
@@ -87150,7 +87150,7 @@ _::-moz-color-swatch {
padding-top: 8px;
padding-bottom: 8px;
margin-left: 15px;
- border-radius: var(--ui-radius, 4px);
+ border-radius: var(--ui-radius, 4px);
text-align: center;
font-size: var(--ui-font, 14px);
font-family: inherit;
@@ -87448,7 +87448,7 @@ datalist {
}
/* for Safari */
@supports not (text-align-last: auto) {
- [is="ui-datetime"][type="time"] {
+ [is="ui-datetime"][type="time"] {
max-width: 125px;
}
}
@@ -88288,7 +88288,7 @@ a:hover .ui-droplist-arrow:empty,
}
.ui-dropanel-close:hover::before {
- background-color: var(--ui-dark, #4c5161);
+ background-color: var(--ui-dark, #4c5161);
}
.ui-dropanel-content {
@@ -88957,7 +88957,7 @@ ui-pagination:not(:defined),
* @author zhangxinxu
* @create 19-10-18
* @editor gandaochuan
- * @edit 20-04-10
+ * @edit 20-04-10
*
**/
@@ -89288,7 +89288,7 @@ input[data-tips][reverse]:not([data-tips*="$"]):active::after {
--mask-url: url("data:image/svg+xml,%3Csvg width='12' height='11' viewBox='0 0 12 11' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6 0l1.693 3.67 4.013.476L8.74 6.89l.788 3.964L6 8.88l-3.527 1.974.788-3.964L.294 4.146l4.013-.476L6 0z'/%3E%3C/svg%3E");
--mask: var(--mask-url) repeat-x left / 2em 100%;
}
-
+
[is="ui-rate"]::-webkit-slider-runnable-track {
background: var(--ui-orange, #f59b00);
height: 2em;
@@ -90779,7 +90779,7 @@ textarea:disabled {
display: inline-block;
zoom: 1;
white-space: nowrap;
-
+
}
.selectize-input>.item{
width: calc(100% - 10px);
diff --git a/src/assets/icons/svg/masterDataMenu02.svg b/src/assets/icons/svg/masterDataMenu02.svg
index 7e88473..8b8356f 100644
--- a/src/assets/icons/svg/masterDataMenu02.svg
+++ b/src/assets/icons/svg/masterDataMenu02.svg
@@ -1 +1,9 @@
-<svg t="1698635429898" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="13525" width="200" height="200"><path d="M383.977281 638.040122C248.113773 629.720642 131.961033 595.162802 63.99728 546.909818V639.960002c0 63.420036 138.359353 116.088744 319.980001 126.200113v63.868008c-135.863509-8.31948-252.016249-42.813324-319.980001-91.130304V831.948003H0.00128V223.986001C0.00128 100.281732 200.564745 0 447.973282 0s447.972002 100.281732 447.972001 223.986001v202.099369h-63.996V339.434785C753.554183 404.454722 610.907098 447.972002 447.973282 447.972002s-305.580901-43.51728-383.976002-108.537217V447.972002c0 63.420036 138.359353 116.088744 319.980001 126.200112v63.868008zM447.973282 1023.936004c-247.408537 0-447.972002-85.946628-447.972002-191.988001h63.996c0 70.71558 171.893257 127.992 383.976002 127.992001v63.996zM447.973282 383.976001c212.082745 0 383.976001-71.67552 383.976001-159.99S660.056027 63.996 447.973282 63.996 63.99728 135.671521 63.99728 223.986001 235.890537 383.976001 447.973282 383.976001z m556.893194 419.813762l-44.541216-25.91838c2.495844-13.631148 4.095744-27.51828 4.095744-41.91738a231.665521 231.665521 0 0 0-4.095744-41.91738l44.541216-25.982376a38.589588 38.589588 0 0 0 13.951128-52.476721l-38.07762-66.491844a37.885632 37.885632 0 0 0-52.028748-14.07912l-45.053185 26.23836a227.825761 227.825761 0 0 0-71.547528-42.23736V486.369602c0-21.182676-17.022936-38.3976-38.07762-38.3976h-76.15524a38.269608 38.269608 0 0 0-38.07762 38.3976v32.63796a227.825761 227.825761 0 0 0-71.547529 42.23736l-45.053184-26.23836a37.885632 37.885632 0 0 0-52.028748 14.07912L453.092962 615.641522a38.589588 38.589588 0 0 0 13.951128 52.476721l44.541216 25.91838a231.665521 231.665521 0 0 0-4.095744 41.91738c0 14.3991 1.5999 28.286232 4.095744 41.91738l-44.541216 25.982376a38.589588 38.589588 0 0 0-13.951128 52.47672l38.07762 66.491845a37.885632 37.885632 0 0 0 52.028748 14.07912l45.053184-26.23836c21.054684 18.046872 44.925192 32.765952 71.547529 42.23736v32.63796c0 21.182676 17.022936 38.3976 38.07762 38.3976h76.15524a38.269608 38.269608 0 0 0 38.07762-38.3976v-32.63796a227.825761 227.825761 0 0 0 71.547528-42.23736l45.053185 26.23836a37.949628 37.949628 0 0 0 52.028748-14.07912l38.07762-66.555841a38.589588 38.589588 0 0 0-13.951128-52.47672z m-47.293044 37.821636l-17.534904 29.886132a17.726892 17.726892 0 0 1-23.9985 6.271608l-48.764953-27.646272a175.989001 175.989001 0 0 1-96.185988 54.652585v37.949628c0 9.471408-7.871508 17.214924-17.5989 17.214924h-35.069808a17.406912 17.406912 0 0 1-17.5989-17.27892v-37.885632a175.989001 175.989001 0 0 1-96.185989-54.652585l-48.764952 27.646272a17.726892 17.726892 0 0 1-23.9985-6.271608l-17.534904-29.886132a17.022936 17.022936 0 0 1 6.3996-23.486532l48.95694-27.774264a168.245485 168.245485 0 0 1-9.27942-54.3966c0-19.070808 3.455784-37.245672 9.343416-54.3966l-49.020936-27.774264a17.022936 17.022936 0 0 1-6.3996-23.486533l17.534904-29.886132a17.726892 17.726892 0 0 1 23.9985-6.271608l48.764952 27.646272a175.989001 175.989001 0 0 1 96.185989-54.652584v-37.949628c0-9.535404 7.871508-17.214924 17.5989-17.214924h35.069808c9.727392 0 17.5989 7.67952 17.5989 17.27892v37.885632a175.989001 175.989001 0 0 1 96.185988 54.652584l48.764953-27.646272a17.726892 17.726892 0 0 1 23.9985 6.271608l17.534904 29.886132a17.022936 17.022936 0 0 1-6.3996 23.486533l-48.95694 27.774264c5.75964 17.150928 9.27942 35.325792 9.27942 54.3966 0 19.070808-3.455784 37.245672-9.27942 54.3966l48.95694 27.774264a17.022936 17.022936 0 0 1 6.3996 23.486532zM735.955283 639.960002a95.994 95.994 0 1 0 0 191.988001 95.994 95.994 0 0 0 0-191.988001z m0 127.992001a31.998 31.998 0 1 1 0-63.996 31.998 31.998 0 0 1 0 63.996z"></path></svg>
+<svg t="1720579857492" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3356"
+ width="200" height="200">
+ <path
+ d="M252.442947 766.005895l3.449264 1.778526 262.844631 151.767579a13.473684 13.473684 0 0 0 11.317895 0.997053l2.155789-0.997053 254.679579-147.051789a40.421053 40.421053 0 0 1 43.708632 67.907368l-3.287579 2.101895-254.679579 147.051789a94.315789 94.315789 0 0 1-89.088 2.802526l-5.22779-2.802526-262.844631-151.767579a40.421053 40.421053 0 0 1 33.414737-73.216l3.557052 1.428211z m401.731369-657.51579l249.613473 144.114527a94.315789 94.315789 0 0 1 46.996211 75.749052l0.161684 5.928421v76.90779a40.421053 40.421053 0 0 1-80.653473 3.880421l-0.188632-3.880421v-76.90779a13.473684 13.473684 0 0 0-6.736842-11.66821l-249.613474-144.114527a40.421053 40.421053 0 0 1 40.421053-70.009263z m-201.027369 14.120421a40.421053 40.421053 0 0 1-14.821052 55.215158l-250.745263 144.788211a13.473684 13.473684 0 0 0-6.548211 9.296842l-0.188632 2.371368v72.677053a40.421053 40.421053 0 0 1-80.680421 3.880421l-0.161684-3.880421v-72.677053a94.315789 94.315789 0 0 1 47.157895-81.677473L397.931789 107.789474a40.421053 40.421053 0 0 1 55.215158 14.794105z"
+ p-id="3357"></path>
+ <path
+ d="M525.473684 0a121.263158 121.263158 0 1 1 0 242.526316 121.263158 121.263158 0 0 1 0-242.526316z m0 80.842105a40.421053 40.421053 0 1 0 0 80.842106 40.421053 40.421053 0 0 0 0-80.842106zM148.210526 485.052632a121.263158 121.263158 0 1 1 0 242.526315 121.263158 121.263158 0 0 1 0-242.526315z m0 80.842105a40.421053 40.421053 0 1 0 0 80.842105 40.421053 40.421053 0 0 0 0-80.842105zM902.736842 485.052632a121.263158 121.263158 0 1 1 0 242.526315 121.263158 121.263158 0 0 1 0-242.526315z m0 80.842105a40.421053 40.421053 0 1 0 0 80.842105 40.421053 40.421053 0 0 0 0-80.842105z"
+ p-id="3358"></path>
+</svg>
diff --git a/src/assets/icons/svg/masterDataMenu03.svg b/src/assets/icons/svg/masterDataMenu03.svg
index 531ad64..04d76e3 100644
--- a/src/assets/icons/svg/masterDataMenu03.svg
+++ b/src/assets/icons/svg/masterDataMenu03.svg
@@ -1 +1,21 @@
-<svg t="1698634142296" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7826" width="200" height="200"><path d="M960 80H64c-35.3 0-64 28.6-64 64v576c0 35.3 28.7 64 64 64h312c4.4 0 8 3.6 8 8v84c0 2.2-1.8 4-4 4h-60c-17.7 0-32 14.3-32 32v32h448v-32c0-17.7-14.3-32-32-32h-60c-2.2 0-4-1.8-4-4v-84c0-4.4 3.6-8 8-8h312c35.3 0 64-28.7 64-64V144c0-35.4-28.7-64-64-64zM576 876c0 2.2-1.8 4-4 4H452c-2.2 0-4-1.8-4-4v-52c0-4.4 3.6-8 8-8h112c4.4 0 8 3.6 8 8v52z m384-172c0 8.8-7.2 16-16 16H80c-8.8 0-16-7.2-16-16v-44c0-2.2 1.8-4 4-4h888c2.2 0 4 1.8 4 4v44z m-4-112H68c-2.2 0-4-1.8-4-4V160c0-8.8 7.2-16 16-16h864c8.8 0 16 7.2 16 16v428c0 2.2-1.8 4-4 4z"></path></svg>
+<svg t="1720579955400" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3512"
+ width="200" height="200">
+ <path
+ d="M215.578947 889.263158m40.421053 0l538.947368 0q40.421053 0 40.421053 40.421053l0 0q0 40.421053-40.421053 40.421052l-538.947368 0q-40.421053 0-40.421053-40.421052l0 0q0-40.421053 40.421053-40.421053Z"
+ p-id="3513"></path>
+ <path
+ d="M215.578947 242.526316m40.421053 0l538.947368 0q40.421053 0 40.421053 40.421052l0 0q0 40.421053-40.421053 40.421053l-538.947368 0q-40.421053 0-40.421053-40.421053l0 0q0-40.421053 40.421053-40.421052Z"
+ p-id="3514"></path>
+ <path
+ d="M215.578947 377.263158m40.421053 0l538.947368 0q40.421053 0 40.421053 40.421053l0 0q0 40.421053-40.421053 40.421052l-538.947368 0q-40.421053 0-40.421053-40.421052l0 0q0-40.421053 40.421053-40.421053Z"
+ p-id="3515"></path>
+ <path
+ d="M215.578947 512m40.421053 0l242.526316 0q40.421053 0 40.421052 40.421053l0 0q0 40.421053-40.421052 40.421052l-242.526316 0q-40.421053 0-40.421053-40.421052l0 0q0-40.421053 40.421053-40.421053Z"
+ p-id="3516"></path>
+ <path
+ d="M889.263158 80.842105a107.789474 107.789474 0 0 1 107.789474 107.789474v485.052632a107.789474 107.789474 0 0 1-107.789474 107.789473H134.736842a107.789474 107.789474 0 0 1-107.789474-107.789473V188.631579a107.789474 107.789474 0 0 1 107.789474-107.789474h754.526316z m0 80.842106H134.736842a26.947368 26.947368 0 0 0-26.758737 23.794526L107.789474 188.631579v485.052632a26.947368 26.947368 0 0 0 23.794526 26.758736L134.736842 700.631579h754.526316a26.947368 26.947368 0 0 0 26.758737-23.794526L916.210526 673.684211V188.631579a26.947368 26.947368 0 0 0-23.794526-26.758737L889.263158 161.684211z"
+ p-id="3517"></path>
+ <path
+ d="M673.684211 700.631579v269.473684H377.263158V700.631579h296.421053z m-80.842106 80.842105h-134.736842v107.789474h134.736842v-107.789474z"
+ p-id="3518"></path>
+</svg>
diff --git a/src/assets/icons/svg/masterDataMenu04.svg b/src/assets/icons/svg/masterDataMenu04.svg
index 7af5021..418f5ad 100644
--- a/src/assets/icons/svg/masterDataMenu04.svg
+++ b/src/assets/icons/svg/masterDataMenu04.svg
@@ -1 +1 @@
-<svg t="1698634166079" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8825" width="200" height="200"><path d="M544.033302 516.000776V96.000564c0-17.672051-14.478655-31.998984-32.150706-31.998984s-32.150706 14.326933-32.150707 31.998984v420.061624c-54.909072 14.251072-95.809105 64.333925-95.809105 123.935554 0 59.691941 40.82056 109.836206 96.090876 124.000579a32.298816 32.298816 0 0 0-0.281771 4.006195v159.99492c0 17.672051 14.478655 31.998984 32.150707 31.998984s32.150706-14.326933 32.150706-31.998984V768.004516a32.280754 32.280754 0 0 0-0.317894-3.941171c55.389526-14.088512 96.397933-64.301413 96.397932-124.058378 0.010837-59.691941-40.809723-109.832593-96.080038-124.004191z m13.221527 169.249989a64.00158 64.00158 0 1 1 18.744945-45.256635 63.578925 63.578925 0 0 1-18.744945 45.260247zM223.678606 196.003711a32.287979 32.287979 0 0 0 0.292607-4.002582V96.000564a31.970084 31.970084 0 1 0-63.940169 0V192.001129a32.371065 32.371065 0 0 0 0.180622 4.060381c-55.270316 14.160761-96.173962 64.301413-96.173961 124.000579s40.910871 109.818143 96.181186 123.996966a32.360228 32.360228 0 0 0-0.184234 3.937558V927.999436a31.970084 31.970084 0 1 0 63.940169 0V448.000226a32.287979 32.287979 0 0 0-0.278158-3.883372c55.385914-14.088512 96.350971-64.301413 96.350971-124.054765S279.071744 210.084998 223.678606 196.003711z m13.575545 169.315013A64.00158 64.00158 0 1 1 255.999097 320.062089a63.578925 63.578925 0 0 1-18.744946 45.256635zM959.99842 320.062089c0-59.775027-41.048144-109.977091-96.45212-124.058378a32.360228 32.360228 0 0 0 0.173397-4.002582V96.000564a31.970084 31.970084 0 1 0-63.940169 0V192.001129a32.291592 32.291592 0 0 0 0.299833 4.060381c-55.270316 14.160761-96.116162 64.301413-96.116163 124.000579s40.82056 109.836206 96.090876 124.000578a32.298816 32.298816 0 0 0-0.281771 3.99897V927.999436a31.970084 31.970084 0 1 0 63.940169 0V448.061637a32.381903 32.381903 0 0 0-0.166172-3.941171c55.407588-14.084899 96.452119-64.286963 96.45212-124.058377z m-82.746526 45.253022a63.997968 63.997968 0 1 1 18.748558-45.253022 63.578925 63.578925 0 0 1-18.748558 45.253022z"></path></svg>
+<svg t="1720580017201" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3672" width="200" height="200"><path d="M808.9 536.4v-347h-4c-5.5-38.2-43.4-70-110.6-92.5-62.1-20.7-144.5-32.1-232.1-32.1S292.1 76.3 230 97c-72.8 24.3-111.3 59.6-111.3 102.2v524.7c0 42.6 38.5 77.9 111.3 102.2 62.1 20.7 144.5 32.1 232.1 32.1 18.3 0 36.4-0.5 53.8-1.5l177.4 102.4 211.9-122.3V592.1l-96.3-55.7z m-261.3 94l145.8-84.1 145.7 84.1v168.2l-145.7 84.1-145.8-84.1V630.4z m188.6-346.1v89.6c-5.3 6.3-21.3 20.5-64.7 34.5-55.4 18.1-129.7 28-209.2 28-102.8 0-171-15.5-210.1-28.5-51.3-17.1-67.2-35-67.2-39.6l-0.1-85.6c29 15 67.6 27.3 112.7 36 50 9.7 106.9 14.8 164.6 14.8 111 0 211.6-18.2 274-49.2z m-0.1-90.9v11.2c-5.3 6.3-21.3 20.5-64.7 34.5-55.3 18-129.6 28-209.2 28-102.8 0-171-15.5-210.1-28.5-51-17-67-34.8-67.2-39.6 0.5-4 13.4-22.2 68.1-40 55.4-18 129.7-28 209.2-28 79.4 0 153.7 9.9 209.2 28 40.6 13.3 58.2 26.7 64.7 34.4zM184.9 647.6c29 15 67.6 27.3 112.7 36.1 50 9.7 106.9 14.8 164.6 14.8 6.3 0 12.8 0 19.3-0.1v93.5c-6.3 0.1-12.8 0.2-19.3 0.2-102.8 0-171-15.5-210.1-28.5-51.3-17.1-67.2-35-67.2-39.6v-76.4z m296.5-55.5v39.8c-7.1 0.2-13.4 0.3-19.3 0.3-102.8 0-171-15.5-210.1-28.5-51.3-17.1-67.2-35-67.2-39.6V451.6c29 15 67.6 27.3 112.7 36.1 50 9.7 106.9 14.8 164.6 14.8 86.7 0 167-11.1 227.7-30.7L481.4 592.1z m254.8-138.8v41l-41.6-24c15.2-5.2 29.2-10.9 41.6-17z" p-id="3673"></path><path d="M797.5 684.1h-129l33.9-33.9c4.4-4.4 4.4-11.6 0-16L682 613.9c-4.4-4.4-11.6-4.4-16 0L591.9 688c-12.1 12.1-12.1 31.8 0 43.8l74.1 74.1c2.2 2.2 5.1 3.3 8 3.3 2.9 0 5.8-1.1 8-3.3l20.4-20.4c2.1-2.1 3.3-5 3.3-8s-1.2-5.9-3.3-8l-33.9-33.8h129c6.2 0 11.3-5.1 11.3-11.3v-28.9c0.1-6.3-5-11.4-11.3-11.4z" p-id="3674"></path></svg>
diff --git a/src/assets/icons/svg/masterDataMenu05.svg b/src/assets/icons/svg/masterDataMenu05.svg
index d4f9ced..efb47dd 100644
--- a/src/assets/icons/svg/masterDataMenu05.svg
+++ b/src/assets/icons/svg/masterDataMenu05.svg
@@ -1 +1,9 @@
-<svg t="1698634431255" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12479" width="200" height="200"><path d="M249.381471 284.474073c-78.441032 0-142.247703-63.806671-142.247703-142.247703S170.940439-0.021333 249.381471-0.021333s142.247703 63.806671 142.247703 142.247703-63.806671 142.247703-142.247703 142.247703z m0-241.829628c-54.910856 0-99.581925 44.671069-99.581925 99.581925s44.671069 99.581925 99.581925 99.581926 99.581925-44.671069 99.581926-99.581926-44.671069-99.581925-99.581926-99.581925z" p-id="12480"></path><path d="M249.360138 496.800317H0v-21.332889c0-166.73786 130.045291-261.77588 135.591842-265.722464a21.332889 21.332889 0 1 1 24.831483 34.687277c-1.087977 0.789317-106.323118 78.270369-116.904232 209.702298h205.841045a21.332889 21.332889 0 0 1 0 42.665778z" p-id="12481"></path><path d="M498.74161 496.800317h-249.381472a21.332889 21.332889 0 0 1 0-42.665778h205.862378c-10.581113-131.453261-115.816254-208.912981-116.925564-209.723631a21.332889 21.332889 0 0 1 24.852816-34.665944c5.546551 3.967917 135.591842 98.984604 135.591842 265.722464v21.332889zM774.618529 811.631091c-78.441032 0-142.247703-63.806671-142.247703-142.22637s63.806671-142.22637 142.247703-142.226371c78.4197 0 142.205037 63.806671 142.205037 142.226371s-63.806671 142.22637-142.205037 142.22637z m0-241.786963c-54.910856 0-99.581925 44.671069-99.581926 99.560593s44.671069 99.560592 99.581926 99.560592c54.889523 0 99.53926-44.671069 99.539259-99.560592s-44.649736-99.560592-99.539259-99.560593z" p-id="12482"></path><path d="M774.618529 1023.978667H525.215725v-21.332889c0-166.780525 130.066624-261.77588 135.591842-265.722464a21.354222 21.354222 0 0 1 24.852815 34.70861c-1.087977 0.767984-106.323118 78.206371-116.904231 209.680965h205.862378a21.332889 21.332889 0 1 1 0 42.665778z" p-id="12483"></path><path d="M1023.978667 1023.978667H774.618529a21.332889 21.332889 0 1 1 0-42.665778h205.841045c-10.581113-131.474594-115.816254-208.912981-116.904231-209.702298a21.332889 21.332889 0 1 1 24.852815-34.687277C893.933376 740.869899 1023.978667 835.865253 1023.978667 1002.645778v21.332889z" p-id="12484"></path><path d="M852.248911 479.286015a21.332889 21.332889 0 0 1-21.332888-21.332889c0-175.889669-143.079686-318.990688-318.926689-318.990688a21.332889 21.332889 0 0 1 0-42.665778c199.398513 0 361.592467 162.23662 361.592466 361.656466a21.332889 21.332889 0 0 1-21.332889 21.332889z" p-id="12485"></path><path d="M855.555509 499.082936l-102.739193-78.995688a21.332889 21.332889 0 1 1 25.983459-33.833962l70.121206 53.908211 60.222745-72.723819a21.332889 21.332889 0 0 1 32.873982 27.220767l-86.462199 104.424491z" p-id="12486"></path><path d="M477.430054 948.289577c-199.398513 0-361.635133-162.215287-361.635133-361.613799a21.332889 21.332889 0 1 1 42.665778 0c0 175.868336 143.101019 318.948022 318.969355 318.948022a21.332889 21.332889 0 1 1 0 42.665777z" p-id="12487"></path><path d="M61.801379 684.295077a21.332889 21.332889 0 0 1-16.426324-34.921939l86.440866-104.445824 102.760525 78.995688a21.332889 21.332889 0 0 1-25.983458 33.833961L138.450449 603.848753l-60.201413 72.723818a21.247557 21.247557 0 0 1-16.447657 7.722506z"></path></svg>
+<svg t="1720580039910" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3828"
+ width="200" height="200">
+ <path
+ d="M498.526316 323.368421a202.105263 202.105263 0 1 1 0 404.210526 202.105263 202.105263 0 0 1 0-404.210526z m0 80.842105a121.263158 121.263158 0 1 0 0 242.526316 121.263158 121.263158 0 0 0 0-242.526316zM821.894737 80.842105a121.263158 121.263158 0 1 1 0 242.526316 121.263158 121.263158 0 0 1 0-242.526316z m0 80.842106a40.421053 40.421053 0 1 0 0 80.842105 40.421053 40.421053 0 0 0 0-80.842105zM875.789474 727.578947a121.263158 121.263158 0 1 1 0 242.526316 121.263158 121.263158 0 0 1 0-242.526316z m0 80.842106a40.421053 40.421053 0 1 0 0 80.842105 40.421053 40.421053 0 0 0 0-80.842105zM202.105263 700.631579a121.263158 121.263158 0 1 1 0 242.526316 121.263158 121.263158 0 0 1 0-242.526316z m0 80.842105a40.421053 40.421053 0 1 0 0 80.842105 40.421053 40.421053 0 0 0 0-80.842105zM175.157895 80.842105a121.263158 121.263158 0 1 1 0 242.526316 121.263158 121.263158 0 0 1 0-242.526316z m0 80.842106a40.421053 40.421053 0 1 0 0 80.842105 40.421053 40.421053 0 0 0 0-80.842105z"
+ p-id="3829"></path>
+ <path
+ d="M242.202947 220.052211l190.544842 190.544842-57.155368 57.182315-190.544842-190.571789zM779.776 220.052211l-190.544842 190.544842 57.155368 57.182315 190.544842-190.571789zM375.565474 597.315368L223.124211 749.756632l57.182315 57.155368 152.414316-152.441263zM646.413474 597.315368l190.544842 190.544843-57.155369 57.182315-190.544842-190.571789z"
+ p-id="3830"></path>
+</svg>
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 5bc6eb8..5891f5e 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -78,6 +78,7 @@ export default {
border-radius: 4px;
top: 80px;
padding: 0 10px;
+ margin-left: 10px;
}
.h-10{
height: calc(100vh - 10px);
diff --git a/src/layout/index.vue b/src/layout/index.vue
index c18a533..ab841f6 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -110,6 +110,7 @@ export default {
.newMenuAppMain {
width: calc(100% - 114px);
overflow: hidden;
+ background-color: #f5f5f5;
}
.drawer-bg {
background: #000;
diff --git a/src/views/integrationOption/compoments/baseDialog.vue b/src/views/integrationOption/compoments/baseDialog.vue
index 885b0aa..4447f5b 100644
--- a/src/views/integrationOption/compoments/baseDialog.vue
+++ b/src/views/integrationOption/compoments/baseDialog.vue
@@ -71,6 +71,9 @@ export default {
},
methods: {
closeHandle() {
+ this.dialogVisible = false;
+ this.$emit("close");
+ return
this.$confirm("是否关闭表单?", "提示", {
confirmButtonText: "关闭",
cancelButtonText: "取消",
diff --git a/src/views/integrationOption/index.vue b/src/views/integrationOption/index.vue
index ff477e7..74fa348 100644
--- a/src/views/integrationOption/index.vue
+++ b/src/views/integrationOption/index.vue
@@ -1070,6 +1070,8 @@ export default {
if (this.lookFlag) {
this.dialogSwitch = false;
} else {
+ this.dialogVisible = false;
+ return
this.$confirm("是否关闭表单?", "提示", {
confirmButtonText: "关闭",
cancelButtonText: "取消",
@@ -1399,4 +1401,4 @@ export default {
}
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/integrationOptionV2/compoments/baseDialog.vue b/src/views/integrationOptionV2/compoments/baseDialog.vue
index 0e1129b..88d4436 100644
--- a/src/views/integrationOptionV2/compoments/baseDialog.vue
+++ b/src/views/integrationOptionV2/compoments/baseDialog.vue
@@ -71,6 +71,9 @@ export default {
},
methods: {
closeHandle() {
+ this.dialogVisible = false;
+ this.$emit("close");
+ return
this.$confirm("是否关闭表单?", "提示", {
confirmButtonText: "关闭",
cancelButtonText: "取消",
diff --git a/src/views/integrationOptionV2/index.vue b/src/views/integrationOptionV2/index.vue
index a4e3906..e3945cf 100644
--- a/src/views/integrationOptionV2/index.vue
+++ b/src/views/integrationOptionV2/index.vue
@@ -394,7 +394,10 @@ export default {
})
this.mainTabLoading = false
this.pageModel.total = res.attribute.total
- this.tableData = res.attribute.list
+ this.tableData = []
+ this.$nextTick(()=>{
+ this.tableData = res.attribute.list
+ })
},
// 列表处理（算row）
baseFormRowDispose(arr, resultArr) {
diff --git a/src/views/intergrationOptionScene/compoments/baseDialog.vue b/src/views/intergrationOptionScene/compoments/baseDialog.vue
index b2a610c..e050a1d 100644
--- a/src/views/intergrationOptionScene/compoments/baseDialog.vue
+++ b/src/views/intergrationOptionScene/compoments/baseDialog.vue
@@ -66,6 +66,8 @@ export default {
},
methods: {
closeHandle() {
+ this.dialogVisible = false;
+ return
this.$confirm("是否关闭表单?", "提示", {
confirmButtonText: "关闭",
cancelButtonText: "取消",
diff --git a/src/views/intergrationTask/compoments/baseDialog.vue b/src/views/intergrationTask/compoments/baseDialog.vue
index 3d931de..b491bc9 100644
--- a/src/views/intergrationTask/compoments/baseDialog.vue
+++ b/src/views/intergrationTask/compoments/baseDialog.vue
@@ -70,6 +70,8 @@ export default {
},
methods: {
closeHandle() {
+ this.dialogVisible = false;
+ return
this.$confirm("是否关闭表单?", "提示", {
confirmButtonText: "关闭",
cancelButtonText: "取消",
diff --git a/src/views/intergrationTask/index.vue b/src/views/intergrationTask/index.vue
index 07ec24b..47dadac 100644
--- a/src/views/intergrationTask/index.vue
+++ b/src/views/intergrationTask/index.vue
@@ -2,55 +2,53 @@
<div class="wraaap">
<div class="left">
<BaseMenuTree
- :menuData="treeData"
- :filterShow="true"
- :Allshow="false"
- :treeButton="false"
- :filterButtonShow="false"
- style="height: 100%"
- :treeProps="treeProps"
- @handleNodeClick="homeHandleNodeClick"
- ref="menuTree"
- @add="treeAddHandle"
- @append="treeAppendHandle"
- @revise="treeReviseHandle"
- @remove="treeRemoveHandle"
+ :menuData="treeData"
+ :filterShow="true"
+ :Allshow="false"
+ :treeButton="false"
+ :filterButtonShow="false"
+ style="height: 100%"
+ :treeProps="treeProps"
+ @handleNodeClick="homeHandleNodeClick"
+ ref="menuTree"
+ @add="treeAddHandle"
+ @append="treeAppendHandle"
+ @revise="treeReviseHandle"
+ @remove="treeRemoveHandle"
></BaseMenuTree>
</div>
<div class="right">
<header style="background: #fff; padding: 20px">
<div class="search">
<BaseNewForm
- :spanNumber="8"
- refName="searchForm"
- :formRow="SearchformRow"
- :formRule="false"
- :ruleForm="searchForm"
- :newFlag="true"
- :isFunBtn="false"
+ :spanNumber="8"
+ refName="searchForm"
+ :formRow="SearchformRow"
+ :formRule="false"
+ :ruleForm="searchForm"
+ :newFlag="true"
+ :isFunBtn="false"
></BaseNewForm>
</div>
<div class="btn">
+ <el-button type="primary" @click="newPage">新增</el-button>
<el-button type="primary" @click="searchHandle">搜索</el-button>
<el-button @click="resizeSearchHandle">重置</el-button>
</div>
</header>
- <main style="background: #fff; padding: 20px 20px 0">
- <div style="margin: 0 0 30px 0">
- <el-button type="primary" @click="newPage">新增</el-button>
- </div>
+ <main style="background: #fff; padding: 0px 0px 0">
<div>
<BaseTable
- ref="mainTable"
- :tableData="tableData"
- :tableColumn="tableColumn"
- :funData="funData"
- :funWidth="funWidth"
- :showIndex="true"
- :tabLoading="mainTabLoading"
- @onFunc="tableButtonHandle"
- :tableHeight="'53vh'"
- :border="false"
+ ref="mainTable"
+ :tableData="tableData"
+ :tableColumn="tableColumn"
+ :funData="funData"
+ :funWidth="funWidth"
+ :showIndex="true"
+ :tabLoading="mainTabLoading"
+ @onFunc="tableButtonHandle"
+ :tableHeight="'53vh'"
+ :border="false"
>
<template #taskStatus="{row}">
{{ row.taskStatus == 1 ? '启用' : '停用' }}
@@ -63,24 +61,24 @@
</main>
<footer>
<basePage
- :pageModel="pageModel"
- @update:pageModel="currentChangeHandle"
+ :pageModel="pageModel"
+ @update:pageModel="currentChangeHandle"
></basePage>
</footer>
</div>
<baseRightDialog
- @handleConfirmClick="handleConfirmClick"
- :dialogVisible="rightDialogSwitch"
- :title="treeTitle"
- @handleClose="rightDialogSwitch = false"
+ @handleConfirmClick="handleConfirmClick"
+ :dialogVisible="rightDialogSwitch"
+ :title="treeTitle"
+ @handleClose="rightDialogSwitch = false"
>
<div class="treeChunk" v-if="treeRuleForm.class_superiors_name">
<div class="text">上级节点：</div>
<div class="input">
<el-input
- :disabled="true"
- v-model="treeRuleForm.class_superiors_name"
- placeholder=""
+ :disabled="true"
+ v-model="treeRuleForm.class_superiors_name"
+ placeholder=""
></el-input>
</div>
</div>
@@ -88,8 +86,8 @@
<div class="text">节点名：</div>
<div class="input">
<el-input
- v-model="treeRuleForm.class_name"
- placeholder="请输入节点名"
+ v-model="treeRuleForm.class_name"
+ placeholder="请输入节点名"
></el-input>
</div>
</div>
@@ -256,12 +254,12 @@ export default {
}
if (this.treeAddFlag) {
const res = await getUserModuleApi(
- {
- tl: 'integrationTaskClassificationService',
- as: 'integrationTaskClassification',
- dj: 'saveTaskClassification'
- },
- this.treeRuleForm
+ {
+ tl: 'integrationTaskClassificationService',
+ as: 'integrationTaskClassification',
+ dj: 'saveTaskClassification'
+ },
+ this.treeRuleForm
)
if (res.status == 200) {
this.$message({
@@ -273,12 +271,12 @@ export default {
}
} else {
const res = await getUserModuleApi(
- {
- tl: 'integrationTaskClassificationService',
- as: 'integrationTaskClassification',
- dj: 'updateTaskClassification'
- },
- this.treeRuleForm
+ {
+ tl: 'integrationTaskClassificationService',
+ as: 'integrationTaskClassification',
+ dj: 'updateTaskClassification'
+ },
+ this.treeRuleForm
)
if (res.status == 200) {
this.$message({
@@ -293,12 +291,12 @@ export default {
// 树初始化
async initTreeData() {
const res = await getUserModuleApi(
- {
- tl: 'sysApplicationService',
- as: '',
- dj: 'queryEntity'
- },
- {}
+ {
+ tl: 'sysApplicationService',
+ as: '',
+ dj: 'queryEntity'
+ },
+ {}
)
if (res.status == 200) {
this.treeData = res.attribute
@@ -330,25 +328,25 @@ export default {
},
treeRemoveHandle(data) {
this.$confirm('确认删除？')
- .then(async() => {
- const res = await getUserModuleApi(
- {
- tl: 'integrationTaskClassificationService',
- as: 'integrationTaskClassification',
- dj: 'updateTaskClassificationSts'
- },
- {
- id: data.id //任务id
- }
- )
- if (res.status == 200) {
- this.$nextTick(() => {
- this.initTreeData()
- })
+ .then(async() => {
+ const res = await getUserModuleApi(
+ {
+ tl: 'integrationTaskClassificationService',
+ as: 'integrationTaskClassification',
+ dj: 'updateTaskClassificationSts'
+ },
+ {
+ id: data.id //任务id
}
- })
- .catch(() => {
- })
+ )
+ if (res.status == 200) {
+ this.$nextTick(() => {
+ this.initTreeData()
+ })
+ }
+ })
+ .catch(() => {
+ })
},
// 左侧树加号点击事件
treeAddHandle() {
@@ -362,17 +360,17 @@ export default {
// 初始化表单
async initTableData(obj = {}) {
const res = await getUserModuleApi(
- {
- tl: 'integrationTaskService',
- as: '',
- dj: 'queryEntityPage'
- },
- {
- pageNum: this.pageModel.pageIndex,
- pageSize: this.pageModel.limit,
- task_app: this.appId,
- ...obj
- }
+ {
+ tl: 'integrationTaskService',
+ as: '',
+ dj: 'queryEntityPage'
+ },
+ {
+ pageNum: this.pageModel.pageIndex,
+ pageSize: this.pageModel.limit,
+ task_app: this.appId,
+ ...obj
+ }
)
if (res.status == 200) {
this.tableData = res.attribute.list
@@ -436,32 +434,32 @@ export default {
})
} else if (item.type === 'dele') {
this.$confirm('确认删除？')
- .then(async() => {
- const res = await getUserModuleApi(
- {
- tl: 'integrationTaskService',
- as: '',
- dj: 'deleteEntity'
- },
- {
- id: val.id //任务id
- }
- )
- if (res.status == 200) {
- if (
- this.pageModel.total - 1 + this.pageModel.limit <=
- this.pageModel.pageIndex * this.pageModel.limit
- ) {
- this.pageModel.pageIndex--
- }
- this.$nextTick(() => {
- this.$vmNews('删除成功', 'success')
- this.initTableData({ ...this.searchForm })
- })
+ .then(async() => {
+ const res = await getUserModuleApi(
+ {
+ tl: 'integrationTaskService',
+ as: '',
+ dj: 'deleteEntity'
+ },
+ {
+ id: val.id //任务id
}
- })
- .catch((err) => {
- })
+ )
+ if (res.status == 200) {
+ if (
+ this.pageModel.total - 1 + this.pageModel.limit <=
+ this.pageModel.pageIndex * this.pageModel.limit
+ ) {
+ this.pageModel.pageIndex--
+ }
+ this.$nextTick(() => {
+ this.$vmNews('删除成功', 'success')
+ this.initTableData({ ...this.searchForm })
+ })
+ }
+ })
+ .catch((err) => {
+ })
} else if (item.type === 'edit') {
this.$router.push({ name: 'taskAdd', query: { id: val.id } })
} else if (item.type === 'start') {
diff --git a/src/views/masterDataOptions/authority/images/删除.png b/src/views/masterDataOptions/authority/images/删除.png
index 7370c1d..c74a004 100644
Binary files a/src/views/masterDataOptions/authority/images/删除.png and b/src/views/masterDataOptions/authority/images/删除.png differ
diff --git a/src/views/masterDataOptions/authority/images/设置.png b/src/views/masterDataOptions/authority/images/设置.png
index eeae824..fa32cf3 100644
Binary files a/src/views/masterDataOptions/authority/images/设置.png and b/src/views/masterDataOptions/authority/images/设置.png differ
diff --git a/src/views/masterDataOptions/authority/index.vue b/src/views/masterDataOptions/authority/index.vue
index b96545f..5033ece 100644
--- a/src/views/masterDataOptions/authority/index.vue
+++ b/src/views/masterDataOptions/authority/index.vue
@@ -98,7 +98,8 @@ export default {
},
{
title: '来源编码',
- id: 'sourceCodeName'
+ id: 'sourceCodeName',
+ tooltip: true
},
{
title: '新增接口',
diff --git a/src/views/masterDataOptions/compoments/baseDialog.vue b/src/views/masterDataOptions/compoments/baseDialog.vue
index 3d931de..b491bc9 100644
--- a/src/views/masterDataOptions/compoments/baseDialog.vue
+++ b/src/views/masterDataOptions/compoments/baseDialog.vue
@@ -70,6 +70,8 @@ export default {
},
methods: {
closeHandle() {
+ this.dialogVisible = false;
+ return
this.$confirm("是否关闭表单?", "提示", {
confirmButtonText: "关闭",
cancelButtonText: "取消",
diff --git a/src/views/masterDataOptions/dataOrigin/images/删除.png b/src/views/masterDataOptions/dataOrigin/images/删除.png
index 7370c1d..c74a004 100644
Binary files a/src/views/masterDataOptions/dataOrigin/images/删除.png and b/src/views/masterDataOptions/dataOrigin/images/删除.png differ
diff --git a/src/views/masterDataOptions/dataOrigin/images/设置.png b/src/views/masterDataOptions/dataOrigin/images/设置.png
index eeae824..fa32cf3 100644
Binary files a/src/views/masterDataOptions/dataOrigin/images/设置.png and b/src/views/masterDataOptions/dataOrigin/images/设置.png differ
diff --git a/src/views/masterDataOptions/dataOrigin/index.vue b/src/views/masterDataOptions/dataOrigin/index.vue
index b42de37..32ccb45 100644
--- a/src/views/masterDataOptions/dataOrigin/index.vue
+++ b/src/views/masterDataOptions/dataOrigin/index.vue
@@ -537,7 +537,7 @@ export default {
height: calc(100%);
.mainAddRow {
- margin-top: 30px;
+ margin-top: 10px;
border: 1px dotted #ccc;
text-align: center;
height: 50px;
@@ -596,8 +596,8 @@ export default {
align-items: center;
> img {
- width: 15px;
- height: 15px;
+ width: 14px;
+ height: 14px;
}
}
}
@@ -635,8 +635,8 @@ export default {
align-items: center;
> img {
- width: 10px;
- height: 10px;
+ width: 14px;
+ height: 14px;
}
}
@@ -652,8 +652,8 @@ export default {
align-items: center;
> img {
- width: 10px;
- height: 10px;
+ width: 14px;
+ height: 14px;
}
}
}
diff --git a/src/views/masterDataOptions/displayInfo/images/删除.png b/src/views/masterDataOptions/displayInfo/images/删除.png
index 7370c1d..c74a004 100644
Binary files a/src/views/masterDataOptions/displayInfo/images/删除.png and b/src/views/masterDataOptions/displayInfo/images/删除.png differ
diff --git a/src/views/masterDataOptions/displayInfo/images/设置.png b/src/views/masterDataOptions/displayInfo/images/设置.png
index 9d7049e..b6fd71a 100644
Binary files a/src/views/masterDataOptions/displayInfo/images/设置.png and b/src/views/masterDataOptions/displayInfo/images/设置.png differ
diff --git a/src/views/masterDataOptions/displayInfo/index.vue b/src/views/masterDataOptions/displayInfo/index.vue
index 082eb94..185d09b 100644
--- a/src/views/masterDataOptions/displayInfo/index.vue
+++ b/src/views/masterDataOptions/displayInfo/index.vue
@@ -2,6 +2,7 @@
<div class="displayInfo" v-loading="mainLoading">
<div class="typeSetting">
<div class="btn">
+ <div class="title">显示类型</div>
<div class="chunk">
<el-button
v-if="!editFlag"
@@ -28,8 +29,7 @@
</div>
</div>
<template v-if="!editFlag">
- <div class="title">显示类型</div>
- <div class="radio">
+ <div class="radio" style="margin-bottom: 20px">
<el-radio-group v-model="displayType" :disabled="true">
<el-radio label="1">树形</el-radio>
<el-radio label="2">列表</el-radio>
@@ -51,8 +51,7 @@
</div>
</template>
<template v-else>
- <div class="title">显示类型</div>
- <div class="radio">
+ <div class="radio" style="margin-bottom: 20px">
<el-radio-group v-model="displayType">
<el-radio label="1">树形</el-radio>
<el-radio label="2">列表</el-radio>
@@ -457,14 +456,28 @@ export default {
.typeSetting {
background-color: #fff;
- padding: 15px 10px;
+ padding: 20px 10px 0px;
+ padding-bottom: 20px;
margin-bottom: 10px;
border-radius: 16px;
width: 100%;
> .btn {
display: flex;
- justify-content: flex-end;
+ justify-content: space-between;
+ align-items: center;
+ .title {
+ font-weight: 600;
+ margin-left: 20px;
+ margin-bottom: 20px;
+ font-family: PingFangSC, PingFang SC;
+ font-weight: 600;
+ font-size: 18px;
+ color: #333333;
+ line-height: 25px;
+ text-align: left;
+ font-style: normal;
+ }
}
> .title {
@@ -569,7 +582,7 @@ export default {
}
.showCheckBoxList {
- height: 40vh;
+ height: 90%;
overflow: auto;
}
diff --git a/src/views/masterDataOptions/distribute/images/删除.png b/src/views/masterDataOptions/distribute/images/删除.png
index 7370c1d..c74a004 100644
Binary files a/src/views/masterDataOptions/distribute/images/删除.png and b/src/views/masterDataOptions/distribute/images/删除.png differ
diff --git a/src/views/masterDataOptions/distribute/images/设置.png b/src/views/masterDataOptions/distribute/images/设置.png
index eeae824..fa32cf3 100644
Binary files a/src/views/masterDataOptions/distribute/images/设置.png and b/src/views/masterDataOptions/distribute/images/设置.png differ
diff --git a/src/views/masterDataOptions/images/删除.png b/src/views/masterDataOptions/images/删除.png
index a867012..c74a004 100644
Binary files a/src/views/masterDataOptions/images/删除.png and b/src/views/masterDataOptions/images/删除.png differ
diff --git a/src/views/masterDataOptions/images/设置.png b/src/views/masterDataOptions/images/设置.png
index fd68bbc..b6fd71a 100644
Binary files a/src/views/masterDataOptions/images/设置.png and b/src/views/masterDataOptions/images/设置.png differ
diff --git a/src/views/masterDataOptions/index.vue b/src/views/masterDataOptions/index.vue
index f229bf2..86ac6e9 100644
--- a/src/views/masterDataOptions/index.vue
+++ b/src/views/masterDataOptions/index.vue
@@ -19,7 +19,7 @@
</div>
</div>
<div class="right" style="display: flex;align-items: center">
- <div style="margin-right: 5px;color: #333;font-size: 12px">共 <span>{{tableData.length}}个主数据</span></div>
+ <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="tableButtonHandle({},{type:'new'})">新增</el-button>
</div>
@@ -132,7 +132,7 @@ export default {
methods: {
//删除
deleteHandle(row) {
- this.$confirm('该操作将删除所有数据。确定删除吗？。', '警告', {
+ this.$confirm('该操作将删除所有数据。确定删除吗？', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'error'
@@ -327,7 +327,7 @@ export default {
main {
margin-top: 5px;
padding: 5px 20px 5px;
- height: 80vh;
+ height: calc(100% - 140px);
border-radius: 20px;
background-color: #fff;
overflow: auto;
@@ -362,6 +362,7 @@ export default {
display: flex;
justify-content: center;
align-items: center;
+
> img {
width: 50px;
height: 50px;
@@ -486,7 +487,7 @@ export default {
.name {
margin-top: 10px;
- color: red;
+ color: #FF3B30;
font-weight: 700;
}
}
diff --git a/src/views/masterDataOptions/masterDataAdd.vue b/src/views/masterDataOptions/masterDataAdd.vue
index 81effc6..ac80a2a 100644
--- a/src/views/masterDataOptions/masterDataAdd.vue
+++ b/src/views/masterDataOptions/masterDataAdd.vue
@@ -4,6 +4,7 @@
<div class="main">
<div class="btn">
+ <div class="title" style="margin-top: 0">主数据信息</div>
<div class="chunkList">
<div class="chunk">
</div>
@@ -23,7 +24,6 @@
</div>
</div>
</div>
- <div class="title">主数据信息</div>
<!-- 展示页-->
<template v-if="!showForm">
<div class="planInfo">
@@ -323,10 +323,11 @@ export default {
border-radius: 16px;
> .btn {
+ padding-top: 20px;
+ padding-right: 10px;
display: flex;
- justify-content: flex-end;
+ justify-content: space-between;
align-items: center;
- padding: 15px 10px 3px;
.chunkList {
display: flex;
diff --git a/src/views/masterDataOptions/settingMenu.vue b/src/views/masterDataOptions/settingMenu.vue
index e8011b1..40b306a 100644
--- a/src/views/masterDataOptions/settingMenu.vue
+++ b/src/views/masterDataOptions/settingMenu.vue
@@ -1,6 +1,6 @@
<template>
<div class="settingMenu">
- <div class="menu">
+ <div class="menu scrollable-box">
<div class="appInfo">
<div class="img" v-loading="imgLoading">
<template v-if="imgUrl">
@@ -87,7 +87,7 @@ export default {
return
}
this.imgUrl =
- 'data:image/png/jpg;base64,' + btoa(new Uint8Array(res).reduce((data, byte) => data + String.fromCharCode(byte), ''))
+ 'data:image/png/jpg;base64,' + btoa(new Uint8Array(res).reduce((data, byte) => data + String.fromCharCode(byte), ''))
})
}
},
@@ -136,12 +136,12 @@ export default {
.menu {
position: fixed;
width: 180px;
- height: 90vh;
+ height: calc(100% - 75px);
//margin-right: 1%;
background-color: #fff;
- border-radius: 16px;
+ border-radius: 8px;
margin-top: 10px;
- overflow: auto;
+
.appInfo {
padding: 10px 0;
@@ -236,10 +236,11 @@ export default {
}
.content {
+ margin-top: 10px;
margin-left: 185px;
flex: 1;
width: calc(100% - 195px);
- border-radius: 16px;
+ border-radius: 8px;
}
}
</style>
diff --git a/src/views/receiptsPage/compoments/baseDialog.vue b/src/views/receiptsPage/compoments/baseDialog.vue
index 9f12822..51fda9f 100644
--- a/src/views/receiptsPage/compoments/baseDialog.vue
+++ b/src/views/receiptsPage/compoments/baseDialog.vue
@@ -75,6 +75,8 @@ export default {
},
methods: {
closeHandle() {
+ this.dialogVisible = false;
+ return
this.$confirm("是否关闭表单?", "提示", {
confirmButtonText: "关闭",
cancelButtonText: "取消",
diff --git a/vue.config.js b/vue.config.js
index 793933f..8a53dc3 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -39,9 +39,9 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[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://192.168.2.78:9999`,
+ // target: `http://192.168.2.78:9999`,
// target: `http://192.168.2.83:9999`,
changeOrigin: true,
pathRewrite: {