From f419218bcabb356799397e6a9bd925be89d21433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com>
Date: Fri, 6 Aug 2021 17:58:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E7=AD=96=E5=BA=93=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/policy/library.js          |   7 ++
 src/layout/components/Navbar.vue   |  23 +++---
 src/views/policy/library/add.vue   |  84 ++++++++++++--------
 src/views/policy/library/index.vue | 120 +++++++++++++++++++++--------
 4 files changed, 159 insertions(+), 75 deletions(-)

diff --git a/src/api/policy/library.js b/src/api/policy/library.js
index 7fd3495..5eca25c 100644
--- a/src/api/policy/library.js
+++ b/src/api/policy/library.js
@@ -76,3 +76,10 @@ export function getPolicyInfo(params) {
     params
   });
 }
+// 根据level查询城市 1->省 2->市 3->合肥
+export function getCityByLevel(params) {
+  return request({
+    url: '/dict/getCityByLevel',
+    params
+  });
+}
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index d53fe9c..b6d883c 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -9,25 +9,25 @@
 
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
 
-    <!-- <div class="right-menu">
-      <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" /> -->
+    <div class="right-menu">
+      <!-- <template v-if="device!=='mobile'">
+        <search id="header-search" class="right-menu-item" />
 
-    <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
+    <el-tooltip content="源码地址" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
         </el-tooltip>
 
         <el-tooltip content="文档地址" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip> -->
+        </el-tooltip>
 
-    <!-- <screenfull id="screenfull" class="right-menu-item hover-effect" />
+    <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
 
-      </template>
+      </template>-->
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
@@ -35,18 +35,21 @@
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
-          <router-link to="/user/profile">
+          <!-- <router-link to="/user/profile">
             <el-dropdown-item>个人中心</el-dropdown-item>
           </router-link>
           <el-dropdown-item @click.native="setting = true">
             <span>布局设置</span>
-          </el-dropdown-item>
+          </el-dropdown-item> -->
+          <router-link to="/">
+            <el-dropdown-item>首页</el-dropdown-item>
+          </router-link>
           <el-dropdown-item divided @click.native="logout">
             <span>退出登录</span>
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
-    </div> -->
+    </div> 
   </div>
 </template>
 
diff --git a/src/views/policy/library/add.vue b/src/views/policy/library/add.vue
index 31f90a6..30df228 100644
--- a/src/views/policy/library/add.vue
+++ b/src/views/policy/library/add.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <div>{{ editPage ? '修改' : '添加' }}政策</div>
     <el-form
-      style="width:50%;margin:15px 0 0 15px"
+      style="width: 50%; margin: 15px 0 0 15px"
       label-position="left"
       :model="ruleForm"
       :rules="rules"
@@ -16,8 +16,8 @@
           :disabled="editPage"
         ></el-input>
       </el-form-item>
-      <el-form-item label="级别" prop="level">
-        <el-select
+      <el-form-item label="城市" prop="ids">
+        <!-- <el-select
           v-model="ruleForm.level"
           placeholder="请选择"
           :disabled="editPage"
@@ -28,7 +28,15 @@
             :label="item.label"
             :value="item.value"
           />
-        </el-select>
+        </el-select> -->
+        <el-cascader
+          v-model="ruleForm.ids"
+          :options="levelOptions"
+          :props="{ expandTrigger: 'hover' }"
+          :show-all-levels="false"
+          :disabled="editPage"
+        >
+        </el-cascader>
       </el-form-item>
       <el-form-item label="归口" prop="attribute">
         <el-select
@@ -51,7 +59,7 @@
             placeholder="选择日期"
             value-format="yyyy-MM-dd"
             v-model="ruleForm.listDate"
-            style="width: 30%;"
+            style="width: 30%"
             :disabled="editPage"
           ></el-date-picker>
         </el-form-item>
@@ -80,77 +88,81 @@
 <script>
 import Editor from '@/components/Editor';
 import { addPolicy, updatePolicy, getPolicyInfo } from '@/api/policy/library';
