cxc/rn-bms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改权限前

Browse Source
This commit is contained in:
熊丽君
2020-12-22 13:20:59 +08:00
parent 1e607c1fb3
commit 9e15baf7c0
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/views/fault/activityWarning/index.vue
View File

@ -25,7 +25,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="产品名称">
<el-select v-model="queryParams.deviceType" clearable placeholder="请选择">
<el-select v-model="queryParams.productId" clearable placeholder="请选择">
<el-option v-for="item in signalLevelList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@ -44,7 +44,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="所属项目">
<el-select v-model="queryParams.deviceType" clearable placeholder="请选择">
<el-select v-model="queryParams.projectId" clearable placeholder="请选择">
<el-option v-for="item in signalLevelList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@ -52,7 +52,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="站址名称">
<el-input v-model="queryParams.deviceName" placeholder="请输入站址名称" clearable @keyup.enter.native="handleQuery" />
<el-input v-model="queryParams.addressName" placeholder="请输入站址名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
<el-col :span="6">
@ -62,7 +62,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="信号量ID">
<el-input v-model="queryParams.productId" placeholder="请输入信号量ID" clearable @keyup.enter.native="handleQuery" />
<el-input v-model="queryParams.signalCode" placeholder="请输入信号量ID" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
</el-row>
@ -140,8 +140,7 @@ export default {
signalLevelList: [
{ label: '一级', value: '1' },
{ label: '二级', value: '2' },
{ label: '三级', value: '3' },
{ label: '四级', value: '4' }
{ label: '三级', value: '3' }
],
queryParams: {
pageNum: 1,
@ -165,7 +164,11 @@ export default {
// 获取告警工单列表
getList () {
this.loading = true;
list(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
if(null != this.dateRange && '' != this.dateRange) {
this.queryParams.startTime = this.dateRange[0];
this.queryParams.endTime = this.dateRange[1];
}
list(this.queryParams).then(res => {
this.tableData = res.rows;
this.total = res.total;
this.loading = false;

17
src/views/workOrderManage/orderList/index.vue
View File

@ -12,7 +12,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="告警等级">
<el-select v-model="queryParams.deviceType" clearable placeholder="请输入告警等级">
<el-select v-model="queryParams.warningLevel" clearable placeholder="请输入告警等级">
<el-option v-for="item in signalLevelList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@ -25,7 +25,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="产品名称">
<el-select v-model="queryParams.deviceType" clearable placeholder="请选择">
<el-select v-model="queryParams.productId" clearable placeholder="请选择">
<el-option v-for="item in signalLevelList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@ -44,7 +44,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="所属项目">
<el-select v-model="queryParams.deviceType" clearable placeholder="请选择">
<el-select v-model="queryParams.projectId" clearable placeholder="请选择">
<el-option v-for="item in signalLevelList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@ -62,7 +62,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="工单编号">
<el-input v-model="queryParams.productId" placeholder="请输入工单编号" clearable @keyup.enter.native="handleQuery" />
<el-input v-model="queryParams.workCode" placeholder="请输入工单编号" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
</el-row>
@ -174,8 +174,7 @@ export default {
signalLevelList: [
{ label: '一级', value: '1' },
{ label: '二级', value: '2' },
{ label: '三级', value: '3' },
{ label: '四级', value: '4' }
{ label: '三级', value: '3' }
],
workStatusList: [
{ label: '待接单', value: '1' },
@ -204,7 +203,11 @@ export default {
// 获取告警工单列表
getList () {
this.loading = true;
list(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
if(null != this.dateRange && '' != this.dateRange) {
this.queryParams.startTime = this.dateRange[0];
this.queryParams.endTime = this.dateRange[1];
}
list(this.queryParams).then(res => {
this.tableData = res.rows;
this.total = res.total;
this.loading = false;

4
vue.config.js
View File

@ -35,8 +35,8 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://47.115.73.110:8080`,
// target: `http://121.37.250.170:8080`,
target: `http://192.168.0.129:8080`,
target: `http://121.37.250.170:8080`,
// target: `http://192.168.0.129:8080`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''