Merge remote-tracking branch 'origin/master'

industry-admin/src/views/alarm/alarmLevel/alarmLevel.vue

@@ -1,6 +1,6 @@
 <template>
     <!-- 报警级别全部信息 -->
-    <el-dialog v-if="visible" :title="title" width="30%" custom-class="dialog-med" top="10vh" 
+    <el-dialog v-if="visible" :title="title" width="30%" custom-class="dialog-med" top="10vh"
         :before-close="dialogClose" :visible.sync="visible" :close-on-click-modal="false" :append-to-body="true">
         <el-form ref="alarmLevelForm" :model="alarmLevelForm" :rules="alarmLevelRules" label-width="90px"
             label-position="right">
@@ -126,4 +126,4 @@ export default {
 //         overflow: hidden;
 //     }
 // }
-</style>
+</style>

industry-admin/src/views/alarm/alarmLevel/index.vue

@@ -3,9 +3,9 @@
         <el-row>
             <el-col>
                 <!-- 操作按钮 -->
-                <el-row class="czBtns">
+                <el-row class="czBtns" style="float: right;">
                     <el-col :span="1.5">
-                        <el-button type="primary" plain icon="el-icon-circle-plus-outline" size="mini"
+                        <el-button type="primary" icon="el-icon-plus" size="small"
                             @click="addAlarmLevelEvent">新增</el-button>
                     </el-col>
                 </el-row>
@@ -50,29 +50,30 @@ export default {
             tableHeaderTitle: [
                 {
                     propName: "levelName",
-                    labelName: "报警名称",
-                    align: "center"
+                    labelName: "报警等级",
+                    align: "left"
                 },
                 {
                     propName: "alarmColor",
                     labelName: "报警颜色",
-                    align: "center"
-                },
-                {
-                    propName: "sortNum",
-                    labelName: "排序号",
-                    align: "center",
+                    align: "left"
                 },
                 {
                     propName: "alarmRemark",
                     labelName: "备注",
-                    align: "center"
+                    align: "left"
                 },
                 {
-                    propName: "createTime",
-                    labelName: "创建时间",
-                    align: "center"
-                }
+                    propName: "sortNum",
+                    labelName: "排序号",
+                    align: "center",
+                    width:80
+                },
+                // {
+                //     propName: "createTime",
+                //     labelName: "创建时间",
+                //     align: "center"
+                // }
             ],
             tableData: [],
             tableOperate: [

industry-admin/src/views/device/deviceType/index.vue

@@ -17,7 +17,7 @@
             <!-- 操作按钮 -->
             <el-row class="czBtns" style="float: right;">
                 <el-col :span="1.5">
-                    <el-button type="primary" icon="el-icon-circle-plus-outline" size="small"
+                    <el-button type="primary" icon="el-icon-plus" size="small"
                         @click="addDeviceTypeEvent">新增</el-button>
                 </el-col>
             </el-row>

industry-admin/src/views/fault/faultManage/faultManage.vue

@@ -1,14 +1,14 @@
 <template>
     <div>
         <!-- 设备台账全部信息 -->
-        <el-dialog :title="title" width="45%" custom-class="dialog-max" top="5vh" :before-close="dialogClose"
+        <el-dialog :title="title" width="50%" custom-class="dialog-max" top="5vh" :before-close="dialogClose"
             :visible.sync="visible" :append-to-body="true" @open="handleOpen" @close="handleClose">
-            <el-form ref="faultManageForm" :model="faultManageForm" :rules="faultManageRules" label-width="110px"
+            <el-form ref="faultManageForm" :model="faultManageForm" :rules="faultManageRules" label-width="80px"
                 label-position="right">
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="设备名称" prop="deviceName" >
-                            <el-input v-model="faultManageForm.deviceName" disabled placeholder="请选择设备" maxlength="10" style="width:300px">
+                            <el-input v-model="faultManageForm.deviceName" disabled placeholder="请选择设备" maxlength="10">
                                 <el-button type="primary" slot="append" icon="el-icon-search"
                                     @click="chooseLedger">选择</el-button>
                             </el-input>
@@ -16,7 +16,7 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="设备编号" prop="deviceNum" >
-                            <el-input v-model="faultManageForm.deviceNum" disabled style="width:300px">
+                            <el-input v-model="faultManageForm.deviceNum" disabled>
                             </el-input>
                         </el-form-item>
                     </el-col>
@@ -24,13 +24,13 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="规格型号" prop="deviceModel" >
-                            <el-input v-model="faultManageForm.deviceModel" disabled style="width:300px">
+                            <el-input v-model="faultManageForm.deviceModel" disabled>
                             </el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="设备位置" prop="deviceLocation" >
-                            <el-input v-model="faultManageForm.deviceLocation" disabled style="width:300px">
+                            <el-input v-model="faultManageForm.deviceLocation" disabled>
                             </el-input>
                         </el-form-item>
                     </el-col>
@@ -38,27 +38,27 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="购买时间" prop="buyTime" >
-                            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" disabled v-model="faultManageForm.buyTime" style="width:300px"
-                                type="date">
+                            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" disabled v-model="faultManageForm.buyTime"
+                                type="date" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="故障时间" prop="faultTime" >
-                            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="faultManageForm.faultTime" style="width:300px"
-                                type="date" placeholder="选择日期">
+                            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="faultManageForm.faultTime"
+                                type="date" placeholder="选择日期" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <el-form-item label="故障原因" prop="faultReason" >
-                    <el-input type="textarea" v-model="faultManageForm.faultReason" placeholder="请输入故障原因" 
+                    <el-input type="textarea" v-model="faultManageForm.faultReason" placeholder="请输入故障原因"
                         maxlength="100"></el-input>
                 </el-form-item>
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="处理人" prop="handlePersonName" >
-                            <el-input v-model="faultManageForm.handlePersonName" disabled placeholder="请选择处理人" style="width:300px"
+                            <el-input v-model="faultManageForm.handlePersonName" disabled placeholder="请选择处理人"
                                 maxlength="10">
                                 <el-button type="primary" slot="append" icon="el-icon-search"
                                     @click="chooseHandlePerson">选择</el-button>
@@ -67,18 +67,18 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="处理时间" prop="handleTime" >
-                            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="faultManageForm.handleTime" style="width:300px"
-                                type="date" placeholder="选择日期">
+                            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="faultManageForm.handleTime"
+                                type="date" placeholder="选择日期" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <el-form-item label="处理方法" prop="handleMethod" >
-                    <el-input type="textarea" v-model="faultManageForm.handleMethod" placeholder="请输入处理方法" 
+                    <el-input type="textarea" v-model="faultManageForm.handleMethod" placeholder="请输入处理方法"
                         maxlength="100"></el-input>
                 </el-form-item>
                 <el-form-item label="处理结果" prop="handleResult" >
-                    <el-input type="textarea" v-model="faultManageForm.handleResult" placeholder="请输入处理结果" 
+                    <el-input type="textarea" v-model="faultManageForm.handleResult" placeholder="请输入处理结果"
                         maxlength="100"></el-input>
                 </el-form-item>
                 <el-row>
@@ -90,9 +90,6 @@
                         </el-upload>
                     </el-form-item>
                 </el-row>
-                <el-form-item style="text-align: center;">
-                    
-                </el-form-item>
             </el-form>
             <span slot="footer">
                 <el-button size="mini" type="primary" @click="saveFaultManageEvent">确定</el-button>
@@ -339,4 +336,4 @@ export default {
     // height: 40px;
     overflow: auto;
 }
-</style>
+</style>

industry-admin/src/views/fault/faultManage/index.vue

@@ -1,25 +1,31 @@
 <template>
     <div class="sy-content">
         <el-row>
+          <el-col :span="12">
+            <!-- 搜索信息 -->
+            <el-form ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="80px">
+                <el-form-item label="" prop="deviceName">
+                    <el-input v-model="queryParams.deviceName" prefix-icon="el-icon-search" placeholder="请输入设备名称" maxlength="10">
+                    </el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-search" size="small" @click="searchEvent">查询</el-button>
+                    <el-button type="info" ref="btn" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+                </el-form-item>
+            </el-form>
+          </el-col>
+          <el-col :span="12">
+            <!-- 操作按钮 -->
+            <el-row class="czBtns" style="float: right;">
+                <el-col :span="1.5">
+                    <el-button type="primary" icon="el-icon-plus" size="small"
+                        @click="addFaultManageEvent">新增</el-button>
+                </el-col>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row>
             <el-col>
-                <!-- 搜索信息 -->
-                <el-form ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="80px">
-                    <el-form-item label="设备名称" prop="deviceName">
-                        <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" maxlength="10">
-                        </el-input>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button type="primary" icon="el-icon-search" size="mini" @click="searchEvent">查询</el-button>
-                        <el-button ref="btn" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                    </el-form-item>
-                </el-form>
-                <!-- 操作按钮 -->
-                <el-row class="czBtns">
-                    <el-col :span="1.5">
-                        <el-button type="primary" plain icon="el-icon-circle-plus-outline" size="mini"
-                            @click="addFaultManageEvent">新增</el-button>
-                    </el-col>
-                </el-row>
                 <!-- 数据组表格信息 -->
                 <CommonTable ref="mainRunTable" :tableHeaderTitle="tableHeaderTitle" :tableData="tableData"
                     :isShowCheckbox="isShowCheckbox" :isShowIndex="isShowIndex" :tableHight="tableHight"
@@ -62,27 +68,49 @@ export default {
                 {
                     propName: "deviceName",
                     labelName: "设备名称",
-                    align: "center"
+                    align: "left"
+                },
+                {
+                    propName: "deviceNum",
+                    labelName: "设备编号",
+                    align:"left"
+                },
+                {
+                    propName: "deviceModel",
+                    labelName: "设备型号",
+                    align:"left"
+                },
+                {
+                    propName: "deviceLocation",
+                    labelName: "设备位置",
+                    align: "left"
                 },
                 {
                     propName: "faultTime",
                     labelName: "故障时间",
-                    align: "center"
+                    align: "left",
+                    width:"100"
                 },
                 {
                     propName: "faultReason",
                     labelName: "故障原因",
-                    align: "center"
+                    align: "left"
                 },
                 {
                     propName: "handlePersonName",
                     labelName: "处理人",
-                    align: "center"
+                    align: "left"
                 },
                 {
                     propName: "handleTime",
                     labelName: "处理时间",
-                    align: "center"
+                    align: "left",
+                    width:"100"
+                },
+                {
+                    propName: "handleResult",
+                    labelName: "处理结果",
+                    align: "left"
                 }
             ],
             tableData: [],
@@ -143,23 +171,23 @@ export default {
         },
         /** 新增故障管理事件 */
         addFaultManageEvent() {
-            this.$refs.faultManage.title = '新增故障管理'
+            this.$refs.faultManage.title = '新增故障录入'
             this.$refs.faultManage.visible = true
         },
         /** 修改故障管理事件 */
         updateFaultManageEvent(row) {
             this.$refs.faultManage.faultManageForm.id = row.id
-            this.$refs.faultManage.title = '修改故障管理'
+            this.$refs.faultManage.title = '修改故障录入'
             this.$refs.faultManage.visible = true
 
         },
         /** 删除故障管理事件 */
         delFaultManageEvent(row) {
-            showConfirmWin(this, null, '您确定要删除该故障管理吗？', () => {
+            showConfirmWin(this, null, '您确定要删除该故障录入吗？', () => {
                 delFaultManageById(row.id).then(res => {
                     if (!res || !res.data) {
                         this.$message({
-                            message: '删除故障管理失败！',
+                            message: '删除故障录入失败！',
                             type: 'warning'
                         })
                         return

industry-admin/src/views/fault/faultStatistics/index.vue

@@ -1,12 +1,20 @@
 <template>
   <div class="sy-content">
     <el-row>
+      <el-col :span="12">
+
+      </el-col>
+      <el-col :span="12">
+
+      </el-col>
+    </el-row>
+    <el-row>
       <el-form ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="80px">
-        <el-form-item label="设备名称/编号" label-width="120px">
-          <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" maxlength="10">
+        <el-form-item label="" label-width="120px">
+          <el-input v-model="queryParams.deviceName" prefix-icon="el-icon-search" placeholder="请输入设备名称" maxlength="10">
           </el-input>
         </el-form-item>
-        <el-form-item label="查询时间">
+        <el-form-item label="">
           <el-date-picker
             v-model="queryParams.time"
             type="datetimerange"
@@ -17,8 +25,8 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="searchEvent">查询</el-button>
-          <el-button ref="btn" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" size="small" @click="searchEvent">查询</el-button>
+          <el-button type="info" ref="btn" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
     </el-row>
@@ -54,18 +62,18 @@ export default {
       tableHeaderTitle: [{
         propName: "deviceName",
         labelName: "设备名称",
-        align: "center"
+        align: "left"
       }, {
         propName: "timeDiff",
-        labelName: "故障时常",
-        align: "center",
+        labelName: "故障时长",
+        align: "left",
 		formatter: (row, column, cellValue, index) => {
 			return secondsToDHMS(row.timeDiff)
 		}
       }, {
         propName: "num",
         labelName: "故障次数",
-        align: "center"
+        align: "left"
       }]
     }
   },
@@ -91,7 +99,7 @@ export default {
         limit: this.queryParams.limit,
         deviceName: this.queryParams.deviceName,
         startTime: this.queryParams.time[0],
-        endTime: this.queryParams.time[1]	
+        endTime: this.queryParams.time[1]
       }
       getFaultManageStatPage(params).then(json => {
         if (json.code == 200) {
@@ -101,7 +109,7 @@ export default {
 		loading.close()
       }).catch(e => {
 		  loading.close()
-	  }) 
+	  })
     }
   }
 }

industry-admin/src/views/report/reportTable/index.vue

@@ -4,11 +4,11 @@
             <el-col>
                 <!-- 搜索信息 -->
                 <el-form ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="80px">
-                    <el-form-item label="报表名称" prop="reportTableName">
-                        <el-input v-model="queryParams.reportTableName" placeholder="请输入报表名称" maxlength="10">
+                    <el-form-item label="" prop="reportTableName">
+                        <el-input v-model="queryParams.reportTableName" prefix-icon="el-icon-search" placeholder="请输入报表名称" maxlength="10">
                         </el-input>
                     </el-form-item>
-                    <el-form-item label="报表类型" prop="reportTableType">
+                    <el-form-item label="" prop="reportTableType">
                         <el-select v-model="queryParams.reportTableType" clearable placeholder="请选择类型">
                             <el-option v-for="tableType in reportTableTypeList" :key="tableType.value"
                                 :label="tableType.label" :value="tableType.value">
@@ -16,8 +16,8 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item>
-                        <el-button type="primary" icon="el-icon-search" size="mini"
-                            @click="getAllOkReportTable">查询</el-button>
+                        <el-button type="primary" icon="el-icon-search" size="small"
+                            @click="getAllOkReportTable">搜索</el-button>
                         <!-- <el-button ref="btn" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->
                     </el-form-item>
                 </el-form>
@@ -83,23 +83,44 @@ export default {
                         return html
                     },
                     methodName: "reportNameClick",
-                    align: "center"
+                    align: "left"
                 },
                 {
                     propName: "reportTableType",
                     labelName: "报表类型",
+                    type: "html",
                     formatter: (row, column, cellValue, index) => {
+                        let result = ''
                         if (row.reportTableType == 0) {
-                            return '手动报表'
+                            result ='手动报表'
                         } else if (row.reportTableType == 1 || row.reportTableType == 3) {
-                            return '周期报表'
+                            result ='周期报表'
                         } else if (row.reportTableType == 2 || row.reportTableType == 4) {
-                            return '事件驱动报表'
+                            result ='事件驱动报表'
                         } else if (row.reportTableType == 5 || row.reportTableType == 6) {
-                            return '设备报表'
+                            result ='设备报表'
+                        };
+                        let html = '<span class="el-tag el-tag--light">'
+                        html += result
+                        html += '</span>'
+                        return html
+                    },
+                    align: "left",
+                    width:"120"
+                },
+                {
+                    propName: "runState",
+                    labelName: "运行状态",
+                    type: "html",
+                    formatter: (row, column, cellValue, index) => {
+                        if (row.runState == 0) {
+                            return '<span class="el-tag el-tag--danger">停止</span>'
+                        } else if (row.runState == 1) {
+                            return '<span class="el-tag el-tag--success">运行</span>'
                         }
                     },
-                    align: "center"
+                    align: "left",
+                    width: '100'
                 },
                 {
                     propName: "userId",
@@ -116,12 +137,12 @@ export default {
                         html += row.userName + '被分享</el-tag>'
                         return html
                     },
-                    align: "center"
+                    align: "left"
                 },
                 {
                     propName: "createTime",
                     labelName: "创建时间",
-                    align: "center",
+                    align: "left",
                     width: '200'
                 }
             ],

industry-admin/src/views/report/runConfig/index.vue

@@ -5,12 +5,12 @@
                 <el-col>
                     <!-- 搜索信息 -->
                     <el-form ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="80px">
-                        <el-form-item label="报表名称" prop="reportTableName">
-                            <el-input v-model="queryParams.reportTableName" placeholder="请输入报表名称" maxlength="10">
+                        <el-form-item label="" prop="reportTableName">
+                            <el-input v-model="queryParams.reportTableName" prefix-icon="el-icon-search" placeholder="请输入报表名称" maxlength="10">
                             </el-input>
                         </el-form-item>
-                        <el-form-item label="报表类型" prop="reportTableType">
-                            <el-select v-model="queryParams.reportTableType" placeholder="请选择类型">
+                        <el-form-item label="" prop="reportTableType">
+                            <el-select v-model="queryParams.reportTableType" placeholder="请选择报表类型">
                                 <el-option v-for="tableType in reportTableTypeList" :key="tableType.value"
                                     :label="tableType.label" :value="tableType.value">
                                 </el-option>
@@ -18,14 +18,14 @@
                         </el-form-item>
                         <el-form-item>
                             <el-button type="primary" icon="el-icon-search" size="mini"
-                                @click="getAllReportTable">查询</el-button>
+                                @click="getAllReportTable">搜索</el-button>
                             <!-- <el-button ref="btn" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->
                         </el-form-item>
                     </el-form>
                     <!-- 数据组表格信息 -->
                     <CommonTable ref="runConfigTable" :tableHeaderTitle="tableHeaderTitle" :tableData="tableData"
                         :isShowCheckbox="isShowCheckbox" :isShowIndex="isShowIndex" :tableHight="tableHight"
-                        :tableOperate="tableOperate" @reportNameClick="reportNameClick" @runRecordEvent="runRecordEvent"
+                        :tableOperate="tableOperate" :tableOperateWidth="tableOperateWidth" @reportNameClick="reportNameClick" @runRecordEvent="runRecordEvent"
                         @timeConfigEvent="timeConfigEvent" @runConfigEvent="runConfigEvent"
                         @stopConfigEvent="stopConfigEvent" @reportAuthEvent="reportAuthEvent"
                         @reportAuthDetail="reportAuthDetail" @delReportTableEvent="delReportTableEvent">
@@ -91,45 +91,54 @@ export default {
                         return html
                     },
                     methodName: "reportNameClick",
-                    align: "center"
+                    align: "left"
                 },
                 {
                     propName: "reportTableType",
                     labelName: "报表类型",
+                    type: "html",
                     formatter: (row, column, cellValue, index) => {
+                        let result = ''
                         if (row.reportTableType == 0) {
-                            return '手动报表'
+                            result = "手动报表"
                         } else if (row.reportTableType == 1 || row.reportTableType == 3) {
-                            return '周期报表'
+                            result = '周期报表'
                         } else if (row.reportTableType == 2 || row.reportTableType == 4) {
-                            return '事件驱动报表'
+                            result = '事件驱动报表'
                         } else if (row.reportTableType == 5 || row.reportTableType == 6) {
-                            return '设备报表'
-                        }
+                            result = '设备报表'
+                        };
+                        let html = '<span class="el-tag el-tag--light">'
+                        html += result
+                        html += '</span>'
+                        return html
                     },
-                    align: "center"
+                    align: "left",
+                    width:"120"
                 },
                 {
                     propName: "runState",
                     labelName: "运行状态",
+                    type: "html",
                     formatter: (row, column, cellValue, index) => {
                         if (row.runState == 0) {
-                            return '停止'
+                            return '<span class="el-tag el-tag--danger">停止</span>'
                         } else if (row.runState == 1) {
-                            return '运行中'
+                            return '<span class="el-tag el-tag--success">运行</span>'
                         }
                     },
-                    align: "center",
+                    align: "left",
                     width: '100'
                 },
                 {
                     propName: "createTime",
                     labelName: "创建时间",
-                    align: "center",
+                    align: "left",
                     width: '200'
                 }
             ],
             tableData: [],
+            tableOperateWidth:"400",
             tableOperate: [
                 {
                     btnName: '运行记录',

industry-admin/src/views/report/userGroup/index.vue

@@ -3,9 +3,9 @@
     <el-row>
       <el-col>
         <!-- 操作按钮 -->
-        <el-row class="czBtns">
+        <el-row class="czBtns" style="float:right">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="el-icon-circle-plus-outline" size="mini"
+            <el-button type="primary" icon="el-icon-plus" size="small"
               @click="addUserGroupEvent">新增</el-button>
           </el-col>
         </el-row>
@@ -48,23 +48,19 @@ export default {
         {
           propName: "userGroupName",
           labelName: "用户组名称",
-          align: "center"
-        },
-        {
-          propName: "sortNum",
-          labelName: "排序号",
-          align: "center"
+          align: "left"
         },
         {
           propName: "userGroupDescribe",
           labelName: "备注",
-          align: "center"
+          align: "left"
         },
         {
-          propName: "createTime",
-          labelName: "处理时间",
-          align: "center"
-        }
+          propName: "sortNum",
+          labelName: "排序号",
+          align: "center",
+          width:80
+        },
       ],
       tableData: [],
       tableOperate: [

industry-admin/src/views/report/userGroup/userGroup.vue

@@ -8,7 +8,7 @@
                     <el-input v-model="userGroupForm.userGroupName" maxlength="50" placeholder="请输入用户组名称"
                         show-word-limit></el-input>
                 </el-form-item>
-                <el-form-item label="组人员" prop="groupUserList">
+                <el-form-item label="组成员" prop="groupUserList">
                     <el-input :value="userGroupForm.userNameList.join(',')" placeholder="请选择用户" readonly
                         style="width: calc(100% - 100px); margin-right: 15px;"></el-input>
                     <el-button size="mini" @click="chooseUserEvent">选择人员</el-button>
@@ -167,4 +167,4 @@ export default {
         }
     }
 }
-</script>@/api/report/userGroup
+</script>@/api/report/userGroup

industry-admin/src/views/upkeep/upkeepPlan/index.vue

@@ -1,25 +1,31 @@
 <template>
     <div class="sy-content">
         <el-row>
+          <el-col :span="12">
+            <!-- 搜索信息 -->
+            <el-form ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="80px">
+                <el-form-item label="" prop="deviceName">
+                    <el-input v-model="queryParams.deviceName" prefix-icon="el-icon-search" placeholder="请输入设备名称" maxlength="10">
+                    </el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-search" size="small" @click="searchEvent">查询</el-button>
+                    <el-button type="info" ref="btn" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+                </el-form-item>
+            </el-form>
+          </el-col>
+          <el-col :span="12">
+            <!-- 操作按钮 -->
+            <el-row class="czBtns" style="float: right;">
+                <el-col :span="1.5">
+                    <el-button type="primary" icon="el-icon-plus" size="small"
+                        @click="addUpkeepPlanEvent">新增</el-button>
+                </el-col>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row>
             <el-col>
-                <!-- 搜索信息 -->
-                <el-form ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="80px">
-                    <el-form-item label="设备名称" prop="deviceName">
-                        <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" maxlength="10">
-                        </el-input>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button type="primary" icon="el-icon-search" size="mini" @click="searchEvent">查询</el-button>
-                        <el-button ref="btn" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                    </el-form-item>
-                </el-form>
-                <!-- 操作按钮 -->
-                <el-row class="czBtns">
-                    <el-col :span="1.5">
-                        <el-button type="primary" plain icon="el-icon-circle-plus-outline" size="mini"
-                            @click="addUpkeepPlanEvent">新增</el-button>
-                    </el-col>
-                </el-row>
                 <!-- 数据组表格信息 -->
                 <CommonTable ref="mainRunTable" :tableHeaderTitle="tableHeaderTitle" :tableData="tableData"
                     :isShowCheckbox="isShowCheckbox" :isShowIndex="isShowIndex" :tableHight="tableHight"
@@ -62,12 +68,27 @@ export default {
                 {
                     propName: "deviceName",
                     labelName: "设备名称",
-                    align:"center"
+                    align:"left"
+                },
+                {
+                    propName: "deviceNum",
+                    labelName: "设备编号",
+                    align:"left"
+                },
+                {
+                    propName: "deviceModel",
+                    labelName: "设备型号",
+                    align:"left"
+                },
+                {
+                    propName: "deviceLocation",
+                    labelName: "设备位置",
+                    align:"left"
                 },
                 {
                     propName: "faultTime",
                     labelName: "保养周期",
-                    align:"center",
+                    align:"left",
                     formatter: (row, column, cellValue, index) => {
                         if (row.periodType == 0) {
                             return row.upkeepPeriod + '日'
@@ -81,7 +102,7 @@ export default {
                 {
                     propName: "faultReason",
                     labelName: "提醒周期",
-                    align:"center",
+                    align:"left",
                     formatter: (row, column, cellValue, index) => {
                         if (row.expireRemind) {
                             return row.expireRemind + '日'
@@ -91,12 +112,12 @@ export default {
                 {
                     propName: "upkeepContent",
                     labelName: "保养内容",
-                    align:"center"
+                    align:"left"
                 },
                 {
                     propName: "lastTime",
                     labelName: "上次保养时间",
-                    align:"center"
+                    align:"left"
                 }
             ],
             tableData: [],

industry-admin/src/views/upkeep/upkeepPlan/upkeepPlan.vue

@@ -1,14 +1,14 @@
 <template>
     <div>
         <!-- 设备台账全部信息 -->
-        <el-dialog :title="title" width="46%" custom-class="dialog-max" top="5vh" :before-close="dialogClose"
+        <el-dialog :title="title" width="50%" custom-class="dialog-max" top="5vh" :before-close="dialogClose"
             :visible.sync="visible" :append-to-body="true" @open="handleOpen" @close="handleClose">
-            <el-form ref="upkeepPlanForm" :model="upkeepPlanForm" :rules="upkeepPlanRules" label-width="110px"
+            <el-form ref="upkeepPlanForm" :model="upkeepPlanForm" :rules="upkeepPlanRules" label-width="100px"
                 label-position="right">
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="设备名称" prop="deviceName" >
-                            <el-input v-model="upkeepPlanForm.deviceName" disabled placeholder="请选择设备" maxlength="10" style="width:300px">
+                            <el-input v-model="upkeepPlanForm.deviceName" disabled placeholder="请选择设备" maxlength="10">
                                 <el-button type="primary" slot="append" icon="el-icon-search"
                                     @click="chooseLedger">选择</el-button>
                             </el-input>
@@ -16,7 +16,7 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="设备编号" prop="deviceNum" >
-                            <el-input v-model="upkeepPlanForm.deviceNum" disabled style="width:300px">
+                            <el-input v-model="upkeepPlanForm.deviceNum" disabled>
                             </el-input>
                         </el-form-item>
                     </el-col>
@@ -24,13 +24,13 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="规格型号" prop="deviceModel" >
-                            <el-input v-model="upkeepPlanForm.deviceModel" disabled style="width:300px">
+                            <el-input v-model="upkeepPlanForm.deviceModel" disabled>
                             </el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="设备位置" prop="deviceLocation" >
-                            <el-input v-model="upkeepPlanForm.deviceLocation" disabled style="width:300px">
+                            <el-input v-model="upkeepPlanForm.deviceLocation" disabled>
                             </el-input>
                         </el-form-item>
                     </el-col>
@@ -38,48 +38,47 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="购买时间" prop="buyTime" >
-                            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" disabled v-model="upkeepPlanForm.buyTime" style="width:300px"
-                                type="date">
+                            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" disabled v-model="upkeepPlanForm.buyTime"
+                                type="date" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="保养周期" prop="upkeepPeriod" >
-                            <el-input v-model="upkeepPlanForm.upkeepPeriod" style="width:300px">
-                            </el-input>
-                        </el-form-item>
+
                     </el-col>
                 </el-row>
                 <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="设备等级" prop="periodType" >
-                            <el-select clearable v-model="upkeepPlanForm.periodType" placeholder="请选择设备等级" style="width:300px">
-                                <el-option v-for="periodType in periodTypeList" :key="periodType.value"
-                                    :label="periodType.name" :value="periodType.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="到期提醒" prop="expireRemind" >
-                            <el-input v-model="upkeepPlanForm.expireRemind" style="width:300px">
-                                <i slot="suffix" style="margin-right: 10px;">天</i>
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="保养周期" prop="upkeepPeriod" >
+                        <el-input v-model="upkeepPlanForm.upkeepPeriod" style="width: 60%;">
+                        </el-input>
+                        <el-select clearable v-model="upkeepPlanForm.periodType" placeholder="请选择设备等级" style="width: 80px;margin-left: 20px;">
+                            <el-option v-for="periodType in periodTypeList" :key="periodType.value"
+                                :label="periodType.name" :value="periodType.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="到期提醒" prop="expireRemind" >
+                        <el-input v-model="upkeepPlanForm.expireRemind" >
+                            <i slot="suffix" style="margin-right: 10px;">天</i>
+                        </el-input>
+                    </el-form-item>
+                  </el-col>
                 </el-row>
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="上次保养时间" prop="lastTime" >
-                            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="upkeepPlanForm.lastTime" type="date" style="width:300px"
-                                placeholder="选择日期">
+                            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="upkeepPlanForm.lastTime" type="date"
+                                placeholder="选择日期" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="保养内容" prop="upkeepContent" >
-                           <el-input type="textarea" v-model="upkeepPlanForm.upkeepContent" placeholder="请输入保养内容" style="width:300px"
-                        maxlength="100"></el-input>
+                    <el-col :span="12">
+                        <el-form-item label="保养内容" prop="upkeepContent">
+                           <el-input type="textarea" v-model="upkeepPlanForm.upkeepContent" placeholder="请输入保养内容"
+                         ></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -268,4 +267,4 @@ export default {
     // height: 40px;
     overflow: auto;
 }
-</style>
+</style>

industry-admin/src/views/upkeep/upkeepRecord/index.vue

@@ -1,25 +1,31 @@
 <template>
     <div class="sy-content">
         <el-row>
+          <el-col :span="12">
+            <!-- 搜索信息 -->
+            <el-form ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="80px">
+                <el-form-item label="" prop="deviceName">
+                    <el-input v-model="queryParams.deviceName" prefix-icon="el-icon-search" placeholder="请输入设备名称" maxlength="10">
+                    </el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-search" size="small" @click="searchEvent">查询</el-button>
+                    <el-button type="info" ref="btn" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+                </el-form-item>
+            </el-form>
+          </el-col>
+          <el-col :span="12">
+            <!-- 操作按钮 -->
+            <el-row class="czBtns" style="float: right;">
+                <el-col :span="1.5">
+                    <el-button type="primary" icon="el-icon-plus" size="small"
+                        @click="addUpkeepRecordEvent">新增</el-button>
+                </el-col>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row>
             <el-col>
-                <!-- 搜索信息 -->
-                <el-form ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="80px">
-                    <el-form-item label="设备名称" prop="deviceName">
-                        <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" maxlength="10">
-                        </el-input>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button type="primary" icon="el-icon-search" size="mini" @click="searchEvent">查询</el-button>
-                        <el-button ref="btn" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                    </el-form-item>
-                </el-form>
-                <!-- 操作按钮 -->
-                <el-row class="czBtns">
-                    <el-col :span="1.5">
-                        <el-button type="primary" plain icon="el-icon-circle-plus-outline" size="mini"
-                            @click="addUpkeepRecordEvent">新增</el-button>
-                    </el-col>
-                </el-row>
                 <!-- 数据组表格信息 -->
                 <CommonTable ref="mainRunTable" :tableHeaderTitle="tableHeaderTitle" :tableData="tableData"
                     :isShowCheckbox="isShowCheckbox" :isShowIndex="isShowIndex" :tableHight="tableHight"
@@ -62,27 +68,43 @@ export default {
                 {
                     propName: "deviceName",
                     labelName: "设备名称",
-                    align:"center"
+                    align:"left"
+                },
+                {
+                    propName: "deviceNum",
+                    labelName: "设备编号",
+                    align:"left"
+                },
+                {
+                    propName: "deviceModel",
+                    labelName: "设备型号",
+                    align:"left"
+                },
+                {
+                    propName: "deviceLocation",
+                    labelName: "设备位置",
+                    align:"left"
                 },
                 {
                     propName: "runTime",
                     labelName: "设备运行时长",
-                    align:"center"
+                    align:"left"
                 },
                 {
                     propName: "upkeepTime",
                     labelName: "保养时间",
-                    align:"center"
+                    align:"left",
+                    width:"100"
                 },
                 {
                     propName: "upkeepPersonName",
                     labelName: "保养人",
-                    align:"center"
+                    align:"left"
                 },
                 {
                     propName: "upkeepContent",
                     labelName: "保养内容",
-                    align:"center"
+                    align:"left"
                 }
             ],
             tableData: [],

industry-admin/src/views/upkeep/upkeepRecord/upkeepRecord.vue

@@ -8,7 +8,7 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="设备名称" prop="deviceName" >
-                            <el-input v-model="upkeepRecordForm.deviceName" disabled placeholder="请选择设备" maxlength="10" style="width:300px">
+                            <el-input v-model="upkeepRecordForm.deviceName" disabled placeholder="请选择设备" maxlength="10">
                                 <el-button type="primary" slot="append" icon="el-icon-search"
                                     @click="chooseLedger">选择</el-button>
                             </el-input>
@@ -16,7 +16,7 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="设备编号" prop="deviceNum" >
-                            <el-input v-model="upkeepRecordForm.deviceNum" disabled style="width:300px">
+                            <el-input v-model="upkeepRecordForm.deviceNum" disabled>
                             </el-input>
                         </el-form-item>
                     </el-col>
@@ -24,13 +24,13 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="规格型号" prop="deviceModel" >
-                            <el-input v-model="upkeepRecordForm.deviceModel" disabled style="width:300px">
+                            <el-input v-model="upkeepRecordForm.deviceModel" disabled>
                             </el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="设备位置" prop="deviceLocation" >
-                            <el-input v-model="upkeepRecordForm.deviceLocation" disabled style="width:300px">
+                            <el-input v-model="upkeepRecordForm.deviceLocation" disabled>
                             </el-input>
                         </el-form-item>
                     </el-col>
@@ -38,14 +38,14 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="购买时间" prop="buyTime" >
-                            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" disabled v-model="upkeepRecordForm.buyTime" style="width:300px"
-                                type="date">
+                            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" disabled v-model="upkeepRecordForm.buyTime"
+                                type="date" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="设备运行时长" prop="runTime" >
-                            <el-input v-model="upkeepRecordForm.runTime" style="width:300px">
+                            <el-input v-model="upkeepRecordForm.runTime">
                             </el-input>
                         </el-form-item>
                     </el-col>
@@ -53,14 +53,14 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="保养时间" prop="upkeepTime" >
-                            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="upkeepRecordForm.upkeepTime" style="width:300px"
-                                type="date" placeholder="选择日期">
+                            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="upkeepRecordForm.upkeepTime"
+                                type="date" placeholder="选择日期" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="保养人" prop="upkeepPersonName" >
-                            <el-input v-model="upkeepRecordForm.upkeepPersonName" disabled placeholder="请选择保养人" style="width:300px"
+                            <el-input v-model="upkeepRecordForm.upkeepPersonName" disabled placeholder="请选择保养人"
                                 maxlength="10">
                                 <el-button type="primary" slot="append" icon="el-icon-search"
                                     @click="chooseHandlePerson">选择</el-button>
@@ -69,14 +69,14 @@
                     </el-col>
                 </el-row>
                 <el-form-item label="保养内容" prop="upkeepContent" >
-                    <el-input type="textarea" v-model="upkeepRecordForm.upkeepContent" placeholder="请输入保养内容" style="width:300px"
+                    <el-input type="textarea" v-model="upkeepRecordForm.upkeepContent" placeholder="请输入保养内容"
                         maxlength="100"></el-input>
                 </el-form-item>
             </el-form>
             <span slot="footer">
                 <el-button size="mini" type="primary" @click="saveUpkeepRecordEvent">确定</el-button>
                     <!-- <el-button type="primary" @click="resetForm('deviceTypeForm')">重置</el-button> -->
-                    <el-button size="mini" @click="dialogClose">取消</el-button>    
+                    <el-button size="mini" @click="dialogClose">取消</el-button>
             </span>
         </el-dialog>
 
@@ -244,4 +244,4 @@ export default {
     // height: 40px;
     overflow: auto;
 }
-</style>
+</style>