合并分支 'crs' 到 'master'

src/components/basicInformation/person/person.vue

@@ -40,6 +40,7 @@
                                 max-height="840"
                                 :data="allData"
                                 stripe
+                                @row-click="read"
                                 style="width: 100%;">
                             <el-table-column
                                     prop="name"
@@ -61,13 +62,6 @@
                                     label="联系方式"
                                     align="center">
                             </el-table-column>
-                            <el-table-column
-                                    label="查看"
-                                    align="center">
-                                <template slot-scope="scope">
-                                    <span class="change" @click="read(scope.row)"><img src="./img/look.png">查看</span>
-                                </template>
-                            </el-table-column>
                         </el-table>
                     </div>
                     <!-- 分页 -->
@@ -197,8 +191,8 @@ export default {
             this.openModel = false;
         },
         // 查看
-        read(val) {
-            this.$router.push({name: 'personPage',params:{'value': val}});
+        read(row) {
+            this.$router.push({name: 'personPage',params:{'value': row}});
         },
         // 新增人员
         addperson() {

src/components/basicInformation/person/personPage.vue

@@ -34,7 +34,7 @@
                             </p>
                             <p class="search">
                                 <span class="value">
-                                    <span>公司：</span>
+                                    <span>单位：</span>
                                     <el-input v-model="allVal.unit" size="medium" :disabled="true"></el-input>
                                 </span>
                             </p>
@@ -44,7 +44,8 @@
                                 <span>状态：</span>
                                 <img src="./img/click.png" style="width: 21px;height: 21px;" v-if="allVal.status === 1">
                                 <img src="./img/clickN.png" style="width: 21px;height: 21px;" v-if="allVal.status === 0">
-                                <span class="Sfont">在线</span>
+                                <span class="Sfont" v-if="allVal.status === 0">未删除</span>
+                                <span class="Sfont" v-if="allVal.status === 1">已删除</span>
                             </p>
                         </el-col>
                         <el-col :span="10">

src/components/home/home.vue

@@ -196,9 +196,9 @@ export default {
     .firstHome .XCmenu .line{
         display: inline-block;
         position: absolute;
-        top: 5px;
+        top: 15px;
         right: 0px;
-        height: 150px;
+        height: 130px;
         width: 1px;
         background: #4877e6;
     }