Skip to content

M
marketing
Commit 4416d915 by caoyanzhi
Options

Merge branch 'feature/3月迭代' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/js/card.ab453e79fc8f4f4fa9e6.js
#	dist/static/js/ecm.46e7a962fa533a2b5a74.js
#	dist/static/js/ecm.7df86b8fb7cb8e487316.js
#	dist/static/js/ecm.ba63bb58d51729e84928.js
#	dist/static/js/evaluation.24dee8cce61b88177e37.js
#	dist/static/js/evaluation.7f6636ae60d3eda39960.js
#	dist/static/js/evaluation.84de0170a7d4d20235a3.js
#	dist/static/js/manifest.8e9ebdd7fd0b64c67849.js
parents 6b35d459 adb42320
Showing with 273 additions and 57 deletions
dist/index.html
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title></title><link rel=stylesheet type=text/css href=static/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//at.alicdn.com/t/font_3229694_vfjtu9hqyrc.css><script src=//at.alicdn.com/t/font_3229694_vfjtu9hqyrc.js></script><link href=/marketing/static/css/main.1b7ac1283fd50dea9070e2602b7b1771.css rel=stylesheet></head><body><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
=======
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title></title><link rel=stylesheet type=text/css href=static/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//at.alicdn.com/t/font_2996579_93aeeozj35q.css><link href=/marketing/static/css/main.d89dea084120421e7b30d68bd033b244.css rel=stylesheet></head><body><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
>>>>>>> feature/3月迭代
var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
document.write('<script src="//' + host + src + '"><\/script>');
})();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.4e0b8ee288c2b9d19f2e.js></script><script type=text/javascript src=/marketing/static/js/vendor.9f0936124b34828b8756.js></script><script type=text/javascript src=/marketing/static/js/main.8c35d9bc0c7402434d04.js></script></body></html>
\ No newline at end of file
<<<<<<< HEAD
})();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.4e0b8ee288c2b9d19f2e.js></script><script type=text/javascript src=/marketing/static/js/vendor.9f0936124b34828b8756.js></script><script type=text/javascript src=/marketing/static/js/main.8c35d9bc0c7402434d04.js></script></body></html>
=======
})();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.8e9ebdd7fd0b64c67849.js></script><script type=text/javascript src=/marketing/static/js/vendor.f023e8a9a0c1cdaacdae.js></script><script type=text/javascript src=/marketing/static/js/main.43d4b2b8838c019bc1bd.js></script></body></html>
>>>>>>> feature/3月迭代
dist/static/css/main.d89dea084120421e7b30d68bd033b244.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/card.6b8a2aa321095e8bf967.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/ecm.46e7a962fa533a2b5a74.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/ecm.7df86b8fb7cb8e487316.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/evaluation.24dee8cce61b88177e37.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/evaluation.84de0170a7d4d20235a3.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/game.f696a75d18f63ba382a1.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.8e9ebdd7fd0b64c67849.js 0 → 100644
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,c){for(var f,i,u,s=0,d=[];s<r.length;s++)i=r[s],t[i]&&d.push(t[i][0]),t[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,c);d.length;)d.shift()();if(c)for(s=0;s<c.length;s++)u=a(a.s=c[s]);return u};var r={},t={17:0};function a(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,a){n=t[e]=[r,a]});n[2]=r;var o=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,a.nc&&c.setAttribute("nonce",a.nc),c.src=a.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ecm",4:"message",5:"ewash",6:"scan",7:"recharge",8:"activity",9:"signIn",10:"evaluation",11:"cdKey",12:"popup",13:"msg",14:"calllog"}[e]||e)+"."+{0:"6b8a2aa321095e8bf967",1:"f696a75d18f63ba382a1",2:"87577d5631db74a5c53f",3:"46e7a962fa533a2b5a74",4:"5191a87f6bf08777e93b",5:"fcf26357353a16e34874",6:"16de762ea519e8b1b79c",7:"57fab6f6b65984488b8b",8:"027b144d7e02f568cfcb",9:"b9215ca5f80c0f14e4e1",10:"24dee8cce61b88177e37",11:"04ea2e4b129980c10d62",12:"7a732ff9a02812ec59a5",13:"36276a6899f058e9d8e6",14:"0d5636d0cec7eadf7549"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,o.appendChild(c),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/message.5191a87f6bf08777e93b.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/popup.7a732ff9a02812ec59a5.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/recharge.57fab6f6b65984488b8b.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/scan.16de762ea519e8b1b79c.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.f023e8a9a0c1cdaacdae.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/ai/createParams.js 0 → 100644
/**
* 解析property
* @param {Number | String} val property值，也可能是多个对应值之和
* @return {Object} map
* @return {Boolean} map.isCompute 是否是计算属性
* @return {Boolean} map.isField 是否是字段属性
* @return {Boolean} map.isValue 是否是值属性
* @return {Boolean} map.isCategray 是否是不是属性
* @return {Boolean} map.notProperty 是否是类别属性
*/
function parseProperty(val) {
// 用二进制对应位上的1表示对应属性的开启状态
// {
// 1: '0001', // 计算属性
// 2: '0010', // 字段属性
// 4: '0100', // 值属性
// 8: '1000', // 不是属性
// 16: '00010000', // 类别属性
// }
// 将val转为二进制，来处理值之和的情况，例如：3 = 1 + 2 = 0001 + 0010 = 0011
// 然后再把二进制值的字符串转为数字，调转顺序，0 1转为bool
const status = Number(val)
.toString(2)
.split('')
.reverse()
.map(i => i == 1);
// 根据上面的键值对表，从二进制最末一位开始，对应在数组里
const keys = ['isCompute', 'isField', 'isValue', 'isCategray', 'notProperty'];
// 根据数组转换出状态结果
return keys.reduce((map, key, index) => ({ ...map, [key]: !!status[index] }), {});
}
function getParamsData(node) {
const result = { key: '', compute: '', value: '' };
const property = parseProperty(node.property);
if (property.isField) {
result.key = node.columnKey;
// console.log(result.key)
}
// isCompute 是否是计算属性
// 计算属性的值来源：computeCharacter或是选择的值
if (property.isCompute) {
result.compute = node.computeCharacter;
}
// notProperty 是否是类别属性
// 类别属性 dealkey有值就带上，和value key同级，如果没值要删掉
if (property.notProperty && node.dealKey) {
result.dealKey = node.dealKey;
}
result.value = node.value;
return { type: 'data', data: result };
}
/**
* @description 将数据转换成后端需要的数据、缩略信息数据
* @param {Object} data 选择好的筛选条件数据
* @return {Array} result.filterJson 后端需要的查询条件
* @return {Array} result.filterFrontShow 前端回显的数据
*/
const transform = (data, scenes) => {
const result = {
filterJson: [], // 后台需要的查询条件
filterFrontShow: [], // 前端回显的数据
scenes: scenes // 场景值 member02
};
const obj = { list: [], type: 'and' };
let arr = [];
data.forEach(item => {
if (item.value) {
obj.list.push({ type: 'or', list: [getParamsData(item)] });
arr.push(item);
}
});
result.filterJson = JSON.stringify(obj);
result.filterFrontShow = JSON.stringify(arr);
return result;
};
export default transform;
src/views/ai/form.vue
......@@ -30,7 +30,7 @@
<div>
<div class="tips" v-if="form.scene == 4">默认为权限范围内的全部客户</div>
<el-button v-if="form.memberType == 0 && form.scene != 4" size="small" @click="ruleVisible = true">添加其他条件</el-button>
<ruleFilter :visiable.sync="ruleVisible" />
<ruleFilter :visiable.sync="ruleVisible" @save="handleRuleFilterSave" :memberCrowdWidgetId="form.filterJson" />
<el-button v-if="form.memberType == 1 && !selectedGroup.length && form.scene != 4" size="small" @click="groupVisible = true">添加分组</el-button>
<gic-new-member-group :visiable.sync="groupVisible" :defaltSelected="selectedGroup" @change="confirmGroupDialog" />
</div>
......@@ -565,6 +565,10 @@ export default {
const { result } = await getMemberCount(data);
this.form.planMemberCount = result;
},
/**客户筛选 */
handleRuleFilterSave(id) {
this.form.filterJson = id;
},
/**客户分组 */
confirmGroupDialog(arr, idStr) {
this.selectedGroup = arr;
......
src/views/ai/manage.vue
......@@ -28,13 +28,24 @@
<div class="no-data-text">还未创建话术，请联系运营经理创建话术</div>
</div>
<el-dialog :visible.sync="tempDetail.show" @closed="onClosed" width="760px" title="查看话术">
<div class="temp-detail-item" v-for="el in 3" :key="el">
<div class="temp-detail-content">
<div class="temp-detail-title">普通节点</div>
<div class="temp-detail-desc">您好，我是江南布衣集团的首席福利官Rocky（停顿1秒），看到本月是您的生日月，祝您生日快乐呀！（空白2s）您的生日福利包已经准备好咯，本月有专属的生日折扣券和生日礼品福利可以领取呢~我稍后把领取路径发您手机上，记得点击领取一下哦~您的生日礼需要到所属的服务门店凭券直接领取，本月什么时候方便领取一下呢？</div>
<div v-if="!Array.isArray(tempDetail.tempData) || tempDetail.tempData.length == 0" class="no-temp-data">暂无话术节点</div>
<template v-else>
<div class="temp-detail-item" v-for="el in tempDetail.tempData" :key="el.decisionId">
<div class="temp-detail-content">
<div class="temp-detail-title">{{ el.decisionNodeType | formatNodeType }}</div>
<div v-if="!Array.isArray(el.list) || el.list.length == 0" class="no-temp-data">暂无录音</div>
<template v-else>
<div v-for="item in el.list" :key="item.id" class="sound-record">
<div class="temp-detail-desc">{{ item.knowledge }}</div>
<template v-if="item.realKnowledgeOssUrl">
<el-button type="text" @click="onPlay">播放</el-button>
<audio id="player" :src="item.realKnowledgeOssUrl"></audio>
</template>
</div>
</template>
</div>
</div>
<el-button type="text">播放</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
......@@ -42,9 +53,6 @@
<script>
import { tempPageStatistics, tempDetail } from '@/service/api/aiApi.js';
import { formatDateTimeByType } from '@/utils/index.js';
// TODO 渲染话术详情、播放话术录音
// TODO 话术列表接口total字段异常
// TODO 需求文档中话术列表无-1的状态，所以接口是否要过滤掉-1的状态
export default {
name: 'Message',
data() {
......@@ -80,6 +88,10 @@ export default {
const list = [{ label: '三方删除', value: -1 }, ...statusList];
const state = list.find(el => el.value == status);
return state ? state.label : '--';
},
formatNodeType(type) {
const types = ['普通节点', '跳转节点', 'IVR节点', '数据采集节点', '条件判断节点'];
return types[type] || '--';
}
},
created() {
......@@ -96,7 +108,7 @@ export default {
},
getTempDetail() {
tempDetail({ aiTemplateId: this.tempDetail.aiTemplateId }).then(res => {
console.log(res);
this.tempDetail.tempData = res.result.list;
});
},
onSearch() {
......@@ -118,6 +130,9 @@ export default {
onClosed() {
this.tempDetail.aiTemplateId = '';
this.tempDetail.tempData = [];
},
onPlay() {
document.getElementById('player').play();
}
}
};
......@@ -213,11 +228,13 @@ export default {
}
}
}
.no-temp-data {
padding-bottom: 20px;
text-align: center;
color: #909399;
}
.temp-detail-item {
padding-bottom: 10px;
display: flex;
justify-content: space-between;
align-items: center;
+ .temp-detail-item {
padding-top: 10px;
border-top: 1px solid #e4e7ed;
......@@ -230,12 +247,24 @@ export default {
color: #303133;
line-height: 20px;
}
.temp-detail-desc {
width: 650px;
font-size: 14px;
font-weight: 400;
color: #303133;
line-height: 20px;
.sound-record {
display: flex;
justify-content: space-between;
align-items: center;
+ .sound-record {
margin-top: 10px;
.temp-detail-desc {
padding-top: 10px;
border-top: 1px solid #e4e7ed;
}
}
.temp-detail-desc {
width: 650px;
font-size: 14px;
font-weight: 400;
color: #303133;
line-height: 20px;
}
}
}
}
......
src/views/ai/parse-property.js 0 → 100644
/**
* 解析property
* @param {Number | String} val property值，也可能是多个对应值之和
* @return {Object} map
* @return {Boolean} map.isCompute 是否是计算属性
* @return {Boolean} map.isField 是否是字段属性
* @return {Boolean} map.isValue 是否是值属性
* @return {Boolean} map.isCategray 是否是不是属性
* @return {Boolean} map.notProperty 是否是类别属性
*/
export default val => {
// 用二进制对应位上的1表示对应属性的开启状态
// {
// 1: '0001', // 计算属性
// 2: '0010', // 字段属性
// 4: '0100', // 值属性
// 8: '1000', // 不是属性
// 16: '00010000', // 类别属性
// }
// 将val转为二进制，来处理值之和的情况，例如：3 = 1 + 2 = 0001 + 0010 = 0011
// 然后再把二进制值的字符串转为数字，调转顺序，0 1转为bool
const status = Number(val)
.toString(2)
.split('')
.reverse()
.map(i => i == 1);
// 根据上面的键值对表，从二进制最末一位开始，对应在数组里
const keys = ['isCompute', 'isField', 'isValue', 'isCategray', 'notProperty'];
// 根据数组转换出状态结果
return keys.reduce((map, key, index) => ({ ...map, [key]: !!status[index] }), {});
};
src/views/ai/ruleFilter.vue
......@@ -5,20 +5,20 @@
<el-tabs tab-position="left" @tab-click="onTabsClick" v-model="activeName">
<el-tab-pane :label="item.chainNodeName" v-for="item in conditionTypeList" :key="item.esScreeningWidgetChainId" :name="item.esScreeningWidgetChainId">
<div v-if="templateCode == 'tag001'" class="leftContent">
<el-checkbox-group v-model="selectData[item.chainNodeName]" @change="handleChange" class="checkBoxContainer">
<el-checkbox v-for="row in checkboxList" :key="row.key" :label="row.key">{{ row.value }}</el-checkbox>
<el-checkbox-group v-model="item.selectValue" @change="val => handleChange(val, item.esScreeningWidgetChainId)" class="checkBoxContainer">
<el-checkbox v-for="row in item.selectList" :key="row.key" :label="row.key">{{ row.value }}</el-checkbox>
</el-checkbox-group>
</div>
<div v-if="templateCode == 'com026'" class="leftContent">
<div class="line" v-for="(value, index) in checkboxList" :key="index">
<div class="line" v-for="(value, index) in item.selectList" :key="index">
<h3>{{ value.title }}</h3>
<el-checkbox-group v-model="selectData[item.chainNodeName]" @change="handleChange" class="checkBoxContainer">
<el-checkbox v-for="row in value.data" :key="row.key" :label="row.value">{{ row.key }}</el-checkbox>
<el-checkbox-group v-model="item.selectValue" @change="val => handleChange(val, item.esScreeningWidgetChainId)" class="checkBoxContainer">
<el-checkbox v-for="row in value.data" :key="row.key" :label="row.key">{{ row.value }}</el-checkbox>
</el-checkbox-group>
</div>
</div>
<div v-if="templateCode == 'com020'" class="leftContent">
<dm-store-selector style="margin-top: 20px;" ref="newStoreCard" :uuid.sync="uuid"></dm-store-selector>
<vue-gic-store-new :isAdd="isAdd" :creatorId="creatorId" :scenesVal="scenes" scenes="auth" :uuid="item.value" ref="storeNew" @store-change="storeChange"></vue-gic-store-new>
</div>
</el-tab-pane>
</el-tabs>
......@@ -28,13 +28,10 @@
已选条件
</div>
<ul class="right-content">
<li class="contact-li" v-for="(value, name) in selectData" :key="name">
{{ name }}
<div class="li-cell cursor-pointer">
<div>
<span v-for="item in value" :key="item"> {{ item }}</span>
</div>
<i v-if="!readonly" class="el-icon-close" @click="deleteRow(item)"></i>
<li class="contact-li" v-for="(item, index) in selectData" :key="index">
<div class="li-cell cursor-pointer">{{ item.chainNodeName }} <i v-if="!readonly" class="el-icon-close" @click="deleteRow(item)"></i></div>
<div>
<span v-for="row in item.selectValue" :key="row"> {{ row }}</span>
</div>
</li>
</ul>
......@@ -42,38 +39,85 @@
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="close">取消</el-button>
<el-button type="primary" @click="confirmTagsDialog">确定</el-button>
<el-button type="primary" @click="confirm">确定</el-button>
</div>
</el-dialog>
</template>
<script>
import qs from 'qs';
import transform from './createParams.js';
export default {
data() {
return {
activeName: '',
conditionTypeList: [], // 第一层级
checkboxList: [],
selectData: {},
arr: [],
uuid: '',
templateCode: '' //当前控件类型
templateCode: '', //当前控件类型
echoFlag: false
};
},
props: {
visiable: {
type: Boolean,
default: false
},
sceneCode: {
type: String,
default: 'member02'
},
requestProject: {
type: String,
default: 'gic-web'
},
memberCrowdWidgetId: {
type: [String, Number],
default: ''
}
},
mounted() {
this.getDataList();
this.getEchoData();
},
watch: {
memberCrowdWidgetId: {
immediate: true,
handler(newval) {
if (newval && this.echoFlag) {
/**
* 回显数据请求 echoFlag 为真且memberCrowdWidgetId不为空 然后使用memberCrowdWidgetId来查回显的数据
**/
this.getEchoData();
}
}
}
},
computed: {
selectData() {
const data = [];
this.conditionTypeList.forEach(item => {
data.push({ chainNodeName: item.chainNodeName, selectValue: item.selectValue });
});
return data;
}
},
methods: {
handleChange(val) {
getEchoData() {
// "ff8080817fab027b017fce8c4cac26ab"
const data = { memberCrowdWidgetId: 'ff8080817fab027b017fcf080dd8275d' };
this.axios.post(`api-plug/query-member-crowd-new?requestProject=${this.requestProject}`, data).then(res => {
console.log(res);
});
},
handleChange(val, id) {
this.conditionTypeList.find(item => item.esScreeningWidgetChainId == id).value = val.join(',');
console.log(this.conditionTypeList);
},
storeChange(val) {
console.log(val);
this.selectData = Object.assign({}, this.selectData);
},
onTabsClick(val) {
console.log(val);
......@@ -83,23 +127,44 @@ export default {
close() {
this.$emit('update:visiable', false);
},
confirm() {
const data = transform(this.conditionTypeList, this.sceneCode);
console.log(data);
this.axios.post(`api-plug/save-member-crowd-new?requestProject=${this.requestProject}`, data).then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
this.$emit('save', resData.result);
this.echoFlag = true;
}
});
},
// 获取列表
getDataList() {
let para = {
sceneCode: 'member02',
requestProject: 'gic-web'
sceneCode: this.sceneCode,
requestProject: this.requestProject
};
this.axios
.post('/api-plug/get-screening-init-data', qs.stringify(para))
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
this.conditionTypeList = resData.result;
this.activeName = this.conditionTypeList.length && this.conditionTypeList[0].esScreeningWidgetChainId;
this.conditionTypeList.forEach(item => {
this.selectData[item.chainNodeName] = [];
resData.result.forEach(item => {
const { chainNodeName, templateCode, esScreeningWidgetChainId, columnKey, computeCharacter, dealKey, property } = item;
this.conditionTypeList.push({
chainNodeName,
templateCode,
esScreeningWidgetChainId,
columnKey,
computeCharacter,
dealKey,
property,
selectValue: [],
selectList: []
});
});
this.activeName = this.conditionTypeList.length && this.conditionTypeList[0].esScreeningWidgetChainId;
this.getNode(this.activeName);
return;
}
......@@ -116,35 +181,36 @@ export default {
});
},
getNode(widgetChainId) {
this.axios.get(`/api-plug/get-screening-widget-chain-detail?requestProject=gic-web&widgetChainId=${widgetChainId}`).then(res => {
// 第二层节点的控件类型
this.axios.get(`/api-plug/get-screening-widget-chain-detail?requestProject=${this.requestProject}&widgetChainId=${widgetChainId}`).then(res => {
const {
esScreeningWidgetChainId,
widget: { sourceFlag, templateCode, widgetParam, widgetValues },
widgetFieldKey
} = res.data.result; // 返回的结果 从第一层开始
this.templateCode = templateCode;
console.log(res.data.result);
if (sourceFlag == 1) {
// 有接口
const url = JSON.parse(widgetParam)[0].value;
this.getChildNode(url, widgetFieldKey);
this.getChildNode(url, widgetFieldKey, esScreeningWidgetChainId);
} else {
if (templateCode == 'tag001') {
this.checkboxList = JSON.parse(widgetValues);
this.conditionTypeList.find(item => item.esScreeningWidgetChainId == esScreeningWidgetChainId).selectList = JSON.parse(widgetValues);
}
}
});
},
// 获取下一层控件
getChildNode(url, key) {
// 使用接口获取 第二层控件类型的内容
getChildNode(url, key, id) {
const param = {
requestProject: 'gic-web',
requestProject: this.requestProject,
key
};
this.axios.post(`${url}`, qs.stringify(param)).then(res => {
let resData = res.data;
console.log(resData.result);
if (resData.errorCode == 0) {
this.checkboxList = resData.result;
this.conditionTypeList.find(item => item.esScreeningWidgetChainId == id).selectList = resData.result;
}
});
}
......
src/views/recharge/consume.vue
......@@ -623,7 +623,7 @@ export default {
getAiTotalFee({ accountDepartId, searchParam, beginTime, endTime }).then(data => {
const { errorCode, result } = data;
if (errorCode == 0) {
this.sumFee = result != null ? result / 1000 : 0;
this.sumFee = result != null ? result : 0;
}
});
} catch (err) {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment