Skip to content

G
gdtel-gztel-school-center-ui
Commit dd1a116d by 陈浩建
Options

一人一码订单通报*4（未完成）

parent 32764e2a
Showing with 574 additions and 5 deletions
public/UE/third-party/video-js/video.dev.js
...@@ -4414,12 +4414,10 @@ vjs.SeekBar.prototype.onMouseMove = function(event){ ...@@ -4414,12 +4414,10 @@ vjs.SeekBar.prototype.onMouseMove = function(event){
}; };
vjs.SeekBar.prototype.onMouseUp = function(event){ vjs.SeekBar.prototype.onMouseUp = function(event){
debugger
vjs.Slider.prototype.onMouseUp.call(this, event); vjs.Slider.prototype.onMouseUp.call(this, event);
this.player_.scrubbing = false; this.player_.scrubbing = false;
if (this.videoWasPlaying) { if (this.videoWasPlaying) {
debugger
this.player_.play(); this.player_.play();
} }
}; };
......
src/api/school-center/orderConversion/orderConversionAPI.js 0 → 100644
import {postAction,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop/';
//报表
// conversionType：00：移动通报学校 01：移动通报县份 10：宽带通报学校 11：宽带通报学校
let reportList = (params) => postAction(prefix + "orderConversion/getOrderConversionInfo",params);
let reportDownload = (params) => downFilePost(prefix + "orderConversion/outOrderConversionInfo",params);
export {
reportList,
reportDownload
}
src/utils/util.js
...@@ -305,7 +305,6 @@ export function unique (arr) { ...@@ -305,7 +305,6 @@ export function unique (arr) {
*/ */
export function exportFile(pross, name = "data.xlsx", callback) { export function exportFile(pross, name = "data.xlsx", callback) {
pross.then(res =>{ pross.then(res =>{
debugger
let blob = res; let blob = res;
/*let reader = new FileReader(); /*let reader = new FileReader();
reader.readAsDataURL(blob); // 转换为base64，可以直接放入a表情href reader.readAsDataURL(blob); // 转换为base64，可以直接放入a表情href
......
src/views/school-center/broadbandList/RhPhone.vue
...@@ -146,7 +146,6 @@ ...@@ -146,7 +146,6 @@
createfunctionOk(){ createfunctionOk(){
let obj = cloneObject(this.modifyForm); let obj = cloneObject(this.modifyForm);
addData(obj).then(res => { addData(obj).then(res => {
debugger
if (res.state == "success") { if (res.state == "success") {
this.$notification.success({ this.$notification.success({
message: "添加成功！", message: "添加成功！",
......
src/views/school-center/statistics/kdOrderConversionXF.vue 0 → 100644
<template>
<div class="flex-container">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<!-- 搜索区域 -->
<a-form layout="inline">
<a-row :gutter="24">
<a-col :md="6" :sm="12">
<a-form-item label="时间选择：">
<a-range-picker @change="onChange"/>
</a-form-item>
</a-col>
<span class="table-page-search-submitButtons" style="float: left; overflow: hidden;">
<a-col :md="4" :sm="24">
<a-button @click="search()" type="primary">查询</a-button>
<a-button v-show="!callback" @click="handleSubmit" style="margin-left: 10px">导出</a-button>
<a-button v-show="callback" style="margin-left: 10px">
导出中
<a-spin style="margin-left: 5px" size="small"/>
</a-button>
</a-col>
</span>
</a-row>
</a-form>
</div>
<!--列表-->
<s-table
:columns="columns"
:data="rowdata"
bordered
ref="table"
size="small"
class="flex-filling"
:locale="emptyText"
></s-table>
</div>
</template>
<script>
import STable from "@/components/table";
import {reportList, reportDownload} from "../../../api/school-center/orderConversion/orderConversionAPI";
import {cloneObject, exportFile} from "@/utils/util";
import moment from "moment";
export default {
name: "kdOrderConversionXF",
components: {
STable
},
data() {
return {
emptyText: {emptyText: '暂无数据'},
callback: false,
Formtable: this.$form.createForm(this),
queryParam: {
startTime: "",
endTime: "",
conversionType:"11"
},
columns: [
{title: "县分", dataIndex: "sub_name", width: 80},
{title: "学校数量", dataIndex: "schoolCount", width: 80},
{title: "成功单总数", dataIndex: "orderCount", width: 80},
{title: "单宽", children: [
{title: "订单总量", dataIndex: "status_5_1", width: 80},
{title: "已完成", dataIndex: "status_5_2", width: 80},
{title: "异常单", dataIndex: "status_5_3", width: 80},
]
},
{title: "融合", children: [
{title: "订单总量", dataIndex: "status_3_1", width: 80},
{title: "已完成", dataIndex: "status_3_2", width: 80},
{title: "异常单", dataIndex: "status_3_3", width: 80},
]
},
{title: "单宽进融", children: [
{title: "订单总量", dataIndex: "status_10_1", width: 80},
{title: "已完成", dataIndex: "status_10_2", width: 80},
{title: "异常单", dataIndex: "status_10_3", width: 80},
]
}
],
rowdata: parameter => {
let params = {
pageNo: parameter.pageNo,
pageSize: parameter.pageSize
};
let obj = cloneObject(this.queryParam);
//表示
return reportList(Object.assign(params, obj)).then(res => {
console.log(res);
let data = {};
if (res.state !== "success") {
this.$message.error("查询失败！", 5);
this.emptyText.emptyText = '查询失败！'
data = {
data: []
};
} else {
data = {
data: res.data
};
}
return data;
});
}
};
},
methods: {
moment,
search() {
this.$refs.table.refresh({search: true});
},
//时间事件
onChange(date, dateString) {
if (dateString.length == 0) {
this.queryParam.startTime = "";
this.queryParam.endTime = "";
} else {
this.queryParam.startTime = dateString[0];
this.queryParam.endTime = dateString[1];
}
},
handleSubmit() {
this.callback = true;
let today = new Date();
today.setTime(today.getTime());
let s2 = today.getFullYear() + "-" + (today.getMonth() + 1) + "-" + today.getDate();
exportFile(
reportDownload(),
"一人一码移动报表" + s2 + ".xlsx",
this.downloadstatu
);
},
downloadstatu() {
this.callback = false;
}
}
};
</script>
<style scoped>
</style>
\ No newline at end of file
src/views/school-center/statistics/kdOrderConversionXX.vue 0 → 100644
<template>
<div class="flex-container">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<!-- 搜索区域 -->
<a-form layout="inline">
<a-row :gutter="24">
<a-col :md="6" :sm="12">
<a-form-item label="时间选择：">
<a-range-picker @change="onChange"/>
</a-form-item>
</a-col>
<span class="table-page-search-submitButtons" style="float: left; overflow: hidden;">
<a-col :md="4" :sm="24">
<a-button @click="search()" type="primary">查询</a-button>
<a-button v-show="!callback" @click="handleSubmit" style="margin-left: 10px">导出</a-button>
<a-button v-show="callback" style="margin-left: 10px">
导出中
<a-spin style="margin-left: 5px" size="small"/>
</a-button>
</a-col>
</span>
</a-row>
</a-form>
</div>
<!--列表-->
<s-table
:columns="columns"
:data="rowdata"
bordered
ref="table"
size="small"
class="flex-filling"
:locale="emptyText"
></s-table>
</div>
</template>
<script>
import STable from "@/components/table";
import {reportList, reportDownload} from "../../../api/school-center/orderConversion/orderConversionAPI";
import {cloneObject, exportFile} from "@/utils/util";
import moment from "moment";
export default {
name: "kdOrderConversionXX",
components: {
STable
},
data() {
return {
emptyText: {emptyText: '暂无数据'},
callback: false,
Formtable: this.$form.createForm(this),
queryParam: {
startTime: "",
endTime: "",
conversionType:"10"
},
columns: [
{title: "县分", dataIndex: "sub_name", width: 80},
{title: "学校名称", dataIndex: "school", width: 80},
{title: "成功单总数", dataIndex: "orderCount", width: 80},
{title: "单宽", children: [
{title: "订单总量", dataIndex: "status_5_1", width: 80},
{title: "已完成", dataIndex: "status_5_2", width: 80},
{title: "异常单", dataIndex: "status_5_3", width: 80},
]
},
{title: "融合", children: [
{title: "订单总量", dataIndex: "status_3_1", width: 80},
{title: "已完成", dataIndex: "status_3_2", width: 80},
{title: "异常单", dataIndex: "status_3_3", width: 80},
]
},
{title: "单宽进融", children: [
{title: "订单总量", dataIndex: "status_10_1", width: 80},
{title: "已完成", dataIndex: "status_10_2", width: 80},
{title: "异常单", dataIndex: "status_10_3", width: 80},
]
}
],
rowdata: parameter => {
let params = {
pageNo: parameter.pageNo,
pageSize: parameter.pageSize
};
let obj = cloneObject(this.queryParam);
//表示
return reportList(Object.assign(params, obj)).then(res => {
console.log(res);
let data = {};
if (res.state !== "success") {
this.$message.error("查询失败！", 5);
this.emptyText.emptyText = '查询失败！'
data = {
data: []
};
} else {
data = {
data: res.data
};
}
return data;
});
}
};
},
methods: {
moment,
search() {
this.$refs.table.refresh({search: true});
},
//时间事件
onChange(date, dateString) {
if (dateString.length == 0) {
this.queryParam.startTime = "";
this.queryParam.endTime = "";
} else {
this.queryParam.startTime = dateString[0];
this.queryParam.endTime = dateString[1];
}
},
handleSubmit() {
this.callback = true;
let today = new Date();
today.setTime(today.getTime());
let s2 = today.getFullYear() + "-" + (today.getMonth() + 1) + "-" + today.getDate();
exportFile(
reportDownload(),
"一人一码移动报表" + s2 + ".xlsx",
this.downloadstatu
);
},
downloadstatu() {
this.callback = false;
}
}
};
</script>
<style scoped>
</style>
\ No newline at end of file
src/views/school-center/statistics/orderConversionXF.vue 0 → 100644
<template>
<div class="flex-container">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<!-- 搜索区域 -->
<a-form layout="inline">
<a-row :gutter="24">
<a-col :md="6" :sm="12">
<a-form-item label="时间选择：">
<a-range-picker @change="onChange"/>
</a-form-item>
</a-col>
<span class="table-page-search-submitButtons" style="float: left; overflow: hidden;">
<a-col :md="4" :sm="24">
<a-button @click="search()" type="primary">查询</a-button>
<a-button v-show="!callback" @click="handleSubmit" style="margin-left: 10px">导出</a-button>
<a-button v-show="callback" style="margin-left: 10px">
导出中
<a-spin style="margin-left: 5px" size="small"/>
</a-button>
</a-col>
</span>
</a-row>
</a-form>
</div>
<!--列表-->
<s-table
:columns="columns"
:data="rowdata"
bordered
ref="table"
size="small"
class="flex-filling"
:locale="emptyText"
></s-table>
</div>
</template>
<script>
import STable from "@/components/table";
import {reportList, reportDownload} from "../../../api/school-center/orderConversion/orderConversionAPI";
import {cloneObject, exportFile} from "@/utils/util";
import moment from "moment";
export default {
name: "orderConversionXF",
components: {
STable
},
data() {
return {
emptyText: {emptyText: '暂无数据'},
callback: false,
Formtable: this.$form.createForm(this),
queryParam: {
startTime: "",
endTime: "",
conversionType:"01"
},
columns: [
{title: "校区", dataIndex: "sub_name", width: 80},
{title: "订单总数", dataIndex: "orderCount", width: 80},
{title: "小白卡订单", dataIndex: "xb_orderCount", width: 80},
{title: "预制卡订单", dataIndex: "yz_orderCount", width: 80},
{title: "订单状态", children: [
{title: "待识别", dataIndex: "status_1", width: 80},
{title: "待处理", dataIndex: "status_2", width: 80},
{title: "待配送", dataIndex: "status_3", width: 80},
{title: "待活体", dataIndex: "status_4", width: 80},
{title: "已完成", dataIndex: "status_5", width: 80},
]
}
],
rowdata: parameter => {
let params = {
pageNo: parameter.pageNo,
pageSize: parameter.pageSize
};
let obj = cloneObject(this.queryParam);
//表示
return reportList(Object.assign(params, obj)).then(res => {
console.log(res);
let data = {};
if (res.state !== "success") {
this.$message.error("查询失败！", 5);
this.emptyText.emptyText = '查询失败！'
data = {
data: []
};
} else {
data = {
data: res.data
};
}
return data;
});
}
};
},
methods: {
moment,
search() {
this.$refs.table.refresh({search: true});
},
//时间事件
onChange(date, dateString) {
if (dateString.length == 0) {
this.queryParam.startTime = "";
this.queryParam.endTime = "";
} else {
this.queryParam.startTime = dateString[0];
this.queryParam.endTime = dateString[1];
}
},
handleSubmit() {
this.callback = true;
let today = new Date();
today.setTime(today.getTime());
let s2 = today.getFullYear() + "-" + (today.getMonth() + 1) + "-" + today.getDate();
exportFile(
reportDownload(),
"一人一码移动报表" + s2 + ".xlsx",
this.downloadstatu
);
},
downloadstatu() {
this.callback = false;
}
}
};
</script>
<style scoped>
</style>
\ No newline at end of file
src/views/school-center/statistics/orderConversionXX.vue 0 → 100644
<template>
<div class="flex-container">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<!-- 搜索区域 -->
<a-form layout="inline">
<a-row :gutter="24">
<a-col :md="6" :sm="12">
<a-form-item label="时间选择：">
<a-range-picker @change="onChange"/>
</a-form-item>
</a-col>
<span class="table-page-search-submitButtons" style="float: left; overflow: hidden;">
<a-col :md="4" :sm="24">
<a-button @click="search()" type="primary">查询</a-button>
<a-button v-show="!callback" @click="handleSubmit" style="margin-left: 10px">导出</a-button>
<a-button v-show="callback" style="margin-left: 10px">
导出中
<a-spin style="margin-left: 5px" size="small"/>
</a-button>
</a-col>
</span>
</a-row>
</a-form>
</div>
<!--列表-->
<s-table
:columns="columns"
:data="rowdata"
bordered
ref="table"
size="small"
class="flex-filling"
:locale="emptyText"
></s-table>
</div>
</template>
<script>
import STable from "@/components/table";
import {reportList, reportDownload} from "../../../api/school-center/orderConversion/orderConversionAPI";
import {cloneObject, exportFile} from "@/utils/util";
import moment from "moment";
export default {
name: "orderConversionXX",
components: {
STable
},
data() {
return {
emptyText: {emptyText: '暂无数据'},
callback: false,
Formtable: this.$form.createForm(this),
queryParam: {
startTime: "",
endTime: "",
conversionType:"00"
},
columns: [
{title: "校区", dataIndex: "sub_name", width: 80},
{title: "学校", dataIndex: "school", width: 80},
{title: "督导", dataIndex: "supervisor", width: 80},
{title: "订单总数", dataIndex: "orderCount", width: 80},
{title: "小白卡订单", dataIndex: "xb_orderCount", width: 80},
{title: "预制卡订单", dataIndex: "yz_orderCount", width: 80},
{title: "订单状态", children: [
{title: "待识别", dataIndex: "status_1", width: 80},
{title: "待处理", dataIndex: "status_2", width: 80},
{title: "待配送", dataIndex: "status_3", width: 80},
{title: "待活体", dataIndex: "status_4", width: 80},
{title: "已完成", dataIndex: "status_5", width: 80},
]
}
],
rowdata: parameter => {
let params = {
pageNo: parameter.pageNo,
pageSize: parameter.pageSize
};
let obj = cloneObject(this.queryParam);
//表示
return reportList(Object.assign(params, obj)).then(res => {
console.log(res);
let data = {};
if (res.state !== "success") {
this.$message.error("查询失败！", 5);
this.emptyText.emptyText = '查询失败！'
data = {
data: []
};
} else {
data = {
data: res.data
};
}
return data;
});
}
};
},
methods: {
moment,
search() {
this.$refs.table.refresh({search: true});
},
//时间事件
onChange(date, dateString) {
if (dateString.length == 0) {
this.queryParam.startTime = "";
this.queryParam.endTime = "";
} else {
this.queryParam.startTime = dateString[0];
this.queryParam.endTime = dateString[1];
}
},
handleSubmit() {
this.callback = true;
let today = new Date();
today.setTime(today.getTime());
let s2 = today.getFullYear() + "-" + (today.getMonth() + 1) + "-" + today.getDate();
exportFile(
reportDownload(),
"一人一码移动报表" + s2 + ".xlsx",
this.downloadstatu
);
},
downloadstatu() {
this.callback = false;
}
}
};
</script>
<style scoped>
</style>
\ No newline at end of file
src/views/school-center/userManager/PartnerManagement.vue
...@@ -509,7 +509,6 @@ ...@@ -509,7 +509,6 @@
this.modifyForm.sex=values.sex this.modifyForm.sex=values.sex
this.modifyForm.ysm=values.ysm this.modifyForm.ysm=values.ysm
this.modifyForm.password = values.password this.modifyForm.password = values.password
debugger
const subNames = []; const subNames = [];
const schools = []; const schools = [];
console.log(this.treeModelValue); console.log(this.treeModelValue);
......
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