Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

.env.development

@@ -10,12 +10,16 @@ ENV = 'development'
 #罗俊
 # VUE_APP_BASE_API = 'http://10.87.10.49:8080'
 #罗伟
-#VUE_APP_BASE_API = 'http://10.87.10.47:8080'
+VUE_APP_BASE_API = 'http://10.87.10.47:8080'
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
 VUE_APP_BASE_API = 'http://localhost:8080'
 # 55环境
+<<<<<<< HEAD
+#VUE_APP_BASE_API = 'http://10.87.10.55:8080'
+=======
 # VUE_APP_BASE_API = 'http://10.87.10.55:8080'
+>>>>>>> 4bda146fa837db2153388b1119c8ac2e77cc00d6
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/views/system/device/index.vue

@@ -1,12 +1,11 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-  <!--机构数据-->
-  <el-col :span="4" :xs="24">
+      <!--机构数据-->
+      <el-col :span="4" :xs="24">
                   <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @defaultOrg="getDefaultOrg" @checkChange="checkChange"
                     @click="clickTreeNode"></org-tree>
       </el-col>
-     
         <el-col :span="20" :xs="24">
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
             label-width="68px">
@@ -39,10 +38,9 @@
 
           <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                v-hasPermi="['system:device:add']">新增</el-button>
+           
+                <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:device:add']">新增</el-button>
             </el-col>
-         
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           </el-row>
 
@@ -328,6 +326,9 @@ export default {
       debugger
       this.form.orgName = node.name;
     },
+    getDefaultOrg(org){
+      this.orgName = org.name;
+    },
     getDefaultKey(key) {
       this.queryParams.orgId = key;
       this.getList();