yxt_group
/
supervise
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2023-5-11

master
guoxing 2 years ago
parent
6c07485553
commit
47b3d54a13
8 changed files with 124 additions and 67 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
View File

@ -5,5 +5,5 @@ ENV = 'development'
VUE_APP_BASE_API = '/api' 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" ##VUE_APP_URL = "http://8.130.39.13:8112"

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

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

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

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

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

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

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

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

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

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

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

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

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

Write Preview
Loading…
Cancel
Save