Compare commits
No commits in common. "9e3c9fff6d4d04d4faf9ee6b076054bf168c3944" and "52d968fdde2fd5a183a250e41b2928346bba70fd" have entirely different histories.
9e3c9fff6d
...
52d968fdde
6
.env.dev
6
.env.dev
@ -1,7 +1,7 @@
|
||||
###
|
||||
# @Author: zhp
|
||||
# @Date: 2024-04-28 13:42:51
|
||||
# @LastEditTime: 2024-07-26 10:50:10
|
||||
# @LastEditTime: 2024-07-25 15:43:42
|
||||
# @LastEditors: zhp
|
||||
# @Description:
|
||||
###
|
||||
@ -13,7 +13,7 @@ VUE_APP_TITLE = 发电玻璃智能管控平台
|
||||
|
||||
# 芋道管理系统/开发环境
|
||||
# VUE_APP_BASE_API = 'http://192.168.1.70:30307'
|
||||
VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
|
||||
# VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
|
||||
# 闫阳
|
||||
# VUE_APP_BASE_API = 'http://192.168.1.81:48080'
|
||||
# 徐
|
||||
@ -21,7 +21,7 @@ VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
|
||||
# 郭
|
||||
# VUE_APP_BASE_API = 'http://192.168.1.61:48080'
|
||||
# sara
|
||||
# VUE_APP_BASE_API = 'http://192.168.1.63:8080'
|
||||
VUE_APP_BASE_API = 'http://192.168.1.63:8080'
|
||||
# 张一丁
|
||||
# VUE_APP_BASE_API = 'http://192.168.4.139:48080'
|
||||
# 蔡
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-04-15 10:49:13
|
||||
* @LastEditTime: 2024-07-26 11:14:37
|
||||
* @LastEditTime: 2024-07-26 10:32:14
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -30,12 +30,12 @@
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<!-- <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> -->
|
||||
<base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData"
|
||||
<base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
|
||||
:max-height="tableH">
|
||||
<!-- <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right"
|
||||
:method-list="tableBtn" @clickBtn="handleClick" /> -->
|
||||
</base-table>
|
||||
<pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
|
||||
<pagination :limit.sync="listQuery.size" :page.sync="listQuery.current" :total="listQuery.total"
|
||||
@pagination="getDataList" />
|
||||
</div>
|
||||
|
||||
@ -101,8 +101,8 @@ export default {
|
||||
// selectedValues: [],
|
||||
options,
|
||||
listQuery: {
|
||||
pageSize: 20,
|
||||
pageNo: 1,
|
||||
// size: 10,
|
||||
// current: 1,
|
||||
total: 0,
|
||||
center: undefined,
|
||||
start: undefined,
|
||||
@ -394,10 +394,6 @@ export default {
|
||||
this.listQuery.yearPhaseEnd = this.listQuery.end ? this.listQuery.end.slice(0, 6) : undefined
|
||||
if (this.listQuery.end && this.listQuery.start) {
|
||||
if (this.listQuery.end.slice(0, 4) - this.listQuery.start.slice(0, 4) > 10) {
|
||||
this.listQuery.end = undefined
|
||||
this.listQuery.start = undefined
|
||||
this.listQuery.yearPhaseStart = undefined
|
||||
this.listQuery.yearPhaseEnd = undefined
|
||||
return this.$message({
|
||||
message: '起止年份不能超过十年',
|
||||
type: 'warning'
|
||||
@ -509,8 +505,8 @@ export default {
|
||||
this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined;
|
||||
switch (val.btnName) {
|
||||
case 'search':
|
||||
this.listQuery.pageNo = 1;
|
||||
this.listQuery.pageSize = 10;
|
||||
this.listQuery.current = 1;
|
||||
this.listQuery.size = 10;
|
||||
this.getDataList();
|
||||
break;
|
||||
case 'export':
|
||||
@ -523,8 +519,8 @@ export default {
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
const queryParams = this.listQuery;
|
||||
// queryParams.current = 1
|
||||
// queryParams.size = 999
|
||||
queryParams.current = 1
|
||||
queryParams.size = 999
|
||||
// if (this.facType === 0) {
|
||||
this.$modal.confirm('是否确认导出所有数据项?').then(() => {
|
||||
this.exportLoading = true;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-04-15 10:49:13
|
||||
* @LastEditTime: 2024-07-26 11:14:34
|
||||
* @LastEditTime: 2024-07-26 10:28:53
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -10,7 +10,7 @@
|
||||
<div class="app-container" style="height: auto; flex-grow: 1;">
|
||||
<el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
|
||||
<el-form-item label="快捷查询" prop="mDType">
|
||||
<el-select size="small" v-model="listQuery.mDType" clearable @change="handleChange">
|
||||
<el-select size="small" v-model="listQuery.mDType" clearable>
|
||||
<el-option v-for="item in mDTypeList" :key="item.value" :label="item.label" :value="item.value">
|
||||
</el-option>
|
||||
</el-select>
|
||||
@ -54,12 +54,12 @@
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<!-- <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> -->
|
||||
<base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData"
|
||||
<base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
|
||||
:max-height="tableH">
|
||||
<!-- <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right"
|
||||
:method-list="tableBtn" @clickBtn="handleClick" /> -->
|
||||
</base-table>
|
||||
<pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
|
||||
<pagination :limit.sync="listQuery.size" :page.sync="listQuery.current" :total="listQuery.total"
|
||||
@pagination="getDataList" />
|
||||
</div>
|
||||
|
||||
@ -100,8 +100,8 @@ export default {
|
||||
start: undefined,
|
||||
end: undefined,
|
||||
listQuery: {
|
||||
pageSize: 20,
|
||||
pageNo: 1,
|
||||
size: 10,
|
||||
current: 1,
|
||||
total: 0,
|
||||
mDType:0,
|
||||
wDType: 0,
|
||||
@ -283,10 +283,6 @@ export default {
|
||||
// this.changeTime()
|
||||
},
|
||||
methods: {
|
||||
handleChange() {
|
||||
this.listQuery.materialCode = undefined
|
||||
this.listQuery.materialName = undefined
|
||||
},
|
||||
async getDataList() {
|
||||
await getStockRealTimePage(this.listQuery).then(res => {
|
||||
if (res.code === 0) {
|
||||
@ -299,8 +295,8 @@ export default {
|
||||
this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined;
|
||||
switch (val.btnName) {
|
||||
case 'search':
|
||||
this.listQuery.pageNo = 1;
|
||||
this.listQuery.pageSize = 10;
|
||||
this.listQuery.current = 1;
|
||||
this.listQuery.size = 10;
|
||||
this.getDataList();
|
||||
break;
|
||||
case 'export':
|
||||
@ -313,6 +309,8 @@ export default {
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
const queryParams = this.listQuery;
|
||||
queryParams.current = 1
|
||||
queryParams.size = 999
|
||||
// if (this.facType === 0) {
|
||||
this.$modal.confirm('是否确认导出所有数据项?').then(() => {
|
||||
this.exportLoading = true;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user