朱兆平 / vue_cli · 提交

转到一个项目

作者 王勇
提交 0eae9916b697fe3759d0c94685249f2c3741c2ee 1 个父辈 eada4e35

添加进度条

内嵌 并排对比
正在显示 3 个修改的文件 包含 89 行增加 和 375 行删除
... ... @@ -29,10 +29,10 @@ module.exports = {
assetsSubDirectory: 'static',
assetsPublicPath: '/',
proxyTable: {
'/api':{
// target: 'http://192.168.1.53:12343',//设置你调用的接口域名和端口号 别忘了加http
'/api': {
target: 'http://192.168.1.53:12343',//设置你调用的接口域名和端口号 别忘了加http
// target: 'http://127.0.0.1:12343',//设置你调用的接口域名和端口号 别忘了加http
target: 'http://10.50.3.82:22343',//设置你调用的接口域名和端口号 别忘了加http
//target: 'http://10.50.3.82:22343',//设置你调用的接口域名和端口号 别忘了加http
changeOrigin: true,
pathRewrite: {
'^/api/': '/'//这里理解成用‘/api’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add'，直接写‘/api/user/add’即可
... ...
... ... @@ -92,12 +92,6 @@
"printj": "~1.1.0"
}
},
"after": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
"integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
"dev": true
},
"ajv": {
"version": "6.10.2",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
... ... @@ -526,12 +520,6 @@
"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
"dev": true
},
"arraybuffer.slice": {
"version": "0.0.7",
"resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
"integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
"dev": true
},
"asn1": {
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
... ... @@ -1550,12 +1538,6 @@
"integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
"dev": true
},
"backo2": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
"integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
"dev": true
},
"balanced-match": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
... ... @@ -1628,12 +1610,6 @@
}
}
},
"base64-arraybuffer": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
"integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
"dev": true
},
"base64-js": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
... ... @@ -1649,15 +1625,6 @@
"tweetnacl": "^0.14.3"
}
},
"better-assert": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
"integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
"dev": true,
"requires": {
"callsite": "1.0.0"
}
},
"bfj": {
"version": "6.1.2",
"resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz",
... ... @@ -1682,12 +1649,6 @@
"integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
"dev": true
},
"blob": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
"integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
"dev": true
},
"block-stream": {
"version": "0.0.9",
"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
... ... @@ -1939,12 +1900,6 @@
}
}
},
"callsite": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
"integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
"dev": true
},
"callsites": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
... ... @@ -2479,24 +2434,12 @@
"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
"dev": true
},
"component-bind": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
"integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
"dev": true
},
"component-emitter": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
"integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
"dev": true
},
"component-inherit": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
"integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
"dev": true
},
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
... ... @@ -3352,64 +3295,6 @@
"once": "^1.4.0"
}
},
"engine.io-client": {
"version": "3.4.2",
"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.2.tgz",
"integrity": "sha512-AWjc1Xg06a6UPFOBAzJf48W1UR/qKYmv/ubgSCumo9GXgvL/xGIvo05dXoBL+2NTLMipDI7in8xK61C17L25xg==",
"dev": true,
"requires": {
"component-emitter": "~1.3.0",
"component-inherit": "0.0.3",
"debug": "~4.1.0",
"engine.io-parser": "~2.2.0",
"has-cors": "1.1.0",
"indexof": "0.0.1",
"parseqs": "0.0.5",
"parseuri": "0.0.5",
"ws": "~6.1.0",
"xmlhttprequest-ssl": "~1.5.4",
"yeast": "0.1.2"
},
"dependencies": {
"debug": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"dev": true,
"requires": {
"ms": "^2.1.1"
}
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
},
"ws": {
"version": "6.1.4",
"resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz",
"integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==",
"dev": true,
"requires": {
"async-limiter": "~1.0.0"
}
}
}
},
"engine.io-parser": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.0.tgz",
"integrity": "sha512-6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==",
"dev": true,
"requires": {
"after": "0.8.2",
"arraybuffer.slice": "~0.0.7",
"base64-arraybuffer": "0.1.5",
"blob": "0.0.5",
"has-binary2": "~1.0.2"
}
},
"enhanced-resolve": {
"version": "3.4.1",
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
... ... @@ -4955,29 +4840,6 @@
}
}
},
"has-binary2": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
"integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
"dev": true,
"requires": {
"isarray": "2.0.1"
},
"dependencies": {
"isarray": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
"integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
"dev": true
}
}
},
"has-cors": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
"integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=",
"dev": true
},
"has-flag": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
... ... @@ -5320,12 +5182,6 @@
"integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
"dev": true
},
"indexof": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
"integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
"dev": true
},
"inflight": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
... ... @@ -9555,12 +9411,6 @@
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
"dev": true
},
"object-component": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
"integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=",
"dev": true
},
"object-copy": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
... ... @@ -9869,24 +9719,6 @@
"error-ex": "^1.2.0"
}
},
"parseqs": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
"integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
"dev": true,
"requires": {
"better-assert": "~1.0.0"
}
},
"parseuri": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
"integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
"dev": true,
"requires": {
"better-assert": "~1.0.0"
}
},
"parseurl": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
... ... @@ -11843,85 +11675,6 @@
"kind-of": "^3.2.0"
}
},
"socket.io-client": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.0.tgz",
"integrity": "sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==",
"dev": true,
"requires": {
"backo2": "1.0.2",
"base64-arraybuffer": "0.1.5",
"component-bind": "1.0.0",
"component-emitter": "1.2.1",
"debug": "~4.1.0",
"engine.io-client": "~3.4.0",
"has-binary2": "~1.0.2",
"has-cors": "1.1.0",
"indexof": "0.0.1",
"object-component": "0.0.3",
"parseqs": "0.0.5",
"parseuri": "0.0.5",
"socket.io-parser": "~3.3.0",
"to-array": "0.1.4"
},
"dependencies": {
"component-emitter": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
"dev": true
},
"debug": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"dev": true,
"requires": {
"ms": "^2.1.1"
}
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
}
}
},
"socket.io-parser": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.0.tgz",
"integrity": "sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==",
"dev": true,
"requires": {
"component-emitter": "1.2.1",
"debug": "~3.1.0",
"isarray": "2.0.1"
},
"dependencies": {
"component-emitter": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
"dev": true
},
"debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"dev": true,
"requires": {
"ms": "2.0.0"
}
},
"isarray": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
"integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
"dev": true
}
}
},
"sort-keys": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
... ... @@ -12351,12 +12104,6 @@
"os-tmpdir": "~1.0.2"
}
},
"to-array": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
"integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
"dev": true
},
"to-arraybuffer": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
... ... @@ -12908,15 +12655,6 @@
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-2.8.1.tgz",
"integrity": "sha512-MC4jacHBhTPKtmcfzvaj2N7g6jgJ/Z/eIjZdt+yUaUOM1iKC0OUIlO/xCtz6OZFFTNUJs/1YNro2GN/lE+nOXA=="
},
"vue-socket.io": {
"version": "3.0.9",
"resolved": "https://registry.npmjs.org/vue-socket.io/-/vue-socket.io-3.0.9.tgz",
"integrity": "sha512-imgrZL+UuyMhEyOOD6Cl11eDtEaVn606e3mCD/2s/oUAB511Ckqon4U7y97t6dwQgLCKW+tfA8aFhF5d3Eogdw==",
"dev": true,
"requires": {
"socket.io-client": "^2.1.1"
}
},
"vue-style-loader": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-2.0.5.tgz",
... ... @@ -13463,12 +13201,6 @@
"wmf": "~1.0.1"
}
},
"xmlhttprequest-ssl": {
"version": "1.5.5",
"resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
"integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
"dev": true
},
"xtend": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
... ... @@ -13574,12 +13306,6 @@
}
}
},
"yeast": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
"integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
"dev": true
},
"zrender": {
"version": "3.7.4",
"resolved": "https://registry.npmjs.org/zrender/-/zrender-3.7.4.tgz",
... ...
... ... @@ -17,73 +17,36 @@
</el-date-picker>
</el-col>
<el-col :span="10">
<el-button type="primary" @click="getExitInfoList">
查询调度记录
<el-button type="primary" @click="getExitInfoList" style="width: 160px;" icon="el-icon-search">
数据统计查询
</el-button>
<el-button :loading="downloadLoading" type="success" icon="el-icon-s-home"
:disabled="resultStatus!=='200'"
@click="downExcelExit">导出 Excel
:disabled="socketResponse.socketStatus!=='200'" style="width: 160px;"
@click="downExcel">导出 Excel
</el-button>
</el-col>
</el-row>
<el-input v-model="message" style="width: 460px;margin-top: 20px" type="textarea"
<!-- 显示区域 -->
<el-row :gutter="24" style="margin-top: 30px">
<el-col :span="11" style="margin-top: 10px">
<el-progress :text-inside="true" :stroke-width="15" :percentage="proportion"
:color="customColors"
style="width: 455px"></el-progress>
<el-input v-model="message" type="textarea"
:autosize="{ minRows: 6, maxRows: 10}"
style="width: 455px;"
placeholder="获取数据进度" readonly>
</el-input>
</el-col>
<el-col :span="4" style="margin-left: 40px;margin-top: 20px">
<el-progress type="circle" :percentage="proportion"
:color="customColors"
:width="proportion>6?200:126"></el-progress>
</el-col>
</el-row>
</div>
<div>
状态 :
</div>
<div>
消息 :{{socketResponse.message}}
</div>
<!-- 列表显示区域 -->
<!--
<div style="margin-top: 20px;">
<el-table :data="exitInfoList" border stripe highlight-current-row
v-loading="listLoading"
max-height="300"
:element-loading-text="this.message">
<el-table-column type="index" align="center"></el-table-column>
<el-table-column label="航班号" prop="flightNo" align="center" width="130"></el-table-column>
<el-table-column label="航班日期" prop="flightDate" align="center" width="130"></el-table-column>
<el-table-column label="航班时间" prop="flightTime" align="center" width="200"></el-table-column>
<el-table-column label="运单号" prop="waybillNoMaster" align="center"
width="130"></el-table-column>
<el-table-column label="航段" prop="segment" align="center" width="130"></el-table-column>
<el-table-column label="起始站" prop="originatingStation" align="center"
width="130"></el-table-column>
<el-table-column label="目的站" prop="destinationStation" align="center"
width="130"></el-table-column>
<el-table-column label="理货件数" prop="tallyTotalPiece" align="center"
width="130"></el-table-column>
<el-table-column label="理货重量" prop="tallyTotalWeight" align="center"
width="130"></el-table-column>
<el-table-column label="承运人二字码" prop="carrier" align="center" width="130"></el-table-column>
<el-table-column label="发货人名称" prop="shipperName" align="center" width="130"></el-table-column>
<el-table-column label="收货人名称" prop="consigneeName" align="center"
width="130"></el-table-column>
<el-table-column label="货物目的站" prop="aimStation" align="center" width="130"></el-table-column>
<el-table-column label="国家代码" prop="country" align="center" width="130"></el-table-column>
<el-table-column label="所属洲" prop="areaDescChn" align="center" width="130"></el-table-column>
<el-table-column label="订舱代理人" prop="orderName" align="center" width="130"></el-table-column>
<el-table-column label="结算代理人" prop="countName" align="center"
width="130"></el-table-column>
<el-table-column label="品名" prop="sdCargoName" align="center" width="130"></el-table-column>
<el-table-column label="二级类名" prop="twoTypeName" align="center" width="130"></el-table-column>
<el-table-column label="一级类名" prop="typeName" align="center" width="130"></el-table-column>
<el-table-column label="航空公司" prop="airCompany" align="center" width="130"></el-table-column>
<el-table-column label="机型" prop="cfTp" align="center" width="130"></el-table-column>
<el-table-column label="机号" prop="cfNo" align="center" width="130"></el-table-column>
<el-table-column label="航班计划日期" prop="flightPlanDate" align="center"
width="130"></el-table-column>
<el-table-column label="航班计划时间" prop="flightPlanTime" align="center"
width="200"></el-table-column>
<el-table-column label="计费重量" prop="totalGrossWeightMeasure" align="center"
width="130"></el-table-column>
<el-table-column label="体积" prop="volumeMeasure" align="center" width="130"></el-table-column>
</el-table>
</div>
-->
</el-card>
</el-main>
</el-container>
... ... @@ -92,15 +55,10 @@
<script>
import {downExcel, getExitDataAnalysis} from "../../api/exit_data_analysis";
import FilenameOption from '../excel/components/FilenameOption'
import AutoWidthOption from '../excel/components/AutoWidthOption'
import BookTypeOption from '../excel/components/BookTypeOption'
import VueWebsocket from '@/utils/websocket'
import {msgJson, socketDataList, socketMessage, socketStatus} from "@/api/socket";
import VueWebsocket from '@/utils/websocket';
export default {
name: "ExitAnalysis",
components: {FilenameOption, AutoWidthOption, BookTypeOption},
data() {
return {
/**
... ... @@ -109,24 +67,35 @@
exitInfoList: [],
resultStatus: '0',
message: '',
proportion: 0,
socketResponse: {
message: '',
data: '',
status: ''
socketMessage: '',
socketStatus: '',
socketDataList: [],
socketCurrentNum: 1,
socketTotalNum: 1,
},
/**
* 查询列表
*/
queryInfo: {
//航班号
flightNo: 'SL965',
flightNo: 'RU186',
//航班日期
flightDate: '2019-04-12',
flightDate: '2019-10-31',
},
/* 列表加载 */
listLoading: false,
downloadLoading: false,
customColors: [
{color: '#6f7ad3', percentage: 20},
{color: '#f56c6c', percentage: 40},
{color: '#e6a23c', percentage: 60},
{color: '#5cb87a', percentage: 80},
{color: '#1989fa', percentage: 100},
]
}
},
methods: {
... ... @@ -136,59 +105,78 @@
getExitInfoList(onfulfilled) {
let _this = this;
_this.$message.success('开始获取统计数据');
getExitDataAnalysis(_this.queryInfo)
.then(
(response) => {
// _this.message = socketMessage;
// _this.status = socketStatus;
// if (_this.status === '200') {
// _this.exitInfoList = socketDataList;
// }
})
.catch(error => {
_this.$message.error(error.toString());
getExitDataAnalysis(_this.queryInfo).catch(error => {
_this.$message.info("即将结束！请您稍候");
});
},
/**
* 导出excel到本地，功能
* 下载excel
*/
downExcel() {
},
/**
* 生成excel
*/
downExcelExit() {
downExcel(this.exitInfoList).then((response) => {
this.$message.success("导出Excel成功，请您重命名")
downExcel(this.socketResponse.socketDataList).then((response) => {
this.$message.success("Excel准备就绪")
}).catch(error => {
this.$message.error(error.toString());
});
},
socket_onmessage: function (e) {
// eslint-disable-next-line no-console
console.log("从websocket接收到新的消息-->>"+e.data);
this.message = this.message+e.data+"\n";
console.log("从websocket接收到新的消息-->>" + e.data);
//this.message = this.message + e.data + "\n";
let msgJson = JSON.parse(e.data);
this.message = this.message + this.dataFormat(new Date()) + " -> " + msgJson.message + "\n";
this.socketResponse = JSON.parse(e.data);
let socketMessage = msgJson.message;
// eslint-disable-next-line no-console
console.log(socketMessage)
let socketStatus = msgJson.status;
let socketDataList = msgJson.data;
// eslint-disable-next-line no-console
this.socketResponse.socketMessage = msgJson.message;
this.socketResponse.socketCurrentNum = msgJson.currentNum;
this.socketResponse.socketTotalNum = msgJson.totalNum;
console.log(this.socketMessage);
this.socketResponse.socketStatus = msgJson.status;
this.socketResponse.socketDataList = msgJson.data;
console.log(msgJson);
if (this.socketResponse.socketTotalNum !== null && this.socketResponse.socketTotalNum !== 0) {
this.proportion = this.toPercent(this.socketResponse.socketCurrentNum / this.socketResponse.socketTotalNum);
}
if (this.socketResponse.socketCurrentNum === this.socketResponse.socketTotalNum &&
this.socketResponse.socketTotalNum !== 0 && this.socketResponse.socketCurrentNum !== 0) {
this.downExcelExit();
}
},
socket_onopen: function (e) {
// eslint-disable-next-line no-console
console.log("websocket->>链接已链接");
},
/**
* 重写日期函数格式化日期
*/
dataFormat(time) {
return `${time.getFullYear()}-${time.getMonth() + 1 >= 10 ? (time.getMonth() + 1) : '0' + (time.getMonth() + 1)}-${time.getDate() >= 10 ? time.getDate() : '0' + time.getDate()} ${time.getHours() >= 10 ? time.getHours() : '0' + time.getHours()}:${time.getMinutes() >= 10 ? time.getMinutes() : '0' + time.getMinutes()}:${time.getSeconds() >= 10 ? time.getSeconds() : '0' + time.getSeconds()}`;
},
/**
* 将小数转换成百分比
* @param point
* @returns {string|number}
*/
toPercent(point) {
if (point == 0) {
return 0;
}
let str = Number(point * 100).toFixed();
// str+="%";
return parseInt(str);
}
},
created() {
VueWebsocket.onopen = this.socket_onopen;
VueWebsocket.onmessage = this.socket_onmessage;
VueWebsocket.init();
},
destroyed() {
},
watch: {
},
watch: {},
}
</script>
... ...