no message

src/components/xDialog/index.vue

@@ -3,7 +3,7 @@
 -->
 <template>
 	<div class="x-dialog" ref="xDialog">
-		<el-dialog ref="dialog" :draggable="true" v-model="dialogVisible" :fullscreen="isFullscreen" v-bind="$attrs" :show-close="false">
+		<el-dialog ref="dialog" align-center destroy-on-close v-model="dialogVisible" :fullscreen="isFullscreen" v-bind="$attrs" :show-close="false">
 			<template #header>
 				<slot name="header">
 					<span class="el-dialog__title">{{ title }}</span>
@@ -68,6 +68,7 @@
 </script>
 
 <style scoped>
+	
 	.x-dialog__headerbtn {
 		position: absolute;
 		top: var(--el-dialog-padding-primary);
@@ -93,12 +94,12 @@
 	    --el-dialog-margin-top: 0;
 	    --el-dialog-width:60%;
 	    --el-border-color-base: rgb(231 235 241 / 50%);
-	    margin-bottom: 0;
-	    max-height: calc(100% - 80px);
+	    /*margin-bottom: 0;
+	    top: 60px !important;*/
+	    max-height: calc(100% - 50px);
 	    overflow: auto;
 	    display: flex;
 	    flex-direction: column;
-	    top: 60px !important;
 	    left: 0px !important;
 	}
 
@@ -116,6 +117,11 @@
 		border-top: 1px solid var(--el-border-color-base);
 	}
 
+	.x-dialog:deep(.el-dialog) .el-dialog__footer:empty {
+	  	padding: 0;
+	  	border:none;
+	}
+
 	.x-dialog:deep(.el-dialog).is-fullscreen {
 		display: flex;
 		flex-direction: column;

src/components/xTable/index.vue

@@ -26,8 +26,8 @@
 			</el-table>
 		</div>
 		<div class="xTable-page" v-if="!hidePagination || !hideDo">
-			<div class="xTable-pagination">
-				<el-pagination v-if="!hidePagination" background :small="true" :layout="paginationLayout" :total="total" :page-size="scPageSize" :page-sizes="pageSizes" v-model:currentPage="currentPage" @current-change="paginationChange" @update:page-size="pageSizeChange"></el-pagination>
+			<div class="xTable-pagination"  v-if="!hidePagination">
+				<el-pagination background :small="true" :layout="paginationLayout" :total="total" :page-size="scPageSize" :page-sizes="pageSizes" v-model:currentPage="currentPage" @current-change="paginationChange" @update:page-size="pageSizeChange"></el-pagination>
 			</div>
 			<div class="xTable-do" v-if="!hideDo">
 				<el-button v-if="!hideRefresh" @click="refresh" icon="el-icon-refresh" circle style="margin-left:15px"></el-button>
@@ -196,6 +196,7 @@
 					[config.request.prop]: this.prop,
 					[config.request.order]: this.order
 				}
+
 				if(this.hidePagination){
 					delete reqData[config.request.page]
 					delete reqData[config.request.pageSize]

src/components/xWaterMark/index.vue

@@ -3,7 +3,7 @@
 -->
 
 <template>
-	<div class="sc-water-mark" ref="scWaterMark">
+	<div class="x-water-mark" ref="xWaterMark">
 		<slot></slot>
 	</div>
 </template>
@@ -46,10 +46,10 @@
 				watermark.setAttribute('class', 'watermark')
 				const styleStr = `position:absolute;top:0;left:0;right:0;bottom:0;z-index:99;pointer-events:none;background-repeat:repeat;background-image:url('${canvas.toDataURL("image/png")}');`
 				watermark.setAttribute('style', styleStr);
-				this.$refs.scWaterMark.appendChild(watermark)
+				this.$refs.xWaterMark.appendChild(watermark)
 			},
 			clear(){
-				var wmDom = this.$refs.scWaterMark.querySelector('.watermark')
+				var wmDom = this.$refs.xWaterMark.querySelector('.watermark')
 				wmDom && wmDom.remove()
 			}
 		}
@@ -57,5 +57,5 @@
 </script>
 
 <style scoped>
-	.sc-water-mark {position: relative;display: inherit;width: 100%;height: 100%;}
+	.x-water-mark {position: relative;display: inherit;width: 100%;height: 100%;}
 </style>

src/config/table.js

