From 7c47acc9d205fc5777f63e8d0c086aeeabd2303b Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Fri, 3 Nov 2023 15:20:40 +0800 Subject: [PATCH] fix --- package-lock.json | 5 + package.json | 1 + src/setting.js | 3 + src/utils/editor.js | 13 - src/views/parnerOperation/learnMg.vue | 1 + src/views/serve/Configure.vue | 428 ++++++++++++++------------ src/views/serve/projectAdd.vue | 10 +- src/views/shop/addProduct/index.vue | 4 +- 8 files changed, 257 insertions(+), 208 deletions(-) diff --git a/package-lock.json b/package-lock.json index 62eb8c2..a57b815 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12176,6 +12176,11 @@ "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" }, + "tinymce-plugin": { + "version": "0.0.3-beta.22", + "resolved": "https://registry.npmjs.org/tinymce-plugin/-/tinymce-plugin-0.0.3-beta.22.tgz", + "integrity": "sha512-TplhnAlYguOROSQ86x7COOFCI5uZT3l2QxTL0Euq+Mar4SI5VlVzUHi3Ix7lrvrXGGOHtt3SYS533R7ujYaVOg==" + }, "to-arraybuffer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", diff --git a/package.json b/package.json index 82256e1..96a0575 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "px2rem-loader": "^0.1.9", "qs": "^6.11.2", "sortablejs": "^1.14.0", + "tinymce-plugin": "0.0.3-beta.22", "vue": "^2.6.10", "vue-codemirror": "^4.0.6", "vue-cropper": "^0.5.8", diff --git a/src/setting.js b/src/setting.js index 2e098f1..cadf1d3 100644 --- a/src/setting.js +++ b/src/setting.js @@ -6,9 +6,11 @@ const isDev = process.env.NODE_ENV === 'development' // 开发环境 const isPro = url.includes('huorantech.cn') //正式服 let jumpPath = `${location.origin}/judgmentPoint` +let sandPath = `${location.origin}/sandbox` // 沙盘地址 let host = `${location.origin}/` if (isDev) { jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统 + sandPath = `http://${location.hostname}:9520` host = 'http://121.37.12.51/' // host = 'https://huorantech.cn/' // host = 'http://192.168.31.217:9000/'// 榕 @@ -25,6 +27,7 @@ const Setting = { platformId: 3, // 平台标识，1职站，2数据平台，3中台，4合伙人 platformSource: 0, // 平台来源(0中台，1职站) jumpPath, // 判分点系统跳转路径前缀 + sandPath, // 沙盘地址 apiBaseURL: host, // 请求路径前缀 uploadURL: isDev ? 'http://121.37.12.51/' : location.origin + '/', // 阿里云oss域名 // 平台列表 diff --git a/src/utils/editor.js b/src/utils/editor.js index 07eae7c..69bdab2 100644 --- a/src/utils/editor.js +++ b/src/utils/editor.js @@ -200,19 +200,6 @@ export default { { title: 'None', value: '' }, { title: 'Some class', value: 'class-name' } ], - //importcss_append: true, - //自定义文件选择器的回调内容 - file_picker_callback: function (callback, value, meta) { - if (meta.filetype === 'file') { - callback('https://www.baidu.com/img/bd_logo1.png', { text: 'My text' }); - } - if (meta.filetype === 'image') { - callback('https://www.baidu.com/img/bd_logo1.png', { alt: 'My alt text' }); - } - if (meta.filetype === 'media') { - callback('movie.mp4', { source2: 'alt.ogg', poster: 'https://www.baidu.com/img/bd_logo1.png' }); - } - }, //为内容模板插件提供预置模板 templates: [ { title: '中文文章模板1', description: '图片文字流', content: ` diff --git a/src/views/parnerOperation/learnMg.vue b/src/views/parnerOperation/learnMg.vue index 06b1fd1..e1abbf7 100644 --- a/src/views/parnerOperation/learnMg.vue +++ b/src/views/parnerOperation/learnMg.vue @@ -294,6 +294,7 @@ import Setting from '@/setting' import Util from '@/libs/util' import { mapState } from 'vuex' import Editor from '@tinymce/tinymce-vue' +// import t from "tinymce-plugin/plugins/tpImportword/plugin.js"; import editorConfig from '@/utils/editor' import Cropper from '@/components/img-upload/Cropper' import Axios from 'axios' diff --git a/src/views/serve/Configure.vue b/src/views/serve/Configure.vue index a105982..bfbf0a0 100644 --- a/src/views/serve/Configure.vue +++ b/src/views/serve/Configure.vue @@ -1,206 +1,254 @@ diff --git a/src/views/serve/projectAdd.vue b/src/views/serve/projectAdd.vue index fde011b..614ed34 100644 --- a/src/views/serve/projectAdd.vue +++ b/src/views/serve/projectAdd.vue @@ -666,6 +666,10 @@ export default { this.dialogVisible = true; this.handleQueryJudgment(); }, + // 根据系统id判断是否流程类 + isLc (systemId) { + return systemId == 11 || systemId == 12 || systemId == 19 + }, handleQueryJudgment () { // 查询判分点数据 let { systemId } = this.projectManage; this.$nextTick(() => { @@ -680,7 +684,7 @@ export default { }; if (systemId == 2 || systemId == 3) { console.log("系统id：", systemId); - } else if (systemId == 11 || systemId == 12) { + } else if (this.isLc(systemId)) { // (流程)交易类 this.rowKey = "lcId"; this.getProcessClassData(params); @@ -823,7 +827,7 @@ export default { console.log(systemId); } else if (systemId == 3) { console.log(systemId); - } else if (systemId == 11 || systemId == 12) { + } else if (this.isLc(systemId)) { // 交易类判分点（银行综合系统） href = `${jumpPath}/#/Transaction?isView=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; } else { @@ -836,7 +840,7 @@ export default { console.log(systemId); } else if (systemId == 3) { console.log(systemId); - } else if (systemId == 11 || systemId == 12) { + } else if (this.isLc(systemId)) { // 交易类判分点（银行综合系统） href = `${jumpPath}/#/Transaction?isEdit=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; } else { diff --git a/src/views/shop/addProduct/index.vue b/src/views/shop/addProduct/index.vue index 184706d..8a26ca9 100644 --- a/src/views/shop/addProduct/index.vue +++ b/src/views/shop/addProduct/index.vue @@ -924,7 +924,7 @@ export default { if (e.typeIds && e.typeIds.length) e.typeIds = e.typeIds[0] e.mall.interfaceDiagrams = e.mall.interfaceDiagram ? e.mall.interfaceDiagram.split(',') : [] e.mallAnnex.forEach(e => e.name = e.fileName) - if (e.systemId && e.systemId.split(',').filter(e => e != 12 && e != 13).length) this.isPython = true // 选择了python，则可选择主题 + if (e.systemId && e.systemId.split(',').filter(e => e != 11 && e != 12 && e != 19).length) this.isPython = true // 选择了python，则可选择主题 if (!e.mall.themeId) e.mall.themeId = '' if (e.mall.appletIcon) this.appletList = [ { @@ -1075,7 +1075,7 @@ export default { if (data.marketPrice) mall.marketUnitPrice = data.marketPrice // 判断是否是python系统 const systemIds = data.systemIds.split(',') - this.isPython = systemIds.filter(e => e != 12 && e != 13).length + this.isPython = systemIds.filter(e => e != 11 && e != 12 && e != 19).length this.calcAllSettlement() }).catch(err => { }) } else {