Kaynağa Gözat

😁页面样式调整及代码清理

zuohuaijun 2 yıl önce
ebeveyn
işleme
4e166f4169

+ 4 - 2
Web/src/views/system/job/component/editJobTrigger.vue

@@ -223,9 +223,11 @@ const cronValue: WritableComputedRef<string> = computed({
 		// 第二个参数值参阅 https://furion.baiqian.ltd/docs/cron#2624-cronstringformat-%E6%A0%BC%E5%BC%8F%E5%8C%96
 		let cronStringFormatValue = -1;
 		// 如果是 Macro 标识符,使用默认格式
-		if (newValue.startsWith('@')) cronStringFormatValue = 0; // 默认格式,书写顺序:分 时 天 月 周
+		if (newValue.startsWith('@'))
+			cronStringFormatValue = 0; // 默认格式,书写顺序:分 时 天 月 周
 		else {
-			if (newValue.split(' ').length == 6) cronStringFormatValue = 2; // 带秒格式,书写顺序:秒 分 时 天 月 周
+			if (newValue.split(' ').length == 6)
+				cronStringFormatValue = 2; // 带秒格式,书写顺序:秒 分 时 天 月 周
 			else cronStringFormatValue = 3; // 带秒和年格式,书写顺序:秒 分 时 天 月 周 年
 		}
 		state.ruleForm.args = `"${newValue}",${cronStringFormatValue}`;

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

@@ -506,7 +506,7 @@ const openJobTriggerRecord = (row: any) => {
 // 作业触发器运行记录查询操作
 const handleQuery2 = async () => {
 	state.loading2 = true;
-	let params = Object.assign({jobId:state.currentJob.jobDetail.jobId}, state.tableParams2); //state.currentJob.jobTriggers[0].triggerId
+	let params = Object.assign({ jobId: state.currentJob.jobDetail.jobId }, state.tableParams2); //state.currentJob.jobTriggers[0].triggerId
 	var res = await getAPI(SysJobApi).apiSysJobPageJobTriggerRecordPost(params);
 	state.triggerRecordData = res.data.result?.items ?? [];
 	state.tableParams2.total = res.data.result?.total;

+ 1 - 0
Web/src/views/system/server/index.vue

@@ -219,5 +219,6 @@ onDeactivated(() => {
 
 .sysInfo_td {
 	border-bottom: 1px solid #e8e8e8;
+	min-width: 100px;
 }
 </style>

+ 7 - 1
Web/src/views/system/tenant/component/editTenant.vue

@@ -81,7 +81,13 @@
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="从库连接串">
-							<el-input v-model="state.ruleForm.slaveConnections" placeholder="格式:[{'HitRate':10, 'ConnectionString':'xxx'},{'HitRate':10, 'ConnectionString':'xxx'}]" clearable type="textarea" :disabled="state.ruleForm.tenantType == 0 && state.ruleForm.tenantType != undefined" />
+							<el-input
+								v-model="state.ruleForm.slaveConnections"
+								placeholder="格式:[{'HitRate':10, 'ConnectionString':'xxx'},{'HitRate':10, 'ConnectionString':'xxx'}]"
+								clearable
+								type="textarea"
+								:disabled="state.ruleForm.tenantType == 0 && state.ruleForm.tenantType != undefined"
+							/>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">

+ 1 - 1
Web/src/views/system/user/component/orgTree.vue

@@ -67,7 +67,7 @@ onMounted(async () => {
 
 // 递归遍历
 const InitOrg = (orgData: any, id: any) => {
-	if(orgData && orgData.length > 0) {
+	if (orgData && orgData.length > 0) {
 		orgData.forEach(function (u: any) {
 			if (u.id == id) {
 				u.style = currentNodeStyle;