dev
liuyongli 3 years ago
parent 1f48b020cc
commit 0201f1fdb2

1440
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -48,6 +48,7 @@ Page({
sEnergyType: '', sEnergyType: '',
imageUrl: getApp().globalData.imageUrl, imageUrl: getApp().globalData.imageUrl,
mockData: [], mockData: [],
show1:false,
// //
ec: { ec: {
@ -214,7 +215,6 @@ Page({
this.setData({ this.setData({
grades2: arr grades2: arr
}) })
console.log('ooo', arr)
}) })
//级别 //级别
app.globalData.request({ app.globalData.request({
@ -222,19 +222,42 @@ Page({
}).then(res => { }).then(res => {
console.log('de', res) console.log('de', res)
// const data = res; // const data = res;
let arr = [] // let arr = []
res.forEach(ele => { // res.forEach(ele => {
let obj = { // let obj = {
text: ele.value, // text: ele.value,
value: ele.key // value: ele.key
} // }
arr.push(obj) // arr.push(obj)
// })
this.setData({
grades1:res ,
}) })
})
},
// 按级别
mySelect1(e){
console.log('cs', e.currentTarget.dataset.index.data)
let data = e.currentTarget.dataset.index.data
iPageIndex = 1
iPageSize = 20
if(data!= undefined){
this.setData({ this.setData({
grades1: arr, show1:true,
ranking: [],
sSpec: e.detail,
}) })
}else{
this.setData({
show1:false,
ranking: [],
data:[],
sSpec: e.detail,
}) })
}
this.getTrend()
}, },
bindValue(e) { bindValue(e) {
let type = e.detail.type let type = e.detail.type
if (type == 0) { if (type == 0) {
@ -244,15 +267,15 @@ Page({
} }
}, },
// 按级别 // 按级别
mySelect1(e) { // mySelect1(e) {
iPageIndex = 1 // iPageIndex = 1
iPageSize = 20 // iPageSize = 20
this.setData({ // this.setData({
ranking: [], // ranking: [],
sSpec: e.detail, // sSpec: e.detail,
}) // })
this.getTrend() // this.getTrend()
}, // },
// 按价格 // 按价格
mySelect2(e) { mySelect2(e) {
iPageIndex = 1 iPageIndex = 1

@ -24,10 +24,24 @@
</scroll-view> </scroll-view>
<view style="height: 60rpx;margin-top: 10px;"> <view style="height: 60rpx;margin-top: 10px;">
<van-dropdown-menu custom-class="dropdown-menu" active-color="#027AFF;"> <van-dropdown-menu custom-class="dropdown-menu" active-color="#027AFF;">
<van-dropdown-item value="{{ grade_value1 }}" options="{{ grades1 }}" bind:change="mySelect1" title="全部级别" > <!-- <van-dropdown-item value="{{ grade_value1 }}" options="{{ grades1 }}" bind:change="mySelect1" title="全部级别" >
</van-dropdown-item> -->
<van-dropdown-item title="全部级别">
<view style="display: flex;">
<view style="width: 40%;">
<view wx:for="{{grades1}}" wx:for-item="item" wx:key="index" style="height: 40px;line-height: 40px;margin: 0 20rpx;">
<view bindtap="mySelect1" data-index='{{item}}'>{{item.value}}</view>
</view>
</view>
<view style="width: 60%;" wx:if="{{show1}}">
<view wx:for="{{grades1}}" wx:for-item="item" wx:key="index" class="jb-item">
<view bindtap="datalist" wx:for="{{item.data}}" wx:key="index" wx:for-item="it" data-index='{{it}}'>{{it.value}}</view>
</view>
</view>
</view>
</van-dropdown-item> </van-dropdown-item>
<van-dropdown-item value="{{ grade_value2 }}" options="{{ grades2 }}" bind:change="mySelect2" title="全部价格" /> <van-dropdown-item value="{{ grade_value2 }}" options="{{ grades2 }}" bind:change="mySelect2" title="全部价格" />
<van-dropdown-item value="{{ grade_value3 }}" options="{{ grades3}}" bind:change="mySelect3" title="全部能源"/> <van-dropdown-item value="{{ grade_value3 }}" options="{{ grades3}}" bind:change="mySelect3" title="全部能源" />
<van-dropdown-item value="{{ grade_value4 }}" options="{{ grades4 }}" bind:change="mySelect4" /> <van-dropdown-item value="{{ grade_value4 }}" options="{{ grades4 }}" bind:change="mySelect4" />
</van-dropdown-menu> </van-dropdown-menu>
</view> </view>

@ -341,3 +341,8 @@ van-dropdown-item van-dropdown-item--down{
text-align: center; text-align: center;
border-radius: 50rpx; border-radius: 50rpx;
} }
.jb-item{
font-size: 20rpx;
height: 30px;
line-height: 30px;
}

@ -1,10 +1,8 @@
import moment from "moment" import moment from "moment"
const app = getApp(); const app = getApp();
Page({ Page({
<<<<<<< HEAD
data: { data: {
steps: [ steps: [{
{
text: '名称设置', text: '名称设置',
inactiveIcon: 'more-o', inactiveIcon: 'more-o',
activeIcon: 'more', activeIcon: 'more',
@ -29,7 +27,7 @@ Page({
endShow: new Date().getTime(), endShow: new Date().getTime(),
DetailsData: [], DetailsData: [],
AnalyzeWord: '', // 和 或 的主体词 AnalyzeWord: '', // 和 或 的主体词
HuoWord:'', // 和 或 的可选词 HuoWord: '', // 和 或 的可选词
PaiChu: '', // 排除词 PaiChu: '', // 排除词
highAnalizeWord: '', // 高级模式分析词 highAnalizeWord: '', // 高级模式分析词
Source: '', // 定向监测媒体 Source: '', // 定向监测媒体
@ -46,24 +44,48 @@ Page({
/* 分析词设置 */ /* 分析词设置 */
currWordType: '必选词和的关系', currWordType: '必选词和的关系',
wtShow: false, wtShow: false,
wtColumns: ['必选词和的关系','主题词或的关系'], wtColumns: ['必选词和的关系', '主题词或的关系'],
// 是否推送信息 // 是否推送信息
Statu: 0, Statu: 0,
// 预警选项 // 预警选项
affList: [], affList: [],
qgList: [ qgList: [{
{ key: 1, value: "正面", isSelect: false}, key: 1,
{ key: 2, value: "负面", isSelect: false}, value: "正面",
{ key: 3, value: "中性", isSelect: false} isSelect: false
},
{
key: 2,
value: "负面",
isSelect: false
},
{
key: 3,
value: "中性",
isSelect: false
}
], ],
wjList: [ wjList: [{
{ key: 1, value: '低级危机', isSelect: false}, key: 1,
{ key: 2, value: '中级危机', isSelect: false}, value: '低级危机',
{ key: 3, value: '高级危机', isSelect: false} isSelect: false
},
{
key: 2,
value: '中级危机',
isSelect: false
},
{
key: 3,
value: '高级危机',
isSelect: false
}
], ],
}, },
onLoad: function(options) { onLoad: function (options) {
this.setData({Guid: options.Guid}); this.setData({
Guid: options.Guid
});
}, },
onShow() { onShow() {
this.getApi(); this.getApi();
@ -74,13 +96,22 @@ Page({
}).then(res => { }).then(res => {
// todo: 回显预警信息 // todo: 回显预警信息
console.log(res) console.log(res)
if(res.DetailsData) { if (res.DetailsData) {
if(res.DetailsData[0].IsAdvancedQuery == 1) { if (res.DetailsData[0].IsAdvancedQuery == 1) {
this.setData({totalMode: 1, highAnalizeWord: res.DetailsData[0].AnalyzeWord,}) this.setData({
} else if(res.DetailsData[0].IsAdvancedQuery == 0) { totalMode: 1,
this.setData({totalMode: 0, currWordType: '必选词和的关系'}) highAnalizeWord: res.DetailsData[0].AnalyzeWord,
})
} else if (res.DetailsData[0].IsAdvancedQuery == 0) {
this.setData({
totalMode: 0,
currWordType: '必选词和的关系'
})
} else { } else {
this.setData({totalMode: 0, currWordType: '主题词或的关系'}) this.setData({
totalMode: 0,
currWordType: '主题词或的关系'
})
} }
this.setData({ this.setData({
AnalyzeWord: res.DetailsData[0].AnalyzeWord, AnalyzeWord: res.DetailsData[0].AnalyzeWord,
@ -155,240 +186,6 @@ Page({
wjList: that.data.wjList wjList: that.data.wjList
}); });
}, },
=======
data: {
steps: [{
text: '名称设置',
inactiveIcon: 'more-o',
activeIcon: 'more',
},
{
text: '分析词设置',
inactiveIcon: 'more-o',
activeIcon: 'more',
},
{
text: '定向监测',
inactiveIcon: 'more-o',
activeIcon: 'more',
}
],
Guid: '',
>>>>>>> f31422d9a6ef710dd2dce3250a76e567c8c34ad3
//表单
Name: '',
StartTime: '',
EndTime: '',
startShow: new Date().getTime(),
endShow: new Date().getTime(),
DetailsData: [],
AnalyzeWord: '', // 和 或 的主体词
HuoWord: '', // 和 或 的可选词
PaiChu: '', // 排除词
highAnalizeWord: '', // 高级模式分析词
Source: '', // 定向监测媒体
UserAuthor: '', // 定向监测作者
//
active: 0,
activeNames: [],
show1: false,
show2: false,
dt: '',
dt2: '',
// 总体模式
totalMode: 0, // 0便捷 1高级
/* 分析词设置 */
currWordType: '必选词和的关系',
wtShow: false,
wtColumns: ['必选词和的关系', '主题词或的关系'],
// 是否推送信息
Statu: 0,
// 预警选项
affList: [],
qgList: [{
key: 1,
value: "正面",
isSelect: false
},
{
key: 2,
value: "负面",
isSelect: false
},
{
key: 3,
value: "中性",
isSelect: false
}
],
wjList: [{
key: 1,
value: '低级危机',
isSelect: false
},
{
key: 2,
value: '中级危机',
isSelect: false
},
{
key: 3,
value: '高级危机',
isSelect: false
}
],
show: true
},
onLoad: function (options) {
this.setData({
Guid: options.Guid
});
},
onShow() {
this.getApi();
app.globalData.request({
action: 'getSchemeDataByGuid',
token: 't%2BrswgjvzGM=',
Guids: this.data.Guid,
}).then(res => {
// todo: 回显预警信息
if (res.DetailsData) {
if (res.DetailsData[0].IsAdvancedQuery == 1) {
this.setData({
totalMode: 1,
highAnalizeWord: res.DetailsData[0].AnalyzeWord,
})
} else if (res.DetailsData[0].IsAdvancedQuery == 0) {
this.setData({
totalMode: 0,
currWordType: '必选词和的关系'
})
} else {
this.setData({
totalMode: 0,
currWordType: '主题词或的关系'
})
}
this.setData({
show2: false,
EndTime: time,
end: time
});
},
onDisplay() {
this.setData({ show1: true });
},
onDisplay2() {
this.setData({ show2: true });
},
onCancel() {
this.setData({ show1: false, });
},
onCancel2() {
this.setData({ show2: false, });
},
changeTotalMode(event) {
this.setData({ totalMode: event.detail.index });
},
wordType() {
this.setData({ wtShow: true });
},
wtConfirm(event) {
this.setData({ wtShow: false, currWordType: event.detail.value });
},
wtCancel() {
this.setData({ wtShow: false });
},
infoPushChange(event) {
this.setData({ Statu: event.detail });
},
goBeforeStep() {
this.setData({ active: this.data.active - 1 })
},
goNextStep() {
this.setData({ active: this.data.active + 1 })
},
// 分析词设置
bindAnalyzeWord(event) {
this.setData({ AnalyzeWord: event.detail.value})
},
bindHuoWord(event) {
this.setData({ HuoWord: event.detail.value})
},
bindPaiChu(event) {
this.setData({ PaiChu: event.detail.value})
},
bindHighAnalizeWord(event) {
this.setData({ highAnalizeWord: event.detail.value})
},
// 定向监测
bindSource(event) {
this.setData({ Source: event.detail.value})
},
bindUserAuthor(event) {
this.setData({ UserAuthor: event.detail.value})
},
themeSave() {
let qdList = [];
this.data.affList.forEach(ele => {
if (ele.isSelect && ele.key != -1) {
qdList.push(ele.key)
}
});
let qgList = [];
this.data.qgList.forEach(ele => {
if (ele.isSelect && ele.key != -1) {
qgList.push(ele.key)
}
});
let wjList = [];
this.data.wjList.forEach(ele => {
if (ele.isSelect && ele.key != -1) {
wjList.push(ele.key)
}
});
let dtData = {
"AnalyzeWord": this.data.AnalyzeWord,
"HuoWord": this.data.HuoWord,
"PaiChu": this.data.PaiChu,
"IsAdvancedQuery": this.data.totalMode == 0&&this.data.currWordType == '必选词和的关系'?0:this.data.totalMode == 1 ? 1:2,
"Source": this.data.Source,
"UserAuthor": this.data.UserAuthor
};
let jsonObj = {
"Guids": this.data.Guid,
"Name": this.data.Name,
"Classify": 0,
"StartTime": this.data.StartTime,
"EndTime": this.data.EndTime,
"Types": "theme_v6",
"DetailsData": [dtData],
"Warning": {
"Statu": this.data.Statu,
"Es": {
"QuDao": qdList.join(',') || '',
"QingGan": qgList.join(',') || '',
"Crisis": wjList.join(',') || '',
}
}
AnalyzeWord: res.DetailsData[0].AnalyzeWord,
HuoWord: res.DetailsData[0].HuoWord,
PaiChu: res.DetailsData[0].PaiChu,
UserAuthor: res.DetailsData[0].UserAuthor,
Source: res.DetailsData[0].Source,
})
}
this.setData({
Name: res.Name,
StartTime: res.StartTime,
start: res.StartTime,
EndTime: res.EndTime,
end: res.EndTime,
startShow: new Date(res.StartTime).valueOf(),
endShow: new Date(res.EndTime).valueOf(),
})
});
},
getApi() { getApi() {
app.globalData.request({ app.globalData.request({
action: 'getQuDao', //获取所有渠道 action: 'getQuDao', //获取所有渠道

@ -17,21 +17,7 @@
}, },
{ {
"name": "", "name": "",
"pathName": "pages/varComm/index", "pathName": "pages/index/Salesranking/Salesranking",
"query": "",
"launchMode": "default",
"scene": null
},
{
"name": "",
"pathName": "contrastPackages/themeRatio/index",
"query": "",
"launchMode": "default",
"scene": null
},
{
"name": "",
"pathName": "contrastPackages/carModelsRatio/index",
"query": "", "query": "",
"launchMode": "default", "launchMode": "default",
"scene": null "scene": null

Loading…
Cancel
Save