8f912d0f by 任超

style:系统通知

1 parent ddae0b3c
...@@ -147,7 +147,7 @@ MessageBox.setDefaults = defaults => { ...@@ -147,7 +147,7 @@ MessageBox.setDefaults = defaults => {
147 MessageBox.defaults = defaults; 147 MessageBox.defaults = defaults;
148 }; 148 };
149 149
150 MessageBox.alert = (message, title, options) => { 150 MessageBox.alert = (title, message, options) => {
151 if (typeof title === 'object') { 151 if (typeof title === 'object') {
152 options = title; 152 options = title;
153 title = ''; 153 title = '';
......
...@@ -5,22 +5,13 @@ ...@@ -5,22 +5,13 @@
5 <div class="el-message-box" :class="[customClass, center && 'el-message-box--center']"> 5 <div class="el-message-box" :class="[customClass, center && 'el-message-box--center']">
6 <div class="el-message-box__content"> 6 <div class="el-message-box__content">
7 <div class="el-message-box__container"> 7 <div class="el-message-box__container">
8 <p v-if="title !== null">{{ title }}</p> 8 <div v-if="title !== ''" class="message-title">标题:{{ title }}</div>
9 <div class="el-message-box__message" v-if="message !== ''"> 9 <div v-if="message !== ''" class="richText" v-html="message"></div>
10 <slot>
11 <p v-html="message"></p>
12 </slot>
13 </div>
14 <div class="postscript">
15
16 <el-button type="text">下载</el-button>
17 </div>
18 </div> 10 </div>
19 </div> 11 </div>
20 <div class="el-message-box__btns"> 12 <div class="el-message-box__btns">
21 <el-button :loading="cancelButtonLoading" :class="[cancelButtonClasses]" v-if="showCancelButton" 13 <el-button :loading="cancelButtonLoading" :class="[cancelButtonClasses]" :round="roundButton" size="small"
22 :round="roundButton" size="small" @click.native="handleAction('cancel')" 14 @click.native="handleAction('cancel')" @keydown.enter="handleAction('cancel')">
23 @keydown.enter="handleAction('cancel')">
24 {{ cancelButtonText || t('el.messagebox.cancel') }} 15 {{ cancelButtonText || t('el.messagebox.cancel') }}
25 </el-button> 16 </el-button>
26 </div> 17 </div>
...@@ -205,11 +196,6 @@ export default { ...@@ -205,11 +196,6 @@ export default {
205 visible (val) { 196 visible (val) {
206 if (val) { 197 if (val) {
207 this.uid++; 198 this.uid++;
208 if (this.$type === 'alert' || this.$type === 'confirm') {
209 this.$nextTick(() => {
210 this.$refs.confirm.$el.focus();
211 });
212 }
213 this.focusAfterClosed = document.activeElement; 199 this.focusAfterClosed = document.activeElement;
214 messageBox = new Dialog(this.$el, this.focusAfterClosed, this.getFirstFocus()); 200 messageBox = new Dialog(this.$el, this.focusAfterClosed, this.getFirstFocus());
215 } 201 }
...@@ -281,3 +267,15 @@ export default { ...@@ -281,3 +267,15 @@ export default {
281 } 267 }
282 }; 268 };
283 </script> 269 </script>
270 <style scoped>
271 /deep/.message-title {
272 font-size: 18px;
273 font-weight: 700;
274 margin-bottom: 5px;
275 }
276
277 /deep/.el-message-box__content img {
278 width: 100%;
279 height: 100%;
280 }
281 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -243,9 +243,7 @@ export default { ...@@ -243,9 +243,7 @@ export default {
243 chart.render(); 243 chart.render();
244 }, 244 },
245 handleNotice (item) { 245 handleNotice (item) {
246 console.log(item); 246 this.$alertMes(item.noticeTitle, item.noticeContent)
247 this.$alertMes('9999999999')
248 //setReadStatus({'bsmNotice':bsmNotice})
249 } 247 }
250 } 248 }
251 } 249 }
......