@@ -79,15 +79,16 @@
:action="uploadAction+'?cut='+cut"
list-type="picture-card"
:file-list="fileList"
+ :disabled='true'
@preview="handlePreview"
@change="handleChange"
>
-
+
+
+
+
+
+
![example]()
@@ -217,6 +218,23 @@
} else {
this.queryForm.brandText = this.queryForm.brandText
}
+ let file = []
+ getAction('sys/common/getFileInfos', { id: this.queryForm.brandLabel }).then((res) => {
+ if (res.success) {
+ console.log(res.result)
+ res.result.forEach((item =>{
+ file.push({
+ name : item.fileName,
+ uid : item.id,
+ url : item.url
+ })
+ }))
+ console.log(file)
+ this.fileList = file
+ } else {
+ // this.$refs.uploadFile.perentHandleFunc()
+ }
+ })
} else {
this.queryForm = {}
}
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
index 80e23eaf1..f0da57ff2 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
@@ -765,9 +765,32 @@
let content = this.projectNameList.filter(res => {
return res.id == value.projectNameId
})
+ if(value.dutyDepart){
+ value.dutyDepart = value.dutyDepart.split(',')
+ }
+ let file = []
+ getAction('sys/common/getFileInfos', { id: value.brandLabel }).then((res) => {
+ if (res.success) {
+ console.log(res.result)
+ res.result.forEach((item =>{
+ file.push({
+ name : item.fileName,
+ uid : item.id,
+ url : item.url
+ })
+ }))
+ console.log(file)
+ this.fileList = file
+ } else {
+ // this.$refs.uploadFile.perentHandleFunc()
+ }
+ })
this.formInline = value
console.log(this.formInline)
+ this.formInline.engineeringInterfacePersonName = this.formInline.engineeringInterfacePersonName
+ this.formInline.regulationOwnerIdName = this.formInline.regulationOwnerIdName
this.formInline = { ...this.formInline }
+ this.$forceUpdate()
}
} else {
this.projectNameList = []
@@ -794,6 +817,9 @@
editModel(value) {
this.visible = true
this.title = this.$t('edit')
+ const token = Vue.ls.get(ACCESS_TOKEN)
+ this.headers = { 'X-Access-Token': token }
+ console.log(this.headers)
this.getNameList(value)
this.$nextTick(() => {
this.$refs.ruleForm.clearValidate()
@@ -815,6 +841,7 @@
Action = postAction
}
let query = JSON.parse(JSON.stringify(this.formInline))
+ delete query.urlList
Object.keys(query).forEach(res => {
if (query[res] && query[res] instanceof Array) {
query[res] = query[res].join(',')
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
index 1c64a71b0..29e86e54d 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/settingList.vue
@@ -11,7 +11,10 @@
style="height: 100%;overflow: auto;padding-bottom: 53px;">
-
+
+
@@ -21,7 +24,7 @@
{{$t('Nodename')}}
@@ -50,7 +53,55 @@
-
+
+
+
+
+
+
+
+ *
+ {{$t('Nodename')}}
+
+
+
+
+
+
+ {{$t('Nodedate')}}
+
+
+
+
+
@@ -77,7 +128,8 @@
visible: false,
confirmLoading: false,
formInline: {
- list:[{}]
+ listUp:[{}],
+ listDown:[{}],
},
rules: {
},
@@ -88,15 +140,27 @@
},
methods: {
addClick(index){
- if(this.formInline.list.length > 19){
+ if(this.formInline.listUp.length > 19){
this.$message.warning(this.$t('maximum'))
}else{
- this.formInline.list.splice(index + 1, 0, {})
+ this.formInline.listUp.splice(index + 1, 0, {})
}
this.formInline = { ...this.formInline }
},
deleteClick(index) {
- this.formInline.list.splice(index, 1)
+ this.formInline.listUp.splice(index, 1)
+ this.formInline = { ...this.formInline }
+ },
+ addClickdown(index){
+ if(this.formInline.listDown.length > 19){
+ this.$message.warning(this.$t('maximum'))
+ }else{
+ this.formInline.listDown.splice(index + 1, 0, {})
+ }
+ this.formInline = { ...this.formInline }
+ },
+ deleteClickdown(index) {
+ this.formInline.listDown.splice(index, 1)
this.formInline = { ...this.formInline }
},
edit() {
@@ -109,11 +173,12 @@
settingQueryForm() {
getAction(this.url.settingQueryForm, { projectId: this.$route.query.id }).then((res) => {
if (res.success) {
- this.formInline.list = res.result ? res.result : [{}]
+ this.formInline.listUp = res.result.listUp ? res.result.listUp : [{}]
+ this.formInline.listDown = res.result.listDown ? res.result.listDown : [{}]
if(res.result==null ||res.result.length == 0){
- this.formInline.list=[{}]
+ this.formInline.listUp=[{}]
+ this.formInline.listDown=[{}]
}
- console.log(this.formInline.list)
}
})
@@ -121,14 +186,23 @@
handleOk() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
- if(this.formInline.list){
- this.formInline.list.forEach((item,index) => {
+ if(this.formInline.listUp){
+ this.formInline.listUp.forEach((item,index) => {
item.projectId = this.$route.query.id
if((item.nodeName == '' || item.nodeName == undefined) && (item.nodeTime == ''| item.nodeTime == undefined)){
- this.formInline.list.splice(index, 1) // 调用splice方法删除指定的对象
+ this.formInline.listUp.splice(index, 1) // 调用splice方法删除指定的对象
}
})
- this.formInline.list = this.formInline.list
+ this.formInline.listUp = this.formInline.listUp
+ }
+ if(this.formInline.listDown){
+ this.formInline.listDown.forEach((item,index) => {
+ item.projectId = this.$route.query.id
+ if((item.nodeName == '' || item.nodeName == undefined) && (item.nodeTime == ''| item.nodeTime == undefined)){
+ this.formInline.listDown.splice(index, 1) // 调用splice方法删除指定的对象
+ }
+ })
+ this.formInline.listDown = this.formInline.listDown
}
let query = {
...this.formInline,
@@ -160,12 +234,14 @@
},
handleCancel() {
this.formInline = {
- list:[{}]
+ listUp:[{}],
+ listDown:[{}],
}
this.visible = false
},
dateChange(item,index) {
- this.formInline.list[index].danodeTimete = this.formInline.list[index].nodeTime ? moment(this.formInline.list[index].nodeTime).format('YYYY-MM-DD') : ''
+ this.formInline.listUp[index].danodeTimete = this.formInline.listUp[index].nodeTime ? moment(this.formInline.listUp[index].nodeTime).format('YYYY-MM-DD') : ''
+ this.formInline.listDown[index].danodeTimete = this.formInline.listDown[index].nodeTime ? moment(this.formInline.listDown[index].nodeTime).format('YYYY-MM-DD') : ''
}
}
}
@@ -184,7 +260,12 @@
/*.formAdd .ant-form-item {*/
/* margin-bottom: 20px;*/
/*}*/
+ .header-text {
+ font-size: 16px;
+ color: #000000;
+ font-weight: bold;
+ }
.itemModel .ant-form-item-control-wrapper {
width: 100%;
}