Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

src/components/icss/IndeptLabel.vue

@@ -66,7 +66,7 @@
                     <template slot-scope="scope">
                         <el-button  @click="modifyIndeptTag(scope.row)" type="text" size="small">修改</el-button>
                         <span style="margin:0 3px;">|</span>
-                        <el-button @click="showDelDialog(scope.row.id)" class="delete" type="text" size="small">删除</el-button>
+                        <el-button @click="showDelDialog(scope.row)" class="delete" type="text" size="small">删除</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -220,9 +220,13 @@
           resolve();
         }).catch(() => {});
       },
-      showDelDialog(id){
+      showDelDialog(row){
+        const param = {
+          "ids": row.id,
+          "type": row.type
+        }
         this.showConfirmDialog('是否删除该标签？',()=>{
-          api.deleteTagGroup({ids:id}).then((res)=>{
+          api.deleteTagGroup(param).then((res)=>{
             if(res.data.code=='0'){
               this.getDataList();
               this.warning(res.data.msg || '操作成功','success');