Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

src/views/SystemManage/GroupManage.vue

@@ -585,13 +585,25 @@
               show-overflow-tooltip
             >
             </el-table-column>
-            <el-table-column
-              prop="status"
-              label="启用状态"
-              show-overflow-tooltip
-            >
+
+            <el-table-column prop="status" label="启用状态" width="auto">
+              <template slot-scope="scope">
+                <div v-if="scope.row.status === 0" class="circle-red"></div>
+                <div v-if="scope.row.status === 1" class="circle-blue"></div>
+                {{
+                  scope.row.status === 0
+                    ? "停用"
+                    : scope.row.status === 1
+                    ? "启用"
+                    : "无状态"
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="unitname" label="操作"> 
+              <template slot-scope="scope">
+                
+              </template>
             </el-table-column>
-            <el-table-column prop="unitname" label="操作"> </el-table-column>
           </el-table>
         </div>
       </div>

src/views/SystemManage/scss/group.scss

+.circle-red {
+  display: inline-block;
+  width: 8px;
+  height: 8px;
+  background-color: #fe0000;
+  border-radius: 50%;
+  -moz-border-radius: 50%;
+  -webkit-border-radius: 50%;
+}
+.circle-blue {
+  display: inline-block;
+  width: 8px;
+  height: 8px;
+  background-color: #00b47a;
+  border-radius: 50%;
+  -moz-border-radius: 50%;
+  -webkit-border-radius: 50%;
+}
+
 .tooTipBtn {
   padding: 10px;
   max-height: 317px;
@@ -184,6 +203,7 @@
     }
   }
 
+
   .table-data {
     height: 580px;
     width: 100%;