From 8d0532d911852084a07c8b600da0da35d2987955 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期一, 04 十二月 2023 09:13:07 +0800
Subject: [PATCH] 项目
---
web/packages/components/zt-uploader/src/zt-uploader.vue | 10 ++++-
web/src/components/config-uploader/src/config-uploader.vue | 21 ++++++----
web/packages/components/zt-tree-selector/src/zt-tree-selector.vue | 10 ++++-
web/src/views/modules/sys/user-add-or-update.vue | 18 +++++----
web/packages/components/zt-combo-tree/src/zt-combo-tree.vue | 5 ++
web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue | 2
web/src/views/modules/project/Environ-AddOrUpdate.vue | 2
web/src/components/team-group-selector/src/team-group-selector.vue | 6 ++
8 files changed, 51 insertions(+), 23 deletions(-)
diff --git a/web/packages/components/zt-combo-tree/src/zt-combo-tree.vue b/web/packages/components/zt-combo-tree/src/zt-combo-tree.vue
index cf5c121..ab6a554 100644
--- a/web/packages/components/zt-combo-tree/src/zt-combo-tree.vue
+++ b/web/packages/components/zt-combo-tree/src/zt-combo-tree.vue
@@ -1,6 +1,7 @@
<template>
<zt-combo ref="combo" :placeholder="placeholder" :readonly="readonly" :disabled="disabled" @input-change="onInputChange">
<zt-tree-selector ref="tree" v-model="treeValue"
+ :isDisplay="isDisplay"
:idField="idField" :textField="textField" :parentIdField="parentIdField"
:disabled="disabled"
:url="url" :datas="datas" :simple="simple" :multiple="multiple" :leaf-only="leafOnly"
@@ -20,6 +21,10 @@
type: String,
default: 'id'
},
+ isDisplay:{
+ type: Boolean,
+ default: false
+ },
textField: {
type: String,
default: 'name'
diff --git a/web/packages/components/zt-tree-selector/src/zt-tree-selector.vue b/web/packages/components/zt-tree-selector/src/zt-tree-selector.vue
index 6111d26..b3d1188 100644
--- a/web/packages/components/zt-tree-selector/src/zt-tree-selector.vue
+++ b/web/packages/components/zt-tree-selector/src/zt-tree-selector.vue
@@ -3,6 +3,7 @@
<el-tree
ref="tree"
class="comb-tree"
+ :class="[{'isDisplay':isDisplay}]"
:disabled="disabled"
highlight-current
:check-strictly="checkStrictly"
@@ -39,6 +40,10 @@
textField: {
type: String,
default: 'name'
+ },
+ isDisplay:{
+ type: Boolean,
+ default: false
},
disabled:{
type: Boolean,
@@ -318,9 +323,10 @@
transform: rotate(-180deg);
}
- .comb-tree {
+ .isDisplay{
display: flex;
- width: auto;
+ }
+ .comb-tree {
height: 250px;
overflow-y: auto;
diff --git a/web/packages/components/zt-uploader/src/zt-uploader.vue b/web/packages/components/zt-uploader/src/zt-uploader.vue
index 7f9fa0d..ca23766 100644
--- a/web/packages/components/zt-uploader/src/zt-uploader.vue
+++ b/web/packages/components/zt-uploader/src/zt-uploader.vue
@@ -1,5 +1,5 @@
<template>
- <div class="zt-upload">
+ <div class="zt-upload" :class="[{'lineHeight':lineHeight}]">
<!-- 鏂囦欢涓婁紶 -->
<el-upload
ref="upload"
@@ -206,6 +206,10 @@
}
},
dataForm: Object,
+ lineHeight:{
+ type: Boolean,
+ default: false
+ },
action: {
type: String,
default: '/sys/oss/uploadNew'
@@ -956,7 +960,9 @@
.zt-upload {
line-height: 1;
}
-
+ .zt-upload.lineHeight{
+ line-height: 0;
+ }
.zt .upload-input .upload-btn {
padding: 8px 12px;
}
diff --git a/web/src/components/config-uploader/src/config-uploader.vue b/web/src/components/config-uploader/src/config-uploader.vue
index bae704a..2244630 100644
--- a/web/src/components/config-uploader/src/config-uploader.vue
+++ b/web/src/components/config-uploader/src/config-uploader.vue
@@ -34,23 +34,24 @@
<zt-uploader v-model="dataForm[field.busiField]" multiple :limit="field.fileLimit" :file-type="field.fileType"
:accept="field.accept" :file-size="field.fileSize" @input="change(field.busiField)"/>
</zt-form-item>-->
- <template slot="title">
- <el-tag>{{group.busiFieldGroup}}</el-tag>
- </template>
+<!-- <template slot="title">-->
+<!-- <el-tag>{{group.busiFieldGroup}}</el-tag>-->
+<!-- </template>-->
<!-- <zt-form-item :label="field.busiFieldName" :prop="field.busiField" v-for="field in group.fields"
:key="field.busiField" :rules="field.isRequired ? 'required':''" style="width: 100%;">
<zt-uploader v-model="dataForm[field.busiField]" multiple :limit="field.fileLimit" :file-type="field.fileType"
:accept="field.accept" :file-size="field.fileSize" @input="change(field.busiField)"/>
</zt-form-item>-->
<el-table :data="group.fields" :show-header="false">
- <el-table-column width="180" style="text-align: left;white-space:nowrap;">
- <template slot-scope="scope">
- <span v-html="(scope.row.isRequired?'<font color=red>* </font>':'')+ scope.row.busiFieldName"></span>
- </template>
- </el-table-column>
+<!-- <el-table-column width="180" style="text-align: left;white-space:nowrap;">-->
+<!-- <template slot-scope="scope">-->
+<!-- <span v-html="(scope.row.isRequired?'<font color=red>* </font>':'')+ scope.row.busiFieldName"></span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column align="left">
<template slot-scope="scope">
<zt-uploader v-model="dataForm[scope.row.busiField]" :dataForm="dataForm" multiple
+ :lineHeight="lineHeight"
:limit="scope.row.fileLimit" :file-type="scope.row.fileTypeArr"
:showFileList2="false" :accept="scope.row.accept" :file-size="scope.row.fileSize"
@input="change(scope.row.busiField)" @getUploaderImg="getUploaderImg"/>
@@ -68,6 +69,10 @@
name: 'ConfigUploader',
components: {},
props: {
+ lineHeight:{
+ type:Boolean,
+ default:false
+ },
value: Object,
dataForm: Object,
busiType: String // 涓氬姟绫诲瀷
diff --git a/web/src/components/team-group-selector/src/team-group-selector.vue b/web/src/components/team-group-selector/src/team-group-selector.vue
index 469def0..abd91da 100644
--- a/web/src/components/team-group-selector/src/team-group-selector.vue
+++ b/web/src/components/team-group-selector/src/team-group-selector.vue
@@ -1,5 +1,5 @@
<template>
- <zt-combo-tree v-model="selectValue" url="teamGroup/class/tree" :readonly="readonly" :disabled="disabled"
+ <zt-combo-tree v-model="selectValue" url="teamGroup/class/tree" :readonly="readonly" :disabled="disabled" :isDisplay="isDisplay"
:datas="datas" :multiple="multiple" :placeholder="placeholder" :leafOnly="leafOnly" :lazy="lazy" @select="onSelected"/>
</template>
<script>
@@ -14,6 +14,10 @@
type: Boolean,
default: false
},
+ isDisplay:{
+ type: Boolean,
+ default: false
+ },
disabled: {
type: Boolean,
default: false
diff --git a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
index 7236f5d..7b4f338 100644
--- a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
@@ -8,7 +8,7 @@
</div>
<div style="border: 1px solid rgba(0,0,0,.2);width: 99%">
<div style="border-bottom: 1px solid rgba(0,0,0,.2);" class="warehouseContentWidth">
- <el-form-item class="marginTopAndMarginBottom" label="椤圭洰缂栧彿" style="width: 49%">
+ <el-form-item class="marginTopAndMarginBottom" label="椤圭洰缂栧彿" style="width: 49%">
<el-input v-model="dataForm.project.code" placeholder="璇疯緭鍏ラ」鐩紪鍙�"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom" label="椤圭洰鍚嶇О" style="width: 49%">
diff --git a/web/src/views/modules/project/Environ-AddOrUpdate.vue b/web/src/views/modules/project/Environ-AddOrUpdate.vue
index 994e213..d296271 100644
--- a/web/src/views/modules/project/Environ-AddOrUpdate.vue
+++ b/web/src/views/modules/project/Environ-AddOrUpdate.vue
@@ -111,7 +111,7 @@
<div style="width: calc(100% - 120px);">
<div class="el-wt-border-left">
<span>{{dataForm.environ.testEnvirontDiagram}}</span>
- <config-uploader busi-type="test_environt_diagram" model-name="dataForm" :dataForm="dataForm"
+ <config-uploader :lineHeight="true" busi-type="test_environt_diagram" model-name="dataForm" :dataForm="dataForm"
@getImageUrl="getImageUrl"
v-model="dataForm.files"/>
<div v-if="dataForm.url">
diff --git a/web/src/views/modules/sys/user-add-or-update.vue b/web/src/views/modules/sys/user-add-or-update.vue
index 72d121b..014dbf1 100644
--- a/web/src/views/modules/sys/user-add-or-update.vue
+++ b/web/src/views/modules/sys/user-add-or-update.vue
@@ -9,10 +9,9 @@
<config-uploader busi-type="users" model-name="dataForm" :dataForm="dataForm"
@getImageUrl="getImageUrl"
v-model="dataForm.files"/>
- <div v-if="dataForm.url" >
- <el-image :src="dataForm.url" v-for="url in dataForm.url" :key="url[0,1]"></el-image>
+ <div v-if="dataForm.url">
+ <el-image v-for="(url, index) in dataForm.url" :key="index" :src="url"></el-image>
</div>
-
<zt-form-item prop="username" :label="$t('user.username')" rules="required">
<el-input v-model="dataForm.username" :placeholder="$t('user.username')"></el-input>
</zt-form-item>
@@ -163,12 +162,15 @@
}
},
getImageUrl() {
- let pictureId=[];
+ let pictureId=[]
pictureId = this.getFirstImageId(this.dataForm.files)
- for (let i=0;i<=pictureId.length;i++){
- pictureId=pictureId[i]
- this.dataForm.url[i] = `${window.SITE_CONFIG['apiURL']}/sys/oss/content2?fileId=${pictureId}`
- console.log(this.dataForm.url[i], ' this.dataForm.url')
+ console.log(pictureId,'getImageUrl() pictureId')
+ if(pictureId.length>0){
+ for (let i=0;i<=pictureId.length;i++){
+ pictureId=pictureId[i]
+ this.dataForm.url[i] = `${window.SITE_CONFIG['apiURL']}/sys/oss/content2?fileId=${pictureId}`
+ console.log(this.dataForm.url[i], ' this.dataForm.url')
+ }
}
},
getFirstImageId(oss) {
--
Gitblit v1.9.1