Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
lilin 2025-03-26 09:55:51 +08:00
commit 901a26583f
4 changed files with 24 additions and 24 deletions

View File

@ -785,7 +785,7 @@ const fileIcon = (row:any) => {
<el-form ref="ruleFormRef" style="max-width: 600px" :model="projectForme" :rules="moderules" <el-form ref="ruleFormRef" style="max-width: 600px" :model="projectForme" :rules="moderules"
label-width="auto" class="demo-ruleForm" status-icon> label-width="auto" class="demo-ruleForm" status-icon>
<el-form-item label="节点名称" prop="nodeName"> <el-form-item label="节点名称" prop="nodeName">
<el-input v-model="projectForme.nodeName" /> <el-input v-model="projectForme.nodeName" maxlength="40" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div style="width: 100%;display: flex;justify-content: end;"> <div style="width: 100%;display: flex;justify-content: end;">
@ -809,10 +809,10 @@ const fileIcon = (row:any) => {
<el-input v-model="fileObj.fileName" disabled /> <el-input v-model="fileObj.fileName" disabled />
</el-form-item> </el-form-item>
<el-form-item v-if="judge" label="关键字:" prop="taskName"> <el-form-item v-if="judge" label="关键字:" prop="taskName">
<el-input v-model="fileObj.keywords" /> <el-input v-model="fileObj.keywords" maxlength="200" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item v-if="judge" label="描述:"> <el-form-item v-if="judge" label="描述:">
<el-input v-model="fileObj.description" :rows="2" type="textarea" /> <el-input v-model="fileObj.description" :rows="2" type="textarea" maxlength="400" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div style="width: 100%;display: flex;justify-content: end;"> <div style="width: 100%;display: flex;justify-content: end;">

View File

@ -245,7 +245,7 @@ function typeName(arr:any,itemCode:any){
<el-form ref="ruleFormRef" style="max-width: 600px" :model="projectForme" :rules="moderules" <el-form ref="ruleFormRef" style="max-width: 600px" :model="projectForme" :rules="moderules"
label-width="auto" class="demo-ruleForm" status-icon> label-width="auto" class="demo-ruleForm" status-icon>
<el-form-item label=" 项目编号" prop="projectCode"> <el-form-item label=" 项目编号" prop="projectCode">
<el-input v-model="projectForme.projectCode" /> <el-input v-model="projectForme.projectCode" maxlength="40" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item label=" 项目类型" prop="projectType"> <el-form-item label=" 项目类型" prop="projectType">
<el-select v-model="projectForme.projectType" clearable placeholder=" " style="margin-right: 10px ;" @change="getdata()" > <el-select v-model="projectForme.projectType" clearable placeholder=" " style="margin-right: 10px ;" @change="getdata()" >
@ -254,13 +254,13 @@ function typeName(arr:any,itemCode:any){
<!-- <el-input v-model="projectForme.projectType" /> --> <!-- <el-input v-model="projectForme.projectType" /> -->
</el-form-item> </el-form-item>
<el-form-item label=" 项目名称" prop="projectName"> <el-form-item label=" 项目名称" prop="projectName">
<el-input v-model="projectForme.projectName" /> <el-input v-model="projectForme.projectName" maxlength="40" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item label=" 项目描述"> <el-form-item label=" 项目描述">
<el-input v-model="projectForme.description" :rows="2" type="textarea" /> <el-input v-model="projectForme.description" :rows="2" type="textarea" maxlength="400" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item label=" 项目信息"> <el-form-item label=" 项目信息">
<el-input v-model="projectForme.projectProps" :rows="2" type="textarea" /> <el-input v-model="projectForme.projectProps" :rows="2" type="textarea" maxlength="400" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item label=" 项目启动时间" prop="projectTime"> <el-form-item label=" 项目启动时间" prop="projectTime">
<el-date-picker v-model="projectForme.projectTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" <el-date-picker v-model="projectForme.projectTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"

View File

@ -1641,7 +1641,7 @@ function textClose() {
<el-form ref="ruleFormRef" style="max-width: 600px" :model="projectForme" :rules="moderules" <el-form ref="ruleFormRef" style="max-width: 600px" :model="projectForme" :rules="moderules"
label-width="auto" class="demo-ruleForm" status-icon> label-width="auto" class="demo-ruleForm" status-icon>
<el-form-item label="节点名称" prop="nodeName"> <el-form-item label="节点名称" prop="nodeName">
<el-input v-model="projectForme.nodeName" /> <el-input v-model="projectForme.nodeName" maxlength="40" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div style="width: 100%;display: flex;justify-content: end;"> <div style="width: 100%;display: flex;justify-content: end;">
@ -1662,13 +1662,13 @@ function textClose() {
<ZUpload /> <ZUpload />
</el-form-item> </el-form-item>
<el-form-item v-else prop="fileName" label="文件名称:"> <el-form-item v-else prop="fileName" label="文件名称:">
<el-input v-model="fileObj.fileName" /> <el-input v-model="fileObj.fileName" maxlength="40" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item v-if="judge" label="关键字:" prop="taskName"> <el-form-item v-if="judge" label="关键字:" prop="taskName">
<el-input v-model="fileObj.keywords" /> <el-input v-model="fileObj.keywords" maxlength="200" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item v-if="judge" label="描述:"> <el-form-item v-if="judge" label="描述:">
<el-input v-model="fileObj.description" :rows="2" type="textarea" /> <el-input v-model="fileObj.description" :rows="2" type="textarea" maxlength="400" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div style="width: 100%;display: flex;justify-content: end;"> <div style="width: 100%;display: flex;justify-content: end;">
@ -1684,7 +1684,7 @@ function textClose() {
<el-form ref="creatFormRef" style="max-width: 100%" :model="creatObj" :rules="creatrules" label-width="auto" <el-form ref="creatFormRef" style="max-width: 100%" :model="creatObj" :rules="creatrules" label-width="auto"
class="demo-ruleForm" status-icon> class="demo-ruleForm" status-icon>
<el-form-item label="文件/文件夹名称:" prop="fileName"> <el-form-item label="文件/文件夹名称:" prop="fileName">
<el-input v-model="creatObj.fileName" /> <el-input v-model="creatObj.fileName" maxlength="40" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item label="类型:"> <el-form-item label="类型:">
<el-radio-group v-model="creatObj.isFile"> <el-radio-group v-model="creatObj.isFile">
@ -1733,7 +1733,7 @@ function textClose() {
<el-form ref="renameFormRef" style="max-width: 100%" :model="renameobj" :rules="renameRules" <el-form ref="renameFormRef" style="max-width: 100%" :model="renameobj" :rules="renameRules"
label-width="auto" class="demo-ruleForm" status-icon> label-width="auto" class="demo-ruleForm" status-icon>
<el-form-item label="文件名称:" prop="fileName"> <el-form-item label="文件名称:" prop="fileName">
<el-input v-model="renameobj.fileName" /> <el-input v-model="renameobj.fileName" maxlength="40" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div style="width: 100%;display: flex;justify-content: end;"> <div style="width: 100%;display: flex;justify-content: end;">
@ -1754,13 +1754,13 @@ function textClose() {
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="名称:" prop="compressedName"> <el-form-item label="名称:" prop="compressedName">
<el-input v-if="zipzheng" v-model="zipObj.compressedName"> <el-input v-if="zipzheng" v-model="zipObj.compressedName" maxlength="40" show-word-limit >
<template #append>.{{ zipObj.compressedFormat }}</template> <template #append>.{{ zipObj.compressedFormat }}</template>
</el-input> </el-input>
<el-input v-else v-model="zipObj.compressedName" disabled></el-input> <el-input v-else v-model="zipObj.compressedName" disabled maxlength="40" show-word-limit ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="压缩路径:" prop="compressedPath"> <el-form-item label="压缩路径:" prop="compressedPath">
<el-input v-model="zipObj.compressedPath"> <el-input v-model="zipObj.compressedPath" maxlength="600" show-word-limit >
<template #prepend> <template #prepend>
<el-popover :visible="visible" placement="right" :width="400" trigger="click"> <el-popover :visible="visible" placement="right" :width="400" trigger="click">
<template #reference> <template #reference>

View File

@ -260,10 +260,10 @@ onMounted(() => {
<el-form ref="ruleFormRef" style="max-width: 600px" :model="projectForme" :rules="moderules" <el-form ref="ruleFormRef" style="max-width: 600px" :model="projectForme" :rules="moderules"
label-width="auto" class="demo-ruleForm" status-icon> label-width="auto" class="demo-ruleForm" status-icon>
<el-form-item label="任务编号" prop="taskCode"> <el-form-item label="任务编号" prop="taskCode">
<el-input v-model="projectForme.taskCode" /> <el-input v-model="projectForme.taskCode" maxlength="40" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item label="任务名称" prop="taskName"> <el-form-item label="任务名称" prop="taskName">
<el-input v-model="projectForme.taskName" /> <el-input v-model="projectForme.taskName" maxlength="40" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item label="任务时间"> <el-form-item label="任务时间">
<!-- <el-input v-model="projectForme.taskDate" /> --> <!-- <el-input v-model="projectForme.taskDate" /> -->
@ -271,22 +271,22 @@ onMounted(() => {
style="width:100%;" value-format="YYYY-MM-DD HH:mm:ss" /> style="width:100%;" value-format="YYYY-MM-DD HH:mm:ss" />
</el-form-item> </el-form-item>
<el-form-item label="任务地点"> <el-form-item label="任务地点">
<el-input v-model="projectForme.taskPlace" /> <el-input v-model="projectForme.taskPlace" maxlength="500" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item label="任务人员"> <el-form-item label="任务人员">
<el-input v-model="projectForme.taskPerson" /> <el-input v-model="projectForme.taskPerson" maxlength="500" show-word-limit/>
</el-form-item> </el-form-item>
<el-form-item label="载体类型"> <el-form-item label="载体类型">
<el-input v-model="projectForme.carrierType" /> <el-input v-model="projectForme.carrierType" maxlength="200" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item label="载体名称"> <el-form-item label="载体名称">
<el-input v-model="projectForme.carrierName" /> <el-input v-model="projectForme.carrierName" maxlength="40" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item label="设备编号"> <el-form-item label="设备编号">
<el-input v-model="projectForme.deviceCode" /> <el-input v-model="projectForme.deviceCode" maxlength="40" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item label="设备名称"> <el-form-item label="设备名称">
<el-input v-model="projectForme.deviceName" /> <el-input v-model="projectForme.deviceName" maxlength="40" show-word-limit />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div style="width: 100%;display: flex;justify-content: end;"> <div style="width: 100%;display: flex;justify-content: end;">