Merge branch 'dev-新新版' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-新新版

src/assets/scss/buttonstyle.scss

@@ -130,7 +130,7 @@
 .div-table-button--blue {
   font-size: 14px !important;
   font-family: Source Han Serif CN !important;
-  font-weight: 600 !important;
+  font-weight: 400 !important;
   color: #0056D6 !important;
 }
 .div-table-button--red {

src/views/modules/base/community/buildTable.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="div_table">
 
     <div class="div_btn">
       <div class="div_btn_left">
@@ -125,7 +125,6 @@
                 :show-overflow-tooltip="true"
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="tableHeaderStyle"
                 style="width: 100%"
                 @select-all="selectAll"
                 @selection-change="selectionChange">
@@ -225,25 +224,28 @@
 
         <el-table-column label="操作"
                          fixed="right"
-                         width="160"
+                         width="220"
                          header-align="center"
                          align="center"
                          class="operate">
           <template slot-scope="scope">
 
             <el-button type="text"
-                       class="div-table-button--orange"
+                       class="div-table-button--blue"
+                       icon="el-icon-tickets"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
             <el-button v-if="scope.row.showBtn"
                        type="text"
                        class="div-table-button--blue"
+                       icon="el-icon-edit"
                        size="small"
-                       @click="handleEdit(scope.row)">修改</el-button>
+                       @click="handleEdit(scope.row)">编辑</el-button>
 
             <el-button v-if="scope.row.showBtn"
                        type="text"
-                       class="div-table-button--red"
+                       class="div-table-button--blue"
+                       icon="el-icon-delete"
                        size="small"
                        @click="handleDelete(scope.row)">删除</el-button>
           </template>

src/views/modules/base/community/community.vue

@@ -22,6 +22,9 @@
 
           <span slot-scope="{ node, data }"
                 class="custom-tree-node">
+            <img v-if="data.level==='building'"
+                 src="@/assets/img/icon-add.png"
+                 style="height:14px;width:14px;margin-right:5px;margin-top:-3px">
             <span :id="data.id">{{ data.showName }}</span>
           </span>
         </el-tree>

src/views/modules/base/community/communityTable.vue

@@ -214,26 +214,29 @@
 
         <el-table-column label="操作"
                          fixed="right"
-                         width="160"
+                         width="220"
                          header-align="center"
                          align="center"
                          class="operate">
           <template slot-scope="scope">
 
             <el-button type="text"
-                       class="div-table-button--orange"
+                       class="div-table-button--blue"
+                       icon="el-icon-tickets"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
             <el-button v-if="scope.row.showBtn"
                        type="text"
                        class="div-table-button--blue"
                        size="small"
-                       @click="handleEdit(scope.row)">修改</el-button>
+                       icon="el-icon-edit"
+                       @click="handleEdit(scope.row)">编辑</el-button>
 
             <el-button v-if="scope.row.showBtn"
                        type="text"
-                       class="div-table-button--red"
+                       class="div-table-button--blue"
                        size="small"
+                       icon="el-icon-delete"
                        @click="handleDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>

src/views/modules/base/community/roomTable.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="div_table">
     <div class="div_btn">
       <div class="div_btn_left">
         <el-button v-if="agencyObj.level === 'building' || source !== 'search'"
@@ -104,7 +104,6 @@
     <div class="div_table_item">
       <el-table ref="ref_table"
                 :data="tableData"
-                :header-cell-style="tableHeaderStyle"
                 v-loading="tableLoading"
                 @sort-change="handleSortOrderChange"
                 border
@@ -222,25 +221,28 @@
         </el-table-column>
         <el-table-column label="操作"
                          fixed="right"
-                         width="160"
+                         width="220"
                          header-align="center"
                          align="center"
                          class="operate">
           <template slot-scope="scope">
             <el-button type="text"
                        v-if="btnAuths.ic_house_view"
-                       class="div-table-button--orange"
+                       class="div-table-button--blue"
                        size="small"
+                       icon="el-icon-tickets"
                        @click="handleDetail(scope.row)">查看</el-button>
             <el-button v-if="btnAuths.ic_house_update && scope.row.showBtn"
                        type="text"
                        class="div-table-button--blue"
+                       icon="el-icon-edit"
                        size="small"
-                       @click="handleEdit(scope.row)">修改</el-button>
+                       @click="handleEdit(scope.row)">编辑</el-button>
 
             <el-button v-if="btnAuths.ic_house_del && scope.row.showBtn"
                        type="text"
-                       class="div-table-button--red"
+                       class="div-table-button--blue"
+                       icon="el-icon-delete"
                        size="small"
                        @click="handleDelete(scope.row)">删除</el-button>
           </template>
@@ -355,7 +357,7 @@ export default {
         ic_house_smart_import: false, //智能填表
         ic_house_del: false, //删除
         ic_house_view: false, //查看
-        ic_house_update: false, //修改
+        ic_house_update: false, //编辑
         ic_house_view_real_data: false, //显示脱敏信息
       },
     };