From 7351e0853db534f3493da0ba0463cdc5317c69f6 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期四, 18 七月 2024 15:09:55 +0800
Subject: [PATCH] 日工时管理的筛选条件中的时间范围页面不要展示时分秒,就年月日
---
src/components/view/a6-device-management.vue | 64 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 7 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 386d68c..addc892 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -162,7 +162,7 @@
</el-col>
<!-- 鍙宠竟甯冨眬 -->
<el-col :span="7">
- <el-form :label-position="labelPosition" :model="formData" label-width="120px" ref="ruleForm">
+ <el-form :label-position="labelPosition" :model="formData" label-width="140px" ref="ruleForm">
<!-- 瀹為獙瀹ゅ垪琛� -->
<el-form-item label="鎵�灞為儴闂�:">
<el-select :disabled="isUp" v-model="formData.subordinateDepartmentsId" placeholder="璇烽�夋嫨" size="small" style="width:100%">
@@ -225,6 +225,20 @@
</el-upload>
</div>
</el-form-item>
+ <el-form-item label="妫�娴嬬殑鏂囦欢绫诲瀷:">
+ <el-select :disabled="isUp" v-model="formData.fileType" placeholder="璇烽�夋嫨鏂囦欢绫诲瀷" clearable>
+ <el-option v-for="item in fileTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="閲囬泦鍦板潃:" clearable>
+ <el-input :disabled="isUp" v-model="formData.collectUrl"></el-input>
+ </el-form-item>
+ <el-form-item label="鍌ㄥ瓨鍦板潃:">
+ <el-input :disabled="isUp" v-model="formData.storageUrl"></el-input>
+ </el-form-item>
</el-form>
</el-col>
</el-row>
@@ -368,6 +382,20 @@
</el-upload>
</div>
</el-form-item>
+ <el-form-item label="妫�娴嬬殑鏂囦欢绫诲瀷:">
+ <el-select v-model="formData.fileType" placeholder="璇烽�夋嫨鏂囦欢绫诲瀷" clearable>
+ <el-option v-for="item in fileTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="閲囬泦鍦板潃:" clearable>
+ <el-input v-model="formData.collectUrl"></el-input>
+ </el-form-item>
+ <el-form-item label="鍌ㄥ瓨鍦板潃:">
+ <el-input v-model="formData.storageUrl"></el-input>
+ </el-form-item>
</el-form>
</el-col>
</el-row>
@@ -410,7 +438,7 @@
v-model="configForm.y"></el-input>
</div>
<div class="search_thing">
- <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>鍏紡锛�</div>
+ <div class="search_label">鍏紡锛�</div>
<el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="configForm.formula"></el-input>
</div>
@@ -435,6 +463,15 @@
},
data() {
return {
+ fileTypeOptions: [
+ {label: 'csv', value: '.csv'},
+ {label: 'db', value: '.db'},
+ {label: 'mdb', value: '.mdb'},
+ {label: 'word', value: '.docx'},
+ {label: 'excel', value: '.xlsx'},
+ {label: 'txt', value: '.txt'},
+ {label: 'png', value: '.png'},
+ ],
//鏄惁鏄。妗堜慨璁� true涓嶆槸 false鏄�
isUp: true,
formData: {
@@ -598,7 +635,7 @@
if (power[i].menuMethod == 'addDeviceParameter') {
add = true
}
- if (power[i].menuMethod == 'numberCollect') {
+ if (power[i].menuMethod == 'saveDataAcquisitionConfiguration') {
config = true
}
}
@@ -662,6 +699,23 @@
this.componentData.tagField.insProductIds.select = [...this.componentData.tagField.insProductIds.select,...children]
this.componentData.selectField.insProductIds.select = [...this.componentData.selectField.insProductIds.select,...children]
return m
+ })
+ this.options.forEach(item=>{
+ if(item.children.length==0){
+ item.children = null;
+ }else{
+ item.children.forEach(m=>{
+ if(m.children.length==0){
+ m.children = null;
+ }else{
+ m.children.forEach(n=>{
+ if(n.children&&n.children.length==0){
+ n.children = null;
+ }
+ })
+ }
+ })
+ }
})
})
},
@@ -887,10 +941,6 @@
}
if(!this.configForm.y){
this.$message.error('璇峰～鍐橸');
- return
- }
- if(!this.configForm.formula){
- this.$message.error('璇峰～鍐欏叕寮�');
return
}
--
Gitblit v1.9.3