合并分支 'thy' 到 'master'

src/assets/changeElementStyle.css

@@ -166,9 +166,9 @@
 
 /*checkbox选择款*/
 .el-checkbox__input.is-disabled .el-checkbox__inner,.el-checkbox__input.is-checked .el-checkbox__inner{
-    width: 21px;
-    height: 21px;
-    background-image: url("../assets/img/click.png");
+    width: 16px;
+    height: 16px;
+    background-image: url("../assets/img/check_click.png");
     background-repeat: no-repeat;
     background-size: 100% 100%;
     -moz-background-size: 100% 100%;
@@ -176,9 +176,9 @@
     border-color: rgba(0,0,0,0);
 }
 .el-checkbox__inner{
-    width: 21px;
-    height: 21px;
-    background-image: url("../assets/img/clickN.png");
+    width: 16px;
+    height: 16px;
+    background-image: url("../assets/img/check_clickN.png");
     background-repeat: no-repeat;
     background-size: 100% 100%;
     -moz-background-size: 100% 100%;

src/components/roleDispose/roleDispose.vue

@@ -53,7 +53,7 @@
                 align="center">
                 <template slot-scope="scope">
                   <span class="change revise" @click="edit(scope.row)"><span class="img-revise"></span>修改</span>
-                  <span class="change delete" @click="deleteRule(scope.row)"><span class="img"><img src="./img/role-delete.png"/></span>删除</span>
+                  <span class="change delete" @click="deleteRule(scope.row.id)"><span class="img"><img src="./img/role-delete.png"/></span>删除</span>
                 </template>
               </el-table-column>
             </el-table>

src/services/server.js

@@ -346,10 +346,10 @@ const server = {
             data: data
         })
     },
-    delConfig(data){ // 规则配置删除
-        return axios( assess + '/rule/',{
+    delConfig(id){ // 规则配置删除
+        return axios( assess + '/rule/' + id,{
             method: 'delete',
-            data: data
+           
         })
     },
     getConfigPageList(page,size,data){ // 未知规则配置搜索