Browse Source

Merge commit 'db2cea5ac13959efd40a68c750bf0d3e8abb3fe7' into gzb

gzb
guozhongbo 1 year ago
parent
commit
cc5e2dd5c2
3 changed files with 38 additions and 18 deletions
  1. 27
    0
      src/App.vue
  2. 2
    8
      src/views/history/index.vue
  3. 9
    10
      src/views/news/index.vue

+ 27
- 0
src/App.vue View File

123
     }
123
     }
124
   }
124
   }
125
 }
125
 }
126
+.modal_detail {
127
+  .ivu-modal {
128
+    width: 80% !important;
129
+    .ivu-modal-content {
130
+      border-radius: 0;
131
+      .ivu-modal-header {
132
+        background: #2d8cf0;
133
+        padding: 13px 16px !important;
134
+        .ivu-modal-header-inner {
135
+          font-size: 18px !important;
136
+          color: #ffffff;
137
+        }
138
+      }
139
+      .ivu-modal-close {
140
+        top: 4px;
141
+        .ivu-icon-ios-close:before {
142
+          color: #ffffff;
143
+          font-size: 36px;
144
+          font-weight: 600;
145
+        }
146
+      }
147
+      .ivu-modal-footer {
148
+        border-top: none;
149
+      }
150
+    }
151
+  }
152
+}
126
 .ivu-table-header thead tr th,
153
 .ivu-table-header thead tr th,
127
 .ivu-table-cell {
154
 .ivu-table-cell {
128
   text-align: center;
155
   text-align: center;

+ 2
- 8
src/views/history/index.vue View File

66
         :rules="addFormRules"
66
         :rules="addFormRules"
67
         :model="historyAddForm"
67
         :model="historyAddForm"
68
       >
68
       >
69
-        <FormItem label="语言" prop="date">
69
+        <FormItem label="语言" prop="ltype">
70
           <RadioGroup v-model="historyAddForm.ltype">
70
           <RadioGroup v-model="historyAddForm.ltype">
71
             <Radio :label="1">中文</Radio>
71
             <Radio :label="1">中文</Radio>
72
             <Radio :label="2">英文</Radio>
72
             <Radio :label="2">英文</Radio>
108
         :rules="modifyFormRules"
108
         :rules="modifyFormRules"
109
         :model="historyModifyForm"
109
         :model="historyModifyForm"
110
       >
110
       >
111
-        <FormItem label="语言" prop="date">
112
-          <RadioGroup v-model="historyModifyForm.ltype">
113
-            <Radio :label="1">中文</Radio>
114
-            <Radio :label="2">英文</Radio>
115
-          </RadioGroup>
116
-        </FormItem>
117
         <FormItem label="日期" prop="date">
111
         <FormItem label="日期" prop="date">
118
           <DatePicker
112
           <DatePicker
119
             type="month"
113
             type="month"
283
         show: true,
277
         show: true,
284
         date: new Date(),
278
         date: new Date(),
285
         content: "",
279
         content: "",
286
-        ltype: 1
280
+        ltype: this.historySearch.ltype
287
       };
281
       };
288
     },
282
     },
289
     toSaveAdd() {
283
     toSaveAdd() {

+ 9
- 10
src/views/news/index.vue View File

216
     </Modal>
216
     </Modal>
217
     <Modal
217
     <Modal
218
       v-model="detailInfo.show"
218
       v-model="detailInfo.show"
219
-      class="modal1"
219
+      class="modal_detail"
220
       :mask-closable="false"
220
       :mask-closable="false"
221
       title="查看新闻资讯"
221
       title="查看新闻资讯"
222
     >
222
     >
293
         {
293
         {
294
           title: "封面",
294
           title: "封面",
295
           slot: "newspicSlot",
295
           slot: "newspicSlot",
296
-          width: 240
296
+          width: 100
297
         },
297
         },
298
         {
298
         {
299
           title: "置顶",
299
           title: "置顶",
307
         },
307
         },
308
         {
308
         {
309
           title: "标题",
309
           title: "标题",
310
-          key: "newstitle",
311
-          width: 240
312
-        },
313
-        {
314
-          title: "摘要",
315
-          key: "newssummary"
310
+          key: "newstitle"
316
         },
311
         },
312
+        // {
313
+        //   title: "摘要",
314
+        //   key: "newssummary"
315
+        // },
317
         {
316
         {
318
           title: "创建人",
317
           title: "创建人",
319
           key: "createname",
318
           key: "createname",
484
     toAdd() {
483
     toAdd() {
485
       this.addForm = {
484
       this.addForm = {
486
         show: true,
485
         show: true,
487
-        ltype: 1,
486
+        ltype: this.newsSearch.ltype,
488
         newspic: "",
487
         newspic: "",
489
         newstitle: "",
488
         newstitle: "",
490
         newssummary: "",
489
         newssummary: "",
594
 .news_pic {
593
 .news_pic {
595
   display: block;
594
   display: block;
596
   margin: 10px auto;
595
   margin: 10px auto;
597
-  width: 200px;
596
+  width: 60px;
598
   object-fit: cover;
597
   object-fit: cover;
599
 }
598
 }
600
 .foot_page {
599
 .foot_page {

Loading…
Cancel
Save