diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 0000000..937375d
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,4 @@
+{
+  "semi": true,
+  "singleQuote": true
+}
diff --git a/src/api/policy/library.js b/src/api/policy/library.js
index cee485d..7fd3495 100644
--- a/src/api/policy/library.js
+++ b/src/api/policy/library.js
@@ -1,19 +1,78 @@
 import request from '@/utils/request';
 
-// 获取标签列表
-export function getLabel(params) {
+// 获取政策列表
+export function getPolicy(data) {
   return request({
-    url: '/label/getLabel123',
-    method: 'get',
-    params
-  });
-}
-
-// 新增更新信号量
-export function save(data) {
-  return request({
-    url: '/system/signal/save',
+    url:
+      '/policy/getPolicy?pageNum=' +
+      data.pageNum +
+      '&pageSize=' +
+      data.pageSize,
     method: 'post',
     data
   });
 }
+// 删除政策信息 body里ids数组
+export function delPolicy(data) {
+  return request({
+    url: '/policy/delPolicy',
+    method: 'post',
+    data
+  });
+}
+// 获取政策标签管理初始化数据
+export function getLabelSetting(params) {
+  return request({
+    url: '/policy/getLabelSetting',
+    method: 'get',
+    params
+  });
+}
+// 设置政策标签 body里id(政策),ids(标签id数组)
+export function setPolicyLabel(data) {
+  return request({
+    url: '/policy/setPolicyLabel',
+    method: 'post',
+    data
+  });
+}
+// 修改政策信息/截止时间设置
+export function updatePolicy(data) {
+  return request({
+    url: '/policy/updatePolicy',
+    method: 'post',
+    data
+  });
+}
+// 批量推送政策标签 body里ids(政策id数组)
+export function pushPolicy(data) {
+  return request({
+    url: '/policy/pushPolicy',
+    method: 'post',
+    data
+  });
+}
+// 取消推送
+export function noPushPolicy(params) {
+  return request({
+    url: '/policy/noPushPolicy',
+    method: 'get',
+    params
+  });
+}
+// 添加政策
+export function addPolicy(data) {
+  return request({
+    url: '/policy/addPolicy',
+    method: 'post',
+    data
+  });
+}
+// 编辑政策的数据回显
+export function getPolicyInfo(params) {
+  return request({
+    url: '/policy/getPolicyInfo',
+    method: 'get',
+    params
+  });
+}
diff --git a/src/assets/logo/logo2.png b/src/assets/logo/logo2.png
new file mode 100644
index 0000000..5f08af2
Binary files /dev/null and b/src/assets/logo/logo2.png differ
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 6793dca..2f9fa1e 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -194,7 +194,11 @@ aside {
 .operate-container .btn-add {
   float: right;
 }
-//表格栏样式
+// 表格栏样式
 .table-container {
   margin-top: 20px;
+}
+// 操作栏样式
+.operate-container{
+  margin-top: 20px;
 }
\ No newline at end of file
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 23c6823..5baad49 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -1,20 +1,25 @@
 <template>
-  <div class="sidebar-logo-container" :class="{'collapse':collapse}">
+  <div class="sidebar-logo-container" :class="{ collapse: collapse }">
     <transition name="sidebarLogoFade">
-      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo">
-        <h1 v-else class="sidebar-title">{{ title }}<span>管理端</span></h1>
+      <router-link
+        v-if="collapse"
+        key="collapse"
+        class="sidebar-logo-link"
+        to="/"
+      >
+        <img v-if="logo" :src="logo" class="sidebar-logo" />
+        <!-- <h1 v-else class="sidebar-title">{{ title }}<span>管理端</span></h1> -->
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo">
-        <h1 class="sidebar-title">{{ title }}<span>管理端</span></h1>
+        <img v-if="logo" :src="logo" class="sidebar-logo" />
+        <!-- <h1 class="sidebar-title">{{ title }}<span>管理端</span></h1> -->
       </router-link>
     </transition>
   </div>
 </template>
 
 <script>
-import logoImg from '@/assets/logo/logo.png'
+import logoImg from '@/assets/logo/logo2.png';
 
 export default {
   name: 'SidebarLogo',
@@ -26,12 +31,12 @@ export default {
   },
   data() {
     return {
-      title: '嘉策',
-      // logo: logoImg,
-      logo: ''
-    }
+      title: '',
+      logo: logoImg
+      // logo: ''
+    };
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>
@@ -58,8 +63,8 @@ export default {
     width: 100%;
 
     & .sidebar-logo {
-      width: 32px;
-      height: 32px;
+      // width: 32px;
+      // height: 32px;
       vertical-align: middle;
       margin-right: 12px;
     }
diff --git a/src/permission.js b/src/permission.js
index 07f6d7a..3bbb1f3 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -21,7 +21,7 @@ router.beforeEach((to, from, next) => {
         // 判断当前用户是否已拉取完user_info信息
         store.dispatch('GetInfo').then(res => {
           // 拉取user_info
-          console.log(res.roles);
+          // console.log(res.roles);
           const roles = res.roles
           store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => {
           // 测试 默认静态页面
diff --git a/src/router/modules/policyPage.js b/src/router/modules/policyPage.js
index 4bc2b14..4fd41e2 100644
--- a/src/router/modules/policyPage.js
+++ b/src/router/modules/policyPage.js
@@ -1,6 +1,6 @@
 /** When your routing table is too long, you can split it into small modules **/
 
-import Layout from '@/layout'
+import Layout from '@/layout';
 // 政策管理
 const nestedRouter = {
   path: '/policy',
@@ -10,11 +10,17 @@ const nestedRouter = {
   children: [
     {
       path: 'library',
-      component: resolve =>
-        require(['@/views/policy/library/index'], resolve),
+      component: resolve => require(['@/views/policy/library/index'], resolve),
       name: 'library',
       meta: { title: '政策库' }
     },
+    {
+      path: 'add',
+      component: resolve => require(['@/views/policy/library/add'], resolve),
+      name: 'add',
+      meta: { title: '添加' },
+      hidden: true
+    },
     {
       path: 'tag',
       component: resolve => require(['@/views/policy/tag/index'], resolve),
@@ -22,7 +28,6 @@ const nestedRouter = {
       meta: { title: '政策标签' }
     }
   ]
-}
+};
 
-
-export default nestedRouter
+export default nestedRouter;
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index de9efe6..d034afd 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -18,7 +18,7 @@ const permission = {
     // 生成路由
     GenerateRoutes({ commit }) {
       return new Promise(resolve => {
-        console.log(DynamicRoutes);
+        // console.log(DynamicRoutes);
           const accessedRoutes = filterAsyncRouter(DynamicRoutes)
           accessedRoutes.push({ path: '*', redirect: '/404', hidden: true })
           commit('SET_ROUTES', accessedRoutes)
diff --git a/src/views/policy/library/add.vue b/src/views/policy/library/add.vue
new file mode 100644
index 0000000..c7beebc
--- /dev/null
+++ b/src/views/policy/library/add.vue
@@ -0,0 +1,168 @@
+<template>
+  <div class="app-container">
+    <div>添加政策</div>
+    <el-form
+      style="width:50%;margin:15px 0 0 15px"
+      label-position="left"
+      :model="ruleForm"
+      :rules="rules"
+      ref="ruleForm"
+      label-width="80px"
+    >
+      <el-form-item label="政策标题" prop="title">
+        <el-input placeholder="请输入" v-model="ruleForm.title"></el-input>
+      </el-form-item>
+      <el-form-item label="级别" prop="level">
+        <el-select v-model="ruleForm.level" placeholder="请选择">
+          <el-option
+            v-for="item in levelOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归口" prop="attribute">
+        <el-select v-model="ruleForm.attribute" placeholder="请选择">
+          <el-option
+            v-for="item in attributeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="发布日期" required>
+        <el-form-item prop="listDate">
+          <el-date-picker
+            type="date"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+            v-model="ruleForm.listDate"
+            style="width: 30%;"
+          ></el-date-picker>
+        </el-form-item>
+      </el-form-item>
+      <el-form-item label="来源" prop="source">
+        <el-input placeholder="请输入" v-model="ruleForm.source"></el-input>
+      </el-form-item>
+      <el-form-item label="正文" prop="text">
+        <editor v-model="ruleForm.text" :min-height="192" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')"
+          >确定</el-button
+        >
+        <!-- <el-button @click="resetForm('ruleForm')">重置</el-button> -->
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+import Editor from '@/components/Editor';
+import { addPolicy, updatePolicy, getPolicyInfo } from '@/api/policy/library';
+export default {
+  components: {
+    Editor
+  },
+  data() {
+    return {
+      editPage: false,
+      ruleForm: {
+        title: '',
+        level: '',
+        attribute: '',
+        listDate: '',
+        source: '',
+        text: ''
+      },
+      // 归口选项
+      attributeOptions: [
+        {
+          value: 'KJJ',
+          label: '科技'
+        },
+        {
+          value: 'JXJ',
+          label: '经信'
+        },
+        {
+          value: 'FGW',
+          label: '发改'
+        },
+        {
+          value: 'qita',
+          label: '其他'
+        }
+      ],
+      // 级别选项
+      levelOptions: [
+        {
+          value: 1,
+          label: '省级'
+        },
+        {
+          value: 2,
+          label: '市级'
+        },
+        {
+          value: 3,
+          label: '区级'
+        }
+      ],
+      rules: {
+        title: [{ required: true, message: '请输入政策标题', trigger: 'blur' }],
+        level: [{ required: true, message: '请选择级别', trigger: 'change' }],
+        attribute: [
+          { required: true, message: '请选择归口', trigger: 'change' }
+        ],
+        listDate: [
+          {
+            // type: 'date',
+            required: true,
+            message: '请选择日期',
+            trigger: 'change'
+          }
+        ],
+        source: [{ required: true, message: '请填写来源', trigger: 'blur' }],
+        text: [{ required: true, message: '请填写富文本内容', trigger: 'blur' }]
+      }
+    };
+  },
+  methods: {
+    submitForm(formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          if (this.editPage) {
+            // 修改
+            updatePolicy(this.ruleForm).then(({ message }) => {
+              this.msgSuccess(message);
+            });
+          } else {
+            // 添加
+            addPolicy(this.ruleForm).then(({ message }) => {
+              this.msgSuccess(message);
+            });
+          }
+          this.$router.go(-1);
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    }
+    // resetForm(formName) {
+    //   this.$refs[formName].resetFields();
+    // }
+  },
+  created() {
+    let { id } = this.$route.query;
+    if (id) {
+      this.editPage = true;
+      getPolicyInfo({ policyId: id }).then(({ data }) => {
+        this.ruleForm = data;
+      });
+    }
+  }
+};
+</script>
diff --git a/src/views/policy/library/index.vue b/src/views/policy/library/index.vue
index 51993f9..9ba4727 100644
--- a/src/views/policy/library/index.vue
+++ b/src/views/policy/library/index.vue
@@ -1,187 +1,180 @@
 <template>
   <div class="app-container">
-    <el-form
-      :size="size"
-      :model="queryParams"
-      ref="queryForm"
-      v-show="showSearch"
-      :inline="true"
-    >
-      <el-form-item label="角色名称" prop="roleName">
-        <el-input
-          v-model="queryParams.roleName"
-          placeholder="请输入角色名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="权限字符" prop="roleKey">
-        <el-input
-          v-model="queryParams.roleKey"
-          placeholder="请输入权限字符"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="角色状态"
-          clearable
-          style="width: 240px"
+    <el-card class="operate-container" shadow="never">
+      <div>
+        <i class="el-icon-search"></i>
+        <span>筛选搜索</span>
+        <div style="float:right">
+          <el-button type="primary" @click="handleSearchList" size="small">
+            查询
+          </el-button>
+        </div>
+      </div>
+      <div style="margin-top: 15px">
+        <el-form
+          size="small"
+          :model="queryParams"
+          ref="queryForm"
+          :inline="true"
         >
-          <el-option
-            v-for="dict in statusOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button
-          type="cyan"
-          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>
+          <el-form-item label="政策标题">
+            <el-input
+              v-model="queryParams.title"
+              placeholder="请输入"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="产出">
+            <el-select
+              v-model="queryParams.method"
+              placeholder="请选择"
+              clearable
+            >
+              <el-option
+                v-for="item in methodOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="归口">
+            <el-select
+              v-model="queryParams.attribute"
+              placeholder="请选择"
+              clearable
+            >
+              <el-option
+                v-for="item in attributeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="推送状态">
+            <el-select
+              v-model="queryParams.status"
+              placeholder="请选择"
+              clearable
+            >
+              <el-option
+                v-for="item in statusOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-card>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:role:add']"
-          >新增</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:role:edit']"
-          >修改</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:role:remove']"
-          >删除</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:role:export']"
-          >导出</el-button
-        >
-      </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
-    </el-row>
+    <el-card class="operate-container" shadow="never">
+      <i class="el-icon-tickets"></i>
+      <span>数据列表</span>
+      <div class="btn-add">
+        <el-button @click="batchPush" size="small">批量推送</el-button>
+        <el-button @click="handlePage(null)" size="small">添加政策</el-button>
+      </div>
+    </el-card>
 
+    <!-- v-loading="loading" -->
     <el-table
-      v-loading="loading"
-      :data="roleList"
+      class="table-container"
+      :data="libraryList"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="角色编号" prop="roleId" width="120" />
-      <el-table-column
-        label="角色名称"
-        prop="roleName"
-        :show-overflow-tooltip="true"
-        width="150"
-      />
-      <el-table-column
-        label="权限字符"
-        prop="roleKey"
-        :show-overflow-tooltip="true"
-        width="150"
-      />
-      <el-table-column label="显示顺序" prop="roleSort" width="100" />
-      <el-table-column label="状态" align="center" width="100">
+      <el-table-column label="序号" align="center" prop="id" width="120" />
+      <!-- <el-table-column
+        label="序号"
+        width="120"
+        type="index"
+        :index="indexMethods"
+      /> -->
+      <el-table-column label="产生" align="center" prop="method" width="150">
         <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.status"
-            active-value="0"
-            inactive-value="1"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
+          {{
+            methodOptions.filter(item => item.value == scope.row.method)[0]
+              .label
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column label="政策标题" align="center" prop="title" />
+      <el-table-column label="级别" align="center" prop="level" width="150">
+        <template slot-scope="scope">
+          <span v-if="scope.row.level == 1">省级</span>
+          <span v-if="scope.row.level == 2">市级</span>
+          <span v-if="scope.row.level == 3">区级</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="归口" align="center" prop="attribute" width="100">
+        <template slot-scope="scope">
+          {{
+            attributeOptions.filter(
+              item => item.value == scope.row.attribute
+            )[0].label
+          }}
         </template>
       </el-table-column>
       <el-table-column
-        label="创建时间"
+        label="发布日期"
         align="center"
-        prop="createTime"
+        prop="listDate"
         width="180"
       >
-        <template slot-scope="scope">
+        <!-- <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
+        </template> -->
       </el-table-column>
+      <el-table-column label="来源" align="center" prop="source" width="100" />
       <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
       >
+        <template slot-scope="scope">
+          <p>
+            <el-button size="small" type="text" @click="open(scope.row)"
+              >标签管理</el-button
+            >
+            <el-button size="small" type="text" @click="openTime(scope.row)"
+              >截止时间</el-button
+            >
+          </p>
+          <p>
+            <el-button
+              size="small"
+              type="text"
+              @click="handlePage(scope.row.id)"
+              >编辑</el-button
+            >
+            <el-button
+              size="small"
+              type="text"
+              @click="handleDelete(scope.row.id)"
+              >删除</el-button
+            >
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column label="推送" align="center" prop="roleName" width="150">
         <template slot-scope="scope">
           <el-button
-            size="mini"
+            size="small"
+            :disabled="scope.row.status === 1"
             type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:role:edit']"
-            >修改</el-button
+            @click="push([scope.row.id])"
+            >推送</el-button
           >
-          <!-- <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-circle-check"
-            @click="handleDataScope(scope.row)"
-            v-hasPermi="['system:role:edit']"
-          >数据权限</el-button> -->
           <el-button
-            size="mini"
+            size="small"
+            :disabled="scope.row.status === 0"
             type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:role:remove']"
-            >删除</el-button
+            @click="revoke(scope.row.id)"
+            >撤销</el-button
           >
         </template>
       </el-table-column>
@@ -194,512 +187,235 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="角色名称" prop="roleName">
-          <el-input v-model="form.roleName" placeholder="请输入角色名称" />
-        </el-form-item>
-        <el-form-item label="权限字符" prop="roleKey">
-          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
-        </el-form-item>
-        <el-form-item label="角色顺序" prop="roleSort">
-          <el-input-number
-            v-model="form.roleSort"
-            controls-position="right"
-            :min="0"
-          />
-        </el-form-item>
-        <el-form-item label="状态">
-          <el-radio-group v-model="form.status">
-            <el-radio
-              v-for="dict in statusOptions"
-              :key="dict.dictValue"
-              :label="dict.dictValue"
-              >{{ dict.dictLabel }}</el-radio
-            >
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="菜单权限">
-          <el-checkbox
-            v-model="menuExpand"
-            @change="handleCheckedTreeExpand($event, 'menu')"
-            >展开/折叠</el-checkbox
+    <el-dialog :title="str" :visible.sync="dialogVisible" width="20%">
+      <el-form ref="form" :model="form" label-width="80px">
+        <section v-show="str === '标签设置'">
+          <el-form-item
+            :label="item.name"
+            v-for="(item, index) in labelList"
+            :key="item.id"
           >
-          <el-checkbox
-            v-model="menuNodeAll"
-            @change="handleCheckedTreeNodeAll($event, 'menu')"
-            >全选/全不选</el-checkbox
-          >
-          <el-checkbox
-            v-model="form.menuCheckStrictly"
-            @change="handleCheckedTreeConnect($event, 'menu')"
-            >父子联动</el-checkbox
-          >
-          <el-tree
-            class="tree-border"
-            :data="menuOptions"
-            show-checkbox
-            ref="menu"
-            node-key="id"
-            :check-strictly="!form.menuCheckStrictly"
-            empty-text="加载中，请稍后"
-            :props="defaultProps"
-          ></el-tree>
-        </el-form-item>
-        <el-form-item label="备注">
-          <el-input
-            v-model="form.remark"
-            type="textarea"
-            placeholder="请输入内容"
-          ></el-input>
-        </el-form-item>
+            <!-- v-if="item.labelList" -->
+            <el-select v-model="arr[index]" placeholder="请选择" clearable>
+              <el-option
+                v-for="i in item.labelList"
+                :key="i.id"
+                :label="i.name"
+                :value="i.id"
+              />
+            </el-select>
+          </el-form-item>
+        </section>
+        <section v-show="str === '截止时间设置'">
+          <el-form-item label="截止时间">
+            <el-date-picker
+              type="datetime"
+              placeholder="选择日期"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              v-model="form.cutOffTime"
+            ></el-date-picker>
+          </el-form-item>
+        </section>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 分配角色数据权限对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="openDataScope"
-      width="500px"
-      append-to-body
-    >
-      <el-form :model="form" label-width="80px">
-        <el-form-item label="角色名称">
-          <el-input v-model="form.roleName" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="权限字符">
-          <el-input v-model="form.roleKey" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="权限范围">
-          <el-select v-model="form.dataScope">
-            <el-option
-              v-for="item in dataScopeOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="数据权限" v-show="form.dataScope == 2">
-          <el-checkbox
-            v-model="deptExpand"
-            @change="handleCheckedTreeExpand($event, 'dept')"
-            >展开/折叠</el-checkbox
-          >
-          <el-checkbox
-            v-model="deptNodeAll"
-            @change="handleCheckedTreeNodeAll($event, 'dept')"
-            >全选/全不选</el-checkbox
-          >
-          <el-checkbox
-            v-model="form.deptCheckStrictly"
-            @change="handleCheckedTreeConnect($event, 'dept')"
-            >父子联动</el-checkbox
-          >
-          <el-tree
-            class="tree-border"
-            :data="deptOptions"
-            show-checkbox
-            default-expand-all
-            ref="dept"
-            node-key="id"
-            :check-strictly="!form.deptCheckStrictly"
-            empty-text="加载中，请稍后"
-            :props="defaultProps"
-          ></el-tree>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitDataScope">确 定</el-button>
-        <el-button @click="cancelDataScope">取 消</el-button>
-      </div>
+      </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import {
-  listRole,
-  getRole,
-  delRole,
-  addRole,
-  updateRole,
-  exportRole,
-  dataScope,
-  changeRoleStatus
-} from '@/api/system/role';
-import {
-  treeselect as menuTreeselect,
-  roleMenuTreeselect
-} from '@/api/system/menu';
-import {
-  treeselect as deptTreeselect,
-  roleDeptTreeselect
-} from '@/api/system/dept';
-
+  getPolicy,
+  delPolicy,
+  getLabelSetting,
+  setPolicyLabel,
+  updatePolicy,
+  pushPolicy,
+  noPushPolicy
+} from '@/api/policy/library';
 export default {
   name: 'Role',
   data() {
     return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 角色表格数据
-      roleList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      // 是否显示弹出层（数据权限）
-      openDataScope: false,
-      menuExpand: false,
-      menuNodeAll: false,
-      deptExpand: true,
-      deptNodeAll: false,
-      // 日期范围
-      dateRange: [],
-      // 状态数据字典
-      statusOptions: [],
-      // 数据范围选项
-      dataScopeOptions: [
+      // 产出选项
+      methodOptions: [
         {
-          value: '1',
-          label: '全部数据权限'
+          value: 1,
+          label: '爬虫'
         },
         {
-          value: '2',
-          label: '自定数据权限'
-        },
-        {
-          value: '3',
-          label: '本部门数据权限'
-        },
-        {
-          value: '4',
-          label: '本部门及以下数据权限'
-        },
-        {
-          value: '5',
-          label: '仅本人数据权限'
+          value: 2,
+          label: '手动添加'
+        }
+      ],
+      // 归口选项
+      attributeOptions: [
+        {
+          value: 'KJJ',
+          label: '科技'
+        },
+        {
+          value: 'JXJ',
+          label: '经信'
+        },
+        {
+          value: 'FGW',
+          label: '发改'
+        },
+        {
+          value: 'qita',
+          label: '其他'
+        }
+      ],
+      // 推送状态选项
+      statusOptions: [
+        {
+          value: 0,
+          label: '未推送'
+        },
+        {
+          value: 1,
+          label: '已推送'
         }
       ],
-      // 菜单列表
-      menuOptions: [],
-      // 部门列表
-      deptOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
-        roleName: undefined,
-        roleKey: undefined,
-        status: undefined
+        pageSize: 10
       },
-      // 表单参数
+      // 遮罩层
+      loading: true,
+      libraryList: [],
+      // 总条数
+      total: 0,
+      // 选中数组
+      ids: [],
+      // 标签管理弹窗状态
+      dialogVisible: false,
+      str: '',
       form: {},
-      defaultProps: {
-        children: 'children',
-        label: 'label'
-      },
-      // 表单校验
-      rules: {
-        roleName: [
-          { required: true, message: '角色名称不能为空', trigger: 'blur' }
-        ],
-        roleKey: [
-          { required: true, message: '权限字符不能为空', trigger: 'blur' }
-        ],
-        roleSort: [
-          { required: true, message: '角色顺序不能为空', trigger: 'blur' }
-        ]
-      }
+      arr: [],
+      labelList: [],
+      policyId: null
     };
   },
-  created() {
-    this.getList();
-    this.getDicts('sys_normal_disable').then(response => {
-      this.statusOptions = response.data;
-    });
-  },
   methods: {
-    /** 查询角色列表 */
-    getList() {
-      this.loading = true;
-      listRole(this.addDateRange(this.queryParams, this.dateRange)).then(
-        response => {
-          this.roleList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
-    },
-    /** 查询菜单树结构 */
-    getMenuTreeselect() {
-      menuTreeselect().then(response => {
-        this.menuOptions = response.data;
-      });
-    },
-    /** 查询部门树结构 */
-    getDeptTreeselect() {
-      deptTreeselect().then(response => {
-        this.deptOptions = response.data;
-      });
-    },
-    // 所有菜单节点数据
-    getMenuAllCheckedKeys() {
-      // 目前被选中的菜单节点
-      let checkedKeys = this.$refs.menu.getCheckedKeys();
-      // 半选中的菜单节点
-      let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
-      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
-      return checkedKeys;
-    },
-    // 所有部门节点数据
-    getDeptAllCheckedKeys() {
-      // 目前被选中的部门节点
-      let checkedKeys = this.$refs.dept.getCheckedKeys();
-      // 半选中的部门节点
-      let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys();
-      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
-      return checkedKeys;
-    },
-    /** 根据角色ID查询菜单树结构 */
-    getRoleMenuTreeselect(roleId) {
-      return roleMenuTreeselect(roleId).then(response => {
-        this.menuOptions = response.menus;
-        return response;
-      });
-    },
-    /** 根据角色ID查询部门树结构 */
-    getRoleDeptTreeselect(roleId) {
-      return roleDeptTreeselect(roleId).then(response => {
-        this.deptOptions = response.depts;
-        return response;
-      });
-    },
-    // 角色状态修改
-    handleStatusChange(row) {
-      let text = row.status === '0' ? '启用' : '停用';
-      this.$confirm(
-        '确认要"' + text + '""' + row.roleName + '"角色吗?',
-        '警告',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      )
-        .then(function() {
-          return changeRoleStatus(row.roleId, row.status);
-        })
-        .then(() => {
-          this.msgSuccess(text + '成功');
-        })
-        .catch(function() {
-          row.status = row.status === '0' ? '1' : '0';
-        });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 取消按钮（数据权限）
-    cancelDataScope() {
-      this.openDataScope = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      if (this.$refs.menu != undefined) {
-        this.$refs.menu.setCheckedKeys([]);
-      }
-      (this.menuExpand = false),
-        (this.menuNodeAll = false),
-        (this.deptExpand = true),
-        (this.deptNodeAll = false),
-        (this.form = {
-          roleId: undefined,
-          roleName: undefined,
-          roleKey: undefined,
-          roleSort: 0,
-          status: '0',
-          menuIds: [],
-          deptIds: [],
-          menuCheckStrictly: true,
-          deptCheckStrictly: true,
-          remark: undefined
-        });
-      this.resetForm('form');
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
+    handleSearchList() {
       this.queryParams.pageNum = 1;
       this.getList();
     },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm('queryForm');
-      this.handleQuery();
+    getList() {
+      getPolicy(this.queryParams).then(({ data }) => {
+        this.libraryList = data.list;
+        this.total = data.total;
+      });
+    },
+    // 处理序号=》倒序
+    // indexMethods(index) {
+    //   console.log(index);
+    //   if (this.libraryList.length < 10) {
+    //     return this.libraryList.length - index;
+    //   } else {
+    //     return (
+    //       this.libraryList.length - (this.queryParams.pageNum - 1) * 10 - index
+    //     );
+    //   }
+    // },
+    // 跳转页面
+    handlePage(id) {
+      this.$router.push({ path: '/policy/add', query: { id } });
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.roleId);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
+      this.ids = selection.map(item => item.id);
     },
-    // 树权限（展开/折叠）
-    handleCheckedTreeExpand(value, type) {
-      if (type == 'menu') {
-        let treeList = this.menuOptions;
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
+    // 批量推送
+    batchPush() {
+      if (this.ids == null || this.ids.length < 1)
+        return this.msgInfo('请选择要操作的数据');
+      this.push(this.ids);
+    },
+    open(row) {
+      this.str = '标签设置';
+      this.dialogVisible = true;
+      this.policyId = row.id;
+      getLabelSetting({ policyId: row.id, pageNum: 1, pageSize: 100 }).then(
+        ({ data }) => {
+          this.labelList = data.list;
+          this.arr = data.list.map(item =>
+            item.labelList
+              ? item.labelList.filter(v => v.isHas)[0]
+                ? item.labelList.filter(v => v.isHas)[0].id
+                : ''
+              : undefined
+          );
+          // this.arr = data.list.map(item => {
+          //   // return item.labelList ? item.labelList.map(v => v.id) : undefined;
+          //   return item.labelList
+          //     ? item.labelList.filter(v => v.isHas)[0]
+          //       ? item.labelList.filter(v => v.isHas)[0].id
+          //       : ''
+          //     : undefined;
+          // });
         }
-      } else if (type == 'dept') {
-        let treeList = this.deptOptions;
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
-        }
-      }
+      );
     },
-    // 树权限（全选/全不选）
-    handleCheckedTreeNodeAll(value, type) {
-      if (type == 'menu') {
-        this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
-      } else if (type == 'dept') {
-        this.$refs.dept.setCheckedNodes(value ? this.deptOptions : []);
-      }
+    openTime(row) {
+      this.str = '截止时间设置';
+      this.dialogVisible = true;
+      this.form = row;
     },
-    // 树权限（父子联动）
-    handleCheckedTreeConnect(value, type) {
-      if (type == 'menu') {
-        this.form.menuCheckStrictly = value ? true : false;
-      } else if (type == 'dept') {
-        this.form.deptCheckStrictly = value ? true : false;
-      }
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.getMenuTreeselect();
-      this.open = true;
-      this.title = '添加角色';
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const roleId = row.roleId || this.ids;
-      const roleMenu = this.getRoleMenuTreeselect(roleId);
-      getRole(roleId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.$nextTick(() => {
-          roleMenu.then(res => {
-            this.$refs.menu.setCheckedKeys(res.checkedKeys);
-          });
+    submitForm() {
+      if (this.str === '标签设置') {
+        let ids = this.arr.filter(item => item);
+        setPolicyLabel({ id: this.policyId, ids }).then(({ message }) => {
+          this.msgSuccess(message);
+          this.dialogVisible = false;
         });
-        this.title = '修改角色';
-      });
-    },
-    /** 分配数据权限操作 */
-    handleDataScope(row) {
-      this.reset();
-      const roleDeptTreeselect = this.getRoleDeptTreeselect(row.roleId);
-      getRole(row.roleId).then(response => {
-        this.form = response.data;
-        this.openDataScope = true;
-        this.$nextTick(() => {
-          roleDeptTreeselect.then(res => {
-            this.$refs.dept.setCheckedKeys(res.checkedKeys);
-          });
-        });
-        this.title = '分配数据权限';
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          if (this.form.roleId != undefined) {
-            this.form.menuIds = this.getMenuAllCheckedKeys();
-            updateRole(this.form).then(response => {
-              this.msgSuccess('修改成功');
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            this.form.menuIds = this.getMenuAllCheckedKeys();
-            addRole(this.form).then(response => {
-              this.msgSuccess('新增成功');
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 提交按钮（数据权限） */
-    submitDataScope: function() {
-      if (this.form.roleId != undefined) {
-        this.form.deptIds = this.getDeptAllCheckedKeys();
-        dataScope(this.form).then(response => {
-          this.msgSuccess('修改成功');
-          this.openDataScope = false;
-          this.getList();
+      } else {
+        updatePolicy(this.form).then(({ message }) => {
+          this.msgSuccess(message);
+          this.dialogVisible = false;
         });
       }
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const roleIds = row.roleId || this.ids;
-      this.$confirm(
-        '是否确认删除角色编号为"' + roleIds + '"的数据项?',
-        '警告',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      )
+    // 删除
+    handleDelete(id) {
+      this.$confirm('确认删除该数据?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
         .then(function() {
-          return delRole(roleIds);
+          return delPolicy({ ids: [id] });
         })
         .then(() => {
           this.getList();
           this.msgSuccess('删除成功');
         });
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有角色数据项?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(function() {
-          return exportRole(queryParams);
-        })
-        .then(response => {
-          this.download(response.msg);
+    // 推送
+    push(ids) {
+      pushPolicy({ ids, status: 1 }).then(({ data }) => {
+        this.$message({
+          dangerouslyUseHTMLString: true,
+          message: data
         });
+        this.getList();
+      });
+    },
+    // 撤销
+    revoke(id) {
+      noPushPolicy({ id, status: 0 }).then(({ message }) => {
+        this.msgSuccess(message);
+        this.getList();
+      });
     }
+  },
+  created() {
+    this.getList();
   }
 };
 </script>