clearablex修改、用户修改

src/App.vue

@@ -2,7 +2,7 @@
  * @Author: wt 1241351815@qq.com
  * @Date: 2022-04-25 10:00:04
  * @LastEditors: wt 1241351815@qq.com
- * @LastEditTime: 2022-05-13 09:12:01
+ * @LastEditTime: 2022-05-13 10:35:28
  * @FilePath: \deviceManager\src\App.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -118,6 +118,9 @@ export default  {
   height:28px !important;
   line-height: 26px !important;
 }
+.el-input-number.is-controls-right[class*=medium] [class*=increase], .el-input-number.is-controls-right[class*=medium] [class*=decrease]{
+  line-height: 13px;
+}
 .el-textarea .el-input__count,.el-input .el-input__count .el-input__count-inner{
   font-size: 8px;
   height: 12px;
@@ -131,5 +134,10 @@ export default  {
 .el-input-number.is-controls-right[class*=medium] [class*=increase], .el-input-number.is-controls-right[class*=medium] [class*=decrease] {
     line-height: 13px;
 }
+
+/* 时间input */
+.el-date-editor.el-input, .el-date-editor.el-input__inner{
+  width:100% !important;
+}
 </style>
 

src/api/system/user.js

@@ -13,7 +13,7 @@ export function listUser(query) {
 // 查询用户详细
 export function getUser(userId) {
     return request({
-        url: '/system/user/' ,
+        url: '/system/user/' + praseStrEmpty(userId),
         method: 'get'
     })
 }

src/views/business/OM/MochaITOM/crew/index.vue

@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="责任人" prop="userName">
+      <el-form-item label="责任人：" prop="userName">
         <el-select v-model="queryParams.userName"   placeholder="请选择责任人" style="width: 140px">
           <el-option
             v-for="item in zrr"
@@ -77,7 +77,6 @@
                   <el-select
                     v-model="form.companyCode"
                     placeholder="请选择单位名称"
-                    clearable
                     size="small"
                     style="width: 160px"
                   >
@@ -143,11 +142,9 @@
       :limit.sync="queryParams.size"
       @pagination="getList"
     />
-    <a href="" download="" id="xz" style="position: absolute;z-index: -1;opacity: 0;"></a>
   </div>
 </template>
 <script>
-import { BASEPATH } from "@/assets/js/common.js";
 import { listChannel } from "@/api/system/product";
 import { addDevopsTeam, delDevopsTeam, updateDevopsTeam, getDevopsTeam, getTD } from "@/api/business/OM/MochaITOM/crew";
 export default {

src/views/business/OM/MochaITOM/plan/index.vue

@@ -81,7 +81,6 @@
               <el-select
                 v-model="form.teamId"
                 placeholder="请选择执行班组"
-                clearable
                 size="small"
                 style="width: 160px"
               >
@@ -99,7 +98,6 @@
                   <el-select
                     v-model="form.companyCode"
                     placeholder="请选择单位名称"
-                    clearable
                     size="small"
                     style="width: 160px"
                   >
@@ -117,7 +115,6 @@
               <el-select
                 v-model="form.cycle"
                 placeholder="请选择周期"
-                clearable
                 size="small"
                 style="width: 160px"
               >
@@ -155,7 +152,6 @@
               <el-select
                 v-model="form.startInspectTime"
                 placeholder="请选择开始时间"
-                clearable
                 size="small"
                 style="width: 160px"
               >
@@ -172,8 +168,7 @@
             <el-form-item label="执行结束时间" prop="endInspectTime">
               <el-select
                 v-model="form.endInspectTime"
-                placeholder="请选择执行结束时间"
-                clearable
+                placeholder="请选择结束时间"
                 size="small"
                 style="width: 160px"
               >

src/views/business/OM/MochaITOM/point/index.vue

@@ -105,7 +105,6 @@
                   <el-select
                     v-model="form.companyCode"
                     placeholder="请选择单位名称"
-                    clearable
                     size="small"
                     style="width: 160px"
                   >
@@ -184,7 +183,6 @@ import { BASEPATH } from "@/assets/js/common.js";
 import { listChannel } from "@/api/system/product";
 import { getDeviceType } from "@/api/business/deviceMange";
 import { fileUpload } from "@/api/business/uploadfile.js";
-import { getPlanPath } from "@/api/business/OM/MochaITOM/route";
 import { addInspectionPoint, delInspectionPoint, updateInspectionPoint, getInspectionPoint, exportInspectionPoint } from "@/api/business/OM/MochaITOM/point";
 import { YearMonthDateSFN } from "@/assets/js/dataFormate.js";
 export default {

src/views/business/OM/MochaITOM/record/index.vue

@@ -12,8 +12,8 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="完成状态">
-        <el-select v-model.trim="queryParams.isComplete"  size="small" style="width:120px">
+      <el-form-item label="完成状态：">
+        <el-select v-model.trim="queryParams.isComplete"  size="small" style="width:160px" placeholder="请选择完成状态">
           <el-option value="false" label="未完成"></el-option>
           <el-option value="true" label="已完成"></el-option>
         </el-select>
@@ -178,12 +178,8 @@ export default {
       getCollect(this.queryParams).then(response => {
         this.collectList = response.data
         this.loading2 = false
-        
       });
     },
-    
-
-
     /** 导出按钮操作 */
     handleExport() {
       exportMaintianLog(this.queryParams).then(response =>{

src/views/business/OM/eventCenter/alarm/index.vue

@@ -13,8 +13,8 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="处理状态">
-        <el-select v-model.trim="queryParams.status"  size="small" style="width: 120px">
+      <el-form-item label="处理状态：">
+        <el-select v-model.trim="queryParams.status"  size="small" style="width: 160px" placeholder="请选择处理状态">
           <el-option value="0" label="未处理"></el-option>
           <el-option value="1" label="已处理"></el-option>
         </el-select>
@@ -33,7 +33,7 @@
         >导出</el-button>
       </el-form-item>
     </el-form>
-    <el-row :gutter="20">
+    <el-row :gutter="20" v-loading="loading2">
       <el-col :span="2.4">
         <el-col class="event">
             事件总数<span class="color1 colorc">{{collectList.total}}</span>
@@ -51,7 +51,7 @@
       </el-col>
       <el-col :span="2.4">
         <el-col class="event">
-            处置率<span class="color4 colorc " v-if="collectList.checkRadio">{{Number((collectList.checkRadio)*100).toFixed(1)}}%</span>
+            处置率<span class="color4 colorc">{{((collectList.checkRadio)*100).toFixed(2)}}%</span>
         </el-col>
       </el-col>
     </el-row>
@@ -152,7 +152,7 @@
   </div>
 </template>
 <script>
-import { addTbAlarm, delTbAlarm, updateTbAlarm, updateTbAlarmP, getTbAlarm, exportTbAlarm, collectTbAlarm } from "@/api/business/OM/eventCenter";
+import { delTbAlarm, updateTbAlarm, updateTbAlarmP, getTbAlarm, exportTbAlarm, collectTbAlarm } from "@/api/business/OM/eventCenter";
 import { BASEPATH } from "@/assets/js/common.js";
 export default {
   name: "TbAlarm",
@@ -182,13 +182,10 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-
-      },
+      rules: {},
       //综合数据
-      collectList:[
-
-      ]
+      collectList:[],
+      loading2:true,
     };
   },
   created() {
@@ -249,6 +246,9 @@ export default {
     getCollect(){
       collectTbAlarm({type:2}).then(response => {
         this.collectList = response.data
+        setTimeout(() => {
+          this.loading2 = false
+        },500);
       });
     },
 

src/views/business/OM/eventCenter/event/index.vue

@@ -13,8 +13,8 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="事件类型">
-        <el-select v-model.trim="queryParams.type"  size="small" style="width:120px">
+      <el-form-item label="事件类型：">
+        <el-select v-model.trim="queryParams.type"  size="small" style="width:160px" placeholder="请选择事件类型">
           <el-option value="1" label="消防隐患"></el-option>
           <el-option value="2" label="消防告警"></el-option>
           <el-option value="3" label="设备设施"></el-option>
@@ -34,7 +34,7 @@
         >导出</el-button>
       </el-form-item>
     </el-form>
-    <el-row :gutter="20">
+    <el-row :gutter="20" v-loading="loading2">
       <el-col :span="2.4">
         <el-col class="event">
             事件总数<span class="color1 colorc">{{collectList.total}}</span>
@@ -52,7 +52,7 @@
       </el-col>
       <el-col :span="2.4">
         <el-col class="event">
-            处置率<span class="color4 colorc " v-if="collectList.checkRadio">{{Number((collectList.checkRadio)*100).toFixed(1)}}%</span>
+            处置率<span class="color4 colorc">{{((collectList.checkRadio)*100).toFixed(2)}}%</span>
         </el-col>
       </el-col>
     </el-row>
@@ -135,9 +135,8 @@
   </div>
 </template>
 <script>
-import { addEventManage, delEventManage, updateEventManage, getEventManage, exportEventManage, collectEventManage } from "@/api/business/OM/eventCenter";
+import { addEventManage, updateEventManage, getEventManage, exportEventManage, collectEventManage } from "@/api/business/OM/eventCenter";
 import { BASEPATH } from "@/assets/js/common.js";
-// import { listChannel } from "@/api/system/product";
 export default {
   name: "EventManage",
   data() {
@@ -164,17 +163,12 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-
-      },
+      rules: {},
       //综合数据
-      collectList:[
-
-      ],
+      collectList:[],
+      loading2:true,
       //单位列表 =>表单
-      companyList:[
-
-      ],
+      companyList:[],
     };
   },
   created() {
@@ -234,9 +228,9 @@ export default {
     getCollect(){
       collectEventManage().then(response => {
         this.collectList = response.data
-        if(!this.collectList.checkRadio){
-          this.collectList.checkRadio = 0
-        }
+        setTimeout(() => {
+          this.loading2 = false
+        },500);
       });
     },
 

src/views/business/OM/eventCenter/hiddenDanger/index.vue

@@ -13,8 +13,8 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="处理状态">
-        <el-select v-model.trim="queryParams.status"  size="small" style="width:120px">
+      <el-form-item label="处理状态：">
+        <el-select v-model.trim="queryParams.status"  size="small" style="width:160px" placeholder="请选择处理状态">
           <el-option value="0" label="未处理"></el-option>
           <el-option value="1" label="已处理"></el-option>
         </el-select>
@@ -33,7 +33,7 @@
         >导出</el-button>
       </el-form-item>
     </el-form>
-    <el-row :gutter="20">
+    <el-row :gutter="20" v-loading="loading2">
       <el-col :span="2.4">
         <el-col class="event">
             事件总数<span class="color1 colorc">{{collectList.total}}</span>
@@ -51,8 +51,7 @@
       </el-col>
       <el-col :span="2.4">
         <el-col class="event">
-            处置率
-            <span class="color4 colorc " v-if="collectList.checkRadio">{{Number((collectList.checkRadio)*100).toFixed(1)}}%</span>
+            处置率<span class="color4 colorc">{{((collectList.checkRadio)*100).toFixed(2)}}%</span>
         </el-col>
       </el-col>
     </el-row>
@@ -147,7 +146,7 @@
   </div>
 </template>
 <script>
-import { addTbAlarm, delTbAlarm, updateTbAlarm, getTbAlarm, exportTbAlarm, updateTbAlarmP,collectTbAlarm } from "@/api/business/OM/eventCenter";
+import { updateTbAlarm, getTbAlarm, exportTbAlarm, updateTbAlarmP,collectTbAlarm } from "@/api/business/OM/eventCenter";
 import { BASEPATH } from "@/assets/js/common.js";
 export default {
   name: "TbAlarm",
@@ -181,9 +180,8 @@ export default {
       // 日期范围
       dateRange: [],
       //综合数据
-      collectList:[
-
-      ]
+      collectList:[],
+      loading2:true,
     };
   },
   created() {
@@ -242,6 +240,9 @@ export default {
     getCollect(){
       collectTbAlarm({type:1}).then(response => {
         this.collectList = response.data
+        setTimeout(() => {
+          this.loading2 = false
+        },500);
       });
     },
 

src/views/business/OM/workMange/index.vue

@@ -13,8 +13,8 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="处理状态">
-        <el-select v-model.trim="queryParams.status"  size="small" style="width:120px">
+      <el-form-item label="处理状态：">
+        <el-select v-model.trim="queryParams.status"  size="small" style="width:160px" placeholder="请选择处理状态">
           <el-option value="1" label="未处理"></el-option>
           <el-option value="2" label="已处理:通过"></el-option>
           <el-option value="3" label="已处理：未通过"></el-option>
@@ -42,7 +42,7 @@
         >导出</el-button>
       </el-form-item>
     </el-form>
-    <el-row :gutter="20">
+    <el-row :gutter="20" v-loading="loading2">
       <el-col :span="2.4">
         <el-col class="event">
             事件总数<span class="color1 colorc">{{collectList.total}}</span>
@@ -60,8 +60,7 @@
       </el-col>
       <el-col :span="2.4">
         <el-col class="event">
-            处置率<span class="color4 colorc " v-if="collectList.checkRadio">{{Number((collectList.checkRadio)*100).toFixed(2)}}%</span>
-            <span class="color4 colorc " else-if="collectList.checkRadio">0</span>
+            处置率<span class="color4 colorc">{{((collectList.checkRadio)*100).toFixed(2)}}%</span>
         </el-col>
       </el-col>
     </el-row>
@@ -232,13 +231,10 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-
-      },
+      rules: {},
       //综合数据
-      collectList:[
-
-      ]
+      collectList:[],
+      loading2:true,
     };
   },
   created() {
@@ -296,8 +292,6 @@ export default {
         this.loading = false;
       });
     },
-
-
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -389,9 +383,12 @@ export default {
         }
       });
       /** 综合列表列表 */
-        collectWorkOrder({}).then(response => {
-          this.collectList = response.data
-        });
+      collectWorkOrder({}).then(response => {
+        this.collectList = response.data
+        setTimeout(() => {
+          this.loading2 = false
+        }, 500);
+      });
     }
   }
 };

src/views/business/buildMange/floor/index.vue

@@ -4,7 +4,7 @@
       <el-form-item label="楼层名称：" prop="name">
         <el-input
           v-model.trim="queryParams.name"
-          placeholder="请输入建筑名称"
+          placeholder="请输入楼层名称"
           clearable
           size="small"
           style="width: 140px"
@@ -65,7 +65,6 @@
               <el-select
                 v-model="form.buildId"
                 placeholder="请选择建筑名称"
-                clearable
                 size="small"
               >
                 <el-option

src/views/business/buildMange/room/index.vue

@@ -86,7 +86,6 @@
               <el-select  @change="getBuildId($event)"
                 v-model="form.buildId"
                 placeholder="请选择建筑名称"
-                clearable
                 size="small"
               >
                 <el-option
@@ -105,7 +104,6 @@
               <el-select
                 v-model="form.floorId"
                 placeholder="请选择楼层名称"
-                clearable
                 size="small"
               >
                 <el-option

src/views/business/deviceMange/deviceApi/index.vue

@@ -11,8 +11,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="传输方式" prop="transferType">
-        <el-select v-model="queryParams.transferType"   placeholder="请选择传输方式">
+      <el-form-item label="传输方式：" prop="transferType">
+        <el-select v-model="queryParams.transferType"   size="small" style="width: 160px" placeholder="请选择传输方式" >
           <el-option
             v-for="item in transferTypeList"
             :key="item.id"

src/views/business/deviceMange/devicePassageWay/index.vue

@@ -11,8 +11,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="设备类型" prop="dwtype">
-        <el-select v-model="queryParams.dwtype"   placeholder="请选择传输方式">
+      <el-form-item label="设备类型:" prop="dwtype">
+        <el-select v-model="queryParams.dwtype"  size="small" style="width: 160px"  placeholder="请选择传输方式">
           <el-option
             v-for="item in dwtypeList"
             :key="item.id"

src/views/business/propertyMange/index.vue

@@ -104,9 +104,7 @@
               <el-input v-model.trim="form.facilityName" placeholder="请填写资产名称" @input="onInput()" maxlength="10" show-word-limit />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item label="购买时间" prop="buyTime">
               <el-date-picker
                 v-model="form.buyTime"
@@ -115,14 +113,11 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="单位名称：" prop="company">
                 <el-select
                   v-model="form.company"
                   placeholder="请选择单位名称"
-                  clearable
                   size="small"
                 >
                   <el-option
@@ -139,8 +134,6 @@
               <el-input v-model.trim="form.man" placeholder="请填写负责人" @input="onInput()" maxlength="10" show-word-limit />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="购入方式" prop="purchase">
               <el-select v-model="form.purchase"  placeholder="购入方式">
@@ -159,8 +152,6 @@
               <el-input v-model.trim="form.facilityModel" placeholder="请填写型号" @input="onInput()" maxlength="10" show-word-limit />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="计量单位" prop="unit">
               <el-input v-model.trim="form.unit" placeholder="请填写计量单位" @input="onInput()" maxlength="4" show-word-limit/>
@@ -172,8 +163,6 @@
               v-model.trim="form.number" placeholder="请填写数量" @input="onInput()" maxlength="5" show-word-limit/>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="单价" prop="price">
               <el-input type="text"  onkeyup="this.value=this.value.replace(/^\.+|[^\d\.]/g,'')"
@@ -186,8 +175,6 @@
               <el-input type="textarea" v-model.trim="form.addrs" placeholder="请填写存放地址" @input="onInput()" rows="3" maxlength="20" show-word-limit />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="供应商" prop="supplier">
               <el-input v-model.trim="form.supplier" placeholder="请填写供应商" @input="onInput()" maxlength="12" show-word-limit />
@@ -198,8 +185,6 @@
               <el-input v-model.trim="form.buyNo" placeholder="请填写采购编号" @input="onInput()" maxlength="15" show-word-limit />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="发票编号" prop="invoice">
               <el-input v-model.trim="form.invoice" placeholder="请填写发票编号" @input="onInput()" maxlength="15" show-word-limit />
@@ -210,8 +195,6 @@
               <el-input v-model.trim="form.purpose" placeholder="请填写资产用途" @input="onInput()" maxlength="15" show-word-limit />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="维修周期" prop="warrantyPeriod">
               <el-input v-model.trim="form.warrantyPeriod" placeholder="请填写维修周期" @input="onInput()" maxlength="4" show-word-limit />
@@ -224,8 +207,6 @@
               v-model.trim="form.warranty" placeholder="请填写维修天数" @input="onInput()" maxlength="4" show-word-limit />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="已使用年限" prop="usedData">
               <el-input type="text" onkeyup="this.value=this.value.replace(/^\.+|[^\d\.]/g,'')"

src/views/monitor/logininfor/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
-      <el-form-item label="登录地址" prop="ipaddr">
+      <el-form-item label="登录地址：" prop="ipaddr">
         <el-input
           v-model="queryParams.ipaddr"
           placeholder="请输入登录地址"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="用户名称" prop="userName" >
+      <el-form-item label="用户名称：" prop="userName" >
         <el-input
           v-model="queryParams.userName"
           placeholder="请输入用户名称"
@@ -21,13 +21,13 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status" >
+      <el-form-item label="状态：" prop="status" >
         <el-select
           v-model="queryParams.status"
-          placeholder="登录状态"
+          placeholder="请选择登录状态"
           clearable
           size="small"
-          style="width: 140px"
+          style="width: 160px"
         >
           <el-option
             v-for="dict in statusOptions"
@@ -37,7 +37,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="登录时间" >
+      <el-form-item label="登录时间：" >
         <el-date-picker
           v-model="dateRange"
           size="small"
@@ -54,10 +54,8 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
-
     <el-table ref="tables" v-loading="loading" :data="list" height="calc(100vh - 10vh - 120px)" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="访问编号" align="center" prop="infoId" show-overflow-tooltip/>
       <el-table-column label="用户名称" align="center" prop="userName" show-overflow-tooltip sortable="custom" :sort-orders="['descending', 'ascending']" />
       <el-table-column label="登录地址" align="center" prop="ipaddr" show-overflow-tooltip />

src/views/monitor/operlog/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
-      <el-form-item label="系统模块" prop="title">
+      <el-form-item label="系统模块：" prop="title">
         <el-input
           v-model="queryParams.title"
           placeholder="请输入系统模块"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="操作人员" prop="operName" >
+      <el-form-item label="操作人员：" prop="operName" >
         <el-input
           v-model="queryParams.operName"
           placeholder="请输入操作人员"
@@ -21,10 +21,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="类型" prop="businessType">
+      <el-form-item label="类型：" prop="businessType">
         <el-select
           v-model="queryParams.businessType"
-          placeholder="操作类型"
+          placeholder="请选择类型"
           clearable
           size="small"
           style="width: 140px"
@@ -37,10 +37,10 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="状态" prop="status" >
+      <el-form-item label="状态：" prop="status" >
         <el-select
           v-model="queryParams.status"
-          placeholder="操作状态"
+          placeholder="请选择状态"
           clearable
           size="small"
           style="width: 140px"
@@ -53,7 +53,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="操作时间">
+      <el-form-item label="操作时间：">
         <el-date-picker
           v-model="dateRange"
           size="small"
@@ -70,10 +70,8 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
-
     <el-table ref="tables" v-loading="loading" :data="list" height="calc(100vh - 10vh - 120px)" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="日志编号" align="center" prop="operId" show-overflow-tooltip />
       <el-table-column label="系统模块" align="center" prop="title"  show-overflow-tooltip />
       <el-table-column label="操作类型" align="center" prop="businessType" :formatter="typeFormat"  show-overflow-tooltip />

src/views/system/dept/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-      <el-form-item label="部门名称" prop="deptName">
+      <el-form-item label="部门名称：" prop="deptName">
         <el-input
           v-model="queryParams.deptName"
           placeholder="请输入部门名称"
@@ -52,7 +52,6 @@
       <el-table-column label="操作" width="250" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-          disabled
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -60,7 +59,6 @@
             v-hasPermi="['system:dept:edit']"
           >修改</el-button>
           <el-button
-          disabled
             size="mini"
             type="text"
             icon="el-icon-plus"
@@ -68,8 +66,6 @@
             v-hasPermi="['system:dept:add']"
           >新增</el-button>
           <el-button
-          disabled
-            v-if="scope.row.parentId != 0"
             size="mini"
             type="text"
             icon="el-icon-delete"

src/views/system/menu/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-      <el-form-item label="菜单名称" prop="menuName">
+      <el-form-item label="菜单名称：" prop="menuName">
         <el-input
           v-model="queryParams.menuName"
           placeholder="请输入菜单名称"
@@ -10,8 +10,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="菜单状态" clearable size="small">
+      <el-form-item label="状态：" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择菜单状态" size="small" style="width:160px">
           <el-option
             v-for="dict in statusOptions"
             :key="dict.dictValue"
@@ -23,11 +23,6 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -36,8 +31,11 @@
           @click="handleAdd"
           v-hasPermi="['system:menu:add']"
         >新增</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
     <el-table

src/views/system/product/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="公司名称" prop="name">
+      <el-form-item label="公司名称：" prop="name">
         <el-input
           v-model="queryParams.name"
           placeholder="请输入公司名称"
@@ -71,35 +71,35 @@
       @pagination="getList"
     />
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog   :title="title" :visible.sync="open" width="600px" append-to-body :before-close="cancel" :close-on-click-modal="false"  >
+    <el-dialog   :title="title" :visible.sync="open" width="650px" append-to-body :before-close="cancel" :close-on-click-modal="false"  >
       <el-form ref="form" :model="form" :rules="rules" label-width="120px" >
-      <!-- <el-table-column label="单位名称" align="center" prop="ownerName" />
-      <el-table-column label="所属建筑id" align="center" prop="buildingId" />
-      <el-table-column label="单位联系人" align="center" prop="contacts" />
-      <el-table-column label="联系电话" align="center" prop="contactsPhone" />
-      <el-table-column label="创建人" align="center" prop="createMan" />
-      <el-table-column label="创建时间" align="center" prop="createTime" /> -->
-
-        <el-form-item label="单位名称" prop="name" >
-          <el-input v-model.trim="form.name" placeholder="请输入单位名称" maxlength="20" show-word-limit />
-        </el-form-item>
-        <el-form-item label="单位介绍" prop="remark">
-          <el-input type="textarea" :rows="4" placeholder="请输入单位介绍" v-model.trim="form.remark" maxlength="80" show-word-limit  @input="onInput()"/>
-        </el-form-item>
-
-        <el-form-item label="单位LOGO" prop="logo" ref="img">
-          <el-upload
-            class="upload-demo"
-            action="#"
-            :limit = 1
-            :on-change="handleChange"
-            :file-list="fileList"
-            :auto-upload="false"
-            accept=".jpg,.jpeg,.JPG,.JPEG,.PNG,.png,.GIF,.gif"   
-            >
-            <el-button size="small" type="primary">点击上传</el-button>
-          </el-upload>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="单位名称" prop="name" >
+              <el-input v-model.trim="form.name" placeholder="请输入单位名称" maxlength="20" show-word-limit />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="单位介绍" prop="remark">
+              <el-input type="textarea" :rows="4" placeholder="请输入单位介绍" v-model.trim="form.remark" maxlength="80" show-word-limit  @input="onInput()"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="单位LOGO" prop="logo" ref="img">
+              <el-upload
+                class="upload-demo"
+                action="#"
+                :limit = 1
+                :on-change="handleChange"
+                :file-list="fileList"
+                :auto-upload="false"
+                accept=".jpg,.jpeg,.JPG,.JPEG,.PNG,.png,.GIF,.gif"   
+                >
+                <el-button size="small" type="primary">点击上传</el-button>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm" v-if="!loading">确 定</el-button>

src/views/system/role/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
-      <el-form-item label="角色名称" prop="roleName">
+      <el-form-item label="角色名称：" prop="roleName">
         <el-input
           v-model="queryParams.roleName"
           placeholder="请输入角色名称"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="权限字符" prop="roleKey">
+      <el-form-item label="权限字符：" prop="roleKey">
         <el-input
           v-model="queryParams.roleKey"
           placeholder="请输入权限字符"
@@ -21,13 +21,13 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item label="状态：" prop="status">
         <el-select
           v-model="queryParams.status"
-          placeholder="角色状态"
+          placeholder="请选择角色状态"
           clearable
           size="small"
-          style="width: 140px"
+          style="width: 160px"
         >
           <el-option
             v-for="dict in statusOptions"
@@ -37,7 +37,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间：">
         <el-date-picker
           v-model="dateRange"
           size="small"
@@ -141,50 +141,64 @@
     />
 
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :before-close="cancel" :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body :before-close="cancel" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="角色名称" prop="roleName">
-          <el-input v-model.trim="form.roleName" placeholder="请输入角色名称" maxlength="20" show-word-limit/>
-        </el-form-item>
-        <el-form-item prop="roleKey">
-          <span slot="label">
-            <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-            权限字符
-          </span>
-          <el-input v-model.trim="form.roleKey" placeholder="请输入权限字符" maxlength="20" show-word-limit />
-        </el-form-item>
-        <el-form-item label="角色顺序" prop="roleSort">
-          <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
-        </el-form-item>
-        <el-form-item label="状态">
-          <el-radio-group v-model="form.status">
-            <el-radio
-              v-for="dict in statusOptions"
-              :key="dict.dictValue"
-              :label="dict.dictValue"
-            >{{dict.dictLabel}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="菜单权限">
-          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
-          <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
-          <el-tree
-            class="tree-border"
-            :data="menuOptions"
-            show-checkbox
-            ref="menu"
-            node-key="id"
-            :check-strictly="!form.menuCheckStrictly"
-            empty-text="加载中，请稍后"
-            :props="defaultProps"
-          ></el-tree>
-        </el-form-item>
-        <el-form-item label="备注">
-          <el-input v-model="form.remark" type="textarea" rows="3" placeholder="请输入内容" maxlength="20" show-word-limit></el-input>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="角色名称" prop="roleName">
+              <el-input v-model.trim="form.roleName" placeholder="请输入角色名称" maxlength="20" show-word-limit/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="roleKey">
+              <span slot="label">
+                <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
+                  <i class="el-icon-question"></i>
+                </el-tooltip>
+                权限字符
+              </span>
+              <el-input v-model.trim="form.roleKey" placeholder="请输入权限字符" maxlength="20" show-word-limit />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="角色顺序" prop="roleSort">
+              <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                >{{dict.dictLabel}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item label="菜单权限">
+              <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
+              <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
+              <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
+              <el-tree
+                class="tree-border"
+                :data="menuOptions"
+                show-checkbox
+                ref="menu"
+                node-key="id"
+                :check-strictly="!form.menuCheckStrictly"
+                empty-text="加载中，请稍后"
+                :props="defaultProps"
+              ></el-tree>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="备注">
+              <el-input v-model="form.remark" type="textarea" rows="3" placeholder="请输入内容" maxlength="20" show-word-limit></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
 
@@ -195,40 +209,50 @@
     </el-dialog>
 
     <!-- 分配角色数据权限对话框 -->
-    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body >
+    <el-dialog :title="title" :visible.sync="openDataScope" width="650px" append-to-body >
       <el-form :model="form" label-width="80px">
-        <el-form-item label="角色名称">
-          <el-input v-model="form.roleName" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="权限字符">
-          <el-input v-model="form.roleKey" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="权限范围">
-          <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
-            <el-option
-              v-for="item in dataScopeOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="数据权限" v-show="form.dataScope == 2">
-          <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
-          <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
-          <el-tree
-            class="tree-border"
-            :data="deptOptions"
-            show-checkbox
-            default-expand-all
-            ref="dept"
-            node-key="id"
-            :check-strictly="!form.deptCheckStrictly"
-            empty-text="加载中，请稍后"
-            :props="defaultProps"
-          ></el-tree>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="角色名称">
+              <el-input v-model="form.roleName" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="权限字符">
+              <el-input v-model="form.roleKey" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="权限范围">
+              <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
+                <el-option
+                  v-for="item in dataScopeOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="数据权限" v-show="form.dataScope == 2">
+              <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
+              <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
+              <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
+              <el-tree
+                class="tree-border"
+                :data="deptOptions"
+                show-checkbox
+                default-expand-all
+                ref="dept"
+                node-key="id"
+                :check-strictly="!form.deptCheckStrictly"
+                empty-text="加载中，请稍后"
+                :props="defaultProps"
+              ></el-tree>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitDataScope" v-if="!loading">确 定</el-button>
@@ -238,7 +262,6 @@
     </el-dialog>
   </div>
 </template>
-
 <script>
 import { listRole, getRole, delRole, addRole, updateRole, exportRole, dataScope, changeRoleStatus } from "@/api/system/role";
 import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";

src/views/system/security/index.vue

@@ -12,7 +12,6 @@
         >新增</el-button>
       </el-col>
     </el-row>
-
     <el-table v-loading="loading" :data="adminList" >
       <el-table-column label="编号" prop="id"  />
       <el-table-column label="密码长度不少于" prop="pwdLength" >
@@ -21,6 +20,13 @@
     　　</template>
       </el-table-column>
       <el-table-column label="账号锁定次数" prop="lockNumber" />
+      <el-table-column label="锁定时间" prop="loseDate" >
+        <template slot-scope="scope">
+          <span>{{scope.row.loseDate == 1 ? "1分钟" : scope.row.loseDate == 5 ? "5分钟" 
+            : scope.row.loseDate == 15 ? "15分钟" : scope.row.loseDate == 30 ? "30分钟" : scope.row.loseDate == 120 ? "2小时" 
+            : scope.row.loseDate == 1440 ? "1天" : ""}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="默认账户" align="center" >
         <template slot-scope="scope">
           <el-switch
@@ -73,21 +79,36 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :before-close="cancel" :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body :before-close="cancel" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-row>
-          <el-col :span="18">
+          <el-col :span="12">
             <el-form-item label="密码长度不少于" prop="pwdLength">
               <el-input-number v-model="form.pwdLength" controls-position="right" :min="0" :max="30" placeholder="请输入密码长度" />
             </el-form-item>
           </el-col>
-          <el-col :span="18">
+          <el-col :span="12">
             <el-form-item label="账号锁定次数" prop="lockNumber" >
               <el-input-number v-model="form.lockNumber" controls-position="right" :min="0" :max="10" placeholder="请输入账号锁定次数" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="锁定时间" prop="loseDate" >
+              <el-select
+                v-model="form.loseDate"
+                placeholder="请选择锁定时间"
+                size="small"
+              >
+                <el-option
+                  v-for="item in loseDateList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="默认账户" prop="isEnable">
               <el-switch
@@ -151,7 +172,6 @@ export default {
         children: "children",
         label: "label"
       },
-
       // 表单校验
       rules: {
         pwdLength: [
@@ -160,8 +180,18 @@ export default {
         lockNumber: [
           { required: true, message: "锁定次数不能为空", trigger: ["blur",'change']}
         ],
-
-      }
+        loseDate:[
+          { required: true, message: "锁定时间不能为空", trigger: ["blur",'change']}
+        ]
+      },
+      loseDateList:[//锁定时间
+        {value:1,label:"1分钟"},
+        {value:5,label:"5分钟"},
+        {value:15,label:"15分钟"},
+        {value:30,label:"30分钟"},
+        {value:120,label:"2小时"},
+        {value:1440,label:"1天"},
+      ]
     };
   },
   created() {

src/views/system/user/index.vue

@@ -97,8 +97,6 @@
             >删除</el-button>
           </el-form-item>
         </el-form>
-
-
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" height="calc(100vh - 10vh - 120px)">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" show-overflow-tooltip />
@@ -175,7 +173,7 @@
     </el-row>
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :before-close="cancel" :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body :before-close="cancel" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -233,7 +231,6 @@
                   v-for="dict in statusOptions"
                   :key="dict.dictValue"
                   :label="dict.dictValue"
-                  @change="fff"
                 >{{dict.dictLabel}}</el-radio>
               </el-radio-group>
             </el-form-item>
@@ -466,9 +463,6 @@ export default {
     });
   },
   methods: {
-    fff(e){
-      console.log(e)
-    },
     //强制el-input刷新
     onInput(){
         this.$forceUpdate();
@@ -592,14 +586,11 @@ export default {
         this.form = response.data.data;
         this.postOptions = response.data.posts
         this.roleOptions = response.data.roles;
-       
-
         this.form.postId = response.data.postIds[0]
         this.form.roleId = response.data.roleIds[0]
-          this.open = true;
-          this.title = "修改用户";
-          this.form.password = "";
-        
+        this.open = true;
+        this.title = "修改用户";
+        this.form.password = "";
       });
     },
     /** 重置密码按钮操作 */