this.addIndex;i--){
this.contentList[i+lengthImg-1]=this.contentList[i-1]
@@ -751,10 +752,12 @@
this.contentList[++this.addIndex]={
id:'',
type:'IMG',
- itemContent:item.id
+ itemContent:item.id,
+ thumbUrl:item.thumbUrl
}
})
}
+ // this.$refs.uploadFile2.visible=false
this.splitVisible=false
// console.log('conteend',this.contentList)
},
@@ -770,6 +773,11 @@
//表格确认按钮
handleOkTable(){
this.tableVisible=false
+ this.contentList[this.addIndex+1]= {
+ id:'',
+ type:'TABLE',
+ itemContent:this.ueContent
+ }
},
//表格取消按钮
handleCancelTable(){
@@ -788,6 +796,8 @@
//取消行数列数按钮
handleColCancel(){
this.tableColVisible=false
+ this.rowCount=''
+ this.colCount=''
},
//确定行数列数按钮
handleColOk(){
@@ -814,14 +824,12 @@
}
tableStr+=``
this.ueContent=tableStr
- this.contentList[this.addIndex+1]= {
- id:'',
- type:'TABLE',
- itemContent:tableStr
- }
+
this.$nextTick(() => {
this.$refs.ueditor.setContent(this.ueContent)
})
+ this.rowCount=''
+ this.colCount=''
}
// console.log('cont1111',this.addIndex,this.contentList)
},
@@ -849,6 +857,7 @@
},
/** 上传文件的回调 */
uploadSuccess(data) {
+ console.log('dataaaaa',data)
let attIdList = []
if (data && data.length > 0) {
data.map(item => {
@@ -859,6 +868,10 @@
this.formInline[this.uploadName] = attIdList.join(',')
this.formInline = { ...this.formInline }
},
+ //关闭上传
+ coloseHandle(){
+ this.splitVisible=false
+ },
handleInput(value) {
this.$nextTick(() => {
this.formInline = { ...this.formInline }
@@ -957,9 +970,11 @@
this.getForm(() => {
getAction(this.url.getDocumentInfo, { id: item.id }).then((res) => {
if (res.success) {
- this.formInline = res.result[0]
+ this.formInline = res.result
+ console.log('form11111',this.formInline)
}
})
+
})
},
add() {
@@ -977,6 +992,7 @@
this.formInline[value + '_id'] = id
this.formInline = { ...this.formInline }
},
+
//正则替换小数点
limitNumber(value) {
if (typeof value === 'string') {
@@ -1179,4 +1195,13 @@
width: 100%;
}
}
+ .split-img{
+ .ant-modal-body{
+ img{
+ margin-top: 20px;
+ width: 470px;
+ height: 100%;
+ }
+ }
+ }
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
index d0e0421a7..0b5098d7a 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
@@ -16,10 +16,10 @@
@select="onSelect"
>
-
+
{{ title.substr(0, title.indexOf(searchValue)) }}{{ searchValue }}{{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
- {{ title }}
+ {{ title }}
@@ -251,7 +251,7 @@
getAddForm: 'language/switch/getForm', // 表单的字段
addInfo: '/jero-boot/split/sarFileSplitItems/addSplitItems', //新增
updateInfo:'/jero-boot/split/sarFileSplitItems/updateSplitItems', //编辑
- getDocumentInfo:'split/sarFileSplitInfo/queryById',
+ getDocumentInfo:'split/sarFileSplitItems/getSplitItemsById',
importZipUrl: '/split/sarFileSplitItems/importSplitItems',//导入
},
urlBatSet:{
@@ -483,6 +483,7 @@
}
}).finally(()=>{
this.flag=false
+ this.menuRightVisible=false
})
}
}
@@ -505,6 +506,7 @@
}
}).finally(()=>{
this.flag=false
+ this.menuRightVisible=false
})
}
},
@@ -550,41 +552,46 @@
infoIds:infoIds.join(','),
menuids:menuIds.join(',')
}
- this.$confirm({
- title: this.$t('ConfirmReplication'),
- content: '',
- onOk:
- async () => {
- axios({
- url: '/jero-boot/split/sarFileSplitMenu/copyMenuNotChildrenall',
- method: 'get',
- params: params,
- // transformRequest: [function (data) {
- // // Do whatever you want to transform the data
- // let ret = ''
- // for (let it in data) {
- // ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
- // }
- // return ret
- // }],
- headers: {
- // 'Content-Type': 'application/x-www-form-urlencoded',
- 'X-Access-Token':this.token
- }
- })
- .then( (res) => {
- if(res.data.success){
- this.$message.success(this.$t('OperationSuccessful'))
- // this.loadData()
- this.loadMenuData()
- eventBUs.$emit('searchReset')
- }else{
- this.$message.warning(this.$t('operationFailed'))
+ if(menuIds&&menuIds.length>0) {
+ this.$confirm({
+ title: this.$t('ConfirmReplication'),
+ content: '',
+ onOk:
+ async () => {
+ axios({
+ url: '/jero-boot/split/sarFileSplitMenu/copyMenuNotChildrenall',
+ method: 'get',
+ params: params,
+ // transformRequest: [function (data) {
+ // // Do whatever you want to transform the data
+ // let ret = ''
+ // for (let it in data) {
+ // ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+ // }
+ // return ret
+ // }],
+ headers: {
+ // 'Content-Type': 'application/x-www-form-urlencoded',
+ 'X-Access-Token': this.token
}
})
+ .then((res) => {
+ if (res.data.success) {
+ this.$message.success(this.$t('OperationSuccessful'))
+ // this.loadData()
+ this.loadMenuData()
+ eventBUs.$emit('searchReset')
+ } else {
+ this.$message.warning(this.$t('operationFailed'))
+ }
+ })
+ },
+ onCancel() {
},
- onCancel() {},
- });
+ })
+ }else if(menuIds.length==0){
+ this.$message.warning(this.$t('PleaseSelectData'))
+ }
},
//新增
handleAddManage(){
@@ -768,7 +775,7 @@
ids:val.id
}
this.$confirm({
- title: this.$t('ConfirmBatchDeletion'),
+ title: this.$t('areYouSure'),
content: '',
onOk:
async () => {
@@ -958,7 +965,7 @@
display: flex;
justify-content: space-between;
.split-detail-left{
- min-width: 260px;
+ width: 260px;
padding-right: 20px;
border-right: 1px solid #666666;
.menu-item{
@@ -1054,4 +1061,17 @@
text-align: center;
}
}
+ .split-detail-left{
+ .ant-tree-treenode-switcher-open{
+ .ant-tree-node-content-wrapper-normal{
+ width:200px;
+ white-space:nowrap;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ }
+ .ant-tree-title{
+
+ }
+ }
+ }
\ No newline at end of file