Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/views/Business/BusRouter.js

@@ -266,6 +266,6 @@ const BusRouter = [
   { path: 'getset', component: Getset, name: 'Getset', meta: { title: 'Getset' } },
   { path: 'getsel', component: Getsel, name: 'Getsel', meta: { title: 'Getsel' } },
   { path: 'getcrq', component: Getcrq, name: 'Getcrq', meta: { title: 'Getcrq' } },
-  { path: 'notice', component: Notice, name: 'Notice', meta: { title: '通知公告设置' } },
+  { path: 'notice', component: Notice, name: 'Notice', meta: { title: '通知公告' } },
 ]
 export default BusRouter

src/views/Business/Notice/Infsea.vue

 <template>
   <div class="eibs-tab">
-    
+   
+     
     <el-form
       class="m-table-search-form"
       ref="paramsForm"
@@ -13,14 +14,14 @@
         <c-col :span="24">
           <c-col :span="8">
             <el-form-item
-              label="标题"
+              label="公告标题"
               prop="theme"
               style="width: 100%"
             >
               <c-input
                 v-model="model.theme"
-                maxlength="50"
-                placeholder="请输入公告标题"
+                maxlength="20"
+                placeholder="请输入标题名称"
               ></c-input>
             </el-form-item>
           </c-col>
@@ -62,6 +63,8 @@
           </c-col>
         </c-col>
       </c-row>
+    
+      
       <!-- </template> -->
       <c-col
         :span="24"
@@ -83,9 +86,9 @@
     </c-col>
 
 
-    <c-col style="margin-top: 10px">
-      <c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0 ; float :right" @click="ruleAdd()"
-         >+添加公告</c-button
+    <c-col :span="24" style="margin:10px 0px" >
+      <c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0px " @click="ruleAdd()"
+         >添加公告</c-button
       >
     </c-col>
 
@@ -309,7 +312,7 @@ export default {
       nowDate:'',
 
       currentPage: 1, //初始页
-      pagesize: 2, //    每页的数据
+      pagesize: 6, //    每页的数据
       total: 0,
       
 

src/views/Business/Notice/index.vue

 <template>
   <c-page title="通知公告">
-     <div class="eContainer">
-          
+     <div class="eContainer" style="height:90%">
+        <div style="padding:0 15px">  
           <el-form 
                :model="model" 
                :rules="rules" 
                ref="modelForm" 
-               label-width="160px" 
+               label-width="110px" 
                size="small" 
-               label-position="left" 
+               label-position="right" 
                :validate-on-rule-change="false"
                >
-               <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
+                <c-content> 
+                    <m-infsea   :model="model" :codes="codes" ref="infsea"/>
+                
+                </c-content>
+               <!-- <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick"> -->
                
                    
           
                     <!-- PD000001 --> 
                    
-                     <el-tab-pane 
+                     <!-- <el-tab-pane  -->
                        
-                         label="信息查询" name="infsea">
-                          <c-content>
+                         <!-- label="信息查询" name="infsea" -->
+                          <!-- <c-content>
                          <m-infsea :model="model" :codes="codes"/>
-                          </c-content>
-                    </el-tab-pane>
+                          </c-content> -->
+                         
+                    <!-- </el-tab-pane> -->
           
                    
           
                     
-               </c-tabs>
+               <!-- </c-tabs> -->
           </el-form>
+        </div>
           <!-- <c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
 		</c-grid-ety-prompt-dialog> -->
      </div>
@@ -95,6 +101,7 @@ export default {
             rules: null,
             codes: {
             },
+            showPanel:false,
         }
     },
     methods:{