Compare commits

..

No commits in common. "24f4004eb7e1e5f9953369e8d0ea70921116cc12" and "50555ba5eae0671c82d1df66d23b05297996fa33" have entirely different histories.

2 changed files with 5 additions and 8 deletions

View File

@ -323,14 +323,14 @@
</el-card>
</el-col>
</el-row>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 70%">
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 85%">
<el-form >
<el-form-item >
<span style="font-size: 20px; font-weight: bold;">{{formData.newsName}}</span>
<el-divider style="border-top: none; margin: 0;"/>
<span style="font-size: 12px">发布时间: {{formatTime(formData.newsCreatetime,'yyyy-MM-dd')}}</span>
<el-divider style="margin-top: 10px"/>
<span style="line-height: 1.4" v-html="formData.newsContent"></span>
<span style="line-height: 1.2" v-html="formData.newsContent"></span>
</el-form-item>
</el-form>
<template #footer>
@ -341,7 +341,7 @@
<script lang="ts" setup>
import { formatTime } from '@/utils'
import type {Todo, Email} from './types'
import {dateFormatter2} from "@/utils/formatTime";
import {dateFormatter, dateFormatter2} from "@/utils/formatTime";
import {DICT_TYPE} from "@/utils/dict";
import {imgApi, imgVO} from "@/api/home/homeimg";
import {CalendarDateType, CalendarInstance} from "element-plus";
@ -587,7 +587,6 @@ const getList = async () => {
}
const getAllApi = async () => {
loading.value = true
await Promise.all([
getTableData(),
getTodo(),
@ -619,13 +618,11 @@ onMounted(() => {
}
</style>
<style scoped>
<style>
.SystemThem {
background-color: var(--el-color-primary);
}
.SystemThemFont {
font-size: 18px !important;
font-weight: bold !important;
color: var(--el-color-primary);
}
.custom-calendar {

View File

@ -157,7 +157,7 @@ const formRules = reactive({
const formRef = ref() // Ref
//
const processDefineKey = 'car-001' // Key
const processDefineKey = 'test-001' // Key
const startUserSelectTasks = ref([]) //
const startUserSelectAssignees = ref({}) //
const startUserSelectAssigneesFormRef = ref() // Ref