admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

高支模系统(相关模块):bug修复

Browse Source
This commit is contained in:
骆乐 2022-09-22 11:26:28 +08:00
parent 193e81105a
commit 8804a0eff8
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/assets/js/http.js
View File

@ -41,10 +41,10 @@ if (process.env.NODE_ENV == 'development') {
// tag: 本地
// axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地
// axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
// axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
// axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
// axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
// axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
// axios.defaults.baseURL = 'http://192.168.34.216:18070/' // 邱平毅本地
// axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
// axios.defaults.baseURL = 'http://47.97.202.104:6023/';

13
src/views/projectFront/highModulus/pointManage.vue
View File

@ -29,7 +29,7 @@
</el-table-column>
<!-- 操作 -->
<el-table-column
:label="$t('message.highModulus.actions')" width="350">
:label="$t('message.highModulus.actions')" align="center" width="450">
<template slot-scope="scope">
<div class="tableBtns">
<div @click="showDevManage(scope.row)" class="operationText">
@ -207,6 +207,7 @@
<!-- 设备名称 -->
<el-table-column
prop="deviceName"
align="center"
:label="$t('message.highModulus.devName')">
<template slot-scope="scope">
<el-input size="medium" v-if="scope.row.devOpType==1||scope.row.devOpType==2" placeholder="请输入" v-model="scope.row.deviceName"></el-input>
@ -216,6 +217,7 @@
<!-- 采集仪编号 -->
<el-table-column
prop="deviceSn"
align="center"
:label="$t('message.highModulus.devNo')">
<template slot-scope="scope">
<el-input size="medium" v-if="scope.row.devOpType==1||scope.row.devOpType==2" placeholder="请输入" v-model="scope.row.deviceSn"></el-input>
@ -225,6 +227,7 @@
<!-- 传感器类型 -->
<el-table-column
prop="deviceType"
align="center"
:label="$t('message.highModulus.deviceType')">
<template slot-scope="scope">
<el-select v-if="scope.row.devOpType==1||scope.row.devOpType==2" size="medium" placeholder="请选择类型" v-model="scope.row.deviceType">
@ -236,12 +239,14 @@
<!-- 操作 -->
<el-table-column
prop="pressure"
align="center"
:label="$t('message.highModulus.actions')">
<template slot-scope="scope">
<div class="tableBtns" v-if="scope.row.devOpType==1||scope.row.devOpType==2">
<!-- <div class="operationText" @click="saveDevInfo(scope.row)">保存</div> -->
<!-- 保存 -->
<el-button size="medium" type="primary" @click="saveDevInfo(scope.row)">{{$t('message.highModulus.save')}}</el-button>
<el-button size="medium" type="text" @click="saveDevInfo(scope.row)">{{$t('message.highModulus.save')}}</el-button>
<el-button size="medium" type="text" @click="canselDevInfo(scope.row,scope.$index)">取消</el-button>
</div>
<div class="tableBtns" v-else>
<div @click="editDevFn(scope.row,scope.$index)" class="operationText">
@ -561,6 +566,10 @@ export default {
this.loadDevList()
})
}
},
// 取消
canselDevInfo(val,index){
this.devList.splice(index,1)
}
},

1
src/views/projectFront/materialManage/projectSiteManage.vue
View File

@ -137,6 +137,7 @@
<!-- 合理损耗系数(%) -->
<el-table-column
prop="reasonableLoss"
width="200"
:label="$t('message.energyManage.project.expendCount')"
align="center"
></el-table-column>