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

修改size为mini,添加检索条件

Browse Source
This commit is contained in:
熊丽君
2020-12-24 16:27:26 +08:00
parent a7323530f4
commit 97dd60a94b
18 changed files with 65 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main.js
View File

@ -35,6 +35,7 @@ Vue.prototype.selectDictLabel = selectDictLabel
Vue.prototype.selectDictLabels = selectDictLabels
Vue.prototype.download = download
Vue.prototype.handleTree = handleTree
Vue.prototype.size = 'mini'
Vue.prototype.msgSuccess = function (msg) {
this.$message({ showClose: true, message: msg, type: "success" });

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

@ -7,7 +7,7 @@
</el-col>
<!-- form表单 -->
<el-col :span="20">
<el-form size="mini" :model="queryParams" :inline="true" ref="queryForm" v-show="showSearch" label-width="68px">
<el-form :size="size" :model="queryParams" :inline="true" ref="queryForm" v-show="showSearch" label-width="68px">
<!-- 第一行 -->
<el-row>
<el-col :span="6">

2
src/views/fault/encrypt/index.vue
View File

@ -2,7 +2,7 @@
<section class="app-container">
<el-row>
<el-col :span="24">
<el-form size="mini" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
<el-form :size="size" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
<el-form-item label="故障名称">
<el-input v-model="queryParams.faultName" placeholder="请输入故障名称" clearable style="width: 200px"
@keyup.enter.native="handleQuery" />

2
src/views/fault/warningRule/index.vue
View File

@ -1,6 +1,6 @@
<template>
<section class="app-container" v-loading="loading">
<el-form>
<el-form :size="size">
<el-scrollbar class="scrollbar" wrap-class="scrollbar-wrapper">
<el-form-item v-for="item1 in formTitle" :key="item1.id">
<section>

4
src/views/firmware/firmwareList/index.vue
View File

@ -1,8 +1,8 @@
<template>
<section class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form :size="size" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="固件名称">
<el-input v-model="queryParams.fileName" placeholder="请输入固件名称" clearable size="small" style="width: 240px"
<el-input v-model="queryParams.fileName" placeholder="请输入固件名称" clearable style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="产品">

2
src/views/firmware/firmwareUpdate/index.vue
View File

@ -5,7 +5,7 @@
<region @selectdRegionCode="selectdRegionCode" :currentNodeKey.sync="queryParams.provinceCode"></region>
</el-col>
<el-col :span="20">
<el-form :inline="true" size="small" v-show="showSearch">
<el-form :size="size" :inline="true" v-show="showSearch">
<el-form-item label="产品">
<el-select v-model="queryParams.productId" clearable placeholder="请选择" @change="queryProductIdChange">
<el-option v-for="item in queryProductSelectList" :key="item.id" :label="item.productName" :value="item.productId">

32
src/views/hardware/device/list.vue
View File

@ -5,13 +5,21 @@
<region @selectdRegionCode="selectdRegionCode" :currentNodeKey.sync="queryParams.provinceCode"></region>
</el-col>
<el-col :span="20">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="产品SN">
<el-input v-model="queryParams.productId" placeholder="请输入产品SN" clearable size="small" style="width: 240px"
@keyup.enter.native="handleQuery" />
<el-form :size="size" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="产品">
<el-select v-model="queryParams.productId" clearable placeholder="请选择产品SN">
<el-option v-for="item in queryProductSelectList" :key="item.id" :label="item.productName" :value="item.productId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目" prop="projectId">
<el-select v-model="queryParams.projectId" clearable placeholder="请选择项目SN">
<el-option v-for="item in queryProjectSelectList" :key="item.id" :label="item.projectName" :value="item.projectId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="设备名称">
<el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable size="small" style="width: 240px"
<el-input v-model="queryParams.deviceName" placeholder="请输入设备名称或SN" clearable style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="设备类型">
@ -60,12 +68,14 @@
<el-link type="primary" :href="'./detail?id=' + scope.row.id " target="_blank">{{scope.row.deviceName}}</el-link>
</template>
</el-table-column>
<el-table-column prop="projectName" align="center" label="项目名称" min-width="150">
</el-table-column>
<el-table-column prop="deviceType" align="center" label="类型">
<template slot-scope="scope">{{getDeviceTypeLabel(scope.row.deviceType)}}</template>
<!-- <template slot-scope="scope">{{scope.row.deviceType}}</template> -->
<!-- <template slot-scope="scope">{{deviceTypeList.find(v=> v.value == scope.row.deviceType).label}}</template> -->
</el-table-column>
<el-table-column prop="productId" align="center" label="产品SN" min-width="200">
<el-table-column prop="productName" align="center" label="产品SN" min-width="200">
</el-table-column>
<!-- <el-table-column prop="deviceCode" align="center" label="设备编码">
</el-table-column>
@ -272,6 +282,8 @@ export default {
return {
snapDeviceInfo: {},
// 产品下拉列表
queryProductSelectList: [],
queryProjectSelectList: [],
productSelectList: [],
userSelectList: [],
projectSelectList: [],
@ -372,6 +384,7 @@ export default {
created () {
productSelect().then(({ code, msg, select }) => {
if (code == 200) {
this.queryProductSelectList = select;
this.productSelectList = select;
} else {
this.$message.error(msg);
@ -392,6 +405,13 @@ export default {
this.$message.error(msg);
}
})
projectSelect().then(({code,select})=>{
if (code == 200) {
this.queryProjectSelectList = select;
} else {
this.$message.error(msg);
}
})
this.getList();
},
methods: {

4
src/views/hardware/productList/index.vue
View File

@ -2,9 +2,9 @@
<section class="app-container">
<el-row>
<el-col :span="24">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form :size="size" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="名称" prop="productName">
<el-input v-model="queryParams.productName" placeholder="请输入名称" clearable size="small" style="width: 240px"
<el-input v-model="queryParams.productName" placeholder="请输入名称" clearable style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>

4
src/views/hardware/projectList/index.vue
View File

@ -2,9 +2,9 @@
<section class="app-container">
<el-row>
<el-col>
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form :size="size" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="项目名称" prop="projectName">
<el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable size="small" style="width: 240px"
<el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>

12
src/views/signal/signalList/index.vue
View File

@ -2,25 +2,25 @@
<section class="app-container">
<el-row>
<el-col :span="24">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
<el-form :size="size" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
<el-form-item label="信号编码">
<el-input v-model="queryParams.signalCode" placeholder="请输入信号编码" clearable size="small" style="width: 200px"
<el-input v-model="queryParams.signalCode" placeholder="请输入信号编码" clearable style="width: 200px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="信号名称">
<el-input v-model="queryParams.signalName" placeholder="请输入信号名称" clearable size="small" style="width: 200px"
<el-input v-model="queryParams.signalName" placeholder="请输入信号名称" clearable style="width: 200px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="信号量">
<el-input v-model="queryParams.signalValue" placeholder="请输入信号量" clearable size="small" style="width: 200px"
<el-input v-model="queryParams.signalValue" placeholder="请输入信号量" clearable style="width: 200px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="信号量范围">
<el-input v-model="queryParams.signalValueRange" placeholder="信号量范围" clearable size="small" style="width: 200px"
<el-input v-model="queryParams.signalValueRange" placeholder="信号量范围" clearable style="width: 200px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="类型">
<el-input v-model="queryParams.signalType" placeholder="类型" clearable size="small" style="width: 200px"
<el-input v-model="queryParams.signalType" placeholder="类型" clearable style="width: 200px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>

2
src/views/system/dept/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
<el-form :size="size" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
<el-form-item label="部门名称" prop="deptName">
<el-input
v-model="queryParams.deptName"

2
src/views/system/menu/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
<el-form :size="size" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
<el-form-item label="菜单名称" prop="menuName">
<el-input
v-model="queryParams.menuName"

2
src/views/system/notice/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form :size="size" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="公告标题" prop="noticeTitle">
<el-input
v-model="queryParams.noticeTitle"

2
src/views/system/post/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form :size="size" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="岗位编码" prop="postCode">
<el-input
v-model="queryParams.postCode"

2
src/views/system/role/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
<el-form :size="size" :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
<el-form-item label="角色名称" prop="roleName">
<el-input
v-model="queryParams.roleName"

12
src/views/system/user/index.vue
View File

@ -4,7 +4,7 @@
<!--部门数据-->
<el-col :span="4" :xs="24">
<div class="head-container">
<el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
<el-input v-model="deptName" placeholder="请输入部门名称" clearable :size="size" prefix-icon="el-icon-search"
style="margin-bottom: 20px" />
</div>
<div class="head-container">
@ -14,22 +14,22 @@
</el-col>
<!--用户数据-->
<el-col :span="20" :xs="24">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form :size="size" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="用户名称" prop="userName">
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable size="small" style="width: 240px"
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable :size="size" style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="手机号码" prop="phonenumber">
<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable size="small" style="width: 240px"
<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable :size="size" style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="用户状态" clearable size="small" style="width: 240px">
<el-select v-model="queryParams.status" placeholder="用户状态" clearable :size="size" style="width: 240px">
<el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
<el-date-picker v-model="dateRange" :size="size" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item>

21
src/views/topic/topicList/index.vue
View File

@ -2,7 +2,7 @@
<section class="app-container">
<el-row>
<el-col :span="24">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form :size="size" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="topicID">
<el-input v-model="queryParams.topicId" placeholder="请输入topicID" clearable size="small" style="width: 240px"
@keyup.enter.native="handleQuery" />
@ -253,22 +253,21 @@ export default {
this.snapRow = Object.assign({}, row);
this.projectListOpen = true;
},
handleTopicProjectSave (row) {
async handleTopicProjectSave (row) {
const loading = this.$loading({
lock: true,
text: '添加中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.3)'
});
save({ topicId: this.snapRow.topicId, projectId: row.projectId }).then(res => {
if (200 == res.code) {
this.topicProSelect(this.row);
this.getProjectList();
} else {
this.msgError(res.msg);
}
loading.close();
});
const {result} = await save({ topicId: this.snapRow.topicId, projectId: row.projectId })
if(result==-1){
this.msgError('改项目已被其它topic占用');
}else{
this.topicProSelect(this.row);
this.getProjectList();
}
loading.close();
},
handleTopicProDel ({ id }) {
const loading = this.$loading({

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

@ -7,7 +7,7 @@
</el-col>
<!-- form表单 -->
<el-col :span="20">
<el-form size="mini" :model="queryParams" :inline="true" ref="queryForm" v-show="showSearch" label-width="68px">
<el-form :size="size" :model="queryParams" :inline="true" ref="queryForm" v-show="showSearch" label-width="68px">
<!-- 第一行 -->
<el-row>
<el-col :span="6">