+import { getCityByLevel } from '@/api/policy/library';
 export default {
   components: {
-    Editor
+    Editor,
   },
   data() {
     return {
       editPage: false,
       ruleForm: {
         title: '',
-        level: '',
+        ids: '',
         attribute: '',
         listDate: '',
         source: '',
-        text: ''
+        text: '',
       },
       // 归口选项
       attributeOptions: [
         {
           value: 'KJJ',
-          label: '科技'
+          label: '科技',
         },
         {
           value: 'JXJ',
-          label: '经信'
+          label: '经信',
         },
         {
           value: 'FGW',
-          label: '发改'
+          label: '发改',
         },
         {
           value: 'OTHER',
-          label: '其他'
-        }
+          label: '其他',
+        },
       ],
       // 级别选项
       levelOptions: [
         {
-          value: 1,
-          label: '省级'
+          value: '1',
+          label: '安徽省',
         },
         {
-          value: 2,
-          label: '市级'
+          value: '2',
+          label: '地级市',
+          children: [],
         },
         {
-          value: 3,
-          label: '区级'
-        }
+          value: '3',
+          label: '合肥区县',
+          children: [],
+        },
       ],
       rules: {
         title: [{ required: true, message: '请输入政策标题', trigger: 'blur' }],
-        level: [{ required: true, message: '请选择级别', trigger: 'change' }],
+        ids: [{ required: true, message: '请选择级别', trigger: 'change' }],
         attribute: [
-          { required: true, message: '请选择归口', trigger: 'change' }
+          { required: true, message: '请选择归口', trigger: 'change' },
         ],
         listDate: [
           {
-            // type: 'date',
             required: true,
             message: '请选择日期',
-            trigger: 'change'
-          }
+            trigger: 'change',
+          },
         ],
         source: [{ required: true, message: '请填写来源', trigger: 'blur' }],
-        text: [{ required: true, message: '请填写富文本内容', trigger: 'blur' }]
-      }
+        text: [
+          { required: true, message: '请填写富文本内容', trigger: 'blur' },
+        ],
+      },
     };
   },
   methods: {
     submitForm(formName) {
-      this.$refs[formName].validate(valid => {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.editPage) {
             // 修改
@@ -169,20 +181,20 @@ export default {
           return false;
         }
       });
-    }
+    },
     // resetForm(formName) {
     //   this.$refs[formName].resetFields();
     // }
   },
   watch: {
     ruleForm: {
-      handler: function() {
+      handler: function () {
         this.$nextTick(() => {
           this.formatRichText(this.ruleForm.downloadUrl);
         });
-      }
+      },
     },
-    deep: true
+    deep: true,
   },
   created() {
     let { id } = this.$route.query;
@@ -192,7 +204,13 @@ export default {
         this.ruleForm = data;
       });
     }
-  }
+    getCityByLevel({ level: 2 }).then(({ data }) => {
+      this.levelOptions[1].children = data;
+    });
+    getCityByLevel({ level: 3 }).then(({ data }) => {
+      this.levelOptions[2].children = data;
+    });
+  },
 };
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/policy/library/index.vue b/src/views/policy/library/index.vue
index 7e98059..36a7e01 100644
--- a/src/views/policy/library/index.vue
+++ b/src/views/policy/library/index.vue
@@ -4,7 +4,7 @@
       <div>
         <i class="el-icon-search"></i>
         <span>筛选搜索</span>
-        <div style="float:right">
+        <div style="float: right">
           <el-button type="primary" @click="handleSearchList" size="small">
             查询
           </el-button>
@@ -66,6 +66,26 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="城市选择">
+            <el-cascader
+              v-model="queryParams.city"
+              :options="leveOptions"
+              :props="{ expandTrigger: 'hover', emitPath: false }"
+              :show-all-levels="false"
+            >
+            </el-cascader>
+          </el-form-item>
+          <el-form-item label="发布日期">
+            <el-date-picker
+              v-model="value1"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            >
+            </el-date-picker>
+          </el-form-item>
         </el-form>
       </div>
     </el-card>
@@ -96,30 +116,30 @@
       <el-table-column label="产生" align="center" prop="method" width="150">
         <template slot-scope="scope">
           {{
-            methodOptions.filter(item => item.value == scope.row.method)[0]
+            methodOptions.filter((item) => item.value == scope.row.method)[0]
               .label
           }}
         </template>
       </el-table-column>
       <el-table-column label="政策标题" align="center" prop="title">
-        <template slot-scope="scope">
+        <!-- <template slot-scope="scope">
           <el-link type="primary" :underline="false">{{
             scope.row.title
           }}</el-link>
