xiaoy
/
water-dispatch-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调令类型、去滚动加倒计时，调令详情等

Browse Source
master
xy 2 years ago
parent 948cd82da6
commit 82b2cc5027
6 changed files with 59 additions and 251 deletions
Show Stats Download Patch File Download Diff File

1
src/components/XyDialog/index.vue
Unescape View File

@ -152,6 +152,7 @@ export default {
}
return (
<el-form
size="small"
style={title.length === 0 ? {'margin-top':'32px'} : {}}
ref="elForm"
props={{

3
src/views/bigScreen1/component/doing.vue
Unescape View File

@ -265,7 +265,8 @@ export default {
this.$nextTick(() => {
const isScroll = this.$refs['listItems']?.$el?.getBoundingClientRect()?.height > this.$refs['elScrollbar']?.$el?.getBoundingClientRect()?.height;
if (isScroll) {
//无需滚动
if (false) {
if (this.scrollTimer) {
clearInterval(this.scrollTimer)
}

3
src/views/bigScreen1/component/toDo.vue
Unescape View File

@ -285,7 +285,8 @@ export default {
this.$nextTick(() => {
const isScroll = this.$refs['listItems']?.$el?.getBoundingClientRect()?.height > this.$refs['elScrollbar']?.$el?.getBoundingClientRect()?.height;
if (isScroll) {
//无需滚动
if (false) {
if (this.scrollTimer) {
clearInterval(this.scrollTimer)
}

18
src/views/bigScreen1/index.vue
Unescape View File

@ -1,5 +1,8 @@
<template>
<div id="big-screen" ref="appRef">
<div class="refresh-time">
{{ refreshTime }}
</div>
<topBackground></topBackground>
<Title ref="title" @show-done="$refs['done'].show()" @step-click="stepClick"></Title>
<toDo ref="toDo"
@ -80,6 +83,7 @@ export default {
},
data() {
return {
refreshTime: refreshTransferTime / 10000,
forwardRefreshTime: '',
transfers1: [],
transfers2: [],
@ -109,6 +113,7 @@ export default {
startTime () {
this.timer = setInterval(() => {
this.time = this.$moment()
this.refreshTime--
},1000)
},
@ -150,6 +155,7 @@ export default {
},
async getTransfer(isFirst = false) {
this.refreshTime = refreshTransferTime / 1000;
if (isFirst) {
this.forwardRefreshTime = this.$moment();
let transfers1 = [];
@ -256,13 +262,13 @@ export default {
this.setRem();
window.onresize = this.setRem;
this.getTransfer(true);
this.startTime();
this.transferTimer = setInterval(() => {
this.getTransfer()
this.getFeedback()
},refreshTransferTime)
},
mounted() {
this.startTime()
},
destroyed() {
window.onscroll = null;
@ -281,6 +287,16 @@ export default {
z-index: 2;
position: relative;
.refresh-time {
font-size: 12px;
color: #fff;
z-index: 3;
position: fixed;
top: 2px;
left: 2px;
}
}
</style>
<style lang="scss">

59
src/views/order/component/adjust.vue
Unescape View File

@ -9,6 +9,21 @@
:rules="rules"
@submit="submit"
>
<template #extraFormTop>
<el-descriptions title="调令信息" :column="2" label-class-name="xy-table-item-label">
<el-descriptions-item label="点位">{{ detail.equipment_id_equipments_id_relation ? detail.equipment_id_equipments_id_relation.name : "" }}</el-descriptions-item>
<el-descriptions-item label="泵闸总数">{{ detail.equipment_id_equipments_id_relation ? detail.equipment_id_equipments_id_relation.bengzhashuliang : "" }}</el-descriptions-item>
<el-descriptions-item label="开启数量">{{ detail.kaiqishuliang }}</el-descriptions-item>
<el-descriptions-item label="开始时间">{{ $moment(detail.start_time).format("HH:mm") }}</el-descriptions-item>
<el-descriptions-item label="结束时间">{{ $moment(detail.end_time).format("HH:mm") }}</el-descriptions-item>
<el-descriptions-item label="类型">
<el-tag size="small">{{ myleibie }}</el-tag>
</el-descriptions-item>
<el-descriptions-item label="范围">
<el-tag size="small">{{ myarea }}</el-tag>
</el-descriptions-item>
</el-descriptions>
</template>
<template v-slot:content>
<div class="xy-table-item">
<div class="xy-table-item-label">调令内容 ：</div>
@ -44,7 +59,7 @@
</div>
</div>
</template>
<template #kaiqishuliang>
<template #kaiqishuliang v-if="form.tiaozhengleixing !== 0 || equipmentType === 1">
<div class="xy-table-item">
<div class="xy-table-item-label">调整数量 ：</div>
<div class="xy-table-item-content">
@ -60,23 +75,8 @@
import { show, save } from "@/api/system/baseForm";
export default {
props: {
tiaozhengleixings: {
type: Array,
default: () => [
{
id: 0,
value: "关闭"
},
{
id: 1,
value: "新开"
},
{
id: 2,
value: "其他"
}
],
},
areas: Array,
abilities: Array
},
data() {
return {
@ -153,7 +153,7 @@ export default {
submit() {
const leixingLabel = this.tiaozhengleixings.find(i => i.id === this.form.tiaozhengleixing)?.value
if (leixingLabel === '关闭') {
this.form.kaiqishuliang = Number(this.detail?.kaiqishuliang) - this.form.kaiqishuliang
this.form.kaiqishuliang = this.originalData.kaiqishuliang
} else if (leixingLabel === '新开') {
this.form.kaiqishuliang = Number(this.detail?.kaiqishuliang) + this.form.kaiqishuliang
} else {
@ -209,21 +209,28 @@ export default {
},
},
computed: {
myarea () {
return this.areas.find(i => i.value === this.detail.equipment_id_equipments_id_relation?.area)?.key || "";
},
myleibie () {
return this.abilities.find(i => i.value === this.detail.equipment_id_equipments_id_relation?.leibie)?.key || "";
},
openNumberMax () {
const leixingLabel = this.tiaozhengleixings.find(i => i.id === this.form.tiaozhengleixing)?.value
console.log(leixingLabel)
const leixingLabel = this.types.find(i => i.id === this.form.tiaozhengleixing)?.value
if (leixingLabel === '关闭') {
return Number(this.detail?.kaiqishuliang) || 0
} else if (leixingLabel === '新开') {
} else {
return (Number(this.detail?.equipment_id_equipments_id_relation?.bengzhashuliang) - Number(this.detail?.kaiqishuliang)) || 0
} else {
return Number(this.detail?.equipment_id_equipments_id_relation?.bengzhashuliang) || 0
}
},
equipmentType () {
return this.detail?.equipment_id_equipments_id_relation?.type;
},
types () {
let type = this.detail?.equipment_id_equipments_id_relation?.type;
if (type === 1) {
if (this.equipmentType === 1) {
return [
{
id: 0,

226
src/views/order/handle.vue
Unescape View File

@ -13,237 +13,17 @@
<header-content :auths="auths_auth_mixin">
<template #search>
<div style="display: flex;">
<!-- <el-date-picker-->
<!-- size="small"-->
<!-- :clearable="false"-->
<!-- v-model="select.filter[3].value"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="日期选择"-->
<!-- format="yyyy-MM-dd"-->
<!-- style="width: 130px;"-->
<!-- ></el-date-picker>-->
<Select clearable v-model="select.filter[1].value" placeholder="请选择类别" style="width: 140px;margin-left: 6px;">
<Option v-for="item in abilities" :value="item.value">{{ item.key }}</Option>
</Select>
<Input style="width: 140px;margin-left: 6px;" clearable v-model="select.filter[0].value" placeholder="搜索内容"/>
<!-- <Select-->
<!-- v-model="select.filter[0].key"-->
<!-- style="width: 100px"-->
<!-- placeholder="搜索条目"-->
<!-- >-->
<!-- <Option-->
<!-- v-for="item in form"-->
<!-- :key="item.id"-->
<!-- :value="item.field"-->
<!-- >{{ item.name }}</Option-->
<!-- >-->
<!-- </Select>-->
<!-- <Select-->
<!-- v-model="select.filter[0].op"-->
<!-- style="width: 100px; margin-left: 10px"-->
<!-- placeholder="搜索条件"-->
<!-- >-->
<!-- <Option-->
<!-- v-for="item in op"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- >{{ item.label }}</Option-->
<!-- >-->
<!-- </Select>-->
<!-- <template-->
<!-- v-if="-->
<!-- select.filter[0].op !== 'range' &&-->
<!-- !columnArrTest(select.filter[0].key)-->
<!-- "-->
<!-- >-->
<!-- <Input-->
<!-- v-model="select.filter[0].value"-->
<!-- style="width: 150px; margin-left: 10px"-->
<!-- placeholder="请填写关键词"-->
<!-- />-->
<!-- </template>-->
<!-- <template-->
<!-- v-else-if="-->
<!-- select.filter[0].op !== 'range' &&-->
<!-- columnArrTest(select.filter[0].key)-->
<!-- "-->
<!-- >-->
<!-- <Select-->
<!-- v-model="select.filter[0].value"-->
<!-- style="width: 150px; margin-left: 10px"-->
<!-- placeholder="请选择关键词"-->
<!-- >-->
<!-- <Option-->
<!-- v-for="item in getColumnParams(select.filter[0].key)"-->
<!-- :key="item.id"-->
<!-- :value="-->
<!-- getColumnField(select.filter[0].key)._relations-->
<!-- ? item[-->
<!-- getColumnField(select.filter[0].key)._relations-->
<!-- .foreign_key-->
<!-- ]-->
<!-- : item.value-->
<!-- "-->
<!-- >{{-->
<!-- item.key ||-->
<!-- item.value ||-->
<!-- item.name ||-->
<!-- item.no ||-->
<!-- item.mingcheng ||-->
<!-- item.id-->
<!-- }}</Option-->
<!-- >-->
<!-- </Select>-->
<!-- </template>-->
<!-- <template v-else>-->
<!-- <Input-->
<!-- :value="select.filter[0].value.split(',')[0]"-->
<!-- style="width: 150px; margin-left: 10px"-->
<!-- placeholder="范围开始关键词"-->
<!-- @input="(e) => inputStartHandler(e, select.filter[0])"-->
<!-- />-->
<!-- <span-->
<!-- style="-->
<!-- margin-left: 10px;-->
<!-- display: flex;-->
<!-- align-items: center;-->
<!-- "-->
<!-- >至</span-->
<!-- >-->
<!-- <Input-->
<!-- :value="select.filter[0].value.split(',')[1]"-->
<!-- style="width: 150px; margin-left: 10px"-->
<!-- placeholder="范围结束关键词"-->
<!-- @input="(e) => inputEndHandler(e, select.filter[0])"-->
<!-- />-->
<!-- </template>-->
<Button
style="margin-left: 10px"
type="primary"
@click="$refs['xyTable'].getTableData(true)"
>查询</Button
>
<!-- <xy-selectors-->
<!-- style="margin-left: 10px"-->
<!-- @reset="reset"-->
<!-- @search="$refs['xyTable'].getTableData(true)"-->
<!-- >-->
<!-- <template>-->
<!-- <div class="select">-->
<!-- <div-->
<!-- class="select__item"-->
<!-- v-for="(item, index) in select.filter"-->
<!-- :key="`${item.value}-${index}`"-->
<!-- >-->
<!-- <p>条件{{ index + 1 }}</p>-->
<!-- <Select-->
<!-- v-model="item.key"-->
<!-- style="width: 100px"-->
<!-- placeholder="搜索条目"-->
<!-- >-->
<!-- <Option-->
<!-- v-for="item in form"-->
<!-- :key="item.id"-->
<!-- :value="item.field"-->
<!-- >{{ item.name }}</Option-->
<!-- >-->
<!-- </Select>-->
<!-- <Select-->
<!-- v-model="item.op"-->
<!-- style="width: 100px; margin-left: 10px"-->
<!-- placeholder="搜索条件"-->
<!-- >-->
<!-- <Option-->
<!-- v-for="item in op"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- >{{ item.label }}</Option-->
<!-- >-->
<!-- </Select>-->
<!-- <template-->
<!-- v-if="-->
<!-- item.op !== 'range' && !columnArrTest(item.key)-->
<!-- "-->
<!-- >-->
<!-- <Input-->
<!-- v-model="item.value"-->
<!-- style="width: 150px; margin-left: 10px"-->
<!-- placeholder="请填写关键词"-->
<!-- />-->
<!-- </template>-->
<!-- <template-->
<!-- v-else-if="-->
<!-- item.op !== 'range' && columnArrTest(item.key)-->
<!-- "-->
<!-- >-->
<!-- <Select-->
<!-- v-model="item.value"-->
<!-- style="width: 150px; margin-left: 10px"-->
<!-- placeholder="请选择关键词"-->
<!-- >-->
<!-- <Option-->
<!-- v-for="item in getColumnParams(item.key)"-->
<!-- :key="item.id"-->
<!-- :value="-->
<!-- getColumnField(item.key)._relations-->
<!-- ? item[-->
<!-- getColumnField(item.key)._relations-->
<!-- .foreign_key-->
<!-- ]-->
<!-- : item.value-->
<!-- "-->
<!-- >{{-->
<!-- item.key ||-->
<!-- item.value ||-->
<!-- item.name ||-->
<!-- item.no ||-->
<!-- item.mingcheng ||-->
<!-- item.id-->
<!-- }}</Option-->
<!-- >-->
<!-- </Select>-->
<!-- </template>-->
<!-- <template v-else>-->
<!-- <Input-->
<!-- :value="item.value.split(',')[0]"-->
<!-- style="width: 150px; margin-left: 10px"-->
<!-- placeholder="范围开始关键词"-->
<!-- @input="(e) => inputStartHandler(e, item)"-->
<!-- />-->
<!-- <span style="margin-left: 10px">至</span>-->
<!-- <Input-->
<!-- :value="item.value.split(',')[1]"-->
<!-- style="width: 150px; margin-left: 10px"-->
<!-- placeholder="范围结束关键词"-->
<!-- @input="(e) => inputEndHandler(e, item)"-->
<!-- />-->
<!-- </template>-->
<!-- <el-button-->
<!-- v-if="index !== 0"-->
<!-- size="small"-->
<!-- type="danger"-->
<!-- icon="el-icon-delete"-->
<!-- circle-->
<!-- style="margin-left: 10px"-->
<!-- @click="select.filter.splice(index, 1)"-->
<!-- ></el-button>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="add-btn">-->
<!-- <el-button-->
<!-- size="small"-->
<!-- type="primary"-->
<!-- icon="el-icon-plus"-->
<!-- circle-->
<!-- @click="-->
<!-- select.filter.push({ key: '', op: '', value: '' })-->
<!-- "-->
<!-- ></el-button>-->
<!-- <span>新增一条</span>-->
<!-- </div>-->
<!-- </template>-->
<!-- </xy-selectors>-->
</div>
</template>
<template #create>
@ -396,7 +176,7 @@
></imports>
<callback ref="callback"></callback>
<adjust ref="adjust" @refresh="$refs['xyTable'].getTableData()"></adjust>
<adjust :areas="areas" :abilities="abilities" ref="adjust" @refresh="$refs['xyTable'].getTableData()"></adjust>
</div>
</template>
@ -436,6 +216,8 @@ export default {
mixins: [authMixin],
provide: {
formStore: () => this.form,
areas: () => this.areas,
abilities: () => this.abilities
},
data() {
return {

Write Preview
Loading…
Cancel
Save