提交

ruoyi-ui/src/components/Multilinequery/index.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

ruoyi-ui/src/views/index.vue

@@ -9,7 +9,7 @@
           </p>
                 <div style="height: 87%;">
                   <ul class="index_headerUl">
-                    <li v-for="(item,index) in configList" :key="index">
+                    <li v-for="(item,index) in configList" :key="index" @click="headerCld(item)">
                         <img src="../assets/images/icon_list_sj.png" alt="">
                         <p>{{item.notice_title}}</p>
                         <span>{{item.create_time}}</span>
@@ -227,28 +227,30 @@
     </el-row>
     <!-- <el-divider /> -->
   <!-- 添加或修改公告对话框 -->
-  <el-dialog :title="title" :visible.sync="open" width="980px" append-to-body>
-           <el-form ref="form" :model="form" :rules="rules" label-width="160px" class="from_index">
-             <el-row>
-               <el-col :span="24" >
-                <dynamic-forms   :ref="item.columnName" :config="form.fixedData" @inputs = "changeFn" :formConfig="item" v-for="(item,index) in queryData.showData" :key='index' />
-               </el-col>
-             </el-row>
-           </el-form>
-           <div slot="footer" class="dialog-footer">
-             <el-button type="primary" @click="handleQuery">确 定</el-button>
-             <el-button @click="cancel">取 消</el-button>
-           </div>
-            <!-- if(){ -->
-              <!-- 日历 -->
+  <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="980px" append-to-body>
 
-              <!-- <dynamic-forms v-if="nummer == 0" :config="form" @inputs = "changeFn" :formConfig="queryData" :open="open" @submitForm="submitForm($event)" @cancel="cancel($event)" :nummer = "nummer" /> -->
-            <!-- }else if(){ -->
-              <!-- 备忘录 -->
-              <!-- <memoran-dum v-if="nummer == 1" :config="form" @inputs = "changeFn" :formConfig="queryDatatwo" :open="open"  @cancel="cancel($event)" :nummer = "nummer" /> -->
-            <!-- } -->
+            <el-form ref="form" :model="form" :rules="rules" label-width="160px" class="from_index">
+              <el-row>
+                <el-col :span="24" >
+                 <dynamic-forms   :ref="item.columnName" :config="form.fixedData" @inputs = "changeFn" :formConfig="item" v-for="(item,index) in queryData.showData" :key='index' />
+                </el-col>
+              </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="handleQuery">确 定</el-button>
+              <el-button @click="cancel">取 消</el-button>
+            </div>
+  </el-dialog>
+  <!-- 通知公告弹窗 -->
+  <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="openety" width="980px" append-to-body>
+           <div class="index_headertan" >
+               <p>{{actingk.notice_title == undefined? '暂无数据' : actingk.notice_title}}</p>
+               <p>{{actingk.create_time == undefined? '暂无数据' : actingk.create_time}} 发布人:{{actingk.create_by}}</p>
+               <p v-html="actingk.notice_content"></p>
+           </div>
 
   </el-dialog>
+
   </div>
 </template>
 
@@ -427,7 +429,10 @@ export default {
           confirmPassword: undefined
         },
         shower:true, //判断删除图标是否显示
-      }
+      },
+      titlees:'通知公告',//通知公告弹框
+      openety:false,
+      actingk:{}
     };
   },
 
@@ -723,6 +728,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.openety = false
       this.reset();
     },
     /** 新增按钮操作 */
@@ -836,6 +842,12 @@ export default {
         this.getLismemorandum()
        console.log(this.user,97653)
       });
+    },
+    // 通知公告弹窗
+    headerCld(index){
+      // this.title = '通知公告'
+      //  this.openety = true,
+      //  this.actingk=index
     }
   },
 };
@@ -923,6 +935,7 @@ export default {
     padding-top: 10px;
     padding-bottom: 10px;
    span{
+     cursor:pointer;
      width: 70px;
      text-align: center;
      line-height: 55px;
@@ -992,6 +1005,7 @@ export default {
         justify-content: space-between;
         align-items: center;
         height: 43px;
+        cursor:pointer;
         img{
           width: 11px;
           height: 13px;
@@ -1098,12 +1112,14 @@ export default {
          height: 8px;
          background: #3C8DBC;
          border-radius: 3px;
+
        }
        span:nth-child(2){
          font-size: 12px;
          font-family: PingFang SC;
          font-weight: 400;
          color: #3C8DBC;
+         cursor:pointer;
        }
     }
   }
@@ -1260,5 +1276,30 @@ export default {
     background-color: #F2F2F2;
   }
 }
+// 通知公告弹窗
+.index_headertan{
+  margin: 0 30px;
+  p{
+    margin: 0;
+  }
+  p:nth-child(1){
+    font-size: 24px;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #343434;
+    line-height: 24px;
+    text-align: center;
+    margin-bottom: 10px;
+  }
+  p:nth-child(2){
+    font-size: 16px;
+    font-family: PingFang SC;
+    font-weight: 400;
+    color: #666666;
+    line-height: 24px;
+    text-align: center;
+    margin-bottom: 20px;
+  }
+}
 
 </style>

ruoyi-ui/src/views/system/editing/index.vue

@@ -2,7 +2,7 @@
   <div class="eniting">
     <!-- 头部 -->
     <div class="eniting_header">
-      <p class="p">表编辑</p>
+      <!-- <p class="p">表编辑</p> -->
       <div class="ppl">
        <p v-for="(item,index) in tabldie" :key="index" @click="enditTab(index)">
           <img src="../../../assets/images/icon_tbtab_normal.png" alt="" class="index_headerImg" v-if="num !== index">
@@ -12,7 +12,7 @@
       </div>
       <el-divider></el-divider>
       <div class="table_headerBtun" v-if="queryData.buttonList">
-           <el-button type="primary" plain v-for="(item,indexss) in queryData.buttonList.split('')" :key="keyname + indexss" @click="handleQuery(item)">{{item | btnConversion}}</el-button>
+           <el-button type="primary" size="small" plain v-for="(item,indexss) in queryData.buttonList.split('')" :key="keyname + indexss" @click="handleQuery(item)">{{item | btnConversion}}</el-button>
       </div>
     </div>
     <!-- 内容 -->

ruoyi-ui/src/views/system/form/index.vue

@@ -2,7 +2,7 @@
   <div class="tabForm">
     <div class="tabForm_header">
       <div class="table_headerBtun" v-if="queryData.buttonList">
-        <el-button type="primary" plain @click="handleQuery(item)" v-for="(item,index) in queryData.buttonList.split('')" :key="index">{{item | btnConversion}}</el-button>
+        <el-button type="primary" size="small" plain @click="handleQuery(item)" v-for="(item,index) in queryData.buttonList.split('')" :key="index">{{item | btnConversion}}</el-button>
       </div>
     </div>
     <!-- 内容 -->

ruoyi-ui/src/views/system/surface/index.vue

@@ -4,7 +4,7 @@
       <!-- <p>单表</p>
       <el-divider></el-divider> -->
       <div class="table_headerBtun" v-if="queryData.buttonList">
-        <el-button type="primary" plain @click="headerBtn(item)" v-for="(item,index) in queryData.buttonList.split('')"
+        <el-button type="primary" plain @click="headerBtn(item)" size="small" v-for="(item,index) in queryData.buttonList.split('')"
           :key="index">{{item | btnConversion}}</el-button>
       </div>
       <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">

ruoyi-ui/src/views/system/table/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="table_total">
     <div class="table_header">
-      <p>单表</p>
-      <el-divider></el-divider>
+      <!-- <p>单表</p>
+      <el-divider></el-divider> -->
       <div class="table_headerBtun" v-if="queryData.buttonList">
-        <el-button type="primary" plain v-for="(item,index) in queryData.buttonList.split('')" :key="index" @click="handleQuery(item)">{{item | btnConversion}}</el-button>
+        <el-button type="primary" size="small"  plain v-for="(item,index) in queryData.buttonList.split('')" :key="index" @click="handleQuery(item)">{{item | btnConversion}}</el-button>
       </div>
     </div>
     <!-- 内容 -->