Merge remote-tracking branch 'origin/master'

src/views/category/fieldManage/index.vue

@@ -11,8 +11,8 @@
     <el-table ref="fieldTable" v-loading="crud.loading" :data="crud.data" style="min-width: 100%;" height="calc(100vh - 302px)" crud-tag="field" @selection-change="selectionChangeHandler" @row-click="clickRowHandler">
       <el-table-column type="selection" width="55" />
       <el-table-column type="index" label="序号" width="55" />
-      <el-table-column prop="fieldCnName" label="字段名称" min-width="140" />
-      <el-table-column prop="fieldName" label="字段标识" min-width="140" />
+      <el-table-column prop="fieldCnName" label="字段名称" min-width="145" show-overflow-tooltip />
+      <el-table-column prop="fieldName" label="字段标识" min-width="145" show-overflow-tooltip />
       <el-table-column label="数据类型" min-width="85">
         <template slot-scope="scope">
           <span v-if="scope.row.isDataType === 1">字符</span>
@@ -30,7 +30,7 @@
           <span v-if="scope.row.isInputClass === 'textarea'">文本域</span>
         </template>
       </el-table-column>
-      <el-table-column prop="dictionaryConfigId.dicName" label="对应字典" min-width="85" />
+      <el-table-column prop="dictionaryConfigId.dicName" label="对应字典" min-width="85" show-overflow-tooltip />
       <el-table-column prop="editLength" label="显示长度" min-width="85" />
       <el-table-column label="显示一整行" min-width="110" align="center">
         <template slot-scope="scope">

src/views/login.vue

@@ -14,7 +14,7 @@
           v-model="loginForm.username"
           type="text"
           auto-complete="off"
-          placeholder="账号"
+          placeholder="登录账号"
         >
           <svg-icon
             slot="prefix"
@@ -103,7 +103,7 @@ export default {
       },
       loginRules: {
         username: [
-          { required: true, trigger: 'blur', message: '用户名不能为空' }
+          { required: true, trigger: 'blur', message: '登录账号不能为空' }
         ],
         password: [
           { required: true, trigger: 'blur', message: '密码不能为空' }

src/views/storeManage/deviceManage/module/deviceDetail.vue

@@ -160,22 +160,22 @@
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" height="calc(100vh - 295px)" @selection-change="selectionChangeHandler" @row-click="clickRowHandler">
         <el-table-column align="center" type="selection" width="50" />
         <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column align="center" prop="storeroomId.name" label="所属区域" width="100" />
+        <el-table-column align="center" prop="storeroomId.name" label="所属区域" width="100" show-overflow-tooltip />
         <el-table-column align="center" label="设备状态" width="100">
           <template slot-scope="scope">
             <span :class="{ 'spk-a': scope.row.deviceState === 1 }" />
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="deviceTypeId.name" label="设备类型" />
-        <el-table-column align="center" prop="supplierId.name" label="设备厂商" width="100" />
-        <el-table-column align="center" prop="deviceName" label="设备名称" />
-        <el-table-column align="center" label="设备ID">
+        <el-table-column align="center" prop="deviceTypeId.name" label="设备类型" show-overflow-tooltip />
+        <el-table-column align="center" prop="supplierId.name" label="设备厂商" width="100" show-overflow-tooltip />
+        <el-table-column align="center" prop="deviceName" label="设备名称" show-overflow-tooltip />
+        <el-table-column align="center" label="设备ID" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="scope.row.deviceId"> {{ scope.row.deviceId }} </span>
             <span v-else>——</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="接口IP" width="120">
+        <el-table-column align="center" label="接口IP" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="scope.row.deviceIp"> {{ scope.row.deviceIp }} </span>
             <span v-else>——</span>

src/views/storeManage/tagManage/bindTagList/index.vue

@@ -5,8 +5,8 @@
         <el-select slot="prepend" v-model="query.isType" class="filter-item" style="width: 130px;height:30px;margin-right:10px" @change="initData">
           <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
-        <el-input v-model="query[inputSelect]" clearable size="small" placeholder="请输入关键词" style="width: 200px;" class="input-prepend filter-item" @keyup.enter.native="initData">
-          <el-select slot="prepend" v-model="inputSelect" style="width: 80px">
+        <el-input v-model="query[inputSelect]" clearable size="small" placeholder="请输入关键词" style="width: 250px;" class="input-prepend filter-item" @keyup.enter.native="initData">
+          <el-select slot="prepend" v-model="inputSelect" style="width: 100px;">
             <el-option v-for="item in queryOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-input>
@@ -15,7 +15,8 @@
       <div class="archives-handler-btn">
         <!-- iconfont icon-weibiaoti-2 -->
         <el-button class="lending-btn" type="primary" :loading="unbindBtnLoading" @click="unbind()">
-          <svg-icon icon-class="remove_bind" class-name="svg-style" style="margin-right:8px" />解除绑定</el-button>
+          <svg-icon icon-class="remove_bind" class-name="svg-style" style="margin-right:8px" />解除绑定
+        </el-button>
       </div>
     </div>
     <el-table ref="table" v-loading="loading" :data="bindTagList" style="width: 100%;" height="calc(100vh - 357px)" @row-click="clickRowHandler" @selection-change="selectionChangeHandler">
@@ -97,7 +98,7 @@ export default {
         },
         {
           label: '标签名称',
-          value: 'tagName'
+          value: 'query'
         }
       ],
       unbindVisible: false,
@@ -177,23 +178,26 @@ export default {
 
 <style lang="scss" scoped>
 @import "~@/assets/styles/archives-manage.scss";
-.header{
+.header {
   display: flex;
   justify-content: space-between;
   padding-top: 0;
   margin-top: -10px;
-  .head-left{
-    .el-button{
-      margin-left:-10px ;
-      background-color: #3A99FD;
-      &:hover{
-        background-color: #02255F;
+  .head-left {
+    .el-button {
+      margin-left: -10px;
+      background-color: #3a99fd;
+      &:hover {
+        background-color: #02255f;
       }
     }
   }
 }
-.archives-handler-btn .el-button{
+.archives-handler-btn .el-button {
   height: 30px;
   width: 106px;
 }
+::v-deep .input-prepend .el-input__inner {
+    padding-left: 100px;
+}
 </style>