diff --git a/jero-web/package-lock.json b/jero-web/package-lock.json index 5a47b558c..c621e69d5 100644 --- a/jero-web/package-lock.json +++ b/jero-web/package-lock.json @@ -29,6 +29,7 @@ "md5": "^2.2.1", "nprogress": "^0.2.0", "tinymce": "^5.3.2", + "v-viewer": "^1.6.4", "viser-vue": "^2.4.8", "vue": "^2.6.10", "vue-area-linkage": "^5.1.0", @@ -18605,6 +18606,14 @@ "webpack": "^2.0.0 || ^3.0.0 || ^4.0.0" } }, + "node_modules/throttle-debounce": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.3.0.tgz", + "integrity": "sha512-H7oLPV0P7+jgvrk+6mwwwBDmxTaxnu9HMXmloNLXwnNO0ZxZ31Orah2n8lU1eMPvsaowP2CX+USCgyovXfdOFQ==", + "engines": { + "node": ">=8" + } + }, "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -19274,6 +19283,19 @@ "uuid": "bin/uuid" } }, + "node_modules/v-viewer": { + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/v-viewer/-/v-viewer-1.6.4.tgz", + "integrity": "sha512-LVkiUHpmsbsZXebeNXnu8krRCi5i2n07FeLFxoIVGhw8lVvTBO0ffpbDC6mLEuacCjrIh09HjIqpciwUtWE8lQ==", + "dependencies": { + "throttle-debounce": "^2.0.1", + "viewerjs": "^1.5.0" + }, + "engines": { + "node": ">=4", + "npm": ">=3" + } + }, "node_modules/validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -19324,6 +19346,11 @@ "extsprintf": "^1.2.0" } }, + "node_modules/viewerjs": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.10.5.tgz", + "integrity": "sha512-QwKrmXlSfKg5x4y74F/jicpHIRqBMMfHXyboOxHDi5n4XAaejjpalphPq4/HW6venQAoMiD57HpVwBk0JvqpSA==" + }, "node_modules/viser": { "version": "2.4.9", "resolved": "https://registry.npmjs.org/viser/-/viser-2.4.9.tgz", @@ -36606,6 +36633,11 @@ "neo-async": "^2.6.0" } }, + "throttle-debounce": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.3.0.tgz", + "integrity": "sha512-H7oLPV0P7+jgvrk+6mwwwBDmxTaxnu9HMXmloNLXwnNO0ZxZ31Orah2n8lU1eMPvsaowP2CX+USCgyovXfdOFQ==" + }, "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -37144,6 +37176,15 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" }, + "v-viewer": { + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/v-viewer/-/v-viewer-1.6.4.tgz", + "integrity": "sha512-LVkiUHpmsbsZXebeNXnu8krRCi5i2n07FeLFxoIVGhw8lVvTBO0ffpbDC6mLEuacCjrIh09HjIqpciwUtWE8lQ==", + "requires": { + "throttle-debounce": "^2.0.1", + "viewerjs": "^1.5.0" + } + }, "validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -37184,6 +37225,11 @@ "extsprintf": "^1.2.0" } }, + "viewerjs": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.10.5.tgz", + "integrity": "sha512-QwKrmXlSfKg5x4y74F/jicpHIRqBMMfHXyboOxHDi5n4XAaejjpalphPq4/HW6venQAoMiD57HpVwBk0JvqpSA==" + }, "viser": { "version": "2.4.9", "resolved": "https://registry.npmjs.org/viser/-/viser-2.4.9.tgz", diff --git a/jero-web/package.json b/jero-web/package.json index bfa8f56e8..c8f4fbeb9 100644 --- a/jero-web/package.json +++ b/jero-web/package.json @@ -31,6 +31,7 @@ "md5": "^2.2.1", "nprogress": "^0.2.0", "tinymce": "^5.3.2", + "v-viewer": "^1.6.4", "viser-vue": "^2.4.8", "vue": "^2.6.10", "vue-area-linkage": "^5.1.0", diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue index 78c8be684..ebd3b676a 100644 --- a/jero-web/src/components/Standardselection/index.vue +++ b/jero-web/src/components/Standardselection/index.vue @@ -150,6 +150,7 @@ }) this.$emit('input', content.join(',')) this.$emit('change', this.query.db_field_name, replace_standard_id.join(',')) + this.$emit('changecontent', this.content) this.visible = false } else { this.$message.warning(this.$t('selectLeastOne')) diff --git a/jero-web/src/main.js b/jero-web/src/main.js index ad5bc39ad..1258d507d 100644 --- a/jero-web/src/main.js +++ b/jero-web/src/main.js @@ -70,7 +70,17 @@ Vue.use(vueBus); Vue.use(JeroComponents); Vue.use(VueAreaLinkage); Vue.use(VueI18n) - +// 图片放大缩小插件 +import Viewer from 'v-viewer' +import 'viewerjs/dist/viewer.css' +Vue.use(Viewer,{ + defaultOptions:{ + zIndex:999999 + } +}); +Viewer.setDefaults({ + Options: { "inline": true, "button": true ,'zIndex': 9999, 'zIndexInline': 9999} +}); const i18n = new VueI18n({ locale: 'zh-cn', messages: { diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue index 4b1023f95..e4fe41ef3 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue @@ -168,6 +168,7 @@
- + + + +
@@ -556,7 +560,8 @@ itemVal:{}, contentTrees:'', isTableEdit:false, - + // 新增添加字段 + standardSelectionContent: [], // 所选择的标准选择的全部字段 } }, props:{ @@ -704,7 +709,7 @@ params.info_id=this.infoId params.menu_id=this.menuId - + console.log(this.contentList,'this.contentListthis.contentList') let contentList=JSON.parse(JSON.stringify(this.contentList)) contentList.forEach((item,index)=>{ if(item.type==='IMG'){ @@ -717,6 +722,8 @@ params.itemValEOList=contentList // console.log('paramsformInline',params) params.delItemIds=this.deleteIds.join(',') + console.log(params,'paramsparams,paramsparams') + console.log() axios({ url: url, method: 'post', @@ -1061,7 +1068,7 @@ if (res.success) { this.dataList = res.result this.ruleList = res.result - // console.log('res',this.dataList) + console.log('res',this.dataList) this.IntegrateData() callBack && callBack() } @@ -1093,9 +1100,15 @@ this.type = 'add' }, + changeContent(val) { + console.log(val,'kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk') + this.standardSelectionContent = val + console.log(this.standardSelectionContent,'vcalllll') + }, StandardselectionChange(value, id) { this.formInline[value + '_id'] = id this.formInline = { ...this.formInline } + console.log(this.formInline,'this.formInlinethis.formInlinethis.formInline') }, PersonnelSelectionChange(value, id) { this.formInline[value + '_id'] = id