Browse Source

2023-5-11

master
guoxing 2 years ago
parent
commit
47b3d54a13
  1. 2
      yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development
  2. 4
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/flowInstrumentAdd.vue
  3. 4
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/index.vue
  4. 79
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/oilTank/oilTankAdd.vue
  5. 4
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/flowInstrumentAdd.vue
  6. 4
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/index.vue
  7. 86
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/oilTypeOutBound/index.vue
  8. 8
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/recordOilTank/index.vue

2
yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development

@ -5,5 +5,5 @@ ENV = 'development'
VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址
VUE_APP_URL = "http://192.168.3.173:7101"
VUE_APP_URL = "http://192.168.1.193:7101"
##VUE_APP_URL = "http://8.130.39.13:8112"

4
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/flowInstrumentAdd.vue

@ -28,12 +28,12 @@
<span class="item_text">流量仪器Code</span>
<el-input v-model="formobj.code" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<!-- <div class="item">
<span class="item_text">油罐编号</span>
<el-select v-model="formobj.tankNumber" filterable placeholder="请选择油罐编号" class="item_input" @change="getTank">
<el-option v-for="item in tankList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
</div>
</div> -->
</el-card>
</div>

4
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/index.vue

@ -37,8 +37,8 @@
<el-table-column label="流量仪器名称" prop="name" align="center" />
<el-table-column label="流量仪器编码" prop="number" align="center" />
<el-table-column label="流量仪器Code" prop="code" align="center" />
<el-table-column label="油罐编号" prop="tankNumber" align="center" />
<el-table-column label="原油编码" prop="crudeNumber" align="center" />
<!-- <el-table-column label="油罐编号" prop="tankNumber" align="center" />
<el-table-column label="原油编码" prop="crudeNumber" align="center" /> -->
</el-table>
</div>
<div class="pages">

79
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/oilTank/oilTankAdd.vue

