Skip to content

M
mes-ui
Commit b84f24e4 authored by renjintao's avatar renjintao
Browse files
Options

bug

parent 2eed7992
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 29 deletions
assets/css/base.less
View file @ b84f24e4
...@@ -868,6 +868,7 @@ textarea::-webkit-input-placeholder { ...@@ -868,6 +868,7 @@ textarea::-webkit-input-placeholder {
background: #F6F8FB; background: #F6F8FB;
} }
} }
.tableCommon tr td { .tableCommon tr td {
line-height: 25px; line-height: 25px;
font-size: 14px; font-size: 14px;
...@@ -1345,4 +1346,8 @@ html [type=button] { ...@@ -1345,4 +1346,8 @@ html [type=button] {
.ivu-input-number{ .ivu-input-number{
width: 100%; width: 100%;
} }
} }
\ No newline at end of file //显示富文本框时的图片
.tohtml img{
max-width: 95%;
}
\ No newline at end of file
pages/processDesign/Process/processview.vue
View file @ b84f24e4
...@@ -299,7 +299,7 @@ ...@@ -299,7 +299,7 @@
<td class="tl">{{item5.taskseq}}</td> <td class="tl">{{item5.taskseq}}</td>
<td class="tl">{{item5.name}}</td> <td class="tl">{{item5.name}}</td>
<td class="tl"> <td class="tl">
<div v-html="item5.task_content" ></div> <div v-html="item5.task_content" class="tohtml"></div>
</td> </td>
<td class="tl">{{item5.operator}}</td> <td class="tl">{{item5.operator}}</td>
<td class="tl">{{item5.proofreader}}</td> <td class="tl">{{item5.proofreader}}</td>
...@@ -308,7 +308,7 @@ ...@@ -308,7 +308,7 @@
<td class="tl">{{item6.taskseq}}</td> <td class="tl">{{item6.taskseq}}</td>
<td class="tl">{{item6.name}}</td> <td class="tl">{{item6.name}}</td>
<td class="tl"> <td class="tl">
<div v-html="item6.task_content" ></div> <div v-html="item6.task_content" class="tohtml"></div>
</td> </td>
<td class="tl">{{item6.operator}}</td> <td class="tl">{{item6.operator}}</td>
<td class="tl">{{item6.proofreader}}</td> <td class="tl">{{item6.proofreader}}</td>
......
pages/processManage/Process/processview.vue
View file @ b84f24e4
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
<td class="tl">{{item5.taskseq}}</td> <td class="tl">{{item5.taskseq}}</td>
<td class="tl">{{item5.name}}</td> <td class="tl">{{item5.name}}</td>
<td class="tl"> <td class="tl">
<div v-html="item5.task_content" ></div> <div v-html="item5.task_content" class="tohtml"></div>
</td> </td>
<td class="tl">{{item5.operator}}</td> <td class="tl">{{item5.operator}}</td>
<td class="tl">{{item5.proofreader}}</td> <td class="tl">{{item5.proofreader}}</td>
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
<td class="tl">{{item6.taskseq}}</td> <td class="tl">{{item6.taskseq}}</td>
<td class="tl">{{item6.name}}</td> <td class="tl">{{item6.name}}</td>
<td class="tl"> <td class="tl">
<div v-html="item6.task_content" ></div> <div v-html="item6.task_content" class="tohtml"></div>
</td> </td>
<td class="tl">{{item6.operator}}</td> <td class="tl">{{item6.operator}}</td>
<td class="tl">{{item6.proofreader}}</td> <td class="tl">{{item6.proofreader}}</td>
......
pages/technology/details/detail.vue
View file @ b84f24e4
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<Filed :span="12" :name="l('efficiencyValue')">{{entity.efficiencyValue}}</Filed> <Filed :span="12" :name="l('efficiencyValue')">{{entity.efficiencyValue}}</Filed>
<Filed :span="12" :name="l('singleOut')">{{entity.singleOut}}</Filed> <Filed :span="12" :name="l('singleOut')">{{entity.singleOut}}</Filed>
<Filed :span="24" :name="l('taskContent')" > <Filed :span="24" :name="l('taskContent')" >
<div v-html="entity.taskContent" class="html"></div> <div v-html="entity.taskContent" class="tohtml"></div>
</Filed> </Filed>
</Row> </Row>
</div> </div>
......
pages/technology/details/routingStep/detail.vue
View file @ b84f24e4
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<Row> <Row>
<Filed :span="12" :name="l('stepSeq')">{{entity.stepSeq}}</Filed> <Filed :span="12" :name="l('stepSeq')">{{entity.stepSeq}}</Filed>
<Filed :span="12" :name="l('name')">{{entity.name}}</Filed> <Filed :span="12" :name="l('name')">{{entity.name}}</Filed>
<Filed :span="24" :name="l('stepContent')"><div v-html="entity.stepContent" class="html"></div></Filed> <Filed :span="24" :name="l('stepContent')"><div v-html="entity.stepContent" class="tohtml"></div></Filed>
<Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed> <Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="12" :name="l('creatorUserId')"><User :value="entity.creatorUserId"></User></Filed> <Filed :span="12" :name="l('creatorUserId')"><User :value="entity.creatorUserId"></User></Filed>
</Row> </Row>
......
pages/technology/details/routinghcorder/detail.vue
View file @ b84f24e4
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
<!-- <Filed :span="12" :name="l('handlingOpinionsId')">{{entity.handlingOpinionsId}}</Filed> --> <!-- <Filed :span="12" :name="l('handlingOpinionsId')">{{entity.handlingOpinionsId}}</Filed> -->
<Filed :span="12" :name="l('handlingOpinions')">{{entity.handlingOpinions}}</Filed> <Filed :span="12" :name="l('handlingOpinions')">{{entity.handlingOpinions}}</Filed>
<Filed :span="24" :name="l('beforeChangeContent')"> <Filed :span="24" :name="l('beforeChangeContent')">
<div v-html="entity.beforeChangeContent"></div> <div v-html="entity.beforeChangeContent" class="tohtml"></div>
</Filed> </Filed>
<Filed :span="24" :name="l('afterChangeContent')"> <Filed :span="24" :name="l('afterChangeContent')">
<div v-html="entity.afterChangeContent"></div> <div v-html="entity.afterChangeContent" class="tohtml"></div>
</Filed> </Filed>
<Filed :span="12" :name="l('changeorderCode')">{{entity.changeorderCode}}</Filed> <Filed :span="12" :name="l('changeorderCode')">{{entity.changeorderCode}}</Filed>
<Filed :span="24" :name="l('changeReason')">{{entity.changeReason}}</Filed> <Filed :span="24" :name="l('changeReason')">{{entity.changeReason}}</Filed>
......
pages/technology/processview.vue
View file @ b84f24e4
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
<td class="tl">{{item5.taskseq}}</td> <td class="tl">{{item5.taskseq}}</td>
<td class="tl">{{item5.name}}</td> <td class="tl">{{item5.name}}</td>
<td class="tl"> <td class="tl">
<div v-html="item5.task_content" class="html"></div> <div v-html="item5.task_content" class="tohtml"></div>
</td> </td>
<td class="tl">{{item5.operator}}</td> <td class="tl">{{item5.operator}}</td>
<td class="tl">{{item5.proofreader}}</td> <td class="tl">{{item5.proofreader}}</td>
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
<td class="tl">{{item6.taskseq}}</td> <td class="tl">{{item6.taskseq}}</td>
<td class="tl">{{item6.name}}</td> <td class="tl">{{item6.name}}</td>
<td class="tl"> <td class="tl">
<div v-html="item6.task_content" class="html"></div> <div v-html="item6.task_content" class="tohtml"></div>
</td> </td>
<td class="tl">{{item6.operator}}</td> <td class="tl">{{item6.operator}}</td>
<td class="tl">{{item6.proofreader}}</td> <td class="tl">{{item6.proofreader}}</td>
...@@ -347,5 +347,6 @@ export default { ...@@ -347,5 +347,6 @@ export default {
position: relative; position: relative;
border: 0px solid #eee; border: 0px solid #eee;
} }
</style> </style>
src/assets/css/base.css
View file @ b84f24e4
...@@ -8,6 +8,29 @@ html body { ...@@ -8,6 +8,29 @@ html body {
#__layout { #__layout {
height: 100%; height: 100%;
} }
ul,
li {
list-style: none;
}
div::-webkit-scrollbar {
width: 10px;
height: 10px;
/**/
}
div::-webkit-scrollbar-track {
background: #efefef;
border-radius: 2px;
}
div::-webkit-scrollbar-thumb {
background: rgba(38, 128, 235, 0.5);
border-radius: 10px;
}
div::-webkit-scrollbar-thumb:hover {
background: rgba(38, 128, 235, 0.8);
}
div::-webkit-scrollbar-corner {
background: #2680eb;
}
/*flex*/ /*flex*/
.flex { .flex {
display: flex; display: flex;
...@@ -15,6 +38,9 @@ html body { ...@@ -15,6 +38,9 @@ html body {
.fc-m { .fc-m {
justify-content: center; justify-content: center;
} }
.fa-m {
align-items: center;
}
.fc-e { .fc-e {
justify-content: flex-end; justify-content: flex-end;
} }
...@@ -30,6 +56,9 @@ html body { ...@@ -30,6 +56,9 @@ html body {
.fg { .fg {
flex-grow: 1; flex-grow: 1;
} }
.fs {
flex-shrink: 0;
}
.fg2 { .fg2 {
flex-grow: 2; flex-grow: 2;
} }
...@@ -615,13 +644,15 @@ textarea::-webkit-input-placeholder { ...@@ -615,13 +644,15 @@ textarea::-webkit-input-placeholder {
background: #f5f6fa; background: #f5f6fa;
} }
.tableCommon .tableCommon tr th { .tableCommon .tableCommon tr th {
line-height: 30px; line-height: 24px;
font-size: 14px; font-size: 14px;
background: #EEEDF0; background: #EEEDF0;
} }
.tableCommon .tableCommon tr td { .tableCommon .tableCommon tr td {
border: none;
border-bottom: 1px solid #E4E6ED;
padding: 0 2px; padding: 0 2px;
background: #D5E6FB; background: #F6F8FB;
} }
.tableCommon tr td { .tableCommon tr td {
line-height: 25px; line-height: 25px;
...@@ -707,8 +738,20 @@ html [type=button] { ...@@ -707,8 +738,20 @@ html [type=button] {
font-weight: bold; font-weight: bold;
} }
.action a { .action a {
margin: 0 5px;
color: #1890FF; color: #1890FF;
background: transparent;
}
.action a span {
padding: 4px;
}
.action a i {
font-size: 16px;
padding: 4px;
border-radius: 3px;
}
.action a i:hover {
background: #1890FF;
color: #fff;
} }
.action a.detail { .action a.detail {
color: #1890FF; color: #1890FF;
...@@ -716,19 +759,18 @@ html [type=button] { ...@@ -716,19 +759,18 @@ html [type=button] {
.action a.add { .action a.add {
color: #249E91; color: #249E91;
} }
.action a.add:hover {
color: #27AB9D;
}
.action a.edit { .action a.edit {
color: #0693d4; color: #0693d4;
} }
.action a.edit:hover {
color: #35BD90;
}
.action a.remove, .action a.remove,
.action a.delete { .action a.delete {
color: #FF7A8B; color: #FF7A8B;
} }
.action a.remove i:hover,
.action a.delete i:hover {
background: #FF7A8B;
color: #fff;
}
.action a.delete { .action a.delete {
color: #FF7A8B; color: #FF7A8B;
} }
...@@ -752,14 +794,6 @@ html [type=button] { ...@@ -752,14 +794,6 @@ html [type=button] {
font-weight: bold; font-weight: bold;
font-size: 18px; font-size: 18px;
} }
.action a.icon:hover {
background: #27AB9D;
color: #fff;
}
.action a.icon:active {
background: #229185;
color: #fff;
}
.icon_box a.icon { .icon_box a.icon {
display: inline-grid; display: inline-grid;
width: 28px; width: 28px;
...@@ -977,3 +1011,53 @@ html [type=button] { ...@@ -977,3 +1011,53 @@ html [type=button] {
.detail .ivu-row .filed-col p .html p { .detail .ivu-row .filed-col p .html p {
margin: 0 10px 0 0; margin: 0 10px 0 0;
} }
.con_bord {
margin: 10px 20px;
}
.lay100 {
height: calc(100vh - 105px);
background-color: #f5f6fa;
background: #f5f6fa;
}
.lay100 .con {
padding: 5px 5px 0px 10px;
}
.lay100 .con_bord {
margin: 10px 20px;
box-shadow: #c7c7c7 1px 2px 7px 3px;
}
.menu_side {
background: #fff !important;
margin: 5px 0 0 0!important;
border: 1px solid #dcdee2 !important;
}
.show_menu {
width: 30px;
height: 30px;
position: fixed;
top: 100px;
left: 0;
z-index: 9;
}
.show_menu .menu_play {
width: 30px;
height: 30px;
line-height: 34px;
font-size: 14px;
text-align: center;
color: #515A6E;
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
background: #ffffff;
box-shadow: #ccc 2px 2px 4px 1px;
}
.show_menu .menu_play:hover {
background-color: #2d8cf0;
color: white;
}
.details .ivu-input-number {
width: 100%;
}
.tohtml img {
max-width: 95%;
}
static/config.js
View file @ b84f24e4
...@@ -5,7 +5,7 @@ const systemApi = { ...@@ -5,7 +5,7 @@ const systemApi = {
aps:'47.92.102.113' aps:'47.92.102.113'
} }
//环境切换（只修改此处）： //环境切换（只修改此处）：
let address=systemApi.dev; let address=systemApi.product;
//let address=systemApi.product; //let address=systemApi.product;
//let address=systemApi.local; //let address=systemApi.local;
......
static/static/base.css
View file @ b84f24e4
...@@ -1559,4 +1559,7 @@ img.imglogo { ...@@ -1559,4 +1559,7 @@ img.imglogo {
height: 150px; height: 150px;
padding: 5px; padding: 5px;
border-bottom: 2px solid #333; border-bottom: 2px solid #333;
}
.tohtml img{
max-width: 95%;
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment