From 9fab512572ec93c4ac8622eea8dc12911d5a3c69 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 22 八月 2023 10:20:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/message/message/index.vue           |  242 ++++++++++++++++++
 src/views/experiment/planAssignments/plan.vue |   46 ++
 src/views/CNAS/nonConformanceManage/index.vue |  213 ++++++++++++++++
 src/views/message/toDo/index.vue              |  224 +++++++++++++++++
 src/styles/element-ui.scss                    |    5 
 src/styles/sidebar.scss                       |   28 +-
 6 files changed, 728 insertions(+), 30 deletions(-)

diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index a831e80..e788c56 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -13,7 +13,7 @@
 
 .el-upload__input {
   display: none;
-  
+
 }
 
 
@@ -103,9 +103,6 @@
 // .el-menu-popup{
 //   min-width: 100px !important;
 // }
-.el-menu--vertical{
-  max-width: 100px !important;
-}
 
 .el-menu--collapse .el-menu .el-submenu, .el-menu--popup {
   min-width: 100px !important;
diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index 5d56d60..42ae7b0 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -69,18 +69,18 @@
     }
 
     // menu hover
-    
+
     .el-submenu__title,.el-tooltip{
         border-radius: 8px;
         overflow: hidden;
       &:hover {
-        background-color: $menuHover !important;   
+        background-color: $menuHover !important;
         color: $menuActiveText !important;
       }
     }
     .submenu-title-noDropdown{
       &:hover {
-        background-color:transparent !important; 
+        background-color:transparent !important;
         // background-color: $menuBg !important;
         // border-radius: 8px;
         // overflow: hidden;
@@ -103,22 +103,21 @@
 
     }
 
-    
+
 
     & .nest-menu .el-submenu>.el-submenu__title,
     & .el-submenu .el-menu-item {
-      min-width: $sideBarWidth !important;
       background-color: $subMenuBg !important;
 
       &:hover {
-        
+
         background-color: $subMenuHover !important;
       }
     }
 
     // .is-active.el-submenu{
     //   color: $subMenuActiveText !important;
-      
+
     // }
     .is-active.el-menu-item {
       // color: $subMenuActiveText !important;
@@ -179,7 +178,7 @@
 
     .el-submenu {
       overflow: hidden;
-      
+
       &>.el-submenu__title{
         // width: auto;
         // height: auto;
@@ -234,7 +233,7 @@
             margin: 0 auto;
           }
         }
-        
+
       }
     }
 
@@ -301,12 +300,11 @@
   }
   .nest-menu .el-submenu>.el-submenu__title,
   .el-menu-item {
-    width: 100px;
-    height: 30px !important;
-    min-width: 100px !important;
-    line-height: 30px;
-    text-align: left !important;
+    height: 40px !important;
+    line-height: 40px;
+		padding-left: 20px !important;
     font-size: 10px;
+		width: 100% !important;
     justify-content: start !important;
     background-color: $subMenuBg !important;
     color: $subMenuHover !important;
@@ -330,6 +328,8 @@
     max-height: 100vh;
     overflow-y: auto;
     background-color: #fff;
+		width: 150px !important;
+		padding: 0 !important;
     &::-webkit-scrollbar-track-piece {
       background: #d3dce6;
     }
diff --git a/src/views/CNAS/nonConformanceManage/index.vue b/src/views/CNAS/nonConformanceManage/index.vue
index 884cce1..18c1c72 100644
--- a/src/views/CNAS/nonConformanceManage/index.vue
+++ b/src/views/CNAS/nonConformanceManage/index.vue
@@ -1,5 +1,214 @@
 <template>
-    <div>
-        涓嶇鍚堥」绠$悊
+    <div class="content-main">
+        <div class="top-bar">
+            <el-form ref="form" :inline="true" :model="searchData">
+              <el-form-item label="褰曞叆鏃ユ湡:" style="margin-right: 20px;">
+                <el-date-picker
+                    v-model="searchData.entry_date"
+                    type="date"
+                    placeholder="璇烽�夋嫨褰曞叆鏃ユ湡">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="瀹℃牳鏃ユ湡:" style="margin-right: 20px;">
+                <el-date-picker
+                    v-model="searchData.check_date"
+                    type="date"
+                    placeholder="璇烽�夋嫨瀹℃牳鏃ユ湡">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="鐘舵��:" style="margin-right: 20px;">
+                <el-select v-model="searchData.state" placeholder="鍏ㄩ儴" style="width: 100px;">
+                  <el-option
+                    v-for="item in stateoptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="閮ㄩ棬:" style="margin-right: 20px;">
+                <el-input v-model="searchData.department" placeholder="璇疯緭鍏ラ儴闂�">
+                </el-input>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="searchInspections">鏌ヨ</el-button>
+                <el-button type="primary" plain @click="reset">閲嶇疆</el-button>
+              </el-form-item>
+            </el-form>
+            <el-form class="rightBtn">
+              <el-form-item class="createBtn">
+                <el-button type="primary" icon="el-icon-document-add" style="margin-right: 10px;">鏂板璁板綍</el-button>
+              </el-form-item>
+              <el-form-item class="getDataBtn">
+                <el-button type="primary" icon="el-icon-download">瀵煎嚭</el-button>
+              </el-form-item>
+            </el-form>
+        </div>
+        <div class="library-table">
+      <div class="table-header">
+        <el-radio-group v-model="radioValue" @change="radioclick">
+          <el-radio-button v-for="item in conditionsOptions" :key="item.value" :label="item.value">
+            {{ item.label }}
+          </el-radio-button>
+        </el-radio-group>
+      </div>
+      <div class="table-box">
+        <el-table
+                ref="recordTable"
+                :max-height="800"
+                :cell-style="{textAlign: 'center'}"
+                :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
+                :data="recordTable"
+                style="width: 100%"
+              >
+                <el-table-column
+                  label="搴忓彿"
+                  min-width="10%">
+                  <template slot-scope="scope">
+                    <el-checkbox v-model="checked"></el-checkbox>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="title"
+                  label="鏍囬"
+                  min-width="12%"
+                />
+                <el-table-column
+                  prop="content"
+                  label="鍐呭"
+                  min-width="12%"
+                />
+                <el-table-column
+                  prop="level"
+                  label="绛夌骇"
+                  min-width="12%"
+                />
+                <el-table-column
+                  prop="type"
+                  label="绫诲瀷"
+                  min-width="8%"
+                />
+                <el-table-column
+                  prop="state"
+                  label="鐘舵��"
+                  min-width="12%">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.state === 1" style="color: red;">鏈</span>
+                    <span v-if="scope.row.state === 2" style="color: green;">宸茶</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="sender"
+                  label="鍙戜欢浜�"
+                  min-width="8%"
+                />
+                <el-table-column
+                  prop="create_time"
+                  label="鍒涘缓鏃堕棿"
+                  min-width="12%"
+                />
+                <el-table-column
+                  label="鎿嶄綔"
+                  min-width="10%"
+                >
+                  <template slot-scope="scope">
+                    <el-button type="text" size="small" @click="deleteRow(scope.row)">鍒犻櫎</el-button>
+                    <el-button type="text" size="small" @click="readRow(scope.row)">鏍囦负宸茶</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <!-- 鍒嗛〉鍣� -->
+              <div>
+                <el-pagination
+                  @size-change="handleSizeChange"
+                  @current-change="handleCurrentChange"
+                  :current-page="currentPage"
+                  :page-sizes="[5, 10, 15, 20]"
+                  :page-size="pageSize"
+                  layout="total, sizes, prev, pager, next, jumper"
+                  :total="total">
+                </el-pagination>
+              </div>
+      </div>
+    </div>
     </div>
 </template>
+
+<script>
+export default {
+    data(){
+        return {
+            searchData:{
+                entry_date: '',
+                check_date: '',
+                state: 0,
+                department: ''
+            },
+            stateoptions:[{
+                value: 0,
+                label: '宸插叧闂�'
+            },{
+                value: 1,
+                label: '寰呭叧闂�'
+            }],
+            recordTable:[],
+            currentPage: 0,
+            pageSize:5,
+            total: 20
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.content-main{
+      width: 100%;
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+    .top-bar{
+      margin: -25px -15px;
+      background: #fff;
+      display: flex;
+      justify-content: space-between;
+      padding: 5px 24px 0px 24px;
+      .rightBtn{
+        display: flex;
+        justify-content: space-between;
+      }
+    }
+    .library-table{
+      background-color: #fff;
+      flex: 1;
+      margin: 0px -15px;
+      margin-top: 40px;
+      display: flex;
+      flex-direction: column;
+      .table-header{
+        padding: 20px;
+        display: flex;
+        justify-content: space-between;
+        .el-form-item{
+          margin-bottom: 30px !important;
+        }
+      }
+      .table-box{
+          padding: 0px 20px;
+          margin-top: 0px;
+          flex: 1;
+          background: #fff;
+          /* padding: 20px 20px 10px 20px; */
+          display: flex;
+          flex-direction: column;
+          .el-table {
+            flex: 1;
+          }
+          >div:nth-child(2){
+            display: flex;
+            justify-content: end;
+            margin: 10px 0;
+          }
+      }
+    }
+}
+</style>
diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index 0d931cc..ee84390 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -18,6 +18,15 @@
 		padding: 15px;
 		background-color: white;
 		height: calc(100vh - 15vh);
+		overflow-y: auto;
+	}
+
+	.order_num{
+		border-radius: 1rem;
+		width: 35px;
+		height: 25px;
+		text-align: center;
+		margin-right: 8px;
 	}
 </style>
 <style>
@@ -28,6 +37,7 @@
 
 	.plan .cell {
 		color: #333;
+		display: flex;
 	}
 </style>
 
@@ -51,6 +61,14 @@
 				<el-table-column type="index" width="50" label="搴忓彿">
 				</el-table-column>
 				<el-table-column prop="date" label="鐢宠鍗曞彿">
+					<template slot-scope="scope">
+						<div style="display: flex;">
+							<div v-if="scope.row.code=='01'" style="color: #3caaff;background-color: #eff5ff;" class="order_num">01</div>
+							<div v-else-if="scope.row.code=='02'" style="color: #57c981;background-color: #f1fbf4;" class="order_num">02</div>
+							<div v-else-if="scope.row.code=='03'" style="color: #dfa8fb;background-color: #faf2ff;" class="order_num">03</div>
+							<div>{{scope.row.date}}</div>
+						</div>
+					</template>
 				</el-table-column>
 				<el-table-column prop="name" label="妫�楠岀粨鏋�">
 				</el-table-column>
@@ -60,9 +78,9 @@
 					<template slot-scope="scope">
 						<el-button size="mini" type="primary" v-if="isIfReport(scope.row)">涓婃姤</el-button>
 						<el-button size="mini" type="warning" @click="openUpDia(scope.row)"
-							v-else-if="scope.row.insId==undefined&&scope.row.address==null">鍒嗛厤</el-button>
+							v-else-if="scope.row.code=='03'&&scope.row.insId==undefined&&scope.row.address==null">鍒嗛厤</el-button>
 						<el-button size="mini" type="success" @click="openUpInsDia(scope.row)"
-							v-else-if="scope.row.insId==undefined&&scope.row.name==null">妫�楠�</el-button>
+							v-else-if="scope.row.code=='03'&&scope.row.insId==undefined&&scope.row.name==null">妫�楠�</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -159,8 +177,15 @@
 						id: 34,
 						date: '2016-05-01',
 						name: null,
-						res: '[{"number": 1,"res": "涓嶅悎鏍�"},{"number": 2}]',
-						address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�'
+						res: '[{"number": 1,"res": "涓嶅悎鏍�"},{"number": 3,"res": "涓嶅悎鏍�"}]',
+						address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�',
+						children: [{
+							id: 35,
+							date: 'hhh',
+							name: null,
+							res: '[{"number": 1},{"number": 2}]',
+							address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�'
+						}]
 					}]
 				}, {
 					id: 2,
@@ -200,11 +225,16 @@
 		methods: {
 			selectDataList() {
 				this.tableData.forEach(a => {
-					a.code = '[1]'
+					a.code = '01'
 					if (a.children != undefined) {
 						a.children.forEach(b => {
-							b.code = '[2]'
-							b.res = JSON.parse(b.res)
+							b.code = '02'
+							if (b.children != undefined) {
+								b.children.forEach(c => {
+									c.code = '03'
+									c.res = JSON.parse(c.res)
+								})
+							}
 						})
 					}
 				})
@@ -252,4 +282,4 @@
 			}
 		}
 	}
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/message/message/index.vue b/src/views/message/message/index.vue
index ba69703..5e272a3 100644
--- a/src/views/message/message/index.vue
+++ b/src/views/message/message/index.vue
@@ -1,13 +1,253 @@
 <template>
-  <div>娑堟伅</div>
+  <div class="content-main">
+    <div class="top-bar">
+      <el-form ref="form" :inline="true" :model="searchData">
+              <el-form-item label="鏍囬:" class="sermargin">
+                <el-input
+                  v-model="searchData.title"
+                  class="input-form"
+                  placeholder="璇疯緭鍏ユ爣棰�"
+                >
+                </el-input>
+              </el-form-item>
+              <el-form-item label="鍐呭:" style="margin-right: 30px;">
+                <el-input
+                  v-model="searchData.content"
+                  class="input-form"
+                  placeholder="璇疯緭鍏ュ唴瀹�"
+                >
+                </el-input>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="search">鏌ヨ</el-button>
+                <el-button type="primary" plain @click="reset">閲嶇疆</el-button>
+              </el-form-item>
+              </el-form>
+              <el-form>
+                <el-button class="deleteBtn" plain type="primary" @click="deleteMessage" >鍒犻櫎</el-button>
+                <el-button type="primary" @click="readMessage" style="width: 110px;" >鏍囦负宸茶</el-button>
+              </el-form>
+    </div>
+    <div class="library-table">
+      <div class="table-header">
+        <el-radio-group v-model="radioValue" @change="radioclick">
+          <el-radio-button v-for="item in conditionsOptions" :key="item.value" :label="item.value">
+            {{ item.label }}
+          </el-radio-button>
+        </el-radio-group>
+      </div>
+      <div class="table-box">
+        <el-table
+                ref="messageTable"
+                :max-height="800"
+                :cell-style="{textAlign: 'center'}"
+                :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
+                :data="messageTable"
+                @selection-change="handleSelectionChange"
+                style="width: 100%"
+              >
+                <el-table-column
+                  type="selection"
+                  min-width="10%"
+                />
+                <el-table-column
+                  prop="title"
+                  label="鏍囬"
+                  min-width="12%"
+                />
+                <el-table-column
+                  prop="content"
+                  label="鍐呭"
+                  min-width="12%"
+                />
+                <el-table-column
+                  prop="level"
+                  label="绛夌骇"
+                  min-width="12%"
+                />
+                <el-table-column
+                  prop="type"
+                  label="绫诲瀷"
+                  min-width="8%"
+                />
+                <el-table-column
+                  prop="state"
+                  label="鐘舵��"
+                  min-width="12%">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.state === 1" style="color: red;">鏈</span>
+                    <span v-if="scope.row.state === 2" style="color: green;">宸茶</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="sender"
+                  label="鍙戜欢浜�"
+                  min-width="8%"
+                />
+                <el-table-column
+                  prop="create_time"
+                  label="鍒涘缓鏃堕棿"
+                  min-width="12%"
+                />
+                <el-table-column
+                  label="鎿嶄綔"
+                  min-width="10%"
+                >
+                  <template slot-scope="scope">
+                    <el-button type="text" size="small" @click="deleteRow(scope.row)">鍒犻櫎</el-button>
+                    <el-button type="text" size="small" @click="readRow(scope.row)">鏍囦负宸茶</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <!-- 鍒嗛〉鍣� -->
+              <div>
+                <el-pagination
+                  @size-change="handleSizeChange"
+                  @current-change="handleCurrentChange"
+                  :current-page="currentPage"
+                  :page-sizes="[5, 10, 15, 20]"
+                  :page-size="pageSize"
+                  layout="total, sizes, prev, pager, next, jumper"
+                  :total="total">
+                </el-pagination>
+              </div>
+      </div>
+
+    </div>
+
+  </div>
 </template>
 
 <script>
 export default {
+  data(){
+    return {
+      searchData: {
+        title: '',
+        content: ''
+      },
+      radioValue: 0,
+      conditionsOptions: [
+        {
+          label: '鍏ㄩ儴',
+          value: 0
+        },
+        {
+          label: '鏈',
+          value: 1
+        },
+        {
+          label: '宸茶',
+          value: 2
+        }
+      ],
+      selectionRows:[],
+      messageTable:[],
+      currentPage:1,
+      pageSize: 5,
+      total:10,
+
+    }
+  },
+  created(){
+
+  },
+  methods: {
+    deleteMessage(){
+      console.log(this.selectionRows)
+    },
+    readMessage(){
+      console.log(this.selectionRows)
+    },
+    // 鎹曡幏琛ㄦ牸閫夋嫨鐨勬暟鎹�
+    handleSelectionChange(selection){
+      this.selectionRows = selection
+    },
+    // 鏍囪宸茶
+    readRow(row){
+      console.log(row)
+    },
+    // 鍒犻櫎
+    deleteRow(row){
+      console.log(row)
+    },
+    radioclick(){
+      console.log(this.radioValue)
+    },
+    handleSizeChange(val){
+      console.log(`褰撳墠姣忛〉${val}鏉℃暟鎹甡)
+    },
+    handleCurrentChange(val){
+      console.log(`褰撳墠鏄${val}椤礰)
+    }
+  }
 
 }
 </script>
 
 <style lang="scss" scoped>
+.content-main{
+  width: 100%;
+  .top-bar{
+    margin: -25px -15px;
+    padding: 5px 24px 0px 24px;
+    display: flex;
+    justify-content: space-between;
+    background-color: #fff;
+    .sermargin{
+      margin-right: 60px;
+    }
+    .deleteBtn{
+      background-color: #fff;
+      border: 1px solid rgb(225, 222, 222);
+      color: rgb(184, 182, 182);
+    }
+    .deleteBtn:active {
+      outline: none;  /* 鍘婚櫎鎸夐挳鐨勯粯璁ょ偣鍑绘椂鐨勫杈规 */
+      box-shadow: 0 0 4px rgb(142, 141, 141);  /* 娣诲姞鐐瑰嚮鏃剁殑闃村奖鏁堟灉锛岄鑹茶涓虹伆鑹� */
+    }
+    .deleteBtn:hover {
+      outline: none;  /* 鍘婚櫎鎸夐挳鐨勯粯璁ょ偣鍑绘椂鐨勫杈规 */
+      background-color: rgb(233, 233, 233);  /* 娣诲姞鐐瑰嚮鏃剁殑闃村奖鏁堟灉锛岄鑹茶涓虹伆鑹� */
+    }
+    .deleteBtn:focus {
+      outline: none;  /* 鍘婚櫎鎸夐挳鐨勯粯璁ょ偣鍑绘椂鐨勫杈规 */
+      background-color: rgb(233, 233, 233);  /* 娣诲姞鐐瑰嚮鏃剁殑闃村奖鏁堟灉锛岄鑹茶涓虹伆鑹� */
+    }
+  }
+  .library-table{
+      background-color: #fff;
+      flex: 1;
+      margin: 0px -15px;
+      margin-top: 40px;
+      display: flex;
+      flex-direction: column;
+      .table-header{
+        padding: 20px;
+        display: flex;
+        justify-content: space-between;
+        .el-form-item{
+          margin-bottom: 30px !important;
+        }
+      }
+      .table-box{
+          padding: 0px 20px;
+          margin-top: 0px;
+          flex: 1;
+          background: #fff;
+          /* padding: 20px 20px 10px 20px; */
+          display: flex;
+          flex-direction: column;
+          .el-table {
+            flex: 1;
+          }
+          >div:nth-child(2){
+            display: flex;
+            justify-content: end;
+            margin: 10px 0;
+          }
+      }
+    }
+}
 
 </style>
diff --git a/src/views/message/toDo/index.vue b/src/views/message/toDo/index.vue
index 135a43e..ca3ef41 100644
--- a/src/views/message/toDo/index.vue
+++ b/src/views/message/toDo/index.vue
@@ -1,13 +1,235 @@
 <template>
-  <div>寰呭姙</div>
+  <div class="content-main">
+    <div class="top-bar">
+      <el-form ref="form" :inline="true" :model="searchData">
+              <el-form-item label="鏍囬:" class="sermargin">
+                <el-input
+                  v-model="searchData.title"
+                  class="input-form"
+                  placeholder="璇疯緭鍏ユ爣棰�"
+                >
+                </el-input>
+              </el-form-item>
+              <el-form-item label="鍐呭:" style="margin-right: 30px;">
+                <el-input
+                  v-model="searchData.content"
+                  class="input-form"
+                  placeholder="璇疯緭鍏ュ唴瀹�"
+                >
+                </el-input>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="search">鏌ヨ</el-button>
+                <el-button type="primary" plain @click="reset">閲嶇疆</el-button>
+              </el-form-item>
+              </el-form>
+              <el-form>
+                <el-button class="deleteBtn" plain type="primary" @click="deleteMessage" >鍒犻櫎</el-button>
+                <el-button type="primary" @click="readMessage" style="width: 110px;" >鏍囦负宸茶</el-button>
+              </el-form>
+    </div>
+    <div class="library-table">
+      <div class="table-header">
+        <el-radio-group v-model="radioValue" @change="radioclick">
+          <el-radio-button v-for="item in conditionsOptions" :key="item.value" :label="item.value">
+            {{ item.label }}
+          </el-radio-button>
+        </el-radio-group>
+      </div>
+      <div class="table-box">
+        <el-table
+                ref="toDoTable"
+                :max-height="800"
+                :cell-style="{textAlign: 'center'}"
+                :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
+                :data="toDoTable"
+                @selection-change="handleSelectionChange"
+                style="width: 100%"
+              >
+                <el-table-column
+                  prop="sender"
+                  label="鍙戜欢浜�"
+                  min-width="8%"
+                />
+                <el-table-column
+                  prop="title"
+                  label="鏍囬"
+                  min-width="13%"
+                />
+                <el-table-column
+                  prop="todo"
+                  label="浠e姙鍐呭"
+                  min-width="20%"
+                />
+                <el-table-column
+                  prop="group"
+                  label="鍒嗙粍"
+                  min-width="15%"
+                />
+                <el-table-column
+                  prop="level"
+                  label="绛夌骇"
+                  min-width="8%"
+                />
+                <el-table-column
+                  prop="create_time"
+                  label="鍒涘缓鏃堕棿"
+                  min-width="12%"
+                />
+                <el-table-column
+                  prop="deadline"
+                  label="瑕佹眰瀹屾垚鏃堕棿"
+                  min-width="12%"
+                />
+                <el-table-column
+                  prop="state"
+                  label="鐘舵��"
+                  min-width="12%"
+                />
+              </el-table>
+              <!-- 鍒嗛〉鍣� -->
+              <div>
+                <el-pagination
+                  @size-change="handleSizeChange"
+                  @current-change="handleCurrentChange"
+                  :current-page="currentPage"
+                  :page-sizes="[5, 10, 15, 20]"
+                  :page-size="pageSize"
+                  layout="total, sizes, prev, pager, next, jumper"
+                  :total="total">
+                </el-pagination>
+              </div>
+
+      </div>
+
+    </div>
+
+  </div>
 </template>
 
 <script>
 export default {
+  data(){
+    return {
+      searchData: {
+        title: '',
+        content: ''
+      },
+      radioValue: 0,
+      conditionsOptions: [
+        {
+          label: '鍏ㄩ儴',
+          value: 0
+        },
+        {
+          label: '鏈鐞�',
+          value: 1
+        },
+        {
+          label: '宸插鐞�',
+          value: 2
+        },
+        {
+          label: '宸茶秴鏈�',
+          value: 3
+        }
+      ],
+      toDoTable:[],
+      selectionRows:[],
+      currentPage:1,
+      pageSize: 5,
+      total:100,
+
+    }
+  },
+  methods: {
+    deleteMessage(){
+      console.log(this.selectionRows)
+    },
+    readMessage(){
+      console.log(this.selectionRows)
+    },
+    // 鎹曡幏琛ㄦ牸閫夋嫨鐨勬暟鎹�
+    handleSelectionChange(selection){
+      this.selectionRows = selection
+    },
+    radioclick(){
+      console.log(this.radioValue)
+    },
+    handleSizeChange(val){
+      console.log(`褰撳墠姣忛〉${val}鏉℃暟鎹甡)
+    },
+    handleCurrentChange(val){
+      console.log(`褰撳墠鏄${val}椤礰)
+    }
+  }
 
 }
 </script>
 
 <style lang="scss" scoped>
+.content-main{
+  width: 100%;
+  .top-bar{
+    margin: -25px -15px;
+    padding: 5px 24px 0px 24px;
+    display: flex;
+    justify-content: space-between;
+    background-color: #fff;
+    .sermargin{
+      margin-right: 60px;
+    }
+    .deleteBtn{
+      background-color: #fff;
+      border: 1px solid rgb(225, 222, 222);
+      color: rgb(184, 182, 182);
+    }
+    .deleteBtn:active {
+      outline: none;  /* 鍘婚櫎鎸夐挳鐨勯粯璁ょ偣鍑绘椂鐨勫杈规 */
+      box-shadow: 0 0 4px rgb(142, 141, 141);  /* 娣诲姞鐐瑰嚮鏃剁殑闃村奖鏁堟灉锛岄鑹茶涓虹伆鑹� */
+    }
+    .deleteBtn:hover {
+      outline: none;  /* 鍘婚櫎鎸夐挳鐨勯粯璁ょ偣鍑绘椂鐨勫杈规 */
+      background-color: rgb(233, 233, 233);  /* 娣诲姞鐐瑰嚮鏃剁殑闃村奖鏁堟灉锛岄鑹茶涓虹伆鑹� */
+    }
+    .deleteBtn:focus {
+      outline: none;  /* 鍘婚櫎鎸夐挳鐨勯粯璁ょ偣鍑绘椂鐨勫杈规 */
+      background-color: rgb(233, 233, 233);  /* 娣诲姞鐐瑰嚮鏃剁殑闃村奖鏁堟灉锛岄鑹茶涓虹伆鑹� */
+    }
+  }
+  .library-table{
+      background-color: #fff;
+      flex: 1;
+      margin: 0px -15px;
+      margin-top: 40px;
+      display: flex;
+      flex-direction: column;
+      .table-header{
+        padding: 20px;
+        display: flex;
+        justify-content: space-between;
+        .el-form-item{
+          margin-bottom: 30px !important;
+        }
+      }
+      .table-box{
+          padding: 0px 20px;
+          margin-top: 0px;
+          flex: 1;
+          background: #fff;
+          /* padding: 20px 20px 10px 20px; */
+          display: flex;
+          flex-direction: column;
+          .el-table {
+            flex: 1;
+          }
+          >div:nth-child(2){
+            display: flex;
+            justify-content: end;
+            margin: 10px 0;
+          }
+      }
+    }
+}
 
 </style>

--
Gitblit v1.9.3