@ -22,17 +22,24 @@
</div>
<div class="item">
<span class="item_text">原油类型</span>
<el-select v-model="formobj.crudeName" filterable placeholder="请选择原油类型" class="item_input"
@change="getType">
<el-select v-model="formobj.crudeName" filterable placeholder="请选择原油类型" class="item_input" @change="getType">
<el-option v-for="item in crudeList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
<!-- <el-input v-model="formobj.number" placeholder="" class="item_input" clearable /> -->
</div>
<div class="item">
<span class="item_text">原油编号</span>
<el-input v-model="formobj.crudeNumber" placeholder="" :readonly="true" class="item_input" clearable />
<el-input v-model="formobj.crudeNumber" placeholder="" :readonly="true" class="item_input" clearable />
<!-- <span class="item_input">{{formobj.crudeNumber}}</span> -->
</div>
<div class="item">
<span class="item_text">流量仪器</span>
<el-select v-model="formobj.flowmeterName" filterable placeholder="请选择流量仪器" class="item_input"
@change="getFlowmeter">
<el-option v-for="item in flowmeterList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
<!-- <el-input v-model="formobj.number" placeholder="" class="item_input" clearable /> -->
</div>
<div class="item">
<span class="item_text">油罐容量</span>
<el-input v-model="formobj.capacity" placeholder="" class="item_input" clearable />
@ -41,6 +48,18 @@
<span class="item_text">油罐库存</span>
<el-input v-model="formobj.initialInventory" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">油罐底面积</span>
<el-input v-model="formobj.bottomArea" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">原油密度</span>
<el-input v-model="formobj.density" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">油罐高度</span>
<el-input v-model="formobj.height" placeholder="" class="item_input" clearable />
</div>
</el-card>
</div>
@ -50,35 +69,44 @@
<script>
import req from '@/api/oilTank/oilTank'
import req2 from '@/api/flowInstrument/flowInstrument'
export default {
data() {
return {
submitdisabled: false,
crudeLists:[],
crudeList:[],
crudeLists: [],
crudeList: [],
flowmeterLists: [],
flowmeterList: [],
formobj: {
sid: "",
number: "",
crudeSid: "",
crudeName: "",
crudeNumber: "",
flowmeterSid: "",
flowmeterName: "",
capacity: "",
tankPipeline: "",
initialInventory: "",
bottomArea: "",
density: "",
height: "",
}
}
},
created() {
this.crudeinfoList()
this.getFlowmeterList()
},
methods: {
crudeinfoList() {
req.crudeinfoList().then((res) => {
req.crudeinfoList().then((res) => {
if (res.success) {
console.log(">>>>>>>>>2222222", res.data)
console.log(">>>>>>>>>2222222", res.data)
this.crudeLists = res.data
for (var i = 0; i <this.crudeLists.length; i++) {
for (var i = 0; i < this.crudeLists.length; i++) {
let item = {
name: this.crudeLists[i].name,
@ -91,6 +119,25 @@
}
})
},
getFlowmeterList() {
console.log(">>>>>>>>>111111111111wwwwwwwwww")
req2.flowmeterList().then((res) => {
if (res.success) {
console.log(">>>>>>>>>111111111111wwwwwwwwww", res.data)
this.flowmeterLists = res.data
for (var i = 0; i < this.flowmeterLists.length; i++) {
let item = {
name: this.flowmeterLists[i].number,
sid: this.flowmeterLists[i].sid,
}
this.flowmeterList.push(item)
}
}
})
},
saveOrUpdate() {
req.addInfo(this.formobj)
.then(resp => {
@ -113,12 +160,17 @@
this.formobj = {
sid: "",
number: "",
crudeSid:"",
crudeSid: "",
crudeName: "",
crudeNumber: "",
flowmeterSid: "",
flowmeterName: "",
capacity: "",
tankPipeline: "",
initialInventory: "",
bottomArea: "",
density: "",
height: "",
}
this.$emit('doback')
@ -126,11 +178,18 @@
getType(value) {
console.log(">>>>>>>>>getType", value)
const choose = this.crudeLists.filter((item) => item.sid === value)
console.log(">>>>>>>>>getType", choose[0])
console.log(">>>>>>>>>getType", choose[0])
// this.formobj.crudeSid = choose[0].sid
this.formobj.crudeNumber = choose[0].number
this.formobj.crudeSid = value
},
getFlowmeter(value) {
console.log(">>>>>>>>>getType", value)
const choose = this.flowmeterLists.filter((item) => item.sid === value)
console.log(">>>>>>>>>getType", choose[0])
this.formobj.flowmeterSid = choose[0].sid
this.formobj.flowmeterName = choose[0].number
},
}
}
</script>

4
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/flowInstrumentAdd.vue

@ -28,12 +28,12 @@
<span class="item_text">流量仪器Code</span>
<el-input v-model="formobj.code" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<!-- <div class="item">
<span class="item_text">油罐编号</span>
<el-select v-model="formobj.tankNumber" filterable placeholder="请选择油罐编号" class="item_input" @change="getTank">
<el-option v-for="item in tankList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
</div>
</div> -->
</el-card>
</div>

4
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/index.vue

@ -37,8 +37,8 @@
<el-table-column label="流量仪器名称" prop="name" align="center" />
<el-table-column label="流量仪器编码" prop="number" align="center" />
<el-table-column label="流量仪器Code" prop="code" align="center" />
<el-table-column label="油罐编号" prop="tankNumber" align="center" />
<el-table-column label="原油编码" prop="crudeNumber" align="center" />
<!-- <el-table-column label="油罐编号" prop="tankNumber" align="center" /> -->
<!-- <el-table-column label="原油编码" prop="crudeNumber" align="center" /> -->
</el-table>
</div>
<div class="pages">

86
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/oilTypeOutBound/index.vue

@ -31,21 +31,20 @@
value-format="yyyy-MM-dd" placeholder="请选择" />
</div>
<div class="item">
<span class="item_text">流量仪器</span>
<el-select v-model="formobj.flowmeterName" filterable placeholder="请选择流量仪器" class="item_input"
@change="getFlowmeter">
<el-option v-for="item in flowmeterList" :key="item.sid" :label="item.name" :value="item.sid" />
<span class="item_text">油罐编号</span>
<el-select v-model="formobj.tankName" filterable placeholder="请选择油罐编号" class="item_input" @change="getTank">
<el-option v-for="item in tankList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
<!-- <el-input v-model="formobj.number" placeholder="" class="item_input" clearable /> -->
</div>
<div class="item">
<span class="item_text">编号</span>
<el-input v-model="formobj.tankName" placeholder="" :readonly="true" class="item_input" clearable />
<span class="item_text">油编号</span>
<el-input v-model="formobj.oilType" placeholder="" :readonly="true" class="item_input" clearable />
<!-- <span class="item_input">{{formobj.crudeNumber}}</span> -->
</div>
<div class="item">
<span class="item_text">原油编号</span>
<el-input v-model="formobj.oilType" placeholder="" :readonly="true" class="item_input" clearable />
<span class="item_text">流量仪器</span>
<el-input v-model="formobj.flowmeterName" placeholder="" :readonly="true" class="item_input" clearable />
<!-- <span class="item_input">{{formobj.crudeNumber}}</span> -->
</div>
<div class="item">
@ -69,21 +68,20 @@
<script>
import req from '@/api/oilTypeInAndOutBound/oilTypeInAndOutBound'
import req2 from '@/api/flowInstrument/flowInstrument'
export default {
data() {
return {
submitdisabled: false,
flowmeterLists: [],
flowmeterList: [],
tankLists: [],
tankList: [],
formobj: {
sid: "",
salesContractNumber: "",
contractSigningDate: "",
deliveryDate: "",
flowmeterSid: "",
flowmeterName: "",
tankSid: "",
tankName: "",
flowmeterName: "",
oilType: "",
weight: "",
value: "",
@ -94,23 +92,22 @@
},
created() {
console.log(">>>>>>>>>created")
this.getFlowmeterList()
this.getTankList()
},
methods: {
getFlowmeterList() {
console.log(">>>>>>>>>111111111111wwwwwwwwww")
req2.flowmeterList().then((res) => {
getTankList() {
req.tankList().then((res) => {
if (res.success) {
console.log(">>>>>>>>>111111111111wwwwwwwwww", res.data)
this.flowmeterLists = res.data
for (var i = 0; i < this.flowmeterLists.length; i++) {
this.tankLists = res.data
for (var i = 0; i < this.tankLists.length; i++) {
let item = {
name: this.flowmeterLists[i].number,
sid: this.flowmeterLists[i].sid,
name: this.tankLists[i].number,
sid: this.tankLists[i].sid,
}
this.flowmeterList.push(item)
this.tankList.push(item)
}
}
@ -125,20 +122,20 @@
type: 'success',
message: resp.msg
})
this.formobj = {
sid: "",
salesContractNumber: "",
contractSigningDate: "",
deliveryDate: "",
flowmeterSid: "",
flowmeterName: "",
tankName: "",
oilType: "",
weight: "",
value: "",
remarks: "",
}
this.formobj = {
sid: "",
salesContractNumber: "",
contractSigningDate: "",
deliveryDate: "",
tankSid: "",
tankName: "",
flowmeterName: "",
oilType: "",
weight: "",
value: "",
remarks: "",
}
} else {
// resp.code
}
@ -146,17 +143,18 @@
.catch(() => {})
},
handleReturn() {
handleReturn() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
getFlowmeter(value) {
},
getTank(value) {
console.log(">>>>>>>>>getType", value)
const choose = this.flowmeterLists.filter((item) => item.sid === value)
const choose = this.tankLists.filter((item) => item.sid === value)
console.log(">>>>>>>>>getType", choose[0])
this.formobj.flowmeterSid = choose[0].sid
this.formobj.tankName = choose[0].tankNumber
this.formobj.oilType = choose[0].crudeNumber
this.formobj.tankSid = choose[0].sid
this.formobj.oilType = choose[0].crudeName
this.formobj.flowmeterName = choose[0].flowmeterName
},
}
}
@ -223,4 +221,4 @@
}
}
</style>
</style>

8
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/recordOilTank/index.vue

@ -23,8 +23,8 @@
</el-select>
</div>
<div class="item">
<span class="item_text">油罐库存</span>
<el-input v-model="formobj.existingInventory" placeholder="" class="item_input" clearable />
<span class="item_text">油罐库存高度</span>
<el-input v-model="formobj.height" placeholder="" class="item_input" clearable />
</div>
</el-card>
@ -45,7 +45,7 @@
formobj: {
tankName: "",
tankSid: "",
existingInventory: ""
height: ""
}
}
},
@ -84,7 +84,7 @@
this.formobj = {
tankName: "",
tankSid: "",
existingInventory: "",
height: "",
}
} else {

Loading…
Cancel
Save