huoran
/
FE_middlePlatform_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

fix

Browse Source
dev_review
yujialong 1 year ago
parent 905701ae7b
commit 7c47acc9d2
8 changed files with 257 additions and 208 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      package-lock.json
  2. 1
      package.json
  3. 3
      src/setting.js
  4. 13
      src/utils/editor.js
  5. 1
      src/views/parnerOperation/learnMg.vue
  6. 98
      src/views/serve/Configure.vue
  7. 10
      src/views/serve/projectAdd.vue
  8. 4
      src/views/shop/addProduct/index.vue

5
package-lock.json generated
Unescape View File

@ -12176,6 +12176,11 @@
"resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" "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": { "to-arraybuffer": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",

1
package.json
Unescape View File

@ -24,6 +24,7 @@
"px2rem-loader": "^0.1.9", "px2rem-loader": "^0.1.9",
"qs": "^6.11.2", "qs": "^6.11.2",
"sortablejs": "^1.14.0", "sortablejs": "^1.14.0",
"tinymce-plugin": "0.0.3-beta.22",
"vue": "^2.6.10", "vue": "^2.6.10",
"vue-codemirror": "^4.0.6", "vue-codemirror": "^4.0.6",
"vue-cropper": "^0.5.8", "vue-cropper": "^0.5.8",

3
src/setting.js
Unescape View File

@ -6,9 +6,11 @@ const isDev = process.env.NODE_ENV === 'development' // 开发环境
const isPro = url.includes('huorantech.cn') //正式服 const isPro = url.includes('huorantech.cn') //正式服
let jumpPath = `${location.origin}/judgmentPoint` let jumpPath = `${location.origin}/judgmentPoint`
let sandPath = `${location.origin}/sandbox` // 沙盘地址
let host = `${location.origin}/` let host = `${location.origin}/`
if (isDev) { if (isDev) {
jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统 jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统
sandPath = `http://${location.hostname}:9520`
host = 'http://121.37.12.51/' host = 'http://121.37.12.51/'
// host = 'https://huorantech.cn/' // host = 'https://huorantech.cn/'
// host = 'http://192.168.31.217:9000/'// 榕 // host = 'http://192.168.31.217:9000/'// 榕
@ -25,6 +27,7 @@ const Setting = {
platformId: 3, // 平台标识，1职站，2数据平台，3中台，4合伙人 platformId: 3, // 平台标识，1职站，2数据平台，3中台，4合伙人
platformSource: 0, // 平台来源(0中台，1职站) platformSource: 0, // 平台来源(0中台，1职站)
jumpPath, // 判分点系统跳转路径前缀 jumpPath, // 判分点系统跳转路径前缀
sandPath, // 沙盘地址
apiBaseURL: host, // 请求路径前缀 apiBaseURL: host, // 请求路径前缀
uploadURL: isDev ? 'http://121.37.12.51/' : location.origin + '/', // 阿里云oss域名 uploadURL: isDev ? 'http://121.37.12.51/' : location.origin + '/', // 阿里云oss域名
// 平台列表 // 平台列表

13
src/utils/editor.js
Unescape View File

@ -200,19 +200,6 @@ export default {
{ title: 'None', value: '' }, { title: 'None', value: '' },
{ title: 'Some class', value: 'class-name' } { 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: [ templates: [
{ title: '中文文章模板1', description: '图片文字流', content: ` { title: '中文文章模板1', description: '图片文字流', content: `

1
src/views/parnerOperation/learnMg.vue
Unescape View File

@ -294,6 +294,7 @@ import Setting from '@/setting'
import Util from '@/libs/util' import Util from '@/libs/util'
import { mapState } from 'vuex' import { mapState } from 'vuex'
import Editor from '@tinymce/tinymce-vue' import Editor from '@tinymce/tinymce-vue'
// import t from "tinymce-plugin/plugins/tpImportword/plugin.js";
import editorConfig from '@/utils/editor' import editorConfig from '@/utils/editor'
import Cropper from '@/components/img-upload/Cropper' import Cropper from '@/components/img-upload/Cropper'
import Axios from 'axios' import Axios from 'axios'

98
src/views/serve/Configure.vue
Unescape View File

@ -1,6 +1,7 @@
<template> <template>
<div> <div>
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover"
class="mgb20">
<div> <div>
<div class="flex-center mgb20"> <div class="flex-center mgb20">
<p class="hr_tag"></p> <p class="hr_tag"></p>
@ -11,27 +12,37 @@
<div> <div>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="系统归属"> <el-form-item label="系统归属">
<el-select v-model="systemAttribution" clearable placeholder="请选择系统归属" <el-select v-model="systemAttribution"
clearable
placeholder="请选择系统归属"
@change="initData"> @change="initData">
<el-option v-for="(item,index) in systemBelongList" :key="index" <el-option v-for="(item,index) in systemBelongList"
:label="item.label" :value="item.value"></el-option> :key="index"
:label="item.label"
:value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="系统类型"> <el-form-item label="系统类型">
<el-select v-model="systemType" clearable placeholder="请选择系统类型" <el-select v-model="systemType"
clearable
placeholder="请选择系统类型"
@change="initData"> @change="initData">
<el-option v-for="(item,index) in systemTypeList" :key="index" <el-option v-for="(item,index) in systemTypeList"
:label="item.label" :value="item.value"></el-option> :key="index"
:label="item.label"
:value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</div> </div>
<el-col :span="6"> <el-col :span="6">
<el-form-item> <el-form-item>
<el-input placeholder="请输入系统名称" prefix-icon="el-icon-search" <el-input placeholder="请输入系统名称"
v-model.trim="systemSearch" clearable></el-input> prefix-icon="el-icon-search"
v-model.trim="systemSearch"
clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
@ -39,51 +50,83 @@
</div> </div>
</el-card> </el-card>
<el-card shadow="hover" class="card"> <el-card shadow="hover"
class="card">
<div class="flex-center mgb20"> <div class="flex-center mgb20">
<p class="hr_tag"></p> <p class="hr_tag"></p>
<span>服务列表</span> <span>服务列表</span>
</div> </div>
<el-table :data="systemData" class="table" stripe header-align="center"> <el-table :data="systemData"
class="table"
stripe
header-align="center">
<!-- <el-table-column type="selection" width="55" align="center"></el-table-column> --> <!-- <el-table-column type="selection" width="55" align="center"></el-table-column> -->
<el-table-column type="index" width="100" label="序号" align="center"> <el-table-column type="index"
width="100"
label="序号"
align="center">
</el-table-column> </el-table-column>
<el-table-column prop="systemName" label="系统名称" align="center"></el-table-column> <el-table-column prop="systemName"
<el-table-column prop="type" label="系统类型" align="center"> label="系统名称"
align="center"></el-table-column>
<el-table-column prop="type"
label="系统类型"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ systemTypeKeys[scope.row.type] }} {{ systemTypeKeys[scope.row.type] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="supplierName" label="供应商" align="center"></el-table-column> <el-table-column prop="supplierName"
<el-table-column prop="belong" label="系统归属" align="center"> label="供应商"
align="center"></el-table-column>
<el-table-column prop="belong"
label="系统归属"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ systemBelongKeys[scope.row.belong] }} {{ systemBelongKeys[scope.row.belong] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="state" label="系统状态" align="center"> <el-table-column prop="state"
label="系统状态"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ systemStatusKeys[scope.row.state] }} {{ systemStatusKeys[scope.row.state] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="payamount" label="系统后台" align="center"> <el-table-column prop="payamount"
label="系统后台"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="toBackstage(scope.row)" v-if="scope.row.systemId !== '11'" v-auth="'/configure:系统后台进入'">进入</el-button> <el-button type="text"
@click="toBackstage(scope.row)"
v-if="scope.row.systemId !== '11'"
v-auth="'/configure:系统后台进入'">进入</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="payamount" label="项目系统" align="center"> <el-table-column prop="payamount"
label="项目系统"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="getIntoProject(scope.row)" v-auth="'/configure:项目系统进入'">进入</el-button> <el-button type="text"
@click="getIntoProject(scope.row)"
v-auth="'/configure:项目系统进入'">进入</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="payamount" label="判分系统" align="center"> <el-table-column prop="payamount"
label="判分系统"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="getIntoJudgement(scope.row)" v-auth="'/configure:判分系统进入'">进入</el-button> <el-button type="text"
@click="getIntoJudgement(scope.row)"
v-auth="'/configure:判分系统进入'">进入</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pagination"> <div class="pagination">
<el-pagination background @current-change="handleCurrentChange" <el-pagination background
layout="total, prev, pager, next" :total="totals"> @current-change="handleCurrentChange"
layout="total, prev, pager, next"
:total="totals">
</el-pagination> </el-pagination>
</div> </div>
</el-card> </el-card>
@ -92,6 +135,7 @@
<script> <script>
import Setting from "@/setting"; import Setting from "@/setting";
import Cookie from 'js-cookie'
export default { export default {
data () { data () {
return { return {
@ -182,7 +226,11 @@ export default {
}, },
// 进入系统后台 // 进入系统后台
toBackstage (row) { toBackstage (row) {
if (row.systemId == 19) {
location.href = `${Setting.sandPath}/#/config?token=${sessionStorage.getItem('token')}&referrer=${encodeURIComponent(location.href)}`
} else {
this.$router.push(`/backstage?systemId=${row.systemId}&show=1&name=${row.systemName}`) this.$router.push(`/backstage?systemId=${row.systemId}&show=1&name=${row.systemName}`)
}
}, },
getIntoProject (row) { getIntoProject (row) {
this.$router.push(`/projectList?systemId=${row.systemId}&show=1&name=${row.systemName}`) this.$router.push(`/projectList?systemId=${row.systemId}&show=1&name=${row.systemName}`)

10
src/views/serve/projectAdd.vue
Unescape View File

@ -666,6 +666,10 @@ export default {
this.dialogVisible = true; this.dialogVisible = true;
this.handleQueryJudgment(); this.handleQueryJudgment();
}, },
// 根据系统id判断是否流程类
isLc (systemId) {
return systemId == 11 || systemId == 12 || systemId == 19
},
handleQueryJudgment () { // 查询判分点数据 handleQueryJudgment () { // 查询判分点数据
let { systemId } = this.projectManage; let { systemId } = this.projectManage;
this.$nextTick(() => { this.$nextTick(() => {
@ -680,7 +684,7 @@ export default {
}; };
if (systemId == 2 || systemId == 3) { if (systemId == 2 || systemId == 3) {
console.log("系统id：", systemId); console.log("系统id：", systemId);
} else if (systemId == 11 || systemId == 12) { } else if (this.isLc(systemId)) {
// (流程)交易类 // (流程)交易类
this.rowKey = "lcId"; this.rowKey = "lcId";
this.getProcessClassData(params); this.getProcessClassData(params);
@ -823,7 +827,7 @@ export default {
console.log(systemId); console.log(systemId);
} else if (systemId == 3) { } else if (systemId == 3) {
console.log(systemId); 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)}`; href = `${jumpPath}/#/Transaction?isView=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
} else { } else {
@ -836,7 +840,7 @@ export default {
console.log(systemId); console.log(systemId);
} else if (systemId == 3) { } else if (systemId == 3) {
console.log(systemId); 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)}`; href = `${jumpPath}/#/Transaction?isEdit=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
} else { } else {

4
src/views/shop/addProduct/index.vue
Unescape View File

@ -924,7 +924,7 @@ export default {
if (e.typeIds && e.typeIds.length) e.typeIds = e.typeIds[0] if (e.typeIds && e.typeIds.length) e.typeIds = e.typeIds[0]
e.mall.interfaceDiagrams = e.mall.interfaceDiagram ? e.mall.interfaceDiagram.split(',') : [] e.mall.interfaceDiagrams = e.mall.interfaceDiagram ? e.mall.interfaceDiagram.split(',') : []
e.mallAnnex.forEach(e => e.name = e.fileName) 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.themeId) e.mall.themeId = ''
if (e.mall.appletIcon) this.appletList = [ if (e.mall.appletIcon) this.appletList = [
{ {
@ -1075,7 +1075,7 @@ export default {
if (data.marketPrice) mall.marketUnitPrice = data.marketPrice if (data.marketPrice) mall.marketUnitPrice = data.marketPrice
// 判断是否是python系统 // 判断是否是python系统
const systemIds = data.systemIds.split(',') 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() this.calcAllSettlement()
}).catch(err => { }) }).catch(err => { })
} else { } else {

Write Preview
Loading…
Cancel
Save