Merge commit '497a3b9697ae32bbee55f6378a286ad61ed8aa81' into gzb

src/assets/less/common.less

@@ -359,6 +359,9 @@ fieldset[disabled] .ivu-input,
 // 多选框禁用时选中颜色修改
 .ivu-checkbox-indeterminate.ivu-checkbox-disabled,
 .ivu-checkbox-disabled {
+  & + span {
+    color: #798cb5;
+  }
   &.ivu-checkbox-checked .ivu-checkbox-inner,
   .ivu-checkbox-inner {
     background-color: #d2dbf3;

src/views/schoolSection/networkManage/whitelist.vue

@@ -31,8 +31,19 @@
           <div class="action_list">
             <div @click="toView(row)" v-if="row.whiteType !== 2">查看</div>
             <div @click="toEdit(row)" v-if="row.whiteType !== 2">编辑</div>
-            <div class="action_del" @click="toDel(row)">
-              {{ row.whiteType === 2 ? "移除" : "删除" }}
+            <div
+              class="action_del"
+              v-if="row.whiteType === 2 && row.rtype === 3"
+              @click="toDel(row)"
+            >
+              移除
+            </div>
+            <div
+              class="action_del"
+              v-else-if="row.whiteType !== 2"
+              @click="toDel(row)"
+            >
+              删除
             </div>
           </div>
         </template>