sws
/
carInsightSystem_wxapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of git.oa00.com:xiaowen/swsWecat into dev

Browse Source 
* 'dev' of git.oa00.com:xiaowen/swsWecat:
  zx
dev
liuyongli 3 years ago
parent b91315127e dfa4963877
commit 32842fa73a
11 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File

2
pages/insight/pages/brandInsight/brandDataList/index.js
Unescape View File

@ -314,7 +314,7 @@ Page({
sField: JSON.stringify(sField), //导出字段
sFileName: "事件数据" + date, //文件名称
sCheckedIds: this.data.result.join(',') || '', //数据id
iNum: this.data.result.length, //导出条数
iNum: this.data.result.length == 0 ? this.data.total : this.data.result.length, //导出条数
iTimeType: this.data.iTimeType, //0发布时间 1入库时间
}
app.globalData.request(obj).then((res) => {

8
pages/insight/pages/brandInsight/brandDataList/index.wxml
Unescape View File

@ -70,13 +70,13 @@
</view>
</van-checkbox-group>
<view class="tdl-footer" style="display: flex;justify-content: flex-start;">
<view style="margin-top: 3%">
<view style="width: 20%;margin-top: 3%;margin-left: 64rpx">
<van-checkbox-group value="{{ isSelectAll }}" bind:change="changeSelectAll">
<van-checkbox name="0" shape="square" class="van-checkbox">全选</van-checkbox>
</van-checkbox-group>
</view>
<view style="width: 75%;margin-left: 24rpx;">
<van-button bind:click="openReport" custom-style="width: 45%" color="#0084FF" class="theme-add-btn" plain>生成数据</van-button>
<view style="margin-left: 36%;">
<van-button bind:click="openReport" color="#0084FF" custom-style="width: 120%" class="theme-add-btn" plain>生成数据</van-button>
</view>
</view>
<van-dialog use-slot title="导出选项" show="{{reportShow}}" bind:confirm="report" show-cancel-button>
@ -84,7 +84,7 @@
<view>文件名称</view>
<view style="color:#999999;font-size: 14px;margin:24rpx">{{fileName}}</view>
<view>导出数量</view>
<view style="color:#999999;margin: 24rpx;font-size: 14px;">共导出 <span style="color: #0084FF">{{result.length}}</span> 条数据，以xlsx格式导出</view>
<view style="color:#999999;margin: 24rpx;font-size: 14px;">共导出 <span style="color: #0084FF">{{result.length == 0 ? total : result.length}}</span> 条数据，以xlsx格式导出</view>
<view>导出字段</view>
<view class="filter" >
<view wx:for="{{reportOption}}" wx:key="index">

1
pages/insight/pages/brandInsight/brandDataList/index.wxss
Unescape View File

@ -69,6 +69,7 @@
background: #FFF;
width: 100%;
padding: 16rpx 0rpx 24rpx 0rpx;
margin-left: -32rpx;
/* margin-left: 16rpx; */
}
/* 按钮 */

2
pages/insight/pages/eventInsight/evDatalist/index.js
Unescape View File

@ -307,7 +307,7 @@ Component({
sField: JSON.stringify(sField), //导出字段
sFileName: "事件数据" + date, //文件名称
sCheckedIds: this.data.result.join(',') || '', //数据id
iNum: this.data.result.length, //导出条数
iNum: this.data.result.length == 0 ? this.data.total : this.data.result.length, //导出条数
iTimeType: this.data.iTimeType, //0发布时间 1入库时间
}
app.globalData.request(obj).then((res) => {

8
pages/insight/pages/eventInsight/evDatalist/index.wxml
Unescape View File

@ -73,13 +73,13 @@
<van-button custom-class="bottom-button" bind:click="loadMore">点击加载更多</van-button>
</view>
<view class="tdl-footer" style="display: flex;justify-content: flex-start;">
<view style="margin-top: 3%">
<view style="width: 20%;margin-top: 3%;margin-left: 64rpx">
<van-checkbox-group value="{{ isSelectAll }}" bind:change="changeSelectAll">
<van-checkbox name="0" shape="square" class="van-checkbox">全选</van-checkbox>
</van-checkbox-group>
</view>
<view style="width: 75%;margin-left: 24rpx;">
<van-button bind:click="openReport" custom-style="width: 45%" color="#0084FF" class="theme-add-btn" plain>生成数据</van-button>
<view style="margin-left: 36%;">
<van-button bind:click="openReport" color="#0084FF" custom-style="width: 120%" class="theme-add-btn" plain>生成数据</van-button>
</view>
</view>
<van-dialog use-slot title="导出选项" show="{{reportShow}}" bind:confirm="report" show-cancel-button>
@ -87,7 +87,7 @@
<view>文件名称</view>
<view style="color:#999999;font-size: 14px;margin:24rpx">{{fileName}}</view>
<view>导出数量</view>
<view style="color:#999999;margin: 24rpx;font-size: 14px;">共导出 <span style="color: #0084FF">{{result.length}}</span> 条数据，以xlsx格式导出</view>
<view style="color:#999999;margin: 24rpx;font-size: 14px;">共导出 <span style="color: #0084FF">{{result.length == 0 ? total : result.length}}</span> 条数据，以xlsx格式导出</view>
<view>导出字段</view>
<view class="filter" >
<view wx:for="{{reportOption}}" wx:key="index">

1
pages/insight/pages/eventInsight/evDatalist/index.wxss
Unescape View File

@ -74,7 +74,6 @@
background: #FFF;
width: 100%;
padding: 16rpx 0rpx 24rpx 0rpx;
margin-left: 64rpx;
}
/* 按钮 */
.theme-add-btn {

2
pages/insight/pages/modalInsight/modalDataList/index.js
Unescape View File

@ -317,7 +317,7 @@ Page({
sField: JSON.stringify(sField), //导出字段
sFileName: "事件数据" + date, //文件名称
sCheckedIds: this.data.result.join(',') || '', //数据id
iNum: this.data.result.length, //导出条数
iNum: this.data.result.length == 0 ? this.data.total : this.data.result.length, //导出条数
iTimeType: this.data.iTimeType, //0发布时间 1入库时间
}
app.globalData.request(obj).then((res) => {

8
pages/insight/pages/modalInsight/modalDataList/index.wxml
Unescape View File

@ -70,13 +70,13 @@
</view>
</van-checkbox-group>
<view class="tdl-footer" style="display: flex;justify-content: flex-start;">
<view style="margin-top: 3%">
<view style="width: 20%;margin-top: 3%;margin-left: 64rpx">
<van-checkbox-group value="{{ isSelectAll }}" bind:change="changeSelectAll">
<van-checkbox name="0" shape="square" class="van-checkbox">全选</van-checkbox>
</van-checkbox-group>
</view>
<view style="width: 75%;margin-left: 24rpx;">
<van-button bind:click="openReport" custom-style="width: 45%" color="#0084FF" class="theme-add-btn" plain>生成数据</van-button>
<view style="margin-left: 36%;">
<van-button bind:click="openReport" color="#0084FF" custom-style="width: 120%" class="theme-add-btn" plain>生成数据</van-button>
</view>
</view>
<van-dialog use-slot title="导出选项" show="{{reportShow}}" bind:confirm="report" show-cancel-button>
@ -84,7 +84,7 @@
<view>文件名称</view>
<view style="color:#999999;font-size: 14px;margin:24rpx">{{fileName}}</view>
<view>导出数量</view>
<view style="color:#999999;margin: 24rpx;font-size: 14px;">共导出 <span style="color: #0084FF">{{result.length}}</span> 条数据，以xlsx格式导出</view>
<view style="color:#999999;margin: 24rpx;font-size: 14px;">共导出 <span style="color: #0084FF">{{result.length == 0 ? total : result.length}}</span> 条数据，以xlsx格式导出</view>
<view>导出字段</view>
<view class="filter" >
<view wx:for="{{reportOption}}" wx:key="index">

1
pages/insight/pages/modalInsight/modalDataList/index.wxss
Unescape View File

@ -69,6 +69,7 @@
background: #FFF;
width: 100%;
padding: 16rpx 0rpx 24rpx 0rpx;
margin-left: -32rpx;
/* margin-left: 16rpx; */
}
/* 按钮 */

2
pages/insight/pages/themeList/index.js
Unescape View File

@ -410,7 +410,7 @@ Page({
sField: JSON.stringify(sField), //导出字段
sFileName: "主题数据" + date, //文件名称
sCheckedIds: this.data.result.join(',') || '', //数据id
iNum: this.data.result.length, //导出条数
iNum: this.data.result.length == 0 ? this.data.total : this.data.result.length, //导出条数
iTimeType: this.data.iTimeType, //0发布时间 1入库时间
}
app.globalData.request(obj).then((res) => {

2
pages/insight/pages/themeList/index.wxml
Unescape View File

@ -119,7 +119,7 @@
<view>文件名称</view>
<view style="color:#999999;font-size: 14px;margin:24rpx">{{fileName}}</view>
<view>导出数量</view>
<view style="color:#999999;margin: 24rpx;font-size: 14px;">共导出 <span style="color: #0084FF">{{result.length}}</span> 条数据，以xlsx格式导出</view>
<view style="color:#999999;margin: 24rpx;font-size: 14px;">共导出 <span style="color: #0084FF">{{result.length == 0 ? total : result.length}}</span> 条数据，以xlsx格式导出</view>
<view>导出字段</view>
<view class="filter" >
<view wx:for="{{reportOption}}" wx:key="index">

Write Preview
Loading…
Cancel
Save