@@ -7,7 +7,7 @@ export default {
     paginationLayout: "total, sizes, prev, pager, next, jumper", //表格分页布局，可设置"total, sizes, prev, pager, next, jumper"
     parseData: function(res) { //数据分析
         return {
-            data: res.data, //分析无分页的数据字段结构
+            data: res.data.data, //分析无分页的数据字段结构
             rows: res.data.data, //分析行数据字段结构
             total: res.data.count, //分析总数字段结构
             summary: res.data.summary, //分析合计行字段结构

src/views/user/trajectory/index.vue

@@ -23,21 +23,62 @@
             @click="sideClick(item)"/>
         </div>
         <div class="message-body-content">
-          <xTable name="OfferCollege"></xTable>
+          <!-- <xTable name="OfferCollege"></xTable> -->
         </div>
       </div>
     </div>
   </div>
 
-  <x-dialog v-model="dialogVisible" title="fdsafa">
-    <xTable name="OfferCollege"></xTable>
-  </x-dialog>
+  <x-dialog v-model="dialogVisible" width="80%" title="fdsafa">
+    <div style="padding:0 6px 6px 6px" class="pagetable">
+      <xTable 
+        ref="table" 
+        :tableColumn="column" 
+        :name="tablename" 
+        :params="search" 
+        api="app/url/lists" 
+        :row-key="key" 
+        :remoteSort="true" 
+        :remoteFilter="true" 
+        :hideDo="true" 
+        :hideRefresh="true" 
+        :hideSetting="true" 
+        :hidePagination="true" 
+        height="500"
+        border
+        stripe>
 
+    <el-table-column prop="msg" label="msg" width="800" />
+    <el-table-column prop="id" label="Name" width="180" />
+    <el-table-column prop="address" label="Address" width="500" />
+
+
+      </xTable>
+      </div>
+      <template #footer>
+        <el-pagination 
+          style="float: right;" 
+          background 
+          :small="true" 
+          layout="consists,prev,pager,next" 
+          :total="1000" 
+          :page-size="100" 
+          :page-sizes="100" />
+      </template>
+  </x-dialog>
 </template>
+<style scoped>
+  .x-dialog:deep(.el-dialog) .el-dialog__body { padding: 0}
+  .pagetable /deep/ .el-table--border th.el-table__cell{
+    background-color: #f6f8fa;
+    border-bottom: 1px solid #ebeef5;
+    color: #333;
+  }
+</style>
 
 <script>
 import xMenuItem from '@/components/xMenu/item'
-import xTable from '@/views/system/table'  
+// import xTable from '@/views/system/table'  
 
 
 export default {
@@ -45,7 +86,7 @@ export default {
   name: 'trajectory',
 
   components: {
-    xTable,
+    // xTable,
     xMenuItem,
   },
 

src/views/vab/watermark.vue

@@ -1,13 +1,13 @@
 <template>
 	<el-main>
 		<el-card shadow="never">
-			<sc-water-mark ref="wm" text="欢迎体验SCUI" subtext="admin@scui.com">
+			<x-water-mark ref="wm" text="欢迎体验SCUI" subtext="admin@scui.com">
 				<el-table :data="tableData" border stripe style="width: 100%">
 					<el-table-column prop="date" label="Date" width="180" />
 					<el-table-column prop="name" label="Name" width="180" />
 					<el-table-column prop="address" label="Address" />
 				</el-table>
-			</sc-water-mark>
+			</x-water-mark>
 		</el-card>
 		<el-card shadow="never" style="margin-top: 15px;">
 			<el-button type="primary" @click="create">创建水印</el-button>

src/x.js

@@ -26,7 +26,7 @@ import xTrend from './components/xMini/Trend'
 import xQrCode from './components/xQrCode'
 import xPageHeader from './components/xPageHeader'
 import xSelect from './components/xSelect'
-import scWaterMark from './components/scWaterMark'
+import xWaterMark from './components/xWaterMark'
 import {
     Flexbox,
     FlexboxItem
@@ -69,7 +69,7 @@ export default {
         app.component('xSelect', xSelect);
         app.component('xDialog', xDialog);
         app.component('xTitle', xTitle);
-        app.component('scWaterMark', scWaterMark);
+        app.component('xWaterMark', xWaterMark);
         app.component('xQrCode', xQrCode);
         app.component('xStatusIndicator', xStatusIndicator);
         app.component('xTrend', xTrend);