diff --git a/src/api/zongzhi/netSecurity/SafetyYh/index.js b/src/api/zongzhi/netSecurity/SafetyYh/index.js
index e69de29..d6a678c 100644
--- a/src/api/zongzhi/netSecurity/SafetyYh/index.js
+++ b/src/api/zongzhi/netSecurity/SafetyYh/index.js
@@ -0,0 +1,53 @@
+import request from "@/utils/request";
+
+// 查询安全隐患列表
+export function listDanger(query) {
+  return request({
+    url: "/zongzhi/danger/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询安全隐患详细
+export function getDanger(id) {
+  return request({
+    url: "/zongzhi/danger/" + id,
+    method: "get",
+  });
+}
+
+// 新增安全隐患
+export function addDanger(data) {
+  return request({
+    url: "/zongzhi/danger",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改安全隐患
+export function updateDanger(data) {
+  return request({
+    url: "/zongzhi/danger",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除安全隐患
+export function delDanger(id) {
+  return request({
+    url: "/zongzhi/danger/" + id,
+    method: "delete",
+  });
+}
+
+// 导出安全隐患
+export function exportDanger(data) {
+  return request({
+    url: "/zongzhi/danger/export",
+    method: "post",
+    data,
+  });
+}
diff --git a/src/api/zongzhi/netZoology/netArticle/index.js b/src/api/zongzhi/netZoology/netArticle/index.js
index e69de29..aa3ccb3 100644
--- a/src/api/zongzhi/netZoology/netArticle/index.js
+++ b/src/api/zongzhi/netZoology/netArticle/index.js
@@ -0,0 +1,53 @@
+import request from "@/utils/request";
+
+// 查询网络文章列表
+export function listArticle(query) {
+  return request({
+    url: "/zongzhi/article/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询网络文章详细
+export function getArticle(id) {
+  return request({
+    url: "/zongzhi/article/" + id,
+    method: "get",
+  });
+}
+
+// 新增网络文章
+export function addArticle(data) {
+  return request({
+    url: "/zongzhi/article",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改网络文章
+export function updateArticle(data) {
+  return request({
+    url: "/zongzhi/article",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除网络文章
+export function delArticle(id) {
+  return request({
+    url: "/zongzhi/article/" + id,
+    method: "delete",
+  });
+}
+
+// 导出网络文章
+export function exportArticle(data) {
+  return request({
+    url: "/zongzhi/article/export",
+    method: "post",
+    data,
+  });
+}
diff --git a/src/api/zongzhi/netZoology/netMqPrincipal/index.js b/src/api/zongzhi/netZoology/netMqPrincipal/index.js
index e69de29..c541ae4 100644
--- a/src/api/zongzhi/netZoology/netMqPrincipal/index.js
+++ b/src/api/zongzhi/netZoology/netMqPrincipal/index.js
@@ -0,0 +1,53 @@
+import request from "@/utils/request";
+
+// 查询网络民情责任人列表
+export function listPrincipal(query) {
+  return request({
+    url: "/zongzhi/principal/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询网络民情责任人详细
+export function getPrincipal(id) {
+  return request({
+    url: "/zongzhi/principal/" + id,
+    method: "get",
+  });
+}
+
+// 新增网络民情责任人
+export function addPrincipal(data) {
+  return request({
+    url: "/zongzhi/principal",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改网络民情责任人
+export function updatePrincipal(data) {
+  return request({
+    url: "/zongzhi/principal",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除网络民情责任人
+export function delPrincipal(id) {
+  return request({
+    url: "/zongzhi/principal/" + id,
+    method: "delete",
+  });
+}
+
+// 导出网络民情责任人
+export function exportPrincipal(data) {
+  return request({
+    url: "/zongzhi/principal/export",
+    method: "post",
+    data,
+  });
+}
diff --git a/src/api/zongzhi/netZoology/netSafetyZcUnit/index.js b/src/api/zongzhi/netZoology/netSafetyZcUnit/index.js
index e69de29..359195b 100644
--- a/src/api/zongzhi/netZoology/netSafetyZcUnit/index.js
+++ b/src/api/zongzhi/netZoology/netSafetyZcUnit/index.js
@@ -0,0 +1,53 @@
+import request from "@/utils/request";
+
+// 查询网络安全支持单位列表
+export function listNetSafetyZcUnit(query) {
+  return request({
+    url: "/zongzhi/netSafetyZcUnit/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询网络安全支持单位详细
+export function getNetSafetyZcUnit(id) {
+  return request({
+    url: "/zongzhi/netSafetyZcUnit/" + id,
+    method: "get",
+  });
+}
+
+// 新增网络安全支持单位
+export function addNetSafetyZcUnit(data) {
+  return request({
+    url: "/zongzhi/netSafetyZcUnit",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改网络安全支持单位
+export function updateNetSafetyZcUnit(data) {
+  return request({
+    url: "/zongzhi/netSafetyZcUnit",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除网络安全支持单位
+export function delNetSafetyZcUnit(id) {
+  return request({
+    url: "/zongzhi/netSafetyZcUnit/" + id,
+    method: "delete",
+  });
+}
+
+// 导出网络安全支持单位
+export function exportNetSafetyZcUnit(data) {
+  return request({
+    url: "/zongzhi/netSafetyZcUnit/export",
+    method: "post",
+    data,
+  });
+}
diff --git a/src/api/zongzhi/netZoology/netVolunteer/index.js b/src/api/zongzhi/netZoology/netVolunteer/index.js
index e69de29..801387a 100644
--- a/src/api/zongzhi/netZoology/netVolunteer/index.js
+++ b/src/api/zongzhi/netZoology/netVolunteer/index.js
@@ -0,0 +1,53 @@
+import request from "@/utils/request";
+
+// 查询网络文明自愿者列表
+export function listVolunteer(query) {
+  return request({
+    url: "/zongzhi/volunteer/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询网络文明自愿者详细
+export function getVolunteer(id) {
+  return request({
+    url: "/zongzhi/volunteer/" + id,
+    method: "get",
+  });
+}
+
+// 新增网络文明自愿者
+export function addVolunteer(data) {
+  return request({
+    url: "/zongzhi/volunteer",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改网络文明自愿者
+export function updateVolunteer(data) {
+  return request({
+    url: "/zongzhi/volunteer",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除网络文明自愿者
+export function delVolunteer(id) {
+  return request({
+    url: "/zongzhi/volunteer/" + id,
+    method: "delete",
+  });
+}
+
+// 导出网络文明自愿者
+export function exportVolunteer(data) {
+  return request({
+    url: "/zongzhi/volunteer/export",
+    method: "post",
+    data,
+  });
+}
diff --git a/src/utils/myselfFu.js b/src/utils/myselfFu.js
index 6c7d063..c8f9e03 100644
--- a/src/utils/myselfFu.js
+++ b/src/utils/myselfFu.js
@@ -1,6 +1,6 @@
 import store from "@/store";
 
-// 翻译区域id
+// 翻译区域
 export function filterTown(id) {
   if (id == undefined) return;
   let name = store.getters.townList.filter((item) => item.value == id);
diff --git a/src/views/netManage/enterpriseMl/index.vue b/src/views/netManage/enterpriseMl/index.vue
index 3078349..d9fca8c 100644
--- a/src/views/netManage/enterpriseMl/index.vue
+++ b/src/views/netManage/enterpriseMl/index.vue
@@ -166,7 +166,7 @@
         label-width="auto"
         class="dialog-from"
       >
-        <el-form-item label="区域id" prop="areaId">
+        <el-form-item label="区域" prop="areaId">
           <el-select v-model="form.areaId" placeholder="请选择区域" filterable>
             <el-option
               v-for="dict in townList"
@@ -250,7 +250,7 @@
         border
         labelClassName="desLable"
       >
-        <el-descriptions-item label="区域id">{{
+        <el-descriptions-item label="区域">{{
           $filterTown(form.areaId)
         }}</el-descriptions-item>
 
diff --git a/src/views/netManage/netPlatform/index.vue b/src/views/netManage/netPlatform/index.vue
index fdf7800..34d7446 100644
--- a/src/views/netManage/netPlatform/index.vue
+++ b/src/views/netManage/netPlatform/index.vue
@@ -132,7 +132,7 @@
         label-width="auto"
         class="dialog-from"
       >
-        <el-form-item label="区域id" prop="areaId">
+        <el-form-item label="区域" prop="areaId">
           <el-select v-model="form.areaId" placeholder="请选择区域" filterable>
             <el-option
               v-for="dict in townList"
@@ -216,7 +216,7 @@
         border
         labelClassName="desLable"
       >
-        <el-descriptions-item label="区域id">{{
+        <el-descriptions-item label="区域">{{
           $filterTown(form.areaId)
         }}</el-descriptions-item>
 
diff --git a/src/views/netManage/netReport/index.vue b/src/views/netManage/netReport/index.vue
index 765dd2e..e992de6 100644
--- a/src/views/netManage/netReport/index.vue
+++ b/src/views/netManage/netReport/index.vue
@@ -200,8 +200,8 @@
         label-width="auto"
         class="dialog-from"
       >
-        <el-form-item label="区域id" prop="areaId">
-          <el-input v-model="form.areaId" placeholder="请输入区域id" />
+        <el-form-item label="区域" prop="areaId">
+          <el-input v-model="form.areaId" placeholder="请输入区域" />
         </el-form-item>
         <el-form-item label="举报人" prop="jbMan">
           <el-input v-model="form.jbMan" placeholder="请输入举报人" />
@@ -278,7 +278,7 @@
         border
         labelClassName="desLable"
       >
-        <el-descriptions-item label="区域id">{{
+        <el-descriptions-item label="区域">{{
           form.areaId
         }}</el-descriptions-item>
 
diff --git a/src/views/netManage/qlzx/index.vue b/src/views/netManage/qlzx/index.vue
index 60c9cb3..e1d7b81 100644
--- a/src/views/netManage/qlzx/index.vue
+++ b/src/views/netManage/qlzx/index.vue
@@ -97,7 +97,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="区域id" align="center" prop="areaId">
+      <el-table-column label="区域" align="center" prop="areaId">
         <template slot-scope="scope">
           {{ $filterTown(scope.row.areaId) }}
         </template>
@@ -177,7 +177,7 @@
         label-width="auto"
         class="dialog-from"
       >
-        <el-form-item label="区域id" prop="areaId">
+        <el-form-item label="区域" prop="areaId">
           <el-select v-model="form.areaId" placeholder="请选择区域" filterable>
             <el-option
               v-for="dict in townList"
@@ -248,7 +248,7 @@
         border
         labelClassName="desLable"
       >
-        <el-descriptions-item label="区域id">{{
+        <el-descriptions-item label="区域">{{
           form.areaId
         }}</el-descriptions-item>
 
diff --git a/src/views/netManage/supervise/index.vue b/src/views/netManage/supervise/index.vue
index 3720756..0d1d70c 100644
--- a/src/views/netManage/supervise/index.vue
+++ b/src/views/netManage/supervise/index.vue
@@ -77,7 +77,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="区域id" align="center" prop="areaId">
+      <el-table-column label="区域" align="center" prop="areaId">
         <template slot-scope="scope">
           {{ $filterTown(scope.row.areaId) }}
         </template>
@@ -153,7 +153,7 @@
         label-width="auto"
         class="dialog-from"
       >
-        <el-form-item label="区域id" prop="areaId">
+        <el-form-item label="区域" prop="areaId">
           <el-select v-model="form.areaId" placeholder="请选择区域" filterable>
             <el-option
               v-for="dict in townList"
@@ -215,7 +215,7 @@
         border
         labelClassName="desLable"
       >
-        <el-descriptions-item label="区域id">{{
+        <el-descriptions-item label="区域">{{
           $filterTown(form.areaId)
         }}</el-descriptions-item>
 
diff --git a/src/views/netManage/workDynamic/index.vue b/src/views/netManage/workDynamic/index.vue
index bbfbdb4..620793c 100644
--- a/src/views/netManage/workDynamic/index.vue
+++ b/src/views/netManage/workDynamic/index.vue
@@ -82,7 +82,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="区域id" align="center" prop="areaId" />
+      <el-table-column label="区域" align="center" prop="areaId" />
       <el-table-column label="类型" align="center" prop="type" />
       <el-table-column label="材料名称" align="center" prop="materialsName" />
       <el-table-column
@@ -151,7 +151,7 @@
         label-width="auto"
         class="dialog-from"
       >
-        <el-form-item label="区域id" prop="areaId">
+        <el-form-item label="区域" prop="areaId">
           <el-select v-model="form.areaId" placeholder="请选择区域" filterable>
             <el-option
               v-for="dict in townList"
@@ -213,7 +213,7 @@
         border
         labelClassName="desLable"
       >
-        <el-descriptions-item label="区域id">{{
+        <el-descriptions-item label="区域">{{
           form.areaId
         }}</el-descriptions-item>
 
diff --git a/src/views/netManage/workItem/index.vue b/src/views/netManage/workItem/index.vue
index fce246e..9fa30d8 100644
--- a/src/views/netManage/workItem/index.vue
+++ b/src/views/netManage/workItem/index.vue
@@ -187,7 +187,7 @@
         label-width="auto"
         class="dialog-from"
       >
-        <el-form-item label="区域id" prop="areaId">
+        <el-form-item label="区域" prop="areaId">
           <el-select v-model="form.areaId" placeholder="请选择区域" filterable>
             <el-option
               v-for="dict in townList"
@@ -255,7 +255,7 @@
         border
         labelClassName="desLable"
       >
-        <el-descriptions-item label="区域id">{{
+        <el-descriptions-item label="区域">{{
           $filterTown(form.areaId)
         }}</el-descriptions-item>
 
diff --git a/src/views/netSecurity/DataSource/index.vue b/src/views/netSecurity/DataSource/index.vue
index debe6af..0165d43 100644
--- a/src/views/netSecurity/DataSource/index.vue
+++ b/src/views/netSecurity/DataSource/index.vue
@@ -209,7 +209,7 @@
         label-width="auto"
         class="dialog-from"
       >
-        <el-form-item label="区域id" prop="areaId">
+        <el-form-item label="区域" prop="areaId">
           <el-select v-model="form.areaId" placeholder="请选择区域" filterable>
             <el-option
               v-for="dict in townList"
@@ -306,7 +306,7 @@
         border
         labelClassName="desLable"
       >
-        <el-descriptions-item label="区域id">{{
+        <el-descriptions-item label="区域">{{
           $filterTown(form.areaId)
         }}</el-descriptions-item>
 
diff --git a/src/views/netSecurity/SafetyYh/index.vue b/src/views/netSecurity/SafetyYh/index.vue
index 54c8ca6..bd9ec05 100644
--- a/src/views/netSecurity/SafetyYh/index.vue
+++ b/src/views/netSecurity/SafetyYh/index.vue
@@ -1,9 +1,37 @@
 <template>
   <div class="container-main" ref="main">
     <div class="search-hearder" ref="topSearch">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
-        >
-
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        :inline="true"
+        v-show="showSearch"
+        label-width="auto"
+      >
+        <el-form-item label="隐患类型" prop="type">
+          <el-select
+            v-model="queryParams.type"
+            placeholder="请选择隐患类型"
+            clearable
+            size="small"
+          >
+            <el-option
+              v-for="dict in dict.type.tc_yh_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="隐患名称" prop="riskName">
+          <el-input
+            v-model="queryParams.riskName"
+            placeholder="请输入隐患名称"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button
             type="primary"
@@ -12,59 +40,123 @@
             @click="handleQuery"
             >搜索</el-button
           >
-          <el-button size="mini" @click="resetQuery">重置</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+          >
         </el-form-item>
       </el-form>
     </div>
-
     <div class="layui-table-tool" ref="tableTool">
-      <el-button type="primary" size="mini" @click="handleAdd()"
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd()"
+        v-hasPermi="['zongzhi:danger:add']"
         >新增</el-button
       >
+      <el-button
+        type="success"
+        size="mini"
+        :disabled="single"
+        @click="handleUpdate"
+        v-hasPermi="['zongzhi:danger:edit']"
+        >修改</el-button
+      >
+      <el-button
+        type="danger"
+        size="mini"
+        :disabled="multiple"
+        @click="handleDelete"
+        v-hasPermi="['zongzhi:danger:remove']"
+        >删除</el-button
+      >
       <el-button
         type="warning"
         size="mini"
         :loading="exportLoading"
         @click="handleExport"
+        v-hasPermi="['zongzhi:danger:export']"
         >导出</el-button
       >
     </div>
-
     <el-table
       v-loading="loading"
-      :data="sourceList"
+      :data="dangerList"
       :height="tableHeigth"
       @selection-change="handleSelectionChange"
     >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="隐患类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.tc_yh_type" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="隐患名称" align="center" prop="riskName" />
+      <el-table-column label="等级" align="center" prop="level">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.tc_yh_level" :value="scope.row.level" />
+        </template>
+      </el-table-column>
+      <el-table-column label="隐患来源" align="center" prop="riskSource">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.tc_yh_source"
+            :value="scope.row.riskSource"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="目标IP/域名" align="center" prop="ipDns" />
+      <el-table-column label="处置情况" align="center" prop="state">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.tc_yh_cz_state"
+            :value="scope.row.state"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="部门" align="center" prop="depName" />
       <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="300"
+        width="200"
         fixed="right"
       >
         <template slot-scope="scope">
-          <el-button size="mini" @click="handleInfo(scope.row)">
+          <el-button
+            size="mini"
+            @click="handleInfo(scope.row)"
+            v-hasPermi="['zongzhi:danger:list']"
+          >
             查看
           </el-button>
-          <el-button type="primary" size="mini" @click="handleUpdate(scope.row)"
+          <el-button
+            type="success"
+            size="mini"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['zongzhi:danger:edit']"
             >修改</el-button
           >
-          <el-button size="mini" type="danger" @click="handleDelete(scope.row)"
+          <el-button
+            size="mini"
+            type="danger"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['zongzhi:danger:remove']"
             >删除</el-button
           >
         </template>
       </el-table-column>
     </el-table>
+
     <pagination
       v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
-    ></pagination>
+    />
 
-    <!-- 添加或修改安全检测对话框 -->
+    <!-- 添加或修改安全隐患对话框 -->
     <el-dialog
       :visible.sync="open"
       width="500px"
@@ -79,42 +171,234 @@
         label-width="auto"
         class="dialog-from"
       >
+        <el-form-item label="区域id" prop="areaId">
+          <el-select v-model="form.areaId" placeholder="请选择区域" filterable>
+            <el-option
+              v-for="dict in townList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="隐患类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择隐患类型">
+            <el-option
+              v-for="dict in dict.type.tc_yh_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="单位名称" prop="unitName">
+          <el-input v-model="form.unitName" placeholder="请输入单位名称" />
+        </el-form-item>
+        <el-form-item label="隐患名称" prop="riskName">
+          <el-input v-model="form.riskName" placeholder="请输入隐患名称" />
+        </el-form-item>
+        <el-form-item label="等级" prop="level">
+          <el-select v-model="form.level" placeholder="请选择等级">
+            <el-option
+              v-for="dict in dict.type.tc_yh_level"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="隐患来源" prop="riskSource">
+          <el-select v-model="form.riskSource" placeholder="请选择隐患来源">
+            <el-option
+              v-for="dict in dict.type.tc_yh_source"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="目标IP/域名" prop="ipDns">
+          <el-input v-model="form.ipDns" placeholder="请输入目标IP/域名" />
+        </el-form-item>
+        <el-form-item label="处置情况" prop="state">
+          <el-select v-model="form.state" placeholder="请选择处置情况">
+            <el-option
+              v-for="dict in dict.type.tc_yh_cz_state"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="文件名称" prop="fileName">
+          <el-input v-model="form.fileName" placeholder="请输入文件名称" />
+        </el-form-item>
+        <el-form-item label="文件地址" prop="fileUrl">
+          <el-input v-model="form.fileUrl" placeholder="请输入文件地址" />
+        </el-form-item>
+        <el-form-item label="部门" prop="depName">
+          <el-input v-model="form.depName" placeholder="请输入部门" />
+        </el-form-item>
+        <el-form-item label="隐患开始时间" prop="startTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.startTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择隐患开始时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="隐患结束时间" prop="endTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.endTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择隐患结束时间"
+          >
+          </el-date-picker>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
+    <!--查看安全隐患详情页-->
     <el-dialog
       :visible.sync="infoOpen"
       width="1200px"
       append-to-body
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
       custom-class="dialog-box"
     >
       <div slot="title" class="dialog-title">{{ infoTitle }}</div>
+
       <el-descriptions
-        title="数据来源"
+        title="安全隐患"
         :column="2"
         border
         labelClassName="desLable"
       >
+        <el-descriptions-item label="区域id">{{
+          $filterTown(form.areaId)
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="隐患类型">{{
+          form.type
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="单位名称">{{
+          form.unitName
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="隐患名称">{{
+          form.riskName
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="等级">{{
+          form.level
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="隐患来源">{{
+          form.riskSource
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="目标IP/域名">{{
+          form.ipDns
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="处置情况">{{
+          form.state
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="文件名称">{{
+          form.fileName
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="文件地址">{{
+          form.fileUrl
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="部门">{{
+          form.depName
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="隐患开始时间">{{
+          form.startTime
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="隐患结束时间">{{
+          form.endTime
+        }}</el-descriptions-item>
       </el-descriptions>
     </el-dialog>
   </div>
 </template>
 
 <script>
+import { mapGetters } from "vuex";
+import {
+  listDanger,
+  getDanger,
+  delDanger,
+  addDanger,
+  updateDanger,
+  exportDanger,
+} from "@/api/zongzhi/netSecurity/SafetyYh/index.js";
 export default {
-  name: "Detection",
+  computed: {
+    ...mapGetters(["townList"]),
+  },
+  name: "Danger",
   //注释字典
-
+  dicts: ["tc_yh_level", "tc_yh_cz_state", "tc_yh_source", "tc_yh_type"],
   data() {
     return {
       tableHeigth: 0,
+      //查看详情
+      infoOpen: false,
+      //详情标题
+      infoTitle: "",
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 安全隐患表格数据
+      dangerList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: null,
+
+        riskName: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
     };
   },
-  mounted() {
+  created() {
     // //给表格一个固定值
     this.$nextTick(() => {
       this.tableHeigth =
@@ -125,7 +409,171 @@ export default {
       this.getList();
     });
   },
+  methods: {
+    /** 查询安全隐患列表 */
+    getList() {
+      this.loading = true;
+      listDanger(this.queryParams).then((response) => {
+        this.dangerList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        areaId: null,
+
+        type: null,
+
+        unitName: null,
+
+        riskName: null,
+
+        level: null,
+
+        riskSource: null,
+
+        ipDns: null,
+
+        state: null,
+
+        fileName: null,
+
+        fileUrl: null,
+
+        depName: null,
+
+        startTime: null,
+
+        endTime: null,
+
+        createId: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateId: null,
+
+        updateBy: null,
+
+        updateTime: null,
+
+        remark: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /**查看按钮操作 */
+    handleInfo(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getDanger(id).then((response) => {
+        this.form = response.data;
+        this.infoOpen = true;
+        this.infoTitle = "查看安全隐患详情";
+      });
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加安全隐患";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getDanger(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改安全隐患";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateDanger(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDanger(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm(
+        '是否确认删除安全隐患编号为"' + ids + '"的数据项?',
+        "警告",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(function () {
+          return delDanger(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有安全隐患数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.download(
+            "/zongzhi/danger/export",
+            {
+              ...this.queryParams,
+            },
+            "安全隐患_" + new Date().getTime() + ".xlsx"
+          );
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
 };
 </script>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/netSecurity/supervise/DbUnit/index.vue b/src/views/netSecurity/supervise/DbUnit/index.vue
index b9ab1c4..a3d2f9a 100644
--- a/src/views/netSecurity/supervise/DbUnit/index.vue
+++ b/src/views/netSecurity/supervise/DbUnit/index.vue
@@ -173,7 +173,7 @@
         label-width="auto"
         class="dialog-from"
       >
-        <el-form-item label="区域id" prop="areaId">
+        <el-form-item label="区域" prop="areaId">
           <el-select v-model="form.areaId" placeholder="请选择区域" filterable>
             <el-option
               v-for="dict in townList"
@@ -283,7 +283,7 @@
         border
         labelClassName="desLable"
       >
-        <el-descriptions-item label="区域id">{{
+        <el-descriptions-item label="区域">{{
           $filterTown(form.areaId)
         }}</el-descriptions-item>
 
diff --git a/src/views/netSecurity/supervise/GovernmentWeb/index.vue b/src/views/netSecurity/supervise/GovernmentWeb/index.vue
index 24d547c..9488de5 100644
--- a/src/views/netSecurity/supervise/GovernmentWeb/index.vue
+++ b/src/views/netSecurity/supervise/GovernmentWeb/index.vue
@@ -86,7 +86,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="区域id" align="center" prop="areaId">
+      <el-table-column label="区域" align="center" prop="areaId">
         <template slot-scope="scope">
           {{ $filterTown(scope.row.areaId) }}
         </template>
@@ -157,7 +157,7 @@
         label-width="auto"
         class="dialog-from"
       >
-        <el-form-item label="区域id" prop="areaId">
+        <el-form-item label="区域" prop="areaId">
           <el-select v-model="form.areaId" placeholder="请选择区域" filterable>
             <el-option
               v-for="dict in townList"
@@ -206,7 +206,7 @@
         border
         labelClassName="desLable"
       >
-        <el-descriptions-item label="区域id">{{
+        <el-descriptions-item label="区域">{{
           $filterTown(form.areaId)
         }}</el-descriptions-item>
 
diff --git a/src/views/netSecurity/supervise/IdcUnit/index.vue b/src/views/netSecurity/supervise/IdcUnit/index.vue
index ca05c6b..e51a147 100644
--- a/src/views/netSecurity/supervise/IdcUnit/index.vue
+++ b/src/views/netSecurity/supervise/IdcUnit/index.vue
@@ -8,10 +8,10 @@
         v-show="showSearch"
         label-width="auto"
       >
-        <el-form-item label="区域id" prop="areaId">
+        <el-form-item label="区域" prop="areaId">
           <el-input
             v-model="queryParams.areaId"
-            placeholder="请输入区域id"
+            placeholder="请输入区域"
             clearable
             size="small"
             @keyup.enter.native="handleQuery"
@@ -81,7 +81,7 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="${comment}" align="center" prop="id" />
-      <el-table-column label="区域id" align="center" prop="areaId" />
+      <el-table-column label="区域" align="center" prop="areaId" />
       <el-table-column label="名称" align="center" prop="unitName" />
       <el-table-column label="IP段信息" align="center" prop="ipData" />
       <el-table-column
@@ -140,8 +140,8 @@
         label-width="auto"
         class="dialog-from"
       >
-        <el-form-item label="区域id" prop="areaId">
-          <el-input v-model="form.areaId" placeholder="请输入区域id" />
+        <el-form-item label="区域" prop="areaId">
+          <el-input v-model="form.areaId" placeholder="请输入区域" />
         </el-form-item>
         <el-form-item label="名称" prop="unitName">
           <el-input v-model="form.unitName" placeholder="请输入名称" />
@@ -172,7 +172,7 @@
         border
         labelClassName="desLable"
       >
-        <el-descriptions-item label="区域id">{{
+        <el-descriptions-item label="区域">{{
           form.areaId
         }}</el-descriptions-item>
 
diff --git a/src/views/netWorkYq/index.vue b/src/views/netWorkYq/index.vue
index 48eb49d..3433819 100644
--- a/src/views/netWorkYq/index.vue
+++ b/src/views/netWorkYq/index.vue
@@ -222,7 +222,7 @@
         label-width="auto"
         class="dialog-from"
       >
-        <el-form-item label="区域id" prop="areaId">
+        <el-form-item label="区域" prop="areaId">
           <el-select v-model="form.areaId" placeholder="请选择区域" filterable>
             <el-option
               v-for="dict in townList"
@@ -355,7 +355,7 @@
         border
         labelClassName="desLable"
       >
-        <el-descriptions-item label="区域id">{{
+        <el-descriptions-item label="区域">{{
           $filterTown(form.areaId)
         }}</el-descriptions-item>
 
diff --git a/src/views/netZoology/netAppraiser/index.vue b/src/views/netZoology/netAppraiser/index.vue
index e55d8dd..96fd8de 100644
--- a/src/views/netZoology/netAppraiser/index.vue
+++ b/src/views/netZoology/netAppraiser/index.vue
@@ -159,7 +159,7 @@
         label-width="auto"
         class="dialog-from"
       >
-        <el-form-item label="区域id" prop="areaId">
+        <el-form-item label="区域" prop="areaId">
           <el-select v-model="form.areaId" placeholder="请选择区域" filterable>
             <el-option
               v-for="dict in townList"
@@ -236,7 +236,7 @@
         border
         labelClassName="desLable"
       >
-        <el-descriptions-item label="区域id">{{
+        <el-descriptions-item label="区域">{{
           $filterTown(form.areaId)
         }}</el-descriptions-item>
 
diff --git a/src/views/netZoology/netArticle/index.vue b/src/views/netZoology/netArticle/index.vue
index 2bd6249..a57cf72 100644
--- a/src/views/netZoology/netArticle/index.vue
+++ b/src/views/netZoology/netArticle/index.vue
@@ -1,9 +1,509 @@
 <template>
-  <div>网络文章</div>
+  <div class="container-main" ref="main">
+    <div class="search-hearder" ref="topSearch">
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        :inline="true"
+        v-show="showSearch"
+        label-width="auto"
+      >
+        <el-form-item label="文章类型" prop="type">
+          <el-select
+            v-model="queryParams.type"
+            placeholder="请选择文章类型"
+            clearable
+            size="small"
+          >
+            <el-option
+              v-for="dict in dict.type.tc_wz_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="发布时间" prop="releaseTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="queryParams.releaseTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择发布时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="来源" prop="source">
+          <el-select
+            v-model="queryParams.source"
+            placeholder="请选择来源"
+            clearable
+            size="small"
+          >
+            <el-option
+              v-for="dict in dict.type.tc_yq_media"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="layui-table-tool" ref="tableTool">
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd()"
+        v-hasPermi="['zongzhi:article:add']"
+        >新增</el-button
+      >
+      <el-button
+        type="success"
+        size="mini"
+        :disabled="single"
+        @click="handleUpdate"
+        v-hasPermi="['zongzhi:article:edit']"
+        >修改</el-button
+      >
+      <el-button
+        type="danger"
+        size="mini"
+        :disabled="multiple"
+        @click="handleDelete"
+        v-hasPermi="['zongzhi:article:remove']"
+        >删除</el-button
+      >
+      <el-button
+        type="warning"
+        size="mini"
+        :loading="exportLoading"
+        @click="handleExport"
+        v-hasPermi="['zongzhi:article:export']"
+        >导出</el-button
+      >
+    </div>
+    <el-table
+      v-loading="loading"
+      :data="articleList"
+      :height="tableHeigth"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="文章类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.tc_wz_type" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="文章标题" align="center" prop="articleTitle" />
+      <el-table-column
+        label="发布时间"
+        align="center"
+        prop="releaseTime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.releaseTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="来源" align="center" prop="source">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.tc_yq_media"
+            :value="scope.row.source"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="文章地址" align="center" prop="url" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="200"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            @click="handleInfo(scope.row)"
+            v-hasPermi="['zongzhi:article:list']"
+          >
+            查看
+          </el-button>
+          <el-button
+            type="success"
+            size="mini"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['zongzhi:article:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="danger"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['zongzhi:article:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改网络文章对话框 -->
+    <el-dialog
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      custom-class="dialog-box"
+    >
+      <div slot="title" class="dialog-title">{{ title }}</div>
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="auto"
+        class="dialog-from"
+      >
+        <el-form-item label="区域" prop="areaId">
+          <el-select v-model="form.areaId" placeholder="请选择区域" filterable>
+            <el-option
+              v-for="dict in townList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="文章类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择文章类型">
+            <el-option
+              v-for="dict in dict.type.tc_wz_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="文章标题" prop="articleTitle">
+          <el-input v-model="form.articleTitle" placeholder="请输入文章标题" />
+        </el-form-item>
+        <el-form-item label="发布时间" prop="releaseTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.releaseTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择发布时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="来源" prop="source">
+          <el-select v-model="form.source" placeholder="请选择来源">
+            <el-option
+              v-for="dict in dict.type.tc_yq_media"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="文章地址" prop="url">
+          <el-input v-model="form.url" placeholder="请输入文章地址" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!--查看网络文章详情页-->
+    <el-dialog
+      :visible.sync="infoOpen"
+      width="1200px"
+      append-to-body
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+      custom-class="dialog-box"
+    >
+      <div slot="title" class="dialog-title">{{ infoTitle }}</div>
+
+      <el-descriptions
+        title="网络文章"
+        :column="2"
+        border
+        labelClassName="desLable"
+      >
+        <el-descriptions-item label="区域">{{
+          $filterTown(form.areaId)
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="文章类型">
+          <dict-tag :options="dict.type.tc_wz_type" :value="form.type" />
+        </el-descriptions-item>
+
+        <el-descriptions-item label="文章标题">{{
+          form.articleTitle
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="发布时间">{{
+          form.releaseTime
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="来源">
+          <dict-tag :options="dict.type.tc_yq_media" :value="form.source" />
+        </el-descriptions-item>
+
+        <el-descriptions-item label="文章地址">{{
+          form.url
+        }}</el-descriptions-item>
+      </el-descriptions>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-export default {};
-</script>
+import { mapGetters } from "vuex";
+import {
+  listArticle,
+  getArticle,
+  delArticle,
+  addArticle,
+  updateArticle,
+  exportArticle,
+} from "@/api/zongzhi/netZoology/netArticle/index.js";
+export default {
+  computed: {
+    ...mapGetters(["townList"]),
+  },
+  name: "Article",
+  //注释字典
+  dicts: ["tc_wz_type", "tc_yq_media"],
+  data() {
+    return {
+      tableHeigth: 0,
+      //查看详情
+      infoOpen: false,
+      //详情标题
+      infoTitle: "",
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 网络文章表格数据
+      articleList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: null,
+
+        releaseTime: null,
+
+        source: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    // //给表格一个固定值
+    this.$nextTick(() => {
+      this.tableHeigth =
+        this.$refs.main.offsetHeight -
+        (this.$refs.topSearch.offsetHeight +
+          this.$refs.tableTool.offsetHeight) -
+        46;
+      this.getList();
+    });
+  },
+  methods: {
+    /** 查询网络文章列表 */
+    getList() {
+      this.loading = true;
+      listArticle(this.queryParams).then((response) => {
+        this.articleList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        areaId: null,
 
-<style></style>
+        type: null,
+
+        articleTitle: null,
+
+        releaseTime: null,
+
+        source: null,
+
+        url: null,
+
+        createId: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateId: null,
+
+        updateTime: null,
+
+        updateBy: null,
+
+        remark: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /**查看按钮操作 */
+    handleInfo(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getArticle(id).then((response) => {
+        this.form = response.data;
+        this.infoOpen = true;
+        this.infoTitle = "查看网络文章详情";
+      });
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加网络文章";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getArticle(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改网络文章";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateArticle(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addArticle(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm(
+        '是否确认删除网络文章编号为"' + ids + '"的数据项?',
+        "警告",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(function () {
+          return delArticle(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有网络文章数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.download(
+            "/zongzhi/article/export",
+            {
+              ...this.queryParams,
+            },
+            "网络文章_" + new Date().getTime() + ".xlsx"
+          );
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
diff --git a/src/views/netZoology/netMqPrincipal/index.vue b/src/views/netZoology/netMqPrincipal/index.vue
index 784effa..cc3ceb4 100644
--- a/src/views/netZoology/netMqPrincipal/index.vue
+++ b/src/views/netZoology/netMqPrincipal/index.vue
@@ -1,9 +1,451 @@
 <template>
-  <div>网络民情责任人</div>
+  <div class="container-main" ref="main">
+    <div class="search-hearder" ref="topSearch">
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        :inline="true"
+        v-show="showSearch"
+        label-width="auto"
+      >
+        <el-form-item label="单位名称" prop="unitName">
+          <el-input
+            v-model="queryParams.unitName"
+            placeholder="请输入单位名称"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="民情负责人" prop="fuzeMan">
+          <el-input
+            v-model="queryParams.fuzeMan"
+            placeholder="请输入民情负责人"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="layui-table-tool" ref="tableTool">
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd()"
+        v-hasPermi="['zongzhi:principal:add']"
+        >新增</el-button
+      >
+      <el-button
+        type="success"
+        size="mini"
+        :disabled="single"
+        @click="handleUpdate"
+        v-hasPermi="['zongzhi:principal:edit']"
+        >修改</el-button
+      >
+      <el-button
+        type="danger"
+        size="mini"
+        :disabled="multiple"
+        @click="handleDelete"
+        v-hasPermi="['zongzhi:principal:remove']"
+        >删除</el-button
+      >
+      <el-button
+        type="warning"
+        size="mini"
+        :loading="exportLoading"
+        @click="handleExport"
+        v-hasPermi="['zongzhi:principal:export']"
+        >导出</el-button
+      >
+    </div>
+    <el-table
+      v-loading="loading"
+      :data="principalList"
+      :height="tableHeigth"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="单位名称" align="center" prop="unitName" />
+      <el-table-column label="民情负责人" align="center" prop="fuzeMan" />
+      <el-table-column label="职务" align="center" prop="duty" />
+      <el-table-column label="联系电话" align="center" prop="tel" />
+      <el-table-column label="传真号码" align="center" prop="faxNum" />
+      <el-table-column label="手机号" align="center" prop="phoneNum" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="200"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            @click="handleInfo(scope.row)"
+            v-hasPermi="['zongzhi:principal:list']"
+          >
+            查看
+          </el-button>
+          <el-button
+            type="success"
+            size="mini"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['zongzhi:principal:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="danger"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['zongzhi:principal:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改网络民情责任人对话框 -->
+    <el-dialog
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      custom-class="dialog-box"
+    >
+      <div slot="title" class="dialog-title">{{ title }}</div>
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="auto"
+        class="dialog-from"
+      >
+        <el-form-item label="区域" prop="areaId">
+          <el-select v-model="form.areaId" placeholder="请选择区域" filterable>
+            <el-option
+              v-for="dict in townList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="单位名称" prop="unitName">
+          <el-input v-model="form.unitName" placeholder="请输入单位名称" />
+        </el-form-item>
+        <el-form-item label="民情负责人" prop="fuzeMan">
+          <el-input v-model="form.fuzeMan" placeholder="请输入民情负责人" />
+        </el-form-item>
+        <el-form-item label="职务" prop="duty">
+          <el-input v-model="form.duty" placeholder="请输入职务" />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="tel">
+          <el-input v-model="form.tel" placeholder="请输入联系电话" />
+        </el-form-item>
+        <el-form-item label="传真号码" prop="faxNum">
+          <el-input v-model="form.faxNum" placeholder="请输入传真号码" />
+        </el-form-item>
+        <el-form-item label="手机号" prop="phoneNum">
+          <el-input v-model="form.phoneNum" placeholder="请输入手机号" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!--查看网络民情责任人详情页-->
+    <el-dialog
+      :visible.sync="infoOpen"
+      width="1200px"
+      append-to-body
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+      custom-class="dialog-box"
+    >
+      <div slot="title" class="dialog-title">{{ infoTitle }}</div>
+
+      <el-descriptions
+        title="网络民情责任人"
+        :column="2"
+        border
+        labelClassName="desLable"
+      >
+        <el-descriptions-item label="区域">{{
+          $filterTown(form.areaId)
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="单位名称">{{
+          form.unitName
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="民情负责人">{{
+          form.fuzeMan
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="职务">{{
+          form.duty
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="联系电话">{{
+          form.tel
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="传真号码">{{
+          form.faxNum
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="手机号">{{
+          form.phoneNum
+        }}</el-descriptions-item>
+      </el-descriptions>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-export default {};
-</script>
+import { mapGetters } from "vuex";
+import {
+  listPrincipal,
+  getPrincipal,
+  delPrincipal,
+  addPrincipal,
+  updatePrincipal,
+  exportPrincipal,
+} from "@/api/zongzhi/netZoology/netMqPrincipal/index.js";
+export default {
+  computed: {
+    ...mapGetters(["townList"]),
+  },
+  name: "Principal",
+  //注释字典
+  data() {
+    return {
+      tableHeigth: 0,
+      //查看详情
+      infoOpen: false,
+      //详情标题
+      infoTitle: "",
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 网络民情责任人表格数据
+      principalList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        unitName: null,
+
+        fuzeMan: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    // //给表格一个固定值
+    this.$nextTick(() => {
+      this.tableHeigth =
+        this.$refs.main.offsetHeight -
+        (this.$refs.topSearch.offsetHeight +
+          this.$refs.tableTool.offsetHeight) -
+        46;
+      this.getList();
+    });
+  },
+  methods: {
+    /** 查询网络民情责任人列表 */
+    getList() {
+      this.loading = true;
+      listPrincipal(this.queryParams).then((response) => {
+        this.principalList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        areaId: null,
+
+        unitName: null,
 
-<style></style>
+        fuzeMan: null,
+
+        duty: null,
+
+        tel: null,
+
+        faxNum: null,
+
+        phoneNum: null,
+
+        createId: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateId: null,
+
+        updateBy: null,
+
+        updateTime: null,
+
+        remark: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /**查看按钮操作 */
+    handleInfo(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getPrincipal(id).then((response) => {
+        this.form = response.data;
+        this.infoOpen = true;
+        this.infoTitle = "查看网络民情责任人详情";
+      });
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加网络民情责任人";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getPrincipal(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改网络民情责任人";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updatePrincipal(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPrincipal(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm(
+        '是否确认删除网络民情责任人编号为"' + ids + '"的数据项?',
+        "警告",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(function () {
+          return delPrincipal(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有网络民情责任人数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.download(
+            "/zongzhi/principal/export",
+            {
+              ...this.queryParams,
+            },
+            "网络民情责任人_" + new Date().getTime() + ".xlsx"
+          );
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
diff --git a/src/views/netZoology/netSafety/index.vue b/src/views/netZoology/netSafety/index.vue
index 371c690..5891284 100644
--- a/src/views/netZoology/netSafety/index.vue
+++ b/src/views/netZoology/netSafety/index.vue
@@ -153,7 +153,7 @@
         label-width="auto"
         class="dialog-from"
       >
-        <el-form-item label="区域id" prop="areaId">
+        <el-form-item label="区域" prop="areaId">
           <el-select v-model="form.areaId" placeholder="请选择区域" filterable>
             <el-option
               v-for="dict in townList"
@@ -219,7 +219,7 @@
         border
         labelClassName="desLable"
       >
-        <el-descriptions-item label="区域id">{{
+        <el-descriptions-item label="区域">{{
           $filterTown(form.areaId)
         }}</el-descriptions-item>
 
diff --git a/src/views/netZoology/netSafetyZcUnit/index.vue b/src/views/netZoology/netSafetyZcUnit/index.vue
index a9f3024..0d79ed7 100644
--- a/src/views/netZoology/netSafetyZcUnit/index.vue
+++ b/src/views/netZoology/netSafetyZcUnit/index.vue
@@ -1,9 +1,416 @@
 <template>
-  <div>网络安全支持单位</div>
+  <div class="container-main" ref="main">
+    <div class="search-hearder" ref="topSearch">
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        :inline="true"
+        v-show="showSearch"
+        label-width="auto"
+      >
+        <el-form-item label="单位名称" prop="name">
+          <el-input
+            v-model="queryParams.name"
+            placeholder="请输入单位名称"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="联系人" prop="linkMan">
+          <el-input
+            v-model="queryParams.linkMan"
+            placeholder="请输入联系人"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="layui-table-tool" ref="tableTool">
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd()"
+        v-hasPermi="['zongzhi:netSafetyZcUnit:add']"
+        >新增</el-button
+      >
+      <el-button
+        type="success"
+        size="mini"
+        :disabled="single"
+        @click="handleUpdate"
+        v-hasPermi="['zongzhi:netSafetyZcUnit:edit']"
+        >修改</el-button
+      >
+      <el-button
+        type="danger"
+        size="mini"
+        :disabled="multiple"
+        @click="handleDelete"
+        v-hasPermi="['zongzhi:netSafetyZcUnit:remove']"
+        >删除</el-button
+      >
+      <el-button
+        type="warning"
+        size="mini"
+        :loading="exportLoading"
+        @click="handleExport"
+        v-hasPermi="['zongzhi:netSafetyZcUnit:export']"
+        >导出</el-button
+      >
+    </div>
+    <el-table
+      v-loading="loading"
+      :data="netSafetyZcUnitList"
+      :height="tableHeigth"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="${comment}" align="center" prop="id" />
+      <el-table-column label="区域" align="center" prop="areaId" />
+      <el-table-column label="单位名称" align="center" prop="name" />
+      <el-table-column label="联系人" align="center" prop="linkMan" />
+      <el-table-column label="联系电话" align="center" prop="phoneNum" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="200"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            @click="handleInfo(scope.row)"
+            v-hasPermi="['zongzhi:netSafetyZcUnit:list']"
+          >
+            查看
+          </el-button>
+          <el-button
+            type="success"
+            size="mini"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['zongzhi:netSafetyZcUnit:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="danger"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['zongzhi:netSafetyZcUnit:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改网络安全支持单位对话框 -->
+    <el-dialog
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      custom-class="dialog-box"
+    >
+      <div slot="title" class="dialog-title">{{ title }}</div>
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="auto"
+        class="dialog-from"
+      >
+        <el-form-item label="区域" prop="areaId">
+          <el-input v-model="form.areaId" placeholder="请输入区域" />
+        </el-form-item>
+        <el-form-item label="单位名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入单位名称" />
+        </el-form-item>
+        <el-form-item label="联系人" prop="linkMan">
+          <el-input v-model="form.linkMan" placeholder="请输入联系人" />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="phoneNum">
+          <el-input v-model="form.phoneNum" placeholder="请输入联系电话" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!--查看网络安全支持单位详情页-->
+    <el-dialog
+      :visible.sync="infoOpen"
+      width="1200px"
+      append-to-body
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+      custom-class="dialog-box"
+    >
+      <div slot="title" class="dialog-title">{{ infoTitle }}</div>
+
+      <el-descriptions
+        title="网络安全支持单位"
+        :column="2"
+        border
+        labelClassName="desLable"
+      >
+        <el-descriptions-item label="区域">{{
+          form.areaId
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="单位名称">{{
+          form.name
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="联系人">{{
+          form.linkMan
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="联系电话">{{
+          form.phoneNum
+        }}</el-descriptions-item>
+      </el-descriptions>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-export default {};
-</script>
+import { mapGetters } from "vuex";
+import {
+  listNetSafetyZcUnit,
+  getNetSafetyZcUnit,
+  delNetSafetyZcUnit,
+  addNetSafetyZcUnit,
+  updateNetSafetyZcUnit,
+  exportNetSafetyZcUnit,
+} from "@/api/zongzhi/netZoology/netSafetyZcUnit/index.js";
+export default {
+  computed: {
+    ...mapGetters(["townList"]),
+  },
+  name: "NetSafetyZcUnit",
+  //注释字典
+  data() {
+    return {
+      tableHeigth: 0,
+      //查看详情
+      infoOpen: false,
+      //详情标题
+      infoTitle: "",
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 网络安全支持单位表格数据
+      netSafetyZcUnitList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+
+        linkMan: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    // //给表格一个固定值
+    this.$nextTick(() => {
+      this.tableHeigth =
+        this.$refs.main.offsetHeight -
+        (this.$refs.topSearch.offsetHeight +
+          this.$refs.tableTool.offsetHeight) -
+        46;
+      this.getList();
+    });
+  },
+  methods: {
+    /** 查询网络安全支持单位列表 */
+    getList() {
+      this.loading = true;
+      listNetSafetyZcUnit(this.queryParams).then((response) => {
+        this.netSafetyZcUnitList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        areaId: null,
+
+        name: null,
 
-<style></style>
+        linkMan: null,
+
+        phoneNum: null,
+
+        createId: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateId: null,
+
+        updateBy: null,
+
+        updateTime: null,
+
+        remark: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /**查看按钮操作 */
+    handleInfo(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getNetSafetyZcUnit(id).then((response) => {
+        this.form = response.data;
+        this.infoOpen = true;
+        this.infoTitle = "查看网络安全支持单位详情";
+      });
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加网络安全支持单位";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getNetSafetyZcUnit(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改网络安全支持单位";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateNetSafetyZcUnit(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addNetSafetyZcUnit(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm(
+        '是否确认删除网络安全支持单位编号为"' + ids + '"的数据项?',
+        "警告",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(function () {
+          return delNetSafetyZcUnit(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有网络安全支持单位数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.download(
+            "/zongzhi/netSafetyZcUnit/export",
+            {
+              ...this.queryParams,
+            },
+            "网络安全支持单位_" + new Date().getTime() + ".xlsx"
+          );
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
diff --git a/src/views/netZoology/netVolunteer/index.vue b/src/views/netZoology/netVolunteer/index.vue
index df7a763..c7fea5b 100644
--- a/src/views/netZoology/netVolunteer/index.vue
+++ b/src/views/netZoology/netVolunteer/index.vue
@@ -1,9 +1,478 @@
 <template>
-  <div>网络文明自愿者</div>
+  <div class="container-main" ref="main">
+    <div class="search-hearder" ref="topSearch">
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        :inline="true"
+        v-show="showSearch"
+        label-width="auto"
+      >
+        <el-form-item label="类别" prop="type">
+          <el-select
+            v-model="queryParams.type"
+            placeholder="请选择类别"
+            clearable
+            size="small"
+          >
+            <el-option
+              v-for="dict in dict.type.tc_zyz_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input
+            v-model="queryParams.name"
+            placeholder="请输入姓名"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="layui-table-tool" ref="tableTool">
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleAdd()"
+        v-hasPermi="['zongzhi:volunteer:add']"
+        >新增</el-button
+      >
+      <el-button
+        type="success"
+        size="mini"
+        :disabled="single"
+        @click="handleUpdate"
+        v-hasPermi="['zongzhi:volunteer:edit']"
+        >修改</el-button
+      >
+      <el-button
+        type="danger"
+        size="mini"
+        :disabled="multiple"
+        @click="handleDelete"
+        v-hasPermi="['zongzhi:volunteer:remove']"
+        >删除</el-button
+      >
+      <el-button
+        type="warning"
+        size="mini"
+        :loading="exportLoading"
+        @click="handleExport"
+        v-hasPermi="['zongzhi:volunteer:export']"
+        >导出</el-button
+      >
+    </div>
+    <el-table
+      v-loading="loading"
+      :data="volunteerList"
+      :height="tableHeigth"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="类别" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.tc_zyz_type" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="姓名" align="center" prop="name" />
+      <el-table-column label="年龄" align="center" prop="age" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="职务" align="center" prop="duty" />
+      <el-table-column label="联系方式" align="center" prop="phoneNum" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="200"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            @click="handleInfo(scope.row)"
+            v-hasPermi="['zongzhi:volunteer:list']"
+          >
+            查看
+          </el-button>
+          <el-button
+            type="success"
+            size="mini"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['zongzhi:volunteer:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="danger"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['zongzhi:volunteer:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改网络文明自愿者对话框 -->
+    <el-dialog
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      custom-class="dialog-box"
+    >
+      <div slot="title" class="dialog-title">{{ title }}</div>
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="auto"
+        class="dialog-from"
+      >
+        <el-form-item label="区域" prop="areaId">
+          <el-select v-model="form.areaId" placeholder="请选择区域" filterable>
+            <el-option
+              v-for="dict in townList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="类别" prop="type">
+          <el-select v-model="form.type" placeholder="请选择类别">
+            <el-option
+              v-for="dict in dict.type.tc_zyz_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入姓名" />
+        </el-form-item>
+        <el-form-item label="年龄" prop="age">
+          <el-input v-model="form.age" placeholder="请输入年龄" />
+        </el-form-item>
+        <el-form-item label="活动内容" prop="content">
+          <el-input
+            v-model="form.content"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+        <el-form-item label="单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单位" />
+        </el-form-item>
+        <el-form-item label="职务" prop="duty">
+          <el-input v-model="form.duty" placeholder="请输入职务" />
+        </el-form-item>
+        <el-form-item label="联系方式" prop="phoneNum">
+          <el-input v-model="form.phoneNum" placeholder="请输入联系方式" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!--查看网络文明自愿者详情页-->
+    <el-dialog
+      :visible.sync="infoOpen"
+      width="1200px"
+      append-to-body
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+      custom-class="dialog-box"
+    >
+      <div slot="title" class="dialog-title">{{ infoTitle }}</div>
+
+      <el-descriptions
+        title="网络文明自愿者"
+        :column="2"
+        border
+        labelClassName="desLable"
+      >
+        <el-descriptions-item label="区域">{{
+          $filterTown(form.areaId)
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="类别">
+          <dict-tag :options="dict.type.tc_zyz_type" :value="form.type" />
+        </el-descriptions-item>
+
+        <el-descriptions-item label="姓名">{{
+          form.name
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="年龄">{{ form.age }}</el-descriptions-item>
+
+        <el-descriptions-item label="活动内容">{{
+          form.content
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="单位">{{
+          form.unit
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="职务">{{
+          form.duty
+        }}</el-descriptions-item>
+
+        <el-descriptions-item label="联系方式">{{
+          form.phoneNum
+        }}</el-descriptions-item>
+      </el-descriptions>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-export default {};
-</script>
+import { mapGetters } from "vuex";
+import {
+  listVolunteer,
+  getVolunteer,
+  delVolunteer,
+  addVolunteer,
+  updateVolunteer,
+  exportVolunteer,
+} from "@/api/zongzhi/netZoology/netVolunteer/index.js";
+export default {
+  computed: {
+    ...mapGetters(["townList"]),
+  },
+  name: "Volunteer",
+  //注释字典
+  dicts: ["tc_zyz_type"],
+  data() {
+    return {
+      tableHeigth: 0,
+      //查看详情
+      infoOpen: false,
+      //详情标题
+      infoTitle: "",
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 网络文明自愿者表格数据
+      volunteerList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: null,
+
+        name: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    // //给表格一个固定值
+    this.$nextTick(() => {
+      this.tableHeigth =
+        this.$refs.main.offsetHeight -
+        (this.$refs.topSearch.offsetHeight +
+          this.$refs.tableTool.offsetHeight) -
+        46;
+      this.getList();
+    });
+  },
+  methods: {
+    /** 查询网络文明自愿者列表 */
+    getList() {
+      this.loading = true;
+      listVolunteer(this.queryParams).then((response) => {
+        this.volunteerList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        areaId: null,
 
-<style></style>
+        type: null,
+
+        name: null,
+
+        age: null,
+
+        content: null,
+
+        unit: null,
+
+        duty: null,
+
+        phoneNum: null,
+
+        createId: null,
+
+        createBy: null,
+
+        updateId: null,
+
+        updateBy: null,
+
+        updateTime: null,
+
+        remark: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /**查看按钮操作 */
+    handleInfo(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getVolunteer(id).then((response) => {
+        this.form = response.data;
+        this.infoOpen = true;
+        this.infoTitle = "查看网络文明自愿者详情";
+      });
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加网络文明自愿者";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getVolunteer(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改网络文明自愿者";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateVolunteer(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addVolunteer(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm(
+        '是否确认删除网络文明自愿者编号为"' + ids + '"的数据项?',
+        "警告",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(function () {
+          return delVolunteer(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有网络文明自愿者数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.download(
+            "/zongzhi/volunteer/export",
+            {
+              ...this.queryParams,
+            },
+            "网络文明自愿者_" + new Date().getTime() + ".xlsx"
+          );
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>