Bladeren bron

😎调整页面显示

zuohuaijun 2 jaren geleden
bovenliggende
commit
732e34fc1c

+ 3 - 3
Web/src/views/system/job/index.vue

@@ -47,7 +47,7 @@
 						<el-table style="margin-left: 48px; width: calc(100% - 48px)" :data="(scope.row as JobDetailOutput).jobTriggers" border size="small">
 						<el-table style="margin-left: 48px; width: calc(100% - 48px)" :data="(scope.row as JobDetailOutput).jobTriggers" border size="small">
 							<el-table-column type="index" label="序号" width="55" align="center" fixed />
 							<el-table-column type="index" label="序号" width="55" align="center" fixed />
 							<el-table-column prop="triggerId" label="触发器编号" width="120" header-align="center" fixed show-overflow-tooltip />
 							<el-table-column prop="triggerId" label="触发器编号" width="120" header-align="center" fixed show-overflow-tooltip />
-							<el-table-column prop="triggerType" label="类型" header-align="center" show-overflow-tooltip />
+							<el-table-column prop="triggerType" label="类型" width="180" header-align="center" show-overflow-tooltip />
 							<!-- <el-table-column prop="assemblyName" label="程序集" show-overflow-tooltip /> -->
 							<!-- <el-table-column prop="assemblyName" label="程序集" show-overflow-tooltip /> -->
 							<el-table-column prop="args" label="参数" header-align="center" show-overflow-tooltip />
 							<el-table-column prop="args" label="参数" header-align="center" show-overflow-tooltip />
 							<el-table-column prop="description" label="描述" width="120" header-align="center" show-overflow-tooltip />
 							<el-table-column prop="description" label="描述" width="120" header-align="center" show-overflow-tooltip />
@@ -126,7 +126,7 @@
 					</template>
 					</template>
 				</el-table-column>
 				</el-table-column>
 				<el-table-column prop="jobDetail.groupName" label="组名称" width="100" align="center" show-overflow-tooltip />
 				<el-table-column prop="jobDetail.groupName" label="组名称" width="100" align="center" show-overflow-tooltip />
-				<el-table-column prop="jobDetail.jobType" label="类型" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="jobDetail.jobType" label="类型" width="180" header-align="center" show-overflow-tooltip />
 				<!-- <el-table-column prop="jobDetail.assemblyName" label="程序集" show-overflow-tooltip /> -->
 				<!-- <el-table-column prop="jobDetail.assemblyName" label="程序集" show-overflow-tooltip /> -->
 				<el-table-column prop="jobDetail.description" label="描述" header-align="center" show-overflow-tooltip />
 				<el-table-column prop="jobDetail.description" label="描述" header-align="center" show-overflow-tooltip />
 				<el-table-column prop="jobDetail.concurrent" label="执行方式" width="90" align="center" show-overflow-tooltip>
 				<el-table-column prop="jobDetail.concurrent" label="执行方式" width="90" align="center" show-overflow-tooltip>
@@ -222,7 +222,7 @@
 					<el-table-column prop="triggerId" label="触发器编号" min-width="120" header-align="center" show-overflow-tooltip />
 					<el-table-column prop="triggerId" label="触发器编号" min-width="120" header-align="center" show-overflow-tooltip />
 					<el-table-column prop="numberOfRuns" label="当前运行次数" min-width="100" align="center" show-overflow-tooltip />
 					<el-table-column prop="numberOfRuns" label="当前运行次数" min-width="100" align="center" show-overflow-tooltip />
 					<el-table-column prop="lastRunTime" label="最近运行时间" min-width="130" header-align="center" show-overflow-tooltip />
 					<el-table-column prop="lastRunTime" label="最近运行时间" min-width="130" header-align="center" show-overflow-tooltip />
-					<el-table-column prop="nextRunTime" label="下一次运行时间" min-width="120" header-align="center" show-overflow-tooltip />
+					<el-table-column prop="nextRunTime" label="下一次运行时间" min-width="130" header-align="center" show-overflow-tooltip />
 					<el-table-column prop="status" label="触发器状态" align="center" show-overflow-tooltip>
 					<el-table-column prop="status" label="触发器状态" align="center" show-overflow-tooltip>
 						<template #default="scope">
 						<template #default="scope">
 							<el-tag type="warning" effect="plain" v-if="(scope.row as SysJobTrigger).status == 0"> 积压 </el-tag>
 							<el-tag type="warning" effect="plain" v-if="(scope.row as SysJobTrigger).status == 0"> 积压 </el-tag>

+ 1 - 1
Web/src/views/system/onlineUser/index.vue

@@ -23,7 +23,7 @@
 					<el-table-column type="index" label="序号" width="55" align="center" />
 					<el-table-column type="index" label="序号" width="55" align="center" />
 					<el-table-column prop="userName" label="账号" header-align="center" show-overflow-tooltip />
 					<el-table-column prop="userName" label="账号" header-align="center" show-overflow-tooltip />
 					<el-table-column prop="realName" label="姓名" header-align="center" show-overflow-tooltip />
 					<el-table-column prop="realName" label="姓名" header-align="center" show-overflow-tooltip />
