Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/admin_home

src/router/index.js

@@ -417,6 +417,22 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/gather',
+    component: Layout,
+    children: [
+      {
+        name: '',
+        path: '',
+        component: () => import('@/views/crawler/gather'),
+        meta: {
+          title: '采集器',
+          hidden: true,
+          breadcrumb: true
+        }
+      }
+    ]
+  },
   {
     path: '/creatTopic',
     component: Layout,

src/views/complaint/complaintList.vue

@@ -155,7 +155,7 @@
                   </el-radio-group>
                 </div>
                 <!--行政-->
-                <div v-if="form.nature==15" class="natureRadioBoxItem">
+                <div v-if="form.nature==104" class="natureRadioBoxItem">
                   <el-radio-group v-model="form.nature_level0">
                     <el-radio :label="item.id" v-for="item in windowNatureData[2].children[0].children" :key="item.id">{{item.type_name}}</el-radio>
                   </el-radio-group>
@@ -164,7 +164,7 @@
                   <el-input v-model="form.other" placeholder="请输入"></el-input>
                 </div>
                 <!--非讼-->
-                <div v-if="form.nature==104" class="natureRadioBoxItem">
+                <div v-if="form.nature==15" class="natureRadioBoxItem">
                   <el-radio-group v-model="form.nature_level0">
                     <el-radio :label="item.id" v-for="item in windowNatureData[3].children[0].children" :key="item.id">{{item.type_name}}</el-radio>
                   </el-radio-group>

src/views/crawler/gather.vue

@@ -0,0 +1,15 @@
+<template>
+    <div style="height: calc(100vh - 84px);">
+      <iframe :src="externalUrl" frameborder="0" width="100%" height="100%"></iframe>
+    </div>
+  </template>
+   
+  <script>
+  export default {
+    data() {
+      return {
+        externalUrl: 'https://cjq.wngluo.org.cn/index.php?s=/admin/backstage/index' // 外部页面的 URL
+      };
+    }
+  }
+  </script>

src/views/website/websiteColumn.vue

@@ -96,7 +96,8 @@
               >
               <template slot-scope="{ node, data }">
                 <span>{{ data.name }}</span>
-                <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+                <!-- <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span> -->
+                <span>({{ data.id }})</span>
               </template>
             </el-cascader>
           </el-form-item>