Merge branch 'master-500-dev-xwx' into 'master-500-dev'

乙方运维按钮样式优化



See merge request !664

@@ -2,8 +2,8 @@
     <div>
     <div>
         <!--  人员信息总汇-->
         <!--  人员信息总汇-->
         <el-divider content-position="left">人员信息汇总</el-divider>
         <el-divider content-position="left">人员信息汇总</el-divider>
-        <el-button  @click="deleteUser()" style="float:right;margin-right: 6px;margin-bottom: 6px">删除</el-button>
-        <el-button  @click="add" style="float:right;margin-right: 6px;margin-bottom: 6px">录入</el-button>
+        <el-button  @click="deleteUser()" :size="$global.elementConfig.size.button" style="float:right;margin-right: 6px;margin-bottom: 6px">删除</el-button>
+        <el-button  @click="add" :size="$global.elementConfig.size.button" style="float:right;margin-right: 6px;margin-bottom: 6px">录入</el-button>
         <cm-table-page :columns="columns" :dataList="dataList" @loaddata="getPage"@selectionChange="selectionChange" :showIndex="true"
         <cm-table-page :columns="columns" :dataList="dataList" @loaddata="getPage"@selectionChange="selectionChange" :showIndex="true"
                        :showBorder="true" :currentPage="currentPage" :total="total" :loading="false" :showSelection="true"
                        :showBorder="true" :currentPage="currentPage" :total="total" :loading="false" :showSelection="true"
                        :showPage="true" :showTools="true" :height="height" :pageSize="pageSize">
                        :showPage="true" :showTools="true" :height="height" :pageSize="pageSize">

@@ -194,7 +194,7 @@ export default {
                 id.value = row.id
                 id.value = row.id
             }
             }
             if (id.value == null || id.value ==undefined){
             if (id.value == null || id.value ==undefined){
-                proxy.$global.showMsg("请选择用户！","error");
+                proxy.$global.showMsg("请选择需要操作的用户！",'warning');
                 return;
                 return;
             }
             }
             let params={
             let params={