-        </template>
+        </template> -->
       </el-table-column>
       <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>
+          <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
+              (item) => item.value == scope.row.attribute
             )[0].label
           }}
         </template>
@@ -238,7 +258,8 @@ import {
   setPolicyLabel,
   updatePolicy,
   pushPolicy,
-  noPushPolicy
+  noPushPolicy,
+  getCityByLevel,
 } from '@/api/policy/library';
 export default {
   name: 'Role',
@@ -248,47 +269,64 @@ export default {
       methodOptions: [
         {
           value: 1,
-          label: '爬虫'
+          label: '爬虫',
         },
         {
           value: 2,
-          label: '手动添加'
-        }
+          label: '手动添加',
+        },
       ],
       // 归口选项
       attributeOptions: [
         {
           value: 'KJJ',
-          label: '科技'
+          label: '科技',
         },
         {
           value: 'JXJ',
-          label: '经信'
+          label: '经信',
         },
         {
           value: 'FGW',
-          label: '发改'
+          label: '发改',
         },
         {
           value: 'OTHER',
-          label: '其他'
-        }
+          label: '其他',
+        },
       ],
       // 推送状态选项
       statusOptions: [
         {
           value: 0,
-          label: '未推送'
+          label: '未推送',
         },
         {
           value: 1,
-          label: '已推送'
-        }
+          label: '已推送',
+        },
+      ],
+      // 城市选择
+      leveOptions: [
+        {
+          value: 'AH',
+          label: '安徽省',
+        },
+        {
+          value: '2',
+          label: '地级市',
+          children: [],
+        },
+        {
+          value: '3',
+          label: '合肥区县',
+          children: [],
+        },
       ],
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
       },
       // 遮罩层
       loading: true,
@@ -303,9 +341,21 @@ export default {
       form: {},
       arr: [],
       labelList: [],
-      policyId: null
+      policyId: null,
+      value1: '',
     };
   },
+  watch: {
+    value1(a, b) {
+      if (a) {
+        this.queryParams.startTime = a[0];
+        this.queryParams.endTime = a[1];
+      } else {
+        delete this.queryParams.startTime;
+        delete this.queryParams.endTime;
+      }
+    },
+  },
   methods: {
     handleSearchList() {
       this.queryParams.pageNum = 1;
@@ -334,7 +384,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
+      this.ids = selection.map((item) => item.id);
     },
     // 批量推送
     batchPush() {
@@ -349,10 +399,10 @@ export default {
       getLabelSetting({ policyId: row.id, pageNum: 1, pageSize: 100 }).then(
         ({ data }) => {
           this.labelList = data.list;
-          this.arr = data.list.map(item =>
+          this.arr = data.list.map((item) =>
             item.labelList
-              ? item.labelList.filter(v => v.isHas)[0]
-                ? item.labelList.filter(v => v.isHas)[0].id
+              ? item.labelList.filter((v) => v.isHas)[0]
+                ? item.labelList.filter((v) => v.isHas)[0].id
                 : ''
               : undefined
           );
@@ -374,7 +424,7 @@ export default {
     },
     submitForm() {
       if (this.str === '标签设置') {
-        let ids = this.arr.filter(item => item);
+        let ids = this.arr.filter((item) => item);
         setPolicyLabel({ id: this.policyId, ids }).then(({ message }) => {
           this.msgSuccess(message);
           this.dialogVisible = false;
@@ -391,9 +441,9 @@ export default {
       this.$confirm('确认删除该数据?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
       })
-        .then(function() {
+        .then(function () {
           return delPolicy({ ids: [id] });
         })
         .then(() => {
@@ -406,7 +456,7 @@ export default {
       pushPolicy({ ids, status: 1 }).then(({ data }) => {
         this.$message({
           dangerouslyUseHTMLString: true,
-          message: data
+          message: data,
         });
         this.getList();
       });
@@ -417,10 +467,16 @@ export default {
         this.msgSuccess(message);
         this.getList();
       });
-    }
+    },
   },
   created() {
     this.getList();
-  }
+    getCityByLevel({ level: 2 }).then(({ data }) => {
+      this.leveOptions[1].children = data;
+    });
+    getCityByLevel({ level: 3 }).then(({ data }) => {
+      this.leveOptions[2].children = data;
+    });
+  },
 };
 </script>