-					<el-table-column prop="ip" label="IP地址" header-align="center" show-overflow-tooltip />
+					<el-table-column prop="ip" label="IP地址" min-width="100" header-align="center" show-overflow-tooltip />
 					<el-table-column prop="browser" label="浏览器" header-align="center" show-overflow-tooltip />
 					<el-table-column prop="browser" label="浏览器" header-align="center" show-overflow-tooltip />
 					<!-- <el-table-column prop="connectionId" label="连接Id" show-overflow-tooltip></el-table-column> -->
 					<!-- <el-table-column prop="connectionId" label="连接Id" show-overflow-tooltip></el-table-column> -->
 					<el-table-column prop="time" label="登录时间" min-width="120" header-align="center" show-overflow-tooltip />
 					<el-table-column prop="time" label="登录时间" min-width="120" header-align="center" show-overflow-tooltip />

+ 12 - 12
Web/src/views/system/print/component/hiprint/providers.ts

@@ -11,11 +11,11 @@ export const aProvider = function () {
 				{
 				{
 					tid: 'aProviderModule.barcode',
 					tid: 'aProviderModule.barcode',
 					title: '条形码',
 					title: '条形码',
-					data: '18020030720',
+					data: '18012345678',
 					type: 'text',
 					type: 'text',
 					options: {
 					options: {
 						field: 'barCode',
 						field: 'barCode',
-						testData: 'ZUO18020030720',
+						testData: 'Z18012345678',
 						height: 32,
 						height: 32,
 						fontSize: 12,
 						fontSize: 12,
 						lineHeight: 18,
 						lineHeight: 18,
@@ -28,11 +28,11 @@ export const aProvider = function () {
 				{
 				{
 					tid: 'aProviderModule.qrcode',
 					tid: 'aProviderModule.qrcode',
 					title: '二维码',
 					title: '二维码',
-					data: 'ZUO18020030720',
+					data: 'Z18012345678',
 					type: 'text',
 					type: 'text',
 					options: {
 					options: {
 						field: 'qrCode',
 						field: 'qrCode',
-						testData: 'ZUO18020030720',
+						testData: 'Z18012345678',
 						height: 64,
 						height: 64,
 						width: 64,
 						width: 64,
 						fontSize: 12,
 						fontSize: 12,
@@ -223,11 +223,11 @@ export const bProvider = function () {
 				{
 				{
 					tid: 'bProviderModule.order',
 					tid: 'bProviderModule.order',
 					title: '订单编号',
 					title: '订单编号',
-					data: 'ZUO18020030720',
+					data: 'Z18012345678',
 					type: 'text',
 					type: 'text',
 					options: {
 					options: {
 						field: 'orderId',
 						field: 'orderId',
-						testData: 'ZUO18020030720',
+						testData: 'Z18012345678',
 						height: 16,
 						height: 16,
 						fontSize: 6.75,
 						fontSize: 6.75,
 						fontWeight: '700',
 						fontWeight: '700',
@@ -253,10 +253,10 @@ export const bProvider = function () {
 				{
 				{
 					tid: 'bProviderModule.barcode',
 					tid: 'bProviderModule.barcode',
 					title: '条形码',
 					title: '条形码',
-					data: '18020030720',
+					data: '18012345678',
 					type: 'text',
 					type: 'text',
 					options: {
 					options: {
-						testData: 'ZUO18020030720',
+						testData: 'Z18012345678',
 						height: 32,
 						height: 32,
 						fontSize: 12,
 						fontSize: 12,
 						lineHeight: 18,
 						lineHeight: 18,
@@ -269,10 +269,10 @@ export const bProvider = function () {
 				{
 				{
 					tid: 'bProviderModule.qrcode',
 					tid: 'bProviderModule.qrcode',
 					title: '二维码',
 					title: '二维码',
-					data: 'ZUO18020030720',
+					data: 'Z18012345678',
 					type: 'text',
 					type: 'text',
 					options: {
 					options: {
-						testData: 'ZUO18020030720',
+						testData: 'Z18012345678',
 						height: 64,
 						height: 64,
 						width: 64,
 						width: 64,
 						fontSize: 12,
 						fontSize: 12,
@@ -318,11 +318,11 @@ export const bProvider = function () {
 				{
 				{
 					tid: 'bProviderModule.tel',
 					tid: 'bProviderModule.tel',
 					title: '客户电话',
 					title: '客户电话',
-					data: '18020030720',
+					data: '18012345678',
 					type: 'text',
 					type: 'text',
 					options: {
 					options: {
 						field: 'tel',
 						field: 'tel',
-						testData: '18020030720',
+						testData: '18012345678',
 						height: 16,
 						height: 16,
 						fontSize: 6.75,
 						fontSize: 6.75,
 						fontWeight: '700',
 						fontWeight: '700',