Compare commits
No commits in common. "52dbb694a829d2c128eff70b87c1e440b8c61753" and "b05d9067d33e31f52367c6c4e71caa94d50c1c08" have entirely different histories.
52dbb694a8
...
b05d9067d3
6
.env.dev
6
.env.dev
@ -1,7 +1,7 @@
|
|||||||
###
|
###
|
||||||
# @Author: zhp
|
# @Author: zhp
|
||||||
# @Date: 2024-04-28 13:42:51
|
# @Date: 2024-04-28 13:42:51
|
||||||
# @LastEditTime: 2024-07-26 10:50:10
|
# @LastEditTime: 2024-07-25 15:43:42
|
||||||
# @LastEditors: zhp
|
# @LastEditors: zhp
|
||||||
# @Description:
|
# @Description:
|
||||||
###
|
###
|
||||||
@ -13,7 +13,7 @@ VUE_APP_TITLE = 发电玻璃智能管控平台
|
|||||||
|
|
||||||
# 芋道管理系统/开发环境
|
# 芋道管理系统/开发环境
|
||||||
# VUE_APP_BASE_API = 'http://192.168.1.70:30307'
|
# 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'
|
# 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'
|
# VUE_APP_BASE_API = 'http://192.168.1.61:48080'
|
||||||
# sara
|
# 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'
|
# VUE_APP_BASE_API = 'http://192.168.4.139:48080'
|
||||||
# 蔡
|
# 蔡
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2024-04-15 10:49:13
|
* @Date: 2024-04-15 10:49:13
|
||||||
* @LastEditTime: 2024-07-26 11:06:58
|
* @LastEditTime: 2024-07-26 10:32:14
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -394,10 +394,6 @@ export default {
|
|||||||
this.listQuery.yearPhaseEnd = this.listQuery.end ? this.listQuery.end.slice(0, 6) : undefined
|
this.listQuery.yearPhaseEnd = this.listQuery.end ? this.listQuery.end.slice(0, 6) : undefined
|
||||||
if (this.listQuery.end && this.listQuery.start) {
|
if (this.listQuery.end && this.listQuery.start) {
|
||||||
if (this.listQuery.end.slice(0, 4) - this.listQuery.start.slice(0, 4) > 10) {
|
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({
|
return this.$message({
|
||||||
message: '起止年份不能超过十年',
|
message: '起止年份不能超过十年',
|
||||||
type: 'warning'
|
type: 'warning'
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2024-04-15 10:49:13
|
* @Date: 2024-04-15 10:49:13
|
||||||
* @LastEditTime: 2024-07-26 11:05:17
|
* @LastEditTime: 2024-07-26 10:28:53
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -10,7 +10,7 @@
|
|||||||
<div class="app-container" style="height: auto; flex-grow: 1;">
|
<div class="app-container" style="height: auto; flex-grow: 1;">
|
||||||
<el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
|
<el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
|
||||||
<el-form-item label="快捷查询" prop="mDType">
|
<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 v-for="item in mDTypeList" :key="item.value" :label="item.label" :value="item.value">
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
@ -283,10 +283,6 @@ export default {
|
|||||||
// this.changeTime()
|
// this.changeTime()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
handleChange() {
|
|
||||||
this.listQuery.materialCode = undefined
|
|
||||||
this.listQuery.materialName = undefined
|
|
||||||
},
|
|
||||||
async getDataList() {
|
async getDataList() {
|
||||||
await getStockRealTimePage(this.listQuery).then(res => {
|
await getStockRealTimePage(this.listQuery).then(res => {
|
||||||
if (res.code === 0) {
|
if (res.code === 0) {
|
||||||
|
Loading…
Reference in New Issue
Block a user