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

bug修改

Browse Source
master
xy 12 months ago
parent ad819a7d24
commit 1a724466d4
10 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

@ -14,3 +14,4 @@ tests/**/coverage/
*.ntvs* *.ntvs*
*.njsproj *.njsproj
*.sln *.sln
/.VSCodeCounter/

2
src/const/addProps.js
Unescape View File

@ -20,7 +20,7 @@ export const addPropsMap = new Map([
["datetime", { ["datetime", {
type: 'datetime', type: 'datetime',
clearable: true, clearable: true,
valueFormat: 'yyyy-MM-dd mm:hh:ss', valueFormat: 'yyyy-MM-dd HH:mm',
pickerOptions: { pickerOptions: {
shortcuts: [{ shortcuts: [{
text: '今天', text: '今天',

2
src/utils/request.js
Unescape View File

@ -14,7 +14,7 @@ let loading ;
const service = axios.create({ const service = axios.create({
baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
// withCredentials: true, // send cookies when cross-domain requests // withCredentials: true, // send cookies when cross-domain requests
timeout: 5000, // request timeout timeout: 10000, // request timeout
isLoading:true isLoading:true
}) })

13
src/views/bigScreen1/component/detailTransfer.vue
Unescape View File

@ -50,21 +50,20 @@
<tbody> <tbody>
<tr> <tr>
<td> <td>
<div style="padding: 0 20px;overflow-y: scroll;max-height: 19vh;"> <div style="padding: 10px;display: flex;flex-direction: column;justify-content: center;width: 100%;height: 100%;overflow-y: scroll;line-height: 2;">
<div v-if="data.receive_time">接收时间：{{ $moment(data.receive_time).format("YYYY-MM-DD HH:mm") }}</div> <div v-if="data.receive_time">接收时间：{{ $moment(data.receive_time).format("YYYY-MM-DD HH:mm") }}</div>
<div v-if="data.notice_open_time">通知开启：{{ $moment(data.notice_open_time).format("YYYY-MM-DD HH:mm") }}</div> <div v-if="data.notice_open_time">通知开启：{{ $moment(data.notice_open_time).format("YYYY-MM-DD HH:mm") }}</div>
<div v-if="data.open_time">开启时间：{{ $moment(data.open_time).format("YYYY-MM-DD HH:mm") }}</div> <div v-if="data.open_time">开启时间：{{ $moment(data.open_time).format("YYYY-MM-DD HH:mm") }}</div>
<div v-if="data.notice_close_time">通知关闭：{{ $moment(data.notice_close_time).format("YYYY-MM-DD HH:mm") }}</div> <div v-if="data.notice_close_time">通知关闭：{{ $moment(data.notice_close_time).format("YYYY-MM-DD HH:mm") }}</div>
<div v-if="data.close_time">关闭时间：{{ $moment(data.close_time).format("YYYY-MM-DD HH:mm") }}</div> <div v-if="data.close_time">关闭时间：{{ $moment(data.close_time).format("YYYY-MM-DD HH:mm") }}</div>
<div v-if="data.id_logs_transfer_id_relation && data.id_logs_transfer_id_relation.length > 0"> <template v-if="data.id_logs_transfer_id_relation instanceof Array && data.id_logs_transfer_id_relation.length > 0">
<p v-for="item in data.id_logs_transfer_id_relation" style="text-align: left;margin-top: 10px;">{{ $moment(item.created_at).format("YYYY-MM-DD HH:mm") }}{{ item.content }}</p> <div v-for="item in data.id_logs_transfer_id_relation" style="text-align: left;margin-top: 10px;">{{ item.created_at }}{{ item.content }}</div>
</div> </template>
</div> </div>
</td> </td>
<td> <td>
<div <div
style=" style="
max-height: 19vh;
overflow-y: scroll; overflow-y: scroll;
line-height: 2; line-height: 2;
text-align: left; text-align: left;
@ -647,6 +646,7 @@ $height: 74vh;
color: #333; color: #333;
text-align: center; text-align: center;
border-collapse: collapse; border-collapse: collapse;
table-layout: fixed;
font-size: 1.3rem; font-size: 1.3rem;
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -664,6 +664,9 @@ $height: 74vh;
border-bottom: none; border-bottom: none;
} }
} }
td {
height: 10vh;
}
} }
.sign-container { .sign-container {

2
src/views/bigScreen1/component/tomorrow.vue
Unescape View File

@ -4,7 +4,7 @@
:modal="false" :modal="false"
:visible.sync="drawer" :visible.sync="drawer"
direction="rtl" direction="rtl"
size="76%"> size="80%">
<div class="container"> <div class="container">
<div class="header"> <div class="header">
<p>明日调令</p> <p>明日调令</p>

2
src/views/component/dialog.vue
Unescape View File

@ -639,7 +639,7 @@ export default {
}); });
document.documentElement.style.setProperty( document.documentElement.style.setProperty(
"--column-num", "--column-num",
Math.floor(newVal.length / 8).toString() '2'
); );
}, },
//immediate: true, //immediate: true,

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

@ -64,6 +64,7 @@
:label="item.value" :label="item.value"
:value="item.id" :value="item.id"
></el-option> ></el-option>
<el-option label="其他" value=""></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
@ -84,7 +85,7 @@
<el-date-picker <el-date-picker
v-model="form.start_time" v-model="form.start_time"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm"
placeholder="请选择开始时间" placeholder="请选择开始时间"
style="width: 300px" style="width: 300px"
></el-date-picker> ></el-date-picker>
@ -98,7 +99,7 @@
<el-date-picker <el-date-picker
v-model="form.end_time" v-model="form.end_time"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm"
placeholder="请选择结束时间" placeholder="请选择结束时间"
style="width: 300px" style="width: 300px"
></el-date-picker> ></el-date-picker>
@ -200,20 +201,22 @@ export default {
}, },
submit() { submit() {
if (this.form.tiaozhengleixing === "" || this.form.tiaozhengleixing === undefined) { // if (this.form.tiaozhengleixing === "" || this.form.tiaozhengleixing === undefined) {
this.$message({ // this.$message({
message: "请选择类型", // message: "请选择类型",
type: "warning" // type: "warning"
}) // })
return // return
} // }
const leixingLabel = this.types.find(i => i.id === this.form.tiaozhengleixing)?.id const leixingLabel = this.types.find(i => i.id === this.form.tiaozhengleixing)?.id
if (leixingLabel === 0) { if (leixingLabel) {
this.equipmentType === 1 ? (this.form.kaiqishuliang1 = Number(this.detail?.kaiqishuliang1) - Number(this.kaiqishuliang)) : (this.form.kaiqishuliang = Number(this.detail?.kaiqishuliang) - Number(this.kaiqishuliang)) if (leixingLabel === 0) {
} else if (leixingLabel === 1) { this.equipmentType === 1 ? (this.form.kaiqishuliang1 = Number(this.detail?.kaiqishuliang1) - Number(this.kaiqishuliang)) : (this.form.kaiqishuliang = Number(this.detail?.kaiqishuliang) - Number(this.kaiqishuliang))
this.equipmentType === 1 ? (this.form.kaiqishuliang1 = Number(this.detail?.kaiqishuliang1) + Number(this.kaiqishuliang)) : (this.form.kaiqishuliang = Number(this.detail?.kaiqishuliang) + Number(this.kaiqishuliang)) } else if (leixingLabel === 1) {
} else { this.equipmentType === 1 ? (this.form.kaiqishuliang1 = Number(this.detail?.kaiqishuliang1) + Number(this.kaiqishuliang)) : (this.form.kaiqishuliang = Number(this.detail?.kaiqishuliang) + Number(this.kaiqishuliang))
this.equipmentType === 1 ? this.form.kaiqishuliang1 = 0 : this.form.kaiqishuliang = 0; } else {
this.equipmentType === 1 ? this.form.kaiqishuliang1 = 0 : this.form.kaiqishuliang = 0;
}
} }
let updateData = JSON.stringify(this.form); let updateData = JSON.stringify(this.form);
let text = "" let text = ""
@ -241,11 +244,12 @@ export default {
this.form.id_logs_transfer_id_relation = this.detail.id_logs_transfer_id_relation.map(i => ({ this.form.id_logs_transfer_id_relation = this.detail.id_logs_transfer_id_relation.map(i => ({
transfer_id: i.transfer_id, transfer_id: i.transfer_id,
content: i.content, content: i.content,
created_at: this.$moment().format("YYYY-MM-DD HH:mm:ss") created_at: i.created_at
})) }))
this.form.id_logs_transfer_id_relation.push({ this.form.id_logs_transfer_id_relation.push({
transfer_id: this.detail.id, transfer_id: this.detail.id,
content: text content: text,
created_at: this.$moment().format('YYYY-MM-DD')
}) })
for (let key in this.detail) { for (let key in this.detail) {
if (/_relation|_at/g.test(key)) { if (/_relation|_at/g.test(key)) {
@ -263,8 +267,7 @@ export default {
save({ save({
table_name: "logs", table_name: "logs",
transfer_id: this.getId(), transfer_id: this.getId(),
content: text, content: text
created_at: this.$moment().format("YYYY-MM-DD HH:mm:ss")
},false) },false)
} }
this.$message({ this.$message({

8
src/views/order/component/dispatchList.vue
Unescape View File

@ -59,7 +59,7 @@
:table-name="customForm.tableName" :table-name="customForm.tableName"
:form-info="form" :form-info="form"
ref="dialog" ref="dialog"
@refresh="$refs['xyTable'].getTableData()" @refresh="getDispatches"
> >
</dialoger> </dialoger>
</div> </div>
@ -135,6 +135,12 @@ export default {
width: 54, width: 54,
type: "selection" type: "selection"
}, },
{
width: 50,
type: "index",
title: " ",
align: 'center'
},
{ {
width: 100, width: 100,
title: "序号", title: "序号",

9
src/views/order/component/quickCreate.vue
Unescape View File

@ -209,13 +209,14 @@ export default {
this.data.push({ this.data.push({
no: uid, no: uid,
equipment_id: this.equipments.find(i => i.name === dataArr[0])?.id, equipment_id: this.equipments.find(i => i.name === dataArr[0])?.id,
start_time: `${this.$moment().format('YYYY-MM-DD')} ${dataArr[1]}`, start_time: `${dataArr[1]}`,
end_time: `${this.$moment().format('YYYY-MM-DD')} ${dataArr[2]}`, end_time: `${dataArr[2]}`,
content: dataArr[3] || '', content: dataArr[3] || '',
level: 1, level: 1,
status: 1 status: 1
}) })
}) })
console.log(this.data)
} }
}).catch(_ => {}) }).catch(_ => {})
}, },
@ -225,7 +226,9 @@ export default {
let promiseAll = this.data.map(form => { let promiseAll = this.data.map(form => {
return save({ return save({
table_name: 'transfers', table_name: 'transfers',
...form ...form,
start_time: `${this.$moment().format('YYYY-MM-DD')} ${form.start_time}`,
end_time: `${this.$moment().format('YYYY-MM-DD')} ${form.end_time}`,
},false) },false)
}) })
let loadingInstance = this.$loading({ let loadingInstance = this.$loading({

2
src/views/order/orderPlan.vue
Unescape View File

@ -76,7 +76,7 @@
<!-- <span>3×5m3/s</span>--> <!-- <span>3×5m3/s</span>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column :label="weekRange[i]" header-align="center" v-for="(n,i) in 6"> <el-table-column :label="weekRange[i]" header-align="center" v-for="(n,i) in 7">
<el-table-column prop="x1" :label="weekName[i]" min-width="220" header-align="center"> <el-table-column prop="x1" :label="weekName[i]" min-width="220" header-align="center">
<template #default="{ row }"> <template #default="{ row }">
<div> <div>

Write Preview
Loading…
Cancel
Save