diff --git a/package.json b/package.json
index 9fe9a00..5e0eb38 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
     "vueui": "vue ui"
   },
   "dependencies": {
+    "@johmun/vue-tags-input": "^2.1.0",
     "axios": "^0.24.0",
     "core-js": "^3.19.1",
     "echarts": "^5.2.2",
diff --git a/src/api/modules/report.js b/src/api/modules/report.js
index f590359..8eb9656 100644
--- a/src/api/modules/report.js
+++ b/src/api/modules/report.js
@@ -18,10 +18,10 @@ export default {
       params: data
     })
   },
-  // 标签管理
+  // 标签增加
   labelAdd (data) {
     return request({
-      url: '/api/label/add',
+      url: 'api/tree-label/add',
       method: 'POST',
       data
     })
@@ -29,7 +29,7 @@ export default {
   // 标签列表
   labelList (data) {
     return request({
-      url: '/api/label/list',
+      url: 'api/tree-label/list',
       method: 'GET',
       params: data
     })
@@ -37,11 +37,16 @@ export default {
   // 标签删除|单个
   labelDeleteId (data) {
     return request({
-      url: `/api/label/delete/${data.id}`,
+      url: `api/tree-label/${data.id}`,
       method: 'POST'
     })
   },
-
+labelUpdate(){
+  return request({
+    url: 'api/tree-label/update',
+    method: 'POST'
+  })
+},
   // 新增或编辑报告
   reportAdd (data) {
     return request({
@@ -129,4 +134,5 @@ export default {
       params: data
     })
   }
+  //
 }
diff --git a/src/main.js b/src/main.js
index c554d5c..26b2d10 100644
--- a/src/main.js
+++ b/src/main.js
@@ -75,5 +75,8 @@ Vue.config.productionTip = false
 new Vue({
   router,
   store,
+  beforeCreate(){
+		Vue.prototype.$bus = this	//安装全局事件总线
+	},
   render: h => h(App)
 }).$mount('#app')
diff --git a/src/router/modules/userCenter.js b/src/router/modules/userCenter.js
index 2c389cb..0fe81fc 100644
--- a/src/router/modules/userCenter.js
+++ b/src/router/modules/userCenter.js
@@ -1,30 +1,35 @@
 const routes = [
-  // 用户中心管理
-  {
-    path: '/userCenter',
-    name: 'userCenter',
-    component: () => import('../../views/Layout.vue'),
-    children: [
-      // 流程中心
-      {
-        path: 'processCenter',
-        name: 'processCenter',
-        component: () => import('../../views/userCenter/processCenter.vue'),
-        meta: {
-          crumb: ['流程中心']
+    // 用户中心管理
+    {
+      path: '/userCenter',
+      name: 'userCenter',
+      component: () => import('../../views/Layout.vue'),
+      children: [
+        // 流程中心
+        {
+          path: 'processCenter',
+          name: 'processCenter',
+          component: () => import('../../views/userCenter/processCenter.vue'),
+          meta: {
+            crumb: ['流程中心']
+          }
+        },
+        // 流程配置
+        {
+          path: 'processConfig',
+          name: 'processConfig',
+          component: () => import('../../views/userCenter/processConfig/index.vue'),
+          meta: {
+            crumb: ['流程配置']
+          }
+        },
+        {
+          path:'monitorViews',
+          name:'monitorViews',
+          component: () => import('../../views/userCenter/processCenter/monitorProcesses/monitorViews.vue')
         }
-      },
-      // 流程配置
-      {
-        path: 'processConfig',
-        name: 'processConfig',
-        component: () => import('../../views/userCenter/processConfig/index.vue'),
-        meta: {
-          crumb: ['流程配置']
-        }
-      }
-    ]
-  }
-]
+      ]
+    }
+  ]
 
-export default routes
+  export default routes
diff --git a/src/views/Report/ReportList.vue b/src/views/Report/ReportList.vue
index b7cfe27..02338c7 100644
--- a/src/views/Report/ReportList.vue
+++ b/src/views/Report/ReportList.vue
@@ -5,9 +5,15 @@
         </div>
         <div class="tag-search">
             <el-row>
-                <el-col :span="24">
+                <el-col :span="6">
                     <div class="tag-item">
-                        <label class="tag-title">报告年份</label>
+                        <label class="tag-title">关键词:</label>
+                        <el-input v-model="q.keyContent" placeholder="请输入报告名称"></el-input>
+                    </div>
+                </el-col>
+                <el-col :span="6">
+                    <div class="tag-item">
+                        <label class="tag-title">报告年份：</label>
                         <el-select v-model="q.year" multiple collapse-tags placeholder="请选择报告年份">
                             <template v-for="item in yearList">
                                 <el-option :label="item" :value="item" :key="item"></el-option>
@@ -15,7 +21,18 @@
                         </el-select>
                     </div>
                 </el-col>
-                <el-col :span="24">
+                <el-col :span="6">
+                    <div class="tag-item">
+                        <label class="tag-title">报告名称:</label>
+                        <el-input v-model="q.name" placeholder="请输入报告名称"></el-input>
+                    </div>
+                </el-col>
+
+                <el-col :span="6" align="right" class="tag-btns">
+                    <el-button type="primary" @click="search">查询</el-button>
+                    <el-button type="default" @click="reset">重置</el-button>
+                </el-col>
+                <!-- <el-col :span="24">
                     <div class="tag-item">
                         <el-tooltip :content="tagData[1].name" placement="top">
                             <label class="tag-title">{{ tagData[1].name }}</label>
@@ -34,8 +51,8 @@
                                :class="{'el-icon-arrow-down': !tagData[1].tagShow, 'el-icon-arrow-up': tagData[1].tagShow}"></i>
                         </div>
                     </div>
-                </el-col>
-                <el-col :span="24">
+                </el-col> -->
+                <!-- <el-col :span="24">
                     <div class="tag-item">
                         <el-tooltip :content="tagData[2].name" placement="top">
                             <label class="tag-title">{{ tagData[2].name }}</label>
@@ -54,8 +71,8 @@
                                :class="{'el-icon-arrow-down': !tagData[2].tagShow, 'el-icon-arrow-up': tagData[2].tagShow}"></i>
                         </div>
                     </div>
-                </el-col>
-                <el-col :span="24">
+                </el-col> -->
+                <!-- <el-col :span="24">
                     <div class="tag-item">
                         <el-tooltip :content="tagData[3].name" placement="top">
                             <label class="tag-title">{{ tagData[3].name }}</label>
@@ -74,23 +91,31 @@
                                :class="{'el-icon-arrow-down': !tagData[3].tagShow, 'el-icon-arrow-up': tagData[3].tagShow}"></i>
                         </div>
                     </div>
-                </el-col>
-                <el-col :span="12">
-                    <div class="tag-item">
-                        <label class="tag-title">搜索:</label>
-                        <el-input v-model="q.keyContent" placeholder="请输入搜索内容"></el-input>
-                    </div>
-                </el-col>
-                <el-col :span="12" align="right" class="tag-btns">
-                    <el-button type="primary" @click="search">查询</el-button>
-                    <el-button type="default" @click="reset">重置</el-button>
-                </el-col>
+                </el-col> -->
+
+
             </el-row>
         </div>
         <el-row class="tag-btn">
           <el-button type="primary" size="big" @click="permissionApp">权限申请</el-button>
         </el-row>
         <div class="table">
+          <el-row>
+          <el-col :span="4" class="treeList">
+            <el-input placeholder="输入关键字进行过滤" v-model="filterText">
+            </el-input>
+            <el-tree
+              class="filter-tree"
+              :data="treeData"
+              show-checkbox
+              node-key="id"
+              default-expand-all
+              :filter-node-method="filterNode"
+              ref="tree"
+            >
+            </el-tree>
+          </el-col>
+          <el-col :span="19">
             <vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 420px)'"
                        @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent">
               <vxe-column type="checkbox" width="60"></vxe-column>
@@ -116,12 +141,12 @@
                                 <div class="tag-info">
                                     <span class="icon-tag-item"><img src="@/assets/imgs/icon-time.png"
                                                                      alt=""><span>{{row.year}}</span></span>
-                                    <span class="icon-tag-item"><img src="@/assets/imgs/icon-tag01.png"
+                                    <!-- <span class="icon-tag-item"><img src="@/assets/imgs/icon-tag01.png"
                                                                      alt=""><span>{{row.labelOneName}}</span></span>
                                     <span class="icon-tag-item"><img src="@/assets/imgs/icon-tag02.png"
                                                                      alt=""><span>{{row.labelTwoName}}</span></span>
                                     <span class="icon-tag-item"><img src="@/assets/imgs/icon-tag03.png"
-                                                                     alt=""><span>{{row.labelThreeName}}</span></span>
+                                                                     alt=""><span>{{row.labelThreeName}}</span></span> -->
                                     <!--<span class="icon-tag-item"><span>{{(row.fileSize / 1024 / 1024).toFixed(2) }}MB</span></span>-->
                                 </div>
                             </div>
@@ -134,6 +159,7 @@
 <!--                        <el-button type="text" @click="downloadRow(row)">下载</el-button>-->
                     </template>
                 </vxe-column>
+
             </vxe-table>
             <el-pagination
                 @size-change="handleSizeChange"
@@ -143,6 +169,12 @@
                 :page-size="q.pageSize"
                 layout="total, sizes, prev, pager, next, jumper"
                 :total="total"/>
+            </el-col>
+            </el-row>
+
+
+
+
         </div>
 
         <!--预览-->
@@ -214,10 +246,78 @@ export default {
       },
       dialogPreview: false, // 预览
       content: '',
+      filterText:'',
+      treeData: [
+                {
+                    id: 0,
+                    label: '根节点',
+                    children: [
+                        {
+                            id: 1,
+                            label: '一级 1',
+                            children: [
+                                {
+                                    id: 4,
+                                    label: '二级 1-1',
+                                    children: [
+                                        {
+                                            id: 9,
+                                            label: '三级 1-1-1'
+                                        },
+                                        {
+                                            id: 10,
+                                            label: '三级 1-1-2'
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            id: 2,
+                            label: '一级 2',
+                            children: [
+                                {
+                                    id: 5,
+                                    label: '二级 2-1'
+                                },
+                                {
+                                    id: 6,
+                                    label: '二级 2-2'
+                                }
+                            ]
+                        },
+                        {
+                            id: 3,
+                            label: '一级 3',
+                            children: [
+                                {
+                                    id: 7,
+                                    label: '二级 3-1'
+                                },
+                                {
+                                    id: 8,
+                                    label: '二级 3-2'
+                                }
+                            ]
+                        },
+                    ]
+
+                }
+            ],
+      content: '',
       checkIds: []
     }
   },
+  watch: {
+      filterText(val) {
+        this.$refs.tree.filter(val);
+      }
+    },
   methods: {
+    filterNode(value, data) {
+            if (!value) return true;
+            return data.label.indexOf(value) !== -1;
+        },
     selectAllEvent ({ checked }) {
       const records = this.$refs.xTable.getCheckboxRecords()
       this.checkIds = records.map(item => {
diff --git a/src/views/Report/ReportManager.vue b/src/views/Report/ReportManager.vue
index 8035697..d52db69 100644
--- a/src/views/Report/ReportManager.vue
+++ b/src/views/Report/ReportManager.vue
@@ -15,19 +15,19 @@
                             </template>
                         </el-select>
                         <el-select v-model="q.labelOneId" multiple collapse-tags
-                                   :placeholder="'请选择' + tagsForm.tags01.name">
+                            :placeholder="'请选择' + tagsForm.tags01.name">
                             <template v-for="item in tagsForm.tags01.childList">
                                 <el-option :label="item.name" :value="item.id" :key="item.id"></el-option>
                             </template>
                         </el-select>
                         <el-select v-model="q.labelTwoId" multiple collapse-tags
-                                   :placeholder="'请选择' + tagsForm.tags02.name">
+                            :placeholder="'请选择' + tagsForm.tags02.name">
                             <template v-for="item in tagsForm.tags02.childList">
                                 <el-option :label="item.name" :value="item.id" :key="item.id"></el-option>
                             </template>
                         </el-select>
                         <el-select v-model="q.labelThreeId" multiple collapse-tags
-                                   :placeholder="'请选择' + tagsForm.tags03.name">
+                            :placeholder="'请选择' + tagsForm.tags03.name">
                             <template v-for="item in tagsForm.tags03.childList">
                                 <el-option :label="item.name" :value="item.id" :key="item.id"></el-option>
                             </template>
@@ -56,10 +56,13 @@
                         {{ rowIndex + (q.pageNo - 1) * q.pageSize + 1 }}
                     </template>
                 </vxe-column>
-                <vxe-column show-overflow show-header-overflow field="labelOneName" :title="tagsForm.tags01.name"></vxe-column>
+                <vxe-column show-overflow show-header-overflow field="labelOneName"
+                    :title="tagsForm.tags01.name"></vxe-column>
                 <vxe-column show-overflow show-header-overflow field="name" title="报告名称"></vxe-column>
-                <vxe-column show-overflow show-header-overflow field="labelTwoName" :title="tagsForm.tags02.name"></vxe-column>
-                <vxe-column show-overflow show-header-overflow field="labelThreeName" :title="tagsForm.tags03.name"></vxe-column>
+                <vxe-column show-overflow show-header-overflow field="labelTwoName"
+                    :title="tagsForm.tags02.name"></vxe-column>
+                <vxe-column show-overflow show-header-overflow field="labelThreeName"
+                    :title="tagsForm.tags03.name"></vxe-column>
                 <vxe-column show-overflow show-header-overflow field="year" title="报告年份"></vxe-column>
                 <vxe-column show-overflow show-header-overflow field="createDate" title="上传时间"></vxe-column>
                 <vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
@@ -67,29 +70,25 @@
                         <el-button type="text" @click="openReportModify('modify', row)">编辑</el-button>
                         <el-button type="text" class="del-btn" @click="reportDelete(row.id)">删除</el-button>
                         <el-button type="text" @click="previewRow(row)">预览</el-button>
-<!--                        <el-button type="text" @click="downloadRow(row)">下载</el-button>-->
+                        <!--                        <el-button type="text" @click="downloadRow(row)">下载</el-button>-->
                     </template>
                 </vxe-column>
             </vxe-table>
-            <el-pagination
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
-                :current-page="q.pageNo"
-                :page-sizes="[5, 10, 20]"
-                :page-size="q.pageSize"
-                layout="total, sizes, prev, pager, next, jumper"
-                :total="total"/>
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.pageNo"
+                :page-sizes="[5, 10, 20]" :page-size="q.pageSize" layout="total, sizes, prev, pager, next, jumper"
+                :total="total" />
         </div>
         <!--操作日志-->
         <el-dialog title="操作日志" :visible.sync="dialogLog" width="1100px" :close-on-click-modal="false"
-                   :close-on-press-escape="false" modal-append-to-body append-to-body>
+            :close-on-press-escape="false" modal-append-to-body append-to-body>
             <div class="dialog-log">
                 <div class="search">
                     <el-row>
                         <el-col :span="20">
                             <div class="search-box-left">
                                 <label>操作类型:</label>
-                                <el-select v-model="doNames" multiple collapse-tags placeholder="请选择操作类型" @change="handleTyleChange">
+                                <el-select v-model="doNames" multiple collapse-tags placeholder="请选择操作类型"
+                                    @change="handleTyleChange">
                                     <el-option label="新增" value="新增"></el-option>
                                     <el-option label="编辑" value="编辑"></el-option>
                                     <el-option label="删除" value="删除"></el-option>
@@ -97,13 +96,8 @@
                                 <label>报告名称:</label>
                                 <el-input v-model="qLog.reportName" placeholder="请输入报告名称"></el-input>
                                 <label>操作时间:</label>
-                                <el-date-picker
-                                    v-model="qLogDateRange"
-                                    type="daterange"
-                                    range-separator="至"
-                                    start-placeholder="开始时间"
-                                    end-placeholder="结束时间"
-                                    value-format="yyyy-MM-dd"
+                                <el-date-picker v-model="qLogDateRange" type="daterange" range-separator="至"
+                                    start-placeholder="开始时间" end-placeholder="结束时间" value-format="yyyy-MM-dd"
                                     @change="handleLogDate">
                                 </el-date-picker>
                             </div>
@@ -117,7 +111,8 @@
                     </el-row>
                 </div>
                 <div class="table">
-                    <vxe-table :data="logTableData" :empty-render="{name: 'NotData'}" align="center" border stripe height="440">
+                    <vxe-table :data="logTableData" :empty-render="{ name: 'NotData' }" align="center" border stripe
+                        height="440">
                         <vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
                             <template #default="{ row, rowIndex }">
                                 {{ rowIndex + (qLog.pageNo - 1) * qLog.pageSize + 1 }}
@@ -128,177 +123,75 @@
                         <vxe-column show-overflow show-header-overflow field="account" title="用户名"></vxe-column>
                         <vxe-column show-overflow show-header-overflow field="operateTime" title="操作时间"></vxe-column>
                     </vxe-table>
-                    <el-pagination
-                        @size-change="handleLogSizeChange"
-                        @current-change="handleLogCurrentChange"
-                        :current-page="qLog.pageNo"
-                        :page-sizes="[5, 10, 20]"
-                        :page-size="qLog.pageSize"
-                        layout="total, sizes, prev, pager, next, jumper"
-                        :total="qLogTotal"/>
+                    <el-pagination @size-change="handleLogSizeChange" @current-change="handleLogCurrentChange"
+                        :current-page="qLog.pageNo" :page-sizes="[5, 10, 20]" :page-size="qLog.pageSize"
+                        layout="total, sizes, prev, pager, next, jumper" :total="qLogTotal" />
                 </div>
             </div>
         </el-dialog>
         <!--标签维护-->
-        <el-dialog title="标签维护" :visible.sync="dialogTags" width="1100px" :close-on-click-modal="false"
-                   :close-on-press-escape="false" modal-append-to-body append-to-body :before-close="handleTagsClose">
-            <div class="dialog-tags">
-                <el-row :gutter="17">
-                    <el-col :span="8">
-                        <div class="tags-item">
-                            <div class="tag-header">
-                                <el-row>
-                                    <el-col :span="17">
-                                        <el-input v-model="tagsForm.tags01.name" placeholder="请输入标签一名称" maxlength="20" show-word-limit
-                                                  @change="(val)=> handleSaveTopTag(val, 1)"></el-input>
-                                    </el-col>
-                                    <el-col :span="7"><img class="icon-modify" src="@/assets/imgs/icon-modify.png"
-                                                           alt=""></el-col>
-                                </el-row>
-                            </div>
-                            <div class="tags-content">
-                                <el-scrollbar>
-                                    <el-row>
-                                        <template v-for="(item, index) in tagsForm.tags01.childList">
-                                            <el-col :span="17" :key="'input-' + item.id">
-                                                <!--:disabled="index === 0"-->
-                                                <el-input v-model="item.name" placeholder="请输入标签名称"
-                                                          maxlength="20" show-word-limit
-                                                          @change="(val)=> handleSaveTag(val, item, 1)"></el-input>
-                                            </el-col>
-                                            <el-col :span="7" :key="'btns-' + item.id">
-                                                <img @click="addTag(index, 1)" class="icon-add"
-                                                     src="@/assets/imgs/icon-add.png" alt="">
-                                                <!-- v-if="index !== 0"-->
-                                                <img @click="delTag(index, 1)" v-if="tagsForm.tags01.childList.length !== 1" class="icon-sub"
-                                                     src="@/assets/imgs/icon-sub.png" alt="">
-
-                                                <img @click="upTag(item, index, 1)" v-if="index !== 0" class="icon-up"
-                                                     src="@/assets/imgs/icon-up.png" alt="">
-
-                                                <img @click="downTag(item, index, 1)" v-if="index !== tagsForm.tags01.childList.length - 1" class="icon-down"
-                                                     src="@/assets/imgs/icon-down.png" alt="">
-                                            </el-col>
-                                        </template>
-                                    </el-row>
-                                </el-scrollbar>
-                            </div>
-                        </div>
-                    </el-col>
-                    <el-col :span="8">
-                        <div class="tags-item">
-                            <div class="tag-header">
-                                <el-row>
-                                    <el-col :span="17">
-                                        <el-input v-model="tagsForm.tags02.name" placeholder="请输入标签二名称" maxlength="20" show-word-limit
-                                                  @change="(val)=> handleSaveTopTag(val, 2)"></el-input>
-                                    </el-col>
-                                    <el-col :span="7"><img class="icon-modify" src="@/assets/imgs/icon-modify.png"
-                                                           alt=""></el-col>
-                                </el-row>
-                            </div>
-                            <div class="tags-content">
-                                <el-scrollbar>
-                                    <el-row>
-                                        <template v-for="(item, index) in tagsForm.tags02.childList">
-                                            <el-col :span="17" :key="'input-' + item.id">
-                                                <!-- :disabled="index === 0"-->
-                                                <el-input v-model="item.name" placeholder="请输入标签名称"
-                                                          maxlength="20" show-word-limit
-                                                          @change="(val)=> handleSaveTag(val, item, 2)"></el-input>
-                                            </el-col>
-                                            <el-col :span="7" :key="'btns-' + item.id">
-                                                <img @click="addTag(index, 2)" class="icon-add"
-                                                     src="@/assets/imgs/icon-add.png" alt="">
-                                                <!-- v-if="index !== 0"-->
-                                                <img @click="delTag(index, 2)" v-if="tagsForm.tags02.childList.length !== 1" class="icon-sub"
-                                                     src="@/assets/imgs/icon-sub.png" alt="">
-
-                                                <img @click="upTag(item, index, 2)" v-if="index !== 0" class="icon-up"
-                                                     src="@/assets/imgs/icon-up.png" alt="">
-
-                                                <img @click="downTag(item, index, 2)" v-if="index !== tagsForm.tags02.childList.length - 1" class="icon-down"
-                                                     src="@/assets/imgs/icon-down.png" alt="">
-                                            </el-col>
-                                        </template>
-                                    </el-row>
-                                </el-scrollbar>
-                            </div>
-                        </div>
-                    </el-col>
-                    <el-col :span="8">
-                        <div class="tags-item">
-                            <div class="tag-header">
-                                <el-row>
-                                    <el-col :span="17">
-                                        <el-input v-model="tagsForm.tags03.name" placeholder="请输入标签三名称" maxlength="20" show-word-limit
-                                                  @change="(val)=> handleSaveTopTag(val, 3)"></el-input>
-                                    </el-col>
-                                    <el-col :span="7"><img class="icon-modify" src="@/assets/imgs/icon-modify.png"
-                                                           alt=""></el-col>
-                                </el-row>
-                            </div>
-                            <div class="tags-content">
-                                <el-scrollbar>
-                                    <el-row>
-                                        <template v-for="(item, index) in tagsForm.tags03.childList">
-                                            <el-col :span="17" :key="'input-' + item.id">
-                                                <!-- :disabled="index === 0"-->
-                                                <el-input v-model="item.name" placeholder="请输入标签名称"
-                                                          maxlength="20" show-word-limit
-                                                          @change="(val)=> handleSaveTag(val, item, 3)"></el-input>
-                                            </el-col>
-                                            <el-col :span="7" :key="'btns-' + item.id">
-                                                <img @click="addTag(index, 3)" class="icon-add"
-                                                     src="@/assets/imgs/icon-add.png" alt="">
-                                                <!-- v-if="index !== 0"-->
-                                                <img @click="delTag(index, 3)" v-if="tagsForm.tags03.childList.length !== 1" class="icon-sub"
-                                                     src="@/assets/imgs/icon-sub.png" alt="">
-
-                                                <img @click="upTag(item, index, 3)" v-if="index !== 0" class="icon-up"
-                                                     src="@/assets/imgs/icon-up.png" alt="">
-
-                                                <img @click="downTag(item, index, 3)" v-if="index !== tagsForm.tags03.childList.length - 1" class="icon-down"
-                                                     src="@/assets/imgs/icon-down.png" alt="">
-                                            </el-col>
-                                        </template>
-                                    </el-row>
-                                </el-scrollbar>
-                            </div>
-                        </div>
-                    </el-col>
-                    <el-col :span="24" align="center">
-                        <el-button class="save-tag-btn" type="primary" @click="saveTags">保存</el-button>
-                    </el-col>
-                </el-row>
+        <el-dialog title="标签维护" :visible.sync="dialogTags" width="30%" :close-on-click-modal="false"
+            :close-on-press-escape="false" modal-append-to-body append-to-body :before-close="handleTagsClose">
+            <div class="head">
+                <el-input placeholder="输入关键字进行过滤" v-model="filterText">
+                </el-input>
+                <el-button type="primary" class="btn" @click="add">新增</el-button>
+            </div>
+            <div class="tree">
+                <el-tree class="filter-tree" :data="treeData" default-expand-all :filter-node-method="filterNode" ref="tree">
+                    <span class="custom-tree-node" slot-scope="{ node,data}">
+                        <span>{{ node.label }}</span>
+                        <span>
+                            <!-- <el-button type="text" @click.stop="add">新建</el-button> -->
+                            <el-button type="text" v-if="data.parentId != '0'"
+                                @click.stop="update(node, data)">编辑</el-button>
+                            <el-button type="text" v-if="data.parentId != '0'"
+                                @click.stop="deleteNode(node, data)">删除</el-button>
+                        </span>
+                    </span>
+                </el-tree>
             </div>
         </el-dialog>
+        <labelModalVue ref="labelModalVue"></labelModalVue>
         <!--报告上传-->
-        <el-dialog :title="mode === 'modify' ? '报告编辑' : '报告上传'" :visible.sync="dialogReport" width="750px" :close-on-click-modal="false"
-                   :close-on-press-escape="false" modal-append-to-body append-to-body>
+        <el-dialog :title="mode === 'modify' ? '报告编辑' : '报告上传'" :visible.sync="dialogReport" width="750px"
+            :close-on-click-modal="false" :close-on-press-escape="false" modal-append-to-body append-to-body>
             <div class="report-upload">
                 <el-form :model="reportF" label-width="186px" :disabled="mode === 'view'">
                     <el-form-item label="报告名称:" required>
                         <el-input v-model="reportF.name" placeholder="请填写" maxlength="100" show-word-limit></el-input>
                     </el-form-item>
                     <el-form-item label="关键词:">
-                        <el-input v-model="reportF.keyContent" placeholder="请填写" maxlength="100" show-word-limit></el-input>
+                        <vue-tags-input placeholder="请输入关键词" v-model="reportF.keyContent" :tags="tags"
+                            @tags-changed="newTags => tags = newTags" />
                     </el-form-item>
                     <el-form-item label="内容摘要:">
-                        <el-input v-model="reportF.mainContent" placeholder="请填写" type="textarea"
-                                  maxlength="500" show-word-limit></el-input>
+                        <el-input v-model="reportF.mainContent" placeholder="请填写" type="textarea" maxlength="500"
+                            show-word-limit></el-input>
                     </el-form-item>
                     <el-form-item label="报告所属部门:">
                         <el-input v-model="reportF.department" placeholder="请填写" maxlength="100" show-word-limit></el-input>
                     </el-form-item>
-                    <el-form-item label="文件上传:" required>
+                    <el-form-item label="报告涉密等级:">
+                        <el-select v-model="reportF.secretLevel" placeholder="请选择报告涉密等级">
+                            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="报告隐私等级:">
+                        <el-select v-model="reportF.privacyLevel" placeholder="请选择报告隐私等级">
+                            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="上传报告:" required>
                         <el-row type="flex">
                             <el-col :span="15">
                                 <el-input v-model="reportF.fileName" disabled placeholder="请上传报告"></el-input>
                             </el-col>
                             <el-col :span="5" align="center">
-                                <el-upload action="#" :http-request="(params)=>uploadFile(params)"
-                                           :show-file-list="false" :before-upload="beforeUploadFile">
+                                <el-upload action="#" :http-request="(params) => uploadFile(params)" :show-file-list="false"
+                                    :before-upload="beforeUploadFile">
                                     <el-button>选择文件</el-button>
                                 </el-upload>
                             </el-col>
@@ -309,46 +202,17 @@
                     </el-form-item>
                     <el-form-item label="报告年份:" required>
                         <el-date-picker v-model="reportF.year" type="year" value-format="yyyy" placeholder="请选择"
-                                        prefix-icon="null" :picker-options="pickerOptions"/>
+                            prefix-icon="null" :picker-options="pickerOptions" />
                     </el-form-item>
                     <el-form-item label="标签:" required>
-                        <el-row :gutter="10" type="flex">
-                            <el-col :span="8">
-                                <el-select v-model="labelOne" :placeholder="'请选择' + tagsForm.tags01.name" value-key="id"
-                                           @change="(val) => handleSelectTag(val, 1)">
-                                    <template v-for="item in tagsForm.tags01.childList">
-                                        <el-option :label="item.name" :value="item" :key="item.id"></el-option>
-                                    </template>
-                                </el-select>
-                            </el-col>
-                            <el-col :span="8">
-                                <el-select v-model="labelTwo" :placeholder="'请选择' + tagsForm.tags02.name" value-key="id"
-                                           @change="(val) => handleSelectTag(val, 2)">
-                                    <template v-for="item in tagsForm.tags02.childList">
-                                        <el-option :label="item.name" :value="item" :key="item.id"></el-option>
-                                    </template>
-                                </el-select>
-                            </el-col>
-                            <el-col :span="8">
-                                <el-select v-model="labelThree" :placeholder="'请选择' + tagsForm.tags03.name"
-                                           value-key="id"
-                                           @change="(val) => handleSelectTag(val, 3)">
-                                    <template v-for="item in tagsForm.tags03.childList">
-                                        <el-option :label="item.name" :value="item" :key="item.id"></el-option>
-                                    </template>
-                                </el-select>
-                            </el-col>
-                        </el-row>
+                        <el-cascader width="100%" v-model="reportF.label" :options="cascaderOptions" filterable
+                            :props="{ checkStrictly: true }" clearable>
+                        </el-cascader>
                     </el-form-item>
-                    <el-form-item label="权限:" required>
-                        <el-select v-model="reportF.reportUserIdList"
-                                   class="icon-auth"
-                                   multiple
-                                   collapse-tags
-                                   @change="changeSelect"
-                                   @visible-change="changeSelect"
-                                   placeholder="请选择">
-                          <el-checkbox class="check-all" v-model="checked" @change="selectAll">全选</el-checkbox>
+                    <el-form-item label="权限设置:" required>
+                        <el-select v-model="reportF.reportUserIdList" class="icon-auth" multiple collapse-tags
+                            @change="changeSelect" @visible-change="changeSelect" placeholder="请选择">
+                            <el-checkbox class="check-all" v-model="checked" @change="selectAll">全选</el-checkbox>
                             <template v-for="item in userList">
                                 <el-option :label="item.USNAME" :value="item.USID" :key="item.USID"></el-option>
                             </template>
@@ -362,19 +226,18 @@
         </el-dialog>
         <!--预览-->
         <el-dialog title="预览" :visible.sync="dialogPreview" width="1000px" :close-on-click-modal="false"
-                   :close-on-press-escape="false" modal-append-to-body append-to-body :fullscreen="fullscreen">
+            :close-on-press-escape="false" modal-append-to-body append-to-body :fullscreen="fullscreen">
             <div slot="title" class="dialog-title">
                 <span>预览</span>
-                <img v-if="!fullscreen" class="full-screen" src="@/assets/imgs/icon-full.png" alt="" @click="fullscreen = !fullscreen">
+                <img v-if="!fullscreen" class="full-screen" src="@/assets/imgs/icon-full.png" alt=""
+                    @click="fullscreen = !fullscreen">
                 <img v-else class="full-screen" src="@/assets/imgs/icon-small.png" alt="" @click="fullscreen = !fullscreen">
             </div>
-            <div class="preview-dialog-body" :class="{'active': fullscreen}">
+            <div class="preview-dialog-body" :class="{ 'active': fullscreen }">
                 <!-- <img v-if="!fullscreen" class="full-screen" src="@/assets/imgs/icon-full.png" alt="" @click="fullscreen = !fullscreen">
                 <img v-else class="full-screen" src="@/assets/imgs/icon-small.png" alt="" @click="fullscreen = !fullscreen"> -->
                 <!--  这里用v-if是让水印更新  -->
-                <el-scrollbar
-                    v-if="dialogPreview"
-                    v-watermark="{ text: watermarkText }">
+                <el-scrollbar v-if="dialogPreview" v-watermark="{ text: watermarkText }">
                     <div class="preview-content" v-html="content"></div>
                 </el-scrollbar>
             </div>
@@ -384,630 +247,768 @@
 
 <script>
 import { fileType } from '@/utils/fileType'
-import { downloadFile } from '../../utils/downloadFile'
+import { downloadFile } from "../../utils/downloadFile";
 import { formatDate } from '@/utils/date'
-
+import VueTagsInput from '@johmun/vue-tags-input';
+import labelModalVue from './reportManager/labelModal.vue';
 export default {
-  name: 'ReportManager',
-  data () {
-    return {
-      watermarkText: '', // 水印
-      fullscreen: false,
-      /* =============================================== 操作日志 =============================================== */
-      dialogLog: false, // 操作日志
-      qLog: {
-        doName: '', // 操作类型
-        endDate: '', // 结束时间
-        pageNo: 1,
-        pageSize: 10,
-        reportName: '', // 报告名称
-        startDate: '' // 开始时间
-      },
-      qLogTotal: 0,
-      qLogDateRange: '', // 开始结束时间
-      logTableData: [],
-      doNames: [],
-      /* =============================================== 标签维护 =============================================== */
-      dialogTags: false, // 标签维护
-      tagsForm: {
-        tags01: {
-          name: '',
-          parentId: '0',
-          type: '1',
-          id: '',
-          childList: [
-            // {name: '无', type: '1', id: '', parentId: ''},
-          ]
-        },
-        tags02: {
-          name: '',
-          parentId: '0',
-          type: '2',
-          id: '',
-          childList: [
-            // {name: '无', type: '2', id: '', parentId: ''},
-          ]
-        },
-        tags03: {
-          name: '',
-          parentId: '0',
-          type: '3',
-          id: '',
-          childList: [
-            // {name: '无', type: '3', id: '', parentId: ''},
-          ]
+    name: "ReportManager",
+    components: {
+        labelModalVue,
+        VueTagsInput
+    },
+    data() {
+        return {
+            watermarkText: '', // 水印
+            fullscreen: false,
+            /* =============================================== 操作日志 =============================================== */
+            dialogLog: false, // 操作日志
+            qLog: {
+                doName: '',     // 操作类型
+                endDate: '',    // 结束时间
+                pageNo: 1,
+                pageSize: 10,
+                reportName: '', // 报告名称
+                startDate: '',  // 开始时间
+            },
+            qLogTotal: 0,
+            qLogDateRange: '',  // 开始结束时间
+            logTableData: [],
+            doNames: [],
+            /* =============================================== 标签维护 =============================================== */
+            dialogTags: false, // 标签维护
+            filterText: '',
+            treeData: [
+                {
+                    id: 0,
+                    label: '根节点',
+                    children: [
+                        {
+                            id: 1,
+                            label: '一级 1',
+                            children: [
+                                {
+                                    id: 4,
+                                    label: '二级 1-1',
+                                    children: [
+                                        {
+                                            id: 9,
+                                            label: '三级 1-1-1'
+                                        },
+                                        {
+                                            id: 10,
+                                            label: '三级 1-1-2'
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            id: 2,
+                            label: '一级 2',
+                            children: [
+                                {
+                                    id: 5,
+                                    label: '二级 2-1'
+                                },
+                                {
+                                    id: 6,
+                                    label: '二级 2-2'
+                                }
+                            ]
+                        },
+                        {
+                            id: 3,
+                            label: '一级 3',
+                            children: [
+                                {
+                                    id: 7,
+                                    label: '二级 3-1'
+                                },
+                                {
+                                    id: 8,
+                                    label: '二级 3-2'
+                                }
+                            ]
+                        },
+                    ]
+
+                }
+            ],
+            options:[
+                {
+                    value:'1',
+                    label:'1'
+                }
+            ],
+            tagsForm: {
+                tags01: {
+                    name: '',
+                    parentId: '0',
+                    type: '1',
+                    id: '',
+                    childList: [
+                        // {name: '无', type: '1', id: '', parentId: ''},
+                    ]
+                },
+                tags02: {
+                    name: '',
+                    parentId: '0',
+                    type: '2',
+                    id: '',
+                    childList: [
+                        // {name: '无', type: '2', id: '', parentId: ''},
+                    ]
+                },
+                tags03: {
+                    name: '',
+                    parentId: '0',
+                    type: '3',
+                    id: '',
+                    childList: [
+                        // {name: '无', type: '3', id: '', parentId: ''},
+                    ]
+                },
+            },
+            /* =============================================== 报告上传 =============================================== */
+            dialogReport: false, // 报告上传
+            reportF: {
+                name: '',                   // 报告名称
+                keyContent: '',             // 关键词
+                mainContent: '',            // 内容摘要
+                department: '',             // 报告所属部门
+                fileName: '',               // 文件上传
+                fileId: '',
+                year: '',                   // 报告年份
+                // labelOneId: '',             // 标签1
+                // labelOneName: '',           // 标签1
+                // labelTwoId: '',             // 标签2
+                // labelTwoName: '',           // 标签2
+                // labelThreeId: '',           // 标签3
+                // labelThreeName: '',         // 标签3
+                reportUserIdList: [],       // 权限
+                tag: []
+            },
+            tag: '',
+            tags: [],
+            labelOne: {},
+            labelTwo: {},
+            labelThree: {},
+            mode: '',
+            userList: [],
+            cascaderOptions: [{
+                value: 1,
+                label: '东南',
+                children: [{
+                    value: 2,
+                    label: '上海',
+                    children: [
+                        { value: 3, label: '普陀' },
+                        { value: 4, label: '黄埔' },
+                        { value: 5, label: '徐汇' }
+                    ]
+                }, {
+                    value: 7,
+                    label: '江苏',
+                    children: [
+                        { value: 8, label: '南京' },
+                        { value: 9, label: '苏州' },
+                        { value: 10, label: '无锡' }
+                    ]
+                }, {
+                    value: 12,
+                    label: '浙江',
+                    children: [
+                        { value: 13, label: '杭州' },
+                        { value: 14, label: '宁波' },
+                        { value: 15, label: '嘉兴' }
+                    ]
+                }]
+            }],
+            pickerOptions: {
+                disabledDate(time) {
+                    return time.getFullYear() > new Date().getFullYear() + 1 || time.getFullYear() < new Date().getFullYear() - 10;
+                },
+            },
+            /* =============================================== 列表展示 =============================================== */
+            q: {
+                keyContent: '',
+                year: [],
+                labelOneId: [],
+                labelTwoId: [],
+                labelThreeId: [],
+                pageNo: 1,
+                pageSize: 10,
+            },
+            total: 0,
+            tableData: [],
+            yearList: [],
+            dialogPreview: false,
+            content: '',
+            /*  权限全选  */
+            checked: false,
+            mulSelecteds: [], // 已选中选项
         }
-      },
-      /* =============================================== 报告上传 =============================================== */
-      dialogReport: false, // 报告上传
-      reportF: {
-        name: '', // 报告名称
-        keyContent: '', // 关键词
-        mainContent: '', // 内容摘要
-        department: '', // 报告所属部门
-        fileName: '', // 文件上传
-        fileId: '',
-        year: '', // 报告年份
-        labelOneId: '', // 标签1
-        labelOneName: '', // 标签1
-        labelTwoId: '', // 标签2
-        labelTwoName: '', // 标签2
-        labelThreeId: '', // 标签3
-        labelThreeName: '', // 标签3
-        reportUserIdList: [] // 权限
-      },
-      labelOne: {},
-      labelTwo: {},
-      labelThree: {},
-      mode: '',
-      userList: [],
-      pickerOptions: {
-        disabledDate (time) {
-          return time.getFullYear() > new Date().getFullYear() + 1 || time.getFullYear() < new Date().getFullYear() - 10
+    },
+    //监听标签搜索框
+    watch: {
+        filterText(val) {
+            this.$refs.tree.filter(val);
         }
-      },
-      /* =============================================== 列表展示 =============================================== */
-      q: {
-        keyContent: '',
-        year: [],
-        labelOneId: [],
-        labelTwoId: [],
-        labelThreeId: [],
-        pageNo: 1,
-        pageSize: 10
-      },
-      total: 0,
-      tableData: [],
-      yearList: [],
-      dialogPreview: false,
-      content: '',
-      /*  权限全选  */
-      checked: false,
-      mulSelecteds: [] // 已选中选项
-    }
-  },
-  methods: {
-    selectAllEvent ({ checked }) {
-      const records = this.$refs.xTable.getCheckboxRecords()
-      this.checkIds = records.map(item => {
-        return item.id
-      })
     },
-    selectChangeEvent ({ checked }) {
-      const records = this.$refs.xTable.getCheckboxRecords()
-      this.checkIds = records.map(item => {
-        return item.id
-      })
-    },
-    /*  权限全选  */
-    selectAll () {
-      this.reportF.reportUserIdList = []
-      if (this.checked) {
-        this.userList.forEach((item) => { this.reportF.reportUserIdList.push(item.USID) })
-      } else {
-        this.reportF.reportUserIdList = []
-      }
-      // this.$emit('update:updateMultipleSelect',this.reportF.reportUserIdList);
-    },
-    changeSelect (val) {
-      this.checked = (val.length || this.reportF.reportUserIdList.length) === this.userList.length
-      // this.$emit('update:updateMultipleSelect',this.reportF.reportUserIdList);
-    },
-    init () {
-      this.labelList()
-      this.reset()
-      this.reportDateList()
-      this.sysUserList()
-    },
-    /* =============================================== 操作日志 =============================================== */
-    // 操作日志
-    openLog () {
-      this.dialogLog = true
-      this.logReset()
-    },
-    // 日志重置搜索
-    logReset () {
-      this.qLogDateRange = ''
-      this.qLog = {
-        doName: '', // 操作类型
-        endDate: '', // 结束时间
-        pageNo: 1,
-        pageSize: 10,
-        reportName: '', // 报告名称
-        startDate: '' // 开始时间
-      }
-      this.qLogTotal = 0
-      this.qLogDateRange = '' // 开始结束时间
-      this.logTableData = []
-      this.doNames = []
-      this.reportLogList()
-    },
-    // 搜索
-    searchLog () {
-      this.qLog.pageNo = 1
-      this.reportLogList()
-    },
-    // 报告列表
-    reportLogList () {
-      this.$api.report.reportLogList(this.qLog)
-        .then(({ data }) => {
-          this.logTableData = data.records
-          this.qLogTotal = data.total
-          this.qLog.pageNo = data.current
-          this.qLog.pageSize = data.size
-          if (!data.records.length && this.qLog.pageNo !== 1) {
-            this.qLog.pageNo = 1
-            this.reportLogList()
-          }
+    mounted () {
+        this.$bus.$on('updateList',()=>{
+            this.getTreeLabel()
         })
     },
-    // 单页数据量
-    handleLogSizeChange (val) {
-      this.qLog.pageSize = val
-      this.qLog.pageNo = 1
-      this.reportLogList()
-    },
-    // 第几页
-    handleLogCurrentChange (val) {
-      this.qLog.pageNo = val
-      this.reportLogList()
-    },
-    // 日期
-    handleLogDate (val) {
-      if (val) {
-        this.qLog.startDate = val[0]
-        this.qLog.endDate = val[1]
-      } else {
-        this.qLog.startDate = ''
-        this.qLog.endDate = ''
-      }
-    },
-    handleTyleChange (val) {
-      this.qLog.doName = val.join(',')
-    },
-    /* =============================================== 标签维护 =============================================== */
-    // 标签维护 新增
-    addTag (index, type) {
-      if (this.tagsForm['tags0' + type].childList.length >= 20) {
-        return this.$message.warning('最多添加20个标签')
-      }
-      const itemData = { name: '', id: '', parentId: this.tagsForm['tags0' + type].id, type: String(type) }
-      this.tagsForm['tags0' + type].childList.splice(index + 1, 0, itemData)
-    },
-    // 标签维护 删除
-    delTag (index, type) {
-      const { id, status } = this.tagsForm['tags0' + type].childList[index]
-      if (status === '1') {
-        this.$confirm('此标签已应用于报告, 是否删除?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          if (id) {
-            this.$api.report.labelDeleteId({ id }).then(_ => {
-              this.$message.success('操作成功')
-              this.labelList()
+    methods: {
+        init() {
+            this.getTreeLabel()
+            // this.labelList();
+            this.reset();
+            this.reportDateList();
+            this.sysUserList();
+        },
+        getTreeLabel(){
+          this.$api.report.labelList().then(res => {
+            console.log('5555',res);
+            this.treeData=res.data
+          })
+        },
+        //标签搜索
+        filterNode(value, data) {
+            if (!value) return true;
+            return data.label.indexOf(value) !== -1;
+        },
+        add() {
+            this.$refs.labelModalVue.open()
+        },
+        update(node, data) {
+            this.$refs.labelModalVue.open(node, data)
+        },
+        deleteNode(node, data) {
+            this.$confirm('确认删除？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
             })
-          } else {
-            this.tagsForm['tags0' + type].childList.splice(index, 1)
-            this.$message.success('操作成功')
-          }
-        })
-      } else {
-        if (id) {
-          this.$api.report.labelDeleteId({ id }).then(_ => {
-            this.$message.success('操作成功')
-            this.labelList()
-          })
-        } else {
-          this.tagsForm['tags0' + type].childList.splice(index, 1)
-          this.$message.success('操作成功')
-        }
-      }
+                .then(_ => {
+                    done();
+                })
+                .catch(_ => { });
+        },
+
+        /*  权限全选  */
+        selectAll() {
+            this.reportF.reportUserIdList = [];
+            if (this.checked) {
+                this.userList.forEach((item) => { this.reportF.reportUserIdList.push(item.USID) });
+            } else {
+                this.reportF.reportUserIdList = [];
+            }
+            // this.$emit('update:updateMultipleSelect',this.reportF.reportUserIdList);
+        },
+        changeSelect(val) {
+            this.checked = (val.length || this.reportF.reportUserIdList.length) === this.userList.length;
+            // this.$emit('update:updateMultipleSelect',this.reportF.reportUserIdList);
+        },
+
+        /* =============================================== 操作日志 =============================================== */
+        // 操作日志
+        openLog() {
+            this.dialogLog = true;
+            this.logReset();
+        },
+        // 日志重置搜索
+        logReset() {
+            this.qLogDateRange = '';
+            this.qLog = {
+                doName: '',     // 操作类型
+                endDate: '',    // 结束时间
+                pageNo: 1,
+                pageSize: 10,
+                reportName: '', // 报告名称
+                startDate: '',  // 开始时间
+            };
+            this.qLogTotal = 0;
+            this.qLogDateRange = '';  // 开始结束时间
+            this.logTableData = [];
+            this.doNames = [];
+            this.reportLogList();
+        },
+        // 搜索
+        searchLog() {
+            this.qLog.pageNo = 1;
+            this.reportLogList();
+        },
+        // 报告列表
+        reportLogList() {
+            this.$api.report.reportLogList(this.qLog)
+                .then(({ data }) => {
+                    this.logTableData = data.records;
+                    this.qLogTotal = data.total;
+                    this.qLog.pageNo = data.current;
+                    this.qLog.pageSize = data.size;
+                    if (!data.records.length && this.qLog.pageNo !== 1) {
+                        this.qLog.pageNo = 1;
+                        this.reportLogList();
+                    }
+                })
+        },
+        // 单页数据量
+        handleLogSizeChange(val) {
+            this.qLog.pageSize = val;
+            this.qLog.pageNo = 1;
+            this.reportLogList();
+        },
+        // 第几页
+        handleLogCurrentChange(val) {
+            this.qLog.pageNo = val;
+            this.reportLogList();
+        },
+        // 日期
+        handleLogDate(val) {
+            if (val) {
+                this.qLog.startDate = val[0];
+                this.qLog.endDate = val[1];
+            } else {
+                this.qLog.startDate = '';
+                this.qLog.endDate = '';
+            }
+        },
+        handleTyleChange(val) {
+            this.qLog.doName = val.join(',');
+        },
+        /* =============================================== 标签维护 =============================================== */
+        // 标签维护 新增
+        // addTag(index, type) {
+        //     if (this.tagsForm['tags0' + type].childList.length >= 20) {
+        //         return this.$message.warning("最多添加20个标签");
+        //     }
+        //     let itemData = {name: '', id: "", parentId: this.tagsForm['tags0' + type].id, type: String(type)};
+        //     this.tagsForm['tags0' + type].childList.splice(index + 1, 0, itemData);
+        // },
+        // 标签维护 删除
+        delTag(index, type) {
+            let { id, status } = this.tagsForm['tags0' + type].childList[index];
+            if (status === '1') {
+                this.$confirm('此标签已应用于报告, 是否删除?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    if (id) {
+                        this.$api.report.labelDeleteId({ id }).then(_ => {
+                            this.$message.success('操作成功');
+                            this.labelList();
+                        })
+                    } else {
+                        this.tagsForm['tags0' + type].childList.splice(index, 1);
+                        this.$message.success('操作成功');
+                    }
+                })
+            } else {
+                if (id) {
+                    this.$api.report.labelDeleteId({ id }).then(_ => {
+                        this.$message.success('操作成功');
+                        this.labelList();
+                    })
+                } else {
+                    this.tagsForm['tags0' + type].childList.splice(index, 1);
+                    this.$message.success('操作成功');
+                }
+            }
+        },
+        // 上移
+        upTag(item, index, type) {
+            this.$api.report.labelMove({
+                id: item.id,
+                moveType: 'up',
+                type: String(type)
+            }).then(_ => {
+                this.labelList();
+            })
+        },
+        // 下移
+        downTag(item, index, type) {
+            this.$api.report.labelMove({
+                id: item.id,
+                moveType: 'down',
+                type: String(type)
+            }).then(_ => {
+                this.labelList();
+            })
+        },
+        // 标签维护
+        openTags() {
+            this.dialogTags = true;
+            this.labelList();
+        },
+        // 单个标签保存
+        handleSaveTag(val, item, type) {
+            if (val === '') {
+                this.$message.warning('标签名称不能为空');
+                this.labelList();
+                return;
+            }
+            if (val === '-') {
+                this.$message.warning('标签名称不能为-');
+                this.labelList();
+                return;
+            }
+            if (this.tagsForm['tags0' + type].childList.filter(item => item.name === val).length > 1) {
+                this.$message.warning('标签名称不能重复');
+                this.labelList();
+                return;
+            }
+            let params = { name: val, parentId: this.tagsForm['tags0' + type].id, type: String(type), id: item.id || '' }
+            if (item.status === '1') {
+                this.$confirm('此标签已应用于报告, 是否编辑?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    this.$api.report.labelAdd(params).then(_ => {
+                        this.$message.success('操作成功');
+                        this.labelList();
+                    }).catch(_ => {
+                        this.labelList();
+                    })
+                }).catch(_ => {
+                    this.labelList();
+                })
+            } else {
+                this.$api.report.labelAdd(params).then(_ => {
+                    this.$message.success('操作成功');
+                    this.labelList();
+                }).catch(_ => {
+                    this.labelList();
+                })
+            }
+        },
+        // 单个顶级标签保存
+        handleSaveTopTag(val, type) {
+            if (val === '') {
+                this.$message.warning('标签名称不能为空');
+                this.labelList();
+                return;
+            }
+            if (val === '-') {
+                this.$message.warning('标签名称不能为-');
+                this.labelList();
+                return;
+            }
+            if (type === 1 && (val === this.tagsForm.tags02.name || val === this.tagsForm.tags03.name)) {
+                this.$message.warning('标签名称不能重复');
+                this.labelList();
+                return;
+            }
+            if (type === 2 && (val === this.tagsForm.tags01.name || val === this.tagsForm.tags03.name)) {
+                this.$message.warning('标签名称不能重复');
+                this.labelList();
+                return;
+            }
+            if (type === 3 && (val === this.tagsForm.tags01.name || val === this.tagsForm.tags02.name)) {
+                this.$message.warning('标签名称不能重复');
+                this.labelList();
+                return;
+            }
+            let params = { name: val, id: this.tagsForm['tags0' + type].id, parentId: '0', type: String(type) };
+            this.$api.report.labelAdd(params).then(_ => {
+                this.$message.success('操作成功');
+                this.labelList();
+            }).catch(_ => {
+                this.labelList();
+            })
+        },
+        // 标签列表
+        labelList() {
+            // this.$api.report.labelList().then(({data}) => {
+            //     if(!data.labelOne.childList.length){
+            //         data.labelOne.childList = [{name: '', id: '', parentId: this.tagsForm.tags01.id, type: '1'}]
+            //     }
+            //     if(!data.labelTwo.childList.length){
+            //         data.labelTwo.childList = [{name: '', id: '', parentId: this.tagsForm.tags02.id, type: '2'}]
+            //     }
+            //     if(!data.labelThree.childList.length){
+            //         data.labelThree.childList = [{name: '', id: '', parentId: this.tagsForm.tags03.id, type: '3'}]
+            //     }
+            //     this.tagsForm.tags01 = data.labelOne;
+            //     this.tagsForm.tags02 = data.labelTwo;
+            //     this.tagsForm.tags03 = data.labelThree;
+            // })
+        },
+        handleTagsClose() {
+            this.dialogTags = false;
+            this.labelList();
+            this.reset();
+        },
+        // 保存标签
+        // saveTags() {
+        //     let tagsForm = JSON.parse(JSON.stringify(this.tagsForm));
+        //     let params = {
+        //         labelList: [
+        //             tagsForm.tags01,
+        //             tagsForm.tags02,
+        //             tagsForm.tags03
+        //         ]
+        //     }
+        //     let isSave = true;
+        //     params.labelList.forEach(item => {
+        //         if(!item.name || item.name === '-'){
+        //             isSave = false;
+        //             return
+        //         }
+        //         item.childList.forEach(ele => {
+        //             if(!ele.name || item.name === '-'){
+        //                 isSave = false;
+        //                 return
+        //             }
+        //         })
+        //     })
+        //     if(!isSave){
+        //         return this.$message.warning('标签名称不能为空');
+        //     }
+        //     this.$api.report.labelSave(params).then(_ => {
+        //         this.$message.success('操作成功');
+        //         this.dialogTags = false;
+        //         this.labelList();
+        //         this.reset();
+        //     })
+        // },
+        /* =============================================== 报告上传 =============================================== */
+        // 打开报告上传
+        openReportAdd() {
+            this.mode = 'add';
+            this.reportF = {
+                name: '',                      // 报告名称
+                tags: '',                      // 关键词
+                mainContent: '',               // 内容摘要
+                department: '',                // 报告所属部门
+                fileName: '',                  // 文件上传
+                fileId: '',
+                year: '',                      // 报告年份
+                secretLevel: '',                //涉密等级
+                privacyLevel: '',               //报告隐私等级
+                // labelOneId: '',             // 标签1
+                // labelOneName: '',           // 标签1
+                // labelTwoId: '',             // 标签2
+                // labelTwoName: '',           // 标签2
+                // labelThreeId: '',           // 标签3
+                // labelThreeName: '',         // 标签3
+                reportUserIdList: [],          // 权限
+            };
+            this.tags = []
+            // this.labelOne = {};
+            // this.labelTwo = {};
+            // this.labelThree = {};
+            // this.labelList();
+            this.dialogReport = true;
+        },
+        // 选择标签
+        // handleSelectTag(val, type) {
+        //     switch (type) {
+        //         case 1:
+        //             this.reportF.labelOneId = val.id;
+        //             this.reportF.labelOneName = val.name;
+        //             break;
+        //         case 2:
+        //             this.reportF.labelTwoId = val.id;
+        //             this.reportF.labelTwoName = val.name;
+        //             break;
+        //         case 3:
+        //             this.reportF.labelThreeId = val.id;
+        //             this.reportF.labelThreeName = val.name;
+        //             break;
+        //     }
+        // },
+        // 必填项
+        checkReportF() {
+            if (!this.reportF.name) {
+                return this.$message.warning('请检查报告名称') && false;
+            }
+            if (!this.reportF.fileId || !this.reportF.fileName) {
+                return this.$message.warning('请检查上传文件') && false;
+            }
+            if (!this.reportF.year) {
+                return this.$message.warning('请检查报告年份') && false;
+            }
+            if (!this.reportF.label) {
+                return this.$message.warning('请检查报告年份') && false;
+            }
+            // if (!this.reportF.labelOneId || !this.reportF.labelOneName || this.reportF.labelOneName === '-' ) {
+            //     return this.$message.warning(`请检查${this.tagsForm.tags01.name}`) && false;
+            // }
+            // if (!this.reportF.labelTwoId || !this.reportF.labelTwoName || this.reportF.labelTwoName === '-') {
+            //     return this.$message.warning(`请检查${this.tagsForm.tags02.name}`) && false;
+            // }
+            // if (!this.reportF.labelThreeId || !this.reportF.labelThreeName || this.reportF.labelThreeName === '-') {
+            //     return this.$message.warning(`请检查${this.tagsForm.tags03.name}`) && false;
+            // }
+            if (!this.reportF.reportUserIdList || !this.reportF.reportUserIdList.length) {
+                return this.$message.warning('请检查权限') && false;
+            }
+            return true;
+        },
+        // 新增或编辑报告
+        reportAdd() {
+            if (!this.checkReportF()) return;
+            this.$api.report.reportAdd({ ...this.reportF, tags: this.tags }).then(_ => {
+                this.$message.success('操作成功');
+                this.dialogReport = false;
+                this.reset();
+            })
+        },
+        // 上传文件
+        uploadFile(params) {
+            let fd = new FormData();
+            fd.append('file', params.file);
+            this.$api.report.reportUploadFile(fd).then(({ data }) => {
+                this.reportF.fileName = data.name;
+                this.reportF.fileId = data.key;
+            })
+        },
+        // 上传文件前
+        beforeUploadFile(file) {
+            let realFileType = file.name.split('.')[file.name.split('.').length - 1];
+            const isType = (
+                file.type === fileType.pdf || file.type === fileType.xls || file.type === fileType.xlsx || file.type === fileType.doc || file.type === fileType.docx || file.type === fileType.ppt || file.type === fileType.pptx
+                || realFileType === 'pdf' || realFileType === 'xls' || realFileType === 'xlsx' || realFileType === 'doc' || realFileType === 'docx' || realFileType === 'ppt' || realFileType === 'pptx'
+            );
+            const isSize = file.size / 1024 / 1024 < 200;
+            if (!isType) {
+                this.$message.error('仅能上传 pdf｜xls｜xlsx｜doc｜docx｜ppt｜pptx 格式文件');
+            }
+            if (!isSize) {
+                this.$message.error('您最大可上传200M文件');
+            }
+            return isType && isSize;
+        },
+        // 重置
+        resetUploadFile() {
+            this.reportF.fileId = '';
+            this.reportF.fileName = '';
+        },
+        // 打开报告上传
+        openReportModify(mode, row) {
+            this.mode = mode;
+            this.labelList();
+            let rowData = JSON.parse(JSON.stringify(row));
+            if (rowData.labelOneName !== '-') {
+                this.labelOne = { id: rowData.labelOneId, rowData: rowData.labelOneName };
+            } else {
+                this.labelOne = {};
+            }
+            if (rowData.labelTwoName !== '-') {
+                this.labelTwo = { id: rowData.labelTwoId, name: rowData.labelTwoName };
+            } else {
+                this.labelTwo = {};
+            }
+            if (rowData.labelThreeName !== '-') {
+                this.labelThree = { id: rowData.labelThreeId, name: rowData.labelThreeName };
+            } else {
+                this.labelThree = {};
+            }
+            this.reportF = rowData;
+            this.dialogReport = true;
+        },
+        // 获取所有用户
+        sysUserList() {
+            this.$api.user.sysUserList({ pageNo: 1, pageSize: 999999 }).then(({ data }) => {
+                this.userList = data.records;
+            })
+        },
+        /* =============================================== 列表展示 =============================================== */
+        // 重置
+        reset() {
+            this.q = {
+                keyContent: '',
+                year: [],
+                labelOneId: [],
+                labelTwoId: [],
+                labelThreeId: [],
+                pageNo: 1,
+                pageSize: 10,
+            };
+            this.total = 0;
+            this.tableData = [];
+            this.reportList();
+            this.reportDateList();
+        },
+        // 报告删除
+        reportDelete(ids) {
+            this.$confirm('此操作将删除所选数据, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                this.$api.report.reportDelete({ ids }).then(_ => {
+                    this.$message.success('操作成功');
+                    this.reportList();
+                    this.reportDateList();
+                })
+            })
+        },
+        search() {
+            this.q.pageNo = 1;
+            this.reportList();
+        },
+        // 列表
+        reportList() {
+            this.$api.report.reportList(this.q).then(({ data }) => {
+                this.tableData = data.records;
+                this.total = data.total;
+                this.q.pageNo = data.current;
+                this.q.pageSize = data.size;
+                if (!data.records.length && this.q.pageNo !== 1) {
+                    this.q.pageNo = 1;
+                    this.reportList();
+                }
+            })
+        },
+        // 日期列表
+        reportDateList() {
+            this.$api.report.reportDateList().then(({ data }) => {
+                this.yearList = data.list;
+            })
+        },
+        // 单页数据量
+        handleSizeChange(val) {
+            this.q.pageSize = val;
+            this.q.pageNo = 1;
+            this.reportList();
+        },
+        // 第几页
+        handleCurrentChange(val) {
+            this.q.pageNo = val;
+            this.reportList();
+        },
+        // 预览
+        previewRow(row) {
+            this.fullscreen = false;
+            //  更新预览水印的时间戳
+            this.watermarkText = `${this.$store.state.userInfo.usname} ${formatDate(+new Date(), 'yyyy年MM月dd日 hh:mm:ss')}`;
+            this.$api.report.reportGetReportHtmlId({ id: row.id }).then(({ data }) => {
+                this.content = data.content;
+                this.dialogPreview = true;
+            })
+        },
+        // 下载
+        downloadRow(row) {
+            // this.$confirm('此操作将下载所选数据文件, 是否继续?', '提示', {
+            //     confirmButtonText: '确定',
+            //     cancelButtonText: '取消',
+            //     type: 'warning'
+            // }).then(() => {
+            this.$api.report.reportDownload({ fileId: row.fileId }).then(res => {
+                downloadFile(res);
+            })
+            // })
+        },
     },
-    // 上移
-    upTag (item, index, type) {
-      this.$api.report.labelMove({
-        id: item.id,
-        moveType: 'up',
-        type: String(type)
-      }).then(_ => {
-        this.labelList()
-      })
-    },
-    // 下移
-    downTag (item, index, type) {
-      this.$api.report.labelMove({
-        id: item.id,
-        moveType: 'down',
-        type: String(type)
-      }).then(_ => {
-        this.labelList()
-      })
-    },
-    // 标签维护
-    openTags () {
-      this.dialogTags = true
-      this.labelList()
-    },
-    // 单个标签保存
-    handleSaveTag (val, item, type) {
-      if (val === '') {
-        this.$message.warning('标签名称不能为空')
-        this.labelList()
-        return
-      }
-      if (val === '-') {
-        this.$message.warning('标签名称不能为-')
-        this.labelList()
-        return
-      }
-      if (this.tagsForm['tags0' + type].childList.filter(item => item.name === val).length > 1) {
-        this.$message.warning('标签名称不能重复')
-        this.labelList()
-        return
-      }
-      const params = { name: val, parentId: this.tagsForm['tags0' + type].id, type: String(type), id: item.id || '' }
-      if (item.status === '1') {
-        this.$confirm('此标签已应用于报告, 是否编辑?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$api.report.labelAdd(params).then(_ => {
-            this.$message.success('操作成功')
-            this.labelList()
-          }).catch(_ => {
-            this.labelList()
-          })
-        }).catch(_ => {
-          this.labelList()
-        })
-      } else {
-        this.$api.report.labelAdd(params).then(_ => {
-          this.$message.success('操作成功')
-          this.labelList()
-        }).catch(_ => {
-          this.labelList()
-        })
-      }
-    },
-    // 单个顶级标签保存
-    handleSaveTopTag (val, type) {
-      if (val === '') {
-        this.$message.warning('标签名称不能为空')
-        this.labelList()
-        return
-      }
-      if (val === '-') {
-        this.$message.warning('标签名称不能为-')
-        this.labelList()
-        return
-      }
-      if (type === 1 && (val === this.tagsForm.tags02.name || val === this.tagsForm.tags03.name)) {
-        this.$message.warning('标签名称不能重复')
-        this.labelList()
-        return
-      }
-      if (type === 2 && (val === this.tagsForm.tags01.name || val === this.tagsForm.tags03.name)) {
-        this.$message.warning('标签名称不能重复')
-        this.labelList()
-        return
-      }
-      if (type === 3 && (val === this.tagsForm.tags01.name || val === this.tagsForm.tags02.name)) {
-        this.$message.warning('标签名称不能重复')
-        this.labelList()
-        return
-      }
-      const params = { name: val, id: this.tagsForm['tags0' + type].id, parentId: '0', type: String(type) }
-      this.$api.report.labelAdd(params).then(_ => {
-        this.$message.success('操作成功')
-        this.labelList()
-      }).catch(_ => {
-        this.labelList()
-      })
-    },
-    // 标签列表
-    labelList () {
-      this.$api.report.labelList().then(({ data }) => {
-        if (!data.labelOne.childList.length) {
-          data.labelOne.childList = [{ name: '', id: '', parentId: this.tagsForm.tags01.id, type: '1' }]
-        }
-        if (!data.labelTwo.childList.length) {
-          data.labelTwo.childList = [{ name: '', id: '', parentId: this.tagsForm.tags02.id, type: '2' }]
-        }
-        if (!data.labelThree.childList.length) {
-          data.labelThree.childList = [{ name: '', id: '', parentId: this.tagsForm.tags03.id, type: '3' }]
-        }
-        this.tagsForm.tags01 = data.labelOne
-        this.tagsForm.tags02 = data.labelTwo
-        this.tagsForm.tags03 = data.labelThree
-      })
-    },
-    handleTagsClose () {
-      this.dialogTags = false
-      this.labelList()
-      this.reset()
-    },
-    // 保存标签
-    saveTags () {
-      const tagsForm = JSON.parse(JSON.stringify(this.tagsForm))
-      const params = {
-        labelList: [
-          tagsForm.tags01,
-          tagsForm.tags02,
-          tagsForm.tags03
-        ]
-      }
-      let isSave = true
-      params.labelList.forEach(item => {
-        if (!item.name || item.name === '-') {
-          isSave = false
-          return
-        }
-        item.childList.forEach(ele => {
-          if (!ele.name || item.name === '-') {
-            isSave = false
-          }
-        })
-      })
-      if (!isSave) {
-        return this.$message.warning('标签名称不能为空')
-      }
-      this.$api.report.labelSave(params).then(_ => {
-        this.$message.success('操作成功')
-        this.dialogTags = false
-        this.labelList()
-        this.reset()
-      })
-    },
-    /* =============================================== 报告上传 =============================================== */
-    // 打开报告上传
-    openReportAdd () {
-      this.mode = 'add'
-      this.reportF = {
-        name: '', // 报告名称
-        keyContent: '', // 关键词
-        mainContent: '', // 内容摘要
-        department: '', // 报告所属部门
-        fileName: '', // 文件上传
-        fileId: '',
-        year: '', // 报告年份
-        labelOneId: '', // 标签1
-        labelOneName: '', // 标签1
-        labelTwoId: '', // 标签2
-        labelTwoName: '', // 标签2
-        labelThreeId: '', // 标签3
-        labelThreeName: '', // 标签3
-        reportUserIdList: [] // 权限
-      }
-      this.labelOne = {}
-      this.labelTwo = {}
-      this.labelThree = {}
-      this.labelList()
-      this.dialogReport = true
-    },
-    // 选择标签
-    handleSelectTag (val, type) {
-      switch (type) {
-        case 1:
-          this.reportF.labelOneId = val.id
-          this.reportF.labelOneName = val.name
-          break
-        case 2:
-          this.reportF.labelTwoId = val.id
-          this.reportF.labelTwoName = val.name
-          break
-        case 3:
-          this.reportF.labelThreeId = val.id
-          this.reportF.labelThreeName = val.name
-          break
-      }
-    },
-    // 必填项
-    checkReportF () {
-      if (!this.reportF.name) {
-        return this.$message.warning('请检查报告名称') && false
-      }
-      if (!this.reportF.fileId || !this.reportF.fileName) {
-        return this.$message.warning('请检查上传文件') && false
-      }
-      if (!this.reportF.year) {
-        return this.$message.warning('请检查报告年份') && false
-      }
-      if (!this.reportF.labelOneId || !this.reportF.labelOneName || this.reportF.labelOneName === '-') {
-        return this.$message.warning(`请检查${this.tagsForm.tags01.name}`) && false
-      }
-      if (!this.reportF.labelTwoId || !this.reportF.labelTwoName || this.reportF.labelTwoName === '-') {
-        return this.$message.warning(`请检查${this.tagsForm.tags02.name}`) && false
-      }
-      if (!this.reportF.labelThreeId || !this.reportF.labelThreeName || this.reportF.labelThreeName === '-') {
-        return this.$message.warning(`请检查${this.tagsForm.tags03.name}`) && false
-      }
-      if (!this.reportF.reportUserIdList || !this.reportF.reportUserIdList.length) {
-        return this.$message.warning('请检查权限') && false
-      }
-      return true
-    },
-    // 新增或编辑报告
-    reportAdd () {
-      if (!this.checkReportF()) return
-      this.$api.report.reportAdd(this.reportF).then(_ => {
-        this.$message.success('操作成功')
-        this.dialogReport = false
-        this.reset()
-      })
-    },
-    // 上传文件
-    uploadFile (params) {
-      const fd = new FormData()
-      fd.append('file', params.file)
-      this.$api.report.reportUploadFile(fd).then(({ data }) => {
-        this.reportF.fileName = data.name
-        this.reportF.fileId = data.key
-      })
-    },
-    // 上传文件前
-    beforeUploadFile (file) {
-      const realFileType = file.name.split('.')[file.name.split('.').length - 1]
-      const isType = (
-        file.type === fileType.pdf || file.type === fileType.xls || file.type === fileType.xlsx || file.type === fileType.doc || file.type === fileType.docx || file.type === fileType.ppt || file.type === fileType.pptx ||
-                realFileType === 'pdf' || realFileType === 'xls' || realFileType === 'xlsx' || realFileType === 'doc' || realFileType === 'docx' || realFileType === 'ppt' || realFileType === 'pptx'
-      )
-      const isSize = file.size / 1024 / 1024 < 200
-      if (!isType) {
-        this.$message.error('仅能上传 pdf｜xls｜xlsx｜doc｜docx｜ppt｜pptx 格式文件')
-      }
-      if (!isSize) {
-        this.$message.error('您最大可上传200M文件')
-      }
-      return isType && isSize
-    },
-    // 重置
-    resetUploadFile () {
-      this.reportF.fileId = ''
-      this.reportF.fileName = ''
-    },
-    // 打开报告上传
-    openReportModify (mode, row) {
-      this.mode = mode
-      this.labelList()
-      const rowData = JSON.parse(JSON.stringify(row))
-      if (rowData.labelOneName !== '-') {
-        this.labelOne = { id: rowData.labelOneId, rowData: rowData.labelOneName }
-      } else {
-        this.labelOne = {}
-      }
-      if (rowData.labelTwoName !== '-') {
-        this.labelTwo = { id: rowData.labelTwoId, name: rowData.labelTwoName }
-      } else {
-        this.labelTwo = {}
-      }
-      if (rowData.labelThreeName !== '-') {
-        this.labelThree = { id: rowData.labelThreeId, name: rowData.labelThreeName }
-      } else {
-        this.labelThree = {}
-      }
-      this.reportF = rowData
-      this.dialogReport = true
-    },
-    // 获取所有用户
-    sysUserList () {
-      this.$api.user.sysUserList({ pageNo: 1, pageSize: 999999 }).then(({ data }) => {
-        this.userList = data.records
-      })
-    },
-    /* =============================================== 列表展示 =============================================== */
-    // 重置
-    reset () {
-      this.q = {
-        keyContent: '',
-        year: [],
-        labelOneId: [],
-        labelTwoId: [],
-        labelThreeId: [],
-        pageNo: 1,
-        pageSize: 10
-      }
-      this.total = 0
-      this.tableData = []
-      this.reportList()
-      this.reportDateList()
-    },
-    // 报告删除
-    reportDelete (ids) {
-      this.$confirm('此操作将删除所选数据, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.$api.report.reportDelete({ ids }).then(_ => {
-          this.$message.success('操作成功')
-          this.reportList()
-          this.reportDateList()
-        })
-      })
-    },
-    search () {
-      this.q.pageNo = 1
-      this.reportList()
-    },
-    // 列表
-    reportList () {
-      this.$api.report.reportList(this.q).then(({ data }) => {
-        this.tableData = data.records
-        this.total = data.total
-        this.q.pageNo = data.current
-        this.q.pageSize = data.size
-        if (!data.records.length && this.q.pageNo !== 1) {
-          this.q.pageNo = 1
-          this.reportList()
-        }
-      })
-    },
-    // 日期列表
-    reportDateList () {
-      this.$api.report.reportDateList().then(({ data }) => {
-        this.yearList = data.list
-      })
-    },
-    // 单页数据量
-    handleSizeChange (val) {
-      this.q.pageSize = val
-      this.q.pageNo = 1
-      this.reportList()
-    },
-    // 第几页
-    handleCurrentChange (val) {
-      this.q.pageNo = val
-      this.reportList()
-    },
-    // 预览
-    previewRow (row) {
-      this.fullscreen = false
-      //  更新预览水印的时间戳
-      this.watermarkText = `${this.$store.state.userInfo.usname} ${formatDate(+new Date(), 'yyyy年MM月dd日 hh:mm:ss')}`
-      this.$api.report.reportGetReportHtmlId({ id: row.id }).then(({ data }) => {
-        this.content = data.content
-        this.dialogPreview = true
-      })
-    },
-    // 下载
-    downloadRow (row) {
-      // this.$confirm('此操作将下载所选数据文件, 是否继续?', '提示', {
-      //     confirmButtonText: '确定',
-      //     cancelButtonText: '取消',
-      //     type: 'warning'
-      // }).then(() => {
-      this.$api.report.reportDownload({ fileId: row.fileId }).then(res => {
-        downloadFile(res)
-      })
-      // })
+    created() {
+        this.init();
     }
-  },
-  created () {
-    this.init()
-  }
 }
 </script>
 
@@ -1016,6 +1017,7 @@ export default {
     text-align: right;
     width: 95%;
 }
+
 .report-manager {
     .title {
         border-bottom: 1px solid #EBEEF5;
@@ -1182,6 +1184,49 @@ export default {
 }
 
 /* 标签维护 */
+.head {
+    display: flex;
+    align-items: center;
+
+    .btn {
+        cursor: pointer;
+    }
+}
+
+.tree {
+    margin-top: 30px;
+    padding: 0px 50px 50px 50px;
+
+    .custom-tree-node {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-size: 14px;
+
+    }
+}
+
+.head ::v-deep .el-input__inner {
+    margin-top: 10px;
+    height: 40px;
+    line-height: 40px;
+    width: 50% !important;
+    margin-left: 50px;
+}
+
+.head ::v-deep .el-button {
+    margin-top: 10px;
+    height: 40px;
+    line-height: 40px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-left: -120px;
+    cursor: pointer;
+    z-index: 999;
+}
+
 .dialog-tags {
     padding: 11px 33px 0 33px;
 
@@ -1240,8 +1285,9 @@ export default {
                 margin-left: 10px;
                 margin-right: 5px;
             }
+
             .icon-sub,
-            .icon-up{
+            .icon-up {
                 margin-right: 5px;
             }
 
@@ -1250,7 +1296,7 @@ export default {
             .icon-add,
             .icon-sub,
             .icon-up,
-            .icon-down{
+            .icon-down {
                 cursor: pointer;
                 width: 16px;
                 height: 16px;
@@ -1298,6 +1344,14 @@ export default {
                 width: 100%;
             }
 
+            .ti-input {
+                width: 107.5% !important;
+            }
+
+            .el-cascader {
+                width: 100%;
+            }
+
             .el-date-editor {
                 width: 100%;
 
@@ -1348,11 +1402,12 @@ export default {
     }
 }
 
-.dialog-title{
+.dialog-title {
     display: inline-flex;
     justify-content: center;
     align-items: center;
-    .full-screen{
+
+    .full-screen {
         cursor: pointer;
         width: 24px;
         height: 24px;
@@ -1366,10 +1421,12 @@ export default {
     padding: 9px 25px 17px 22px;
     height: 60vh;
     position: relative;
-    &.active{
+
+    &.active {
         height: calc(100vh - 52px);
     }
-    .full-screen{
+
+    .full-screen {
         cursor: pointer;
         position: absolute;
         z-index: 10;
@@ -1385,7 +1442,7 @@ export default {
     ::v-deep .el-scrollbar {
         height: 100%;
 
-        .el-scrollbar__wrap{
+        .el-scrollbar__wrap {
             overflow-x: auto;
         }
 
@@ -1405,5 +1462,4 @@ export default {
         }
     }
 }
-
 </style>
diff --git a/src/views/Report/reportManager/labelModal.vue b/src/views/Report/reportManager/labelModal.vue
new file mode 100644
index 0000000..3b28f0a
--- /dev/null
+++ b/src/views/Report/reportManager/labelModal.vue
@@ -0,0 +1,155 @@
+<template>
+    <div>
+        <el-dialog title="新增/编辑标签" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
+            <div class="form">
+                <el-form ref="form" :model="form" label-width="80px" :rules="rule">
+                    <el-form-item label="上级标签">
+                        <el-cascader v-model="form.nodeLabel" placeholder="请选择上级标签" :options="cascaderOptions" filterable :props="{ checkStrictly: true }" clearable >
+                        </el-cascader>
+                    </el-form-item>
+
+                    <el-form-item label="标签名称" prop="label">
+                        <el-input v-model="form.label"></el-input>
+                    </el-form-item>
+                    <el-form-item label="排序">
+                        <el-input v-model="form.orderNum"></el-input>
+                    </el-form-item>
+                    <el-form-item label="备注">
+                        <el-input v-model="form.remark"></el-input>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button @click="cancel" class="btn">取消</el-button>
+                        <el-button type="primary" @click="submitForm" class="btn">确定</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+
+            <!-- <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click=" submit">确 定</el-button>
+            </span> -->
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'labelModal',
+    data() {
+        return {
+            dialogVisible: false,
+            form: {
+                label:undefined,
+                name:'',
+                sort:'',
+
+                tip:''
+            },
+            cascaderOptions:[
+
+                ],
+            rule: {
+                name: [
+                    { required: true, trigger: 'blur', message: '请输入标签名称' }
+                ],
+                resource: [
+                    {
+                        required: true, trigger: 'change', message: '请选择标签属性'
+                    }
+                ]
+            },
+        };
+    },
+    methods: {
+        handleClose(done) {
+            // this.$confirm('确认关闭？')
+            //   .then(_ => {
+            //     done();
+            //   })
+            //   .catch(_ => {});
+            done();
+        },
+        open(node, data) {
+            this.dialogVisible = true
+            this.$api.report.labelList().then(res => {
+            console.log('666',res);
+            this.cascaderOptions=res.data
+          })
+            if (node && data) {
+                this.showAddOrUpdateLabel = true
+                this.form.nodeLabel = node.parent.data.label
+                this.form.label = data.label
+                this.form.orderNum = data.orderNum
+                this.form.remark = data.remark
+                this.form={...this.form}
+                this.$refs.form.clearValidate('name')
+                this.$forceUpdate()
+            } else {
+                this.form = {}
+                this.$forceUpdate()
+            }
+        },
+        cancel() {
+            this.dialogVisible = false
+        },
+        submitForm() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.form.parentId=this.form.nodeLabel[this.form.nodeLabel.length - 1]
+                    delete this.form.nodeLabel
+                    this.$api.report.labelAdd(this.form).then(res => {
+                    })
+                    this.dialogVisible = false
+                    this.$bus.$emit('updataList')
+                }
+            })
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.form {
+    padding: 50px;
+
+    .btn {
+        margin-left: 40px;
+        width: 90px;
+        height: 40px;
+        border-radius: 30px;
+        margin-right: 30px;
+    }
+}
+
+.form ::v-deep .el-input__inner {
+    width: 90%
+}
+
+.form ::v-deep .el-select {
+    width: 90%;
+}
+
+.form ::v-deep .el-select .el-input__inner {
+    width: 100%;
+}
+
+::v-deep .el-form-item--mini .el-form-item__label {
+    line-height: 40px !important;
+}
+
+::v-deep .el-input__inner {
+    height: 40px;
+    line-height: 40px;
+    width: 80%;
+}
+::v-deep .el-cascader{
+    height: 40px !important;
+    line-height: 40px !important;
+    width: 90%;
+}
+::v-deep .el-cascader .el-input__inner {
+    height: 40px !important;
+    line-height: 40px !important;
+    width: 100%;
+}
+</style>
diff --git a/src/views/userCenter/processCenter.vue b/src/views/userCenter/processCenter.vue
index 786f15a..43a4a6e 100644
--- a/src/views/userCenter/processCenter.vue
+++ b/src/views/userCenter/processCenter.vue
@@ -1,123 +1,104 @@
 <template>
-    <div class="centerBox content-height">
+    <div class="content">
         <div class="title">
             <span>流程中心</span>
         </div>
-        <div class="search">
-          <el-row>
-            <el-col :span="20">
-              <div class="search-box-left">
-                <div class="">
-                  <label>流程编号:</label>
-                  <el-input v-model="form.id" placeholder="请输入流程编号"></el-input>
-                </div>
-                <div class="">
-                  <label>流程名称:</label>
-                  <el-input v-model="form.name" placeholder="请输入流程名称"></el-input>
-                </div>
-              </div>
-            </el-col>
-            <el-col :span="4" align="right">
-              <div class="search-box-right">
+        <div class="searchForm">
+            <div class="item">
+                <div>流程编号：</div>
+                <el-input v-model="form.id" ></el-input>
+            </div>
+            <div class="item">
+                <div>流程名称：</div>
+                <el-input v-model="form.name"></el-input>
+            </div>
+            <div class="item">
                 <el-button type="primary"  @click="search">查询</el-button>
                 <el-button type="" @click="reset">重置</el-button>
-              </div>
-            </el-col>
-          </el-row>
+            </div>
         </div>
         <div class="tabs">
-            <tabs />
+            <tabs :tableData="tableData"/>
         </div>
     </div>
 </template>
 
 <script>
 import tabs from '../userCenter/processCenter/tabs.vue'
-export default {
-  name: 'processCenter',
-  components: {
-    tabs
-  },
-  data () {
-    return {
-      form: {}
-    }
-  },
-  created () {
-
-  },
-  mounted () {
-
-  },
-  methods: {
-    // 查询
-    search () {
-      // this.$api.processCenter.search({})
+    export default {
+        name:'processCenter',
+        components:{
+          tabs
+        },
+        data() {
+            return {
+                form: {},
+                tableData:[]
+            }
+        },
+        created () {
+            ;
+        },
+        mounted () {
+        this.$bus.$on('clearForm',()=>{
+            this.form={}
+        });
     },
-    // 重置
-    reset () {
-      this.form = {}
-      // this.$api.processCenter.reset({})
+        methods: {
+            //查询
+            search() {
+                this.$bus.$emit('getSearchItem',this.form)
+                // this.$api.processCenter.search({})
+                this.tableData=[{createTime:'1999-10-1'}]
+            },
+            //重置
+            reset(){
+                this.form={}
+                this.$forceUpdate()
+                this.$bus.$emit('getSearchItem',this.form)
+                this.tableData=[{createTime:'3000-10-1'}]
+                // this.$api.processCenter.reset({})
+            }
+        },
     }
-  }
-}
 </script>
 
 <style lang="scss" scoped>
-.centerBox{
-  background-color: #fff;
-  height: 100%;
-  width: 100%;
+.content{
+    min-height: calc(100vh - 60px - 20px);
+    box-shadow: 0 6px 11px 0 rgba(163, 163, 163, 0.2);
+    border-radius: 6px;
+    background: #FFFFFF;
     .title {
         border-bottom: 1px solid #EBEEF5;
         height: 42px;
         line-height: 42px;
-         margin: 0 18px 0 22px;
+        margin: 0 18px 0 22px;
+
         span {
             font-size: 16px;
             font-weight: 600;
             color: #262626;
         }
     }
-  .search {
-    .search-box-left {
-      padding-top: 20px;
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-
-      label {
-        font-size: 14px;
-        font-weight: 400;
-        color: #595959;
-        margin-right: 5px;
-        padding-left: 22px;
-      }
-
-      ::v-deep .el-input {
-        width: 167px;
-        margin-right: 5px;
-      }
-      @media screen and (max-width: 1366px) {
-        ::v-deep .el-input {
-          width: 135px;
-          margin-right: 5px;
+    .searchForm{
+        width: 1200px;
+        display: flex;
+        align-items: center;
+        margin: 20px 0 0 22px;
+        .item{
+        width: 300px;
+        display: flex;
+        align-items: center;
         }
-      }
-    }
-    .search-box-right {
-      padding-top: 20px;
-      display: flex;
-      justify-content: flex-end;
-      align-items: center;
-      padding-right: 14px;
-    }
 
-  }
+    }
     .tabs{
-        margin: 20px 20px  5px;
+        margin: 20px 0 0 13px;
     }
 
 }
-
+::v-deep .el-input{
+    width: 200px;
+}
 </style>
diff --git a/src/views/userCenter/processCenter/finishProcess.vue b/src/views/userCenter/processCenter/finishProcess.vue
index 0205bc6..7ea8ade 100644
--- a/src/views/userCenter/processCenter/finishProcess.vue
+++ b/src/views/userCenter/processCenter/finishProcess.vue
@@ -1,129 +1,89 @@
 <template>
     <div>
-    <el-table
-    :data="tableData"
-    style="width: 100%"
-    border
-    :header-cell-style="{background:'#DFE6EC',fontWeight:'700',color:'#1F2D3D'}"
-    >
-    <el-table-column
-      prop="processId"
-      label="流程编号"
-      width="150"
-      align="center"
-      >
-    </el-table-column>
-    <el-table-column
-      prop="processName"
-      label="流程名称"
-    
-      align="center"
-      >
-    </el-table-column>
-    <el-table-column
-      prop="processPerson"
-      label="发起人"
-      width="220"
-      align="center"
-      
-      >
-    </el-table-column>
-    <el-table-column
-      prop="now"
-      label="当前处理人"
-      width="190"
-      align="center"
-      
-      >
-    </el-table-column>
-      <el-table-column
-      prop="last"
-      label="上一处理人"
-      width="180"
-      align="center"
-      
-      >
-    </el-table-column>
-    <el-table-column
-      prop="createTime"
-      label="创建时间"
-      width="180"
-      sortable
-      align="center"
-      
-      >
-    </el-table-column>
-    <el-table-column
-      prop="endTime"
-      label="完成时间"
-      width="170"
-      sortable
-      align="center"
-      
-      >
-    </el-table-column>
-    <el-table-column
-      prop="status"
-      label="状态"
-      width="125"
-      align="center"
-      
-      >
-    </el-table-column>
-    <el-table-column
-    fixed="right"
-      label="操作"
-      width="120"
-      align="center">
-      <template slot-scope="scope">
-        <el-button
-          @click.native.prevent="view(scope.$index, tableData)"
-          type="text"
-          size="small">
-          查看
-        </el-button>
-      </template>
-      </el-table-column>
-  </el-table>
+        <el-table :data="tableData" style="width: 100%" border
+            :header-cell-style="{ background: '#DFE6EC', fontWeight: '700', color: '#1F2D3D' }">
+            <el-table-column prop="processId" label="流程编号"  align="center">
+            </el-table-column>
+            <el-table-column prop="processName" label="流程名称" align="center">
+            </el-table-column>
+            <el-table-column prop="processPerson" label="发起人"  align="center">
+            </el-table-column>
+            <el-table-column prop="now" label="当前处理人"  align="center">
+            </el-table-column>
+            <el-table-column prop="last" label="上一处理人"  align="center">
+            </el-table-column>
+            <el-table-column prop="createTime" label="创建时间"  sortable align="center">
+            </el-table-column>
+            <el-table-column prop="endTime" label="完成时间"  sortable align="center">
+            </el-table-column>
+            <el-table-column prop="status" label="状态"  align="center">
+            </el-table-column>
+            <el-table-column label="操作" width="120" align="center">
+                <template slot-scope="scope">
+                    <el-button @click.native.prevent="view(scope.$index, tableData)" type="text" size="small">
+                        查看
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
     </div>
 </template>
 
 <script>
-    export default {
-        name:'finishProcess',
-        data() {
-      return {
-        tableData: [{
-            processId: '2016-05-1',
-            processName: '王小虎',
-            processPerson: '上海市普陀区金沙江路 1518 弄',
-            createTime:'2023-1-1'
-        }, {
-            processId: '2016-05-2',
-            processName: '王小虎',
-            processPerson: '上海市普陀区金沙江路 1518 弄',
-            createTime:'2023-1-2'
-        }, {
-            processId: '2016-05-3',
-            processName: '王小虎',
-            processPerson: '上海市普陀区金沙江路 1518 弄',
-            createTime:'2023-1-3'
-        }, {
-            processId: '2016-05-4',
-            processName: '王小虎',
-            processPerson: '上海市普陀区金沙江路 1518 弄',
-            createTime:'2023-1-4'
-        }]
+export default {
+    name: 'finishProcess',
+    data() {
+        return {
+            tableData: [{
+                processId: '2016-05-1',
+                processName: '王小虎',
+                processPerson: '上海市普陀区金沙江路 1518 弄',
+                createTime: '2023-1-1'
+            }, {
+                processId: '2016-05-2',
+                processName: '王小虎',
+                processPerson: '上海市普陀区金沙江路 1518 弄',
+                createTime: '2023-1-2'
+            }, {
+                processId: '2016-05-3',
+                processName: '王小虎',
+                processPerson: '上海市普陀区金沙江路 1518 弄',
+                createTime: '2023-1-3'
+            }, {
+                processId: '2016-05-4',
+                processName: '王小虎',
+                processPerson: '上海市普陀区金沙江路 1518 弄',
+                createTime: '2023-1-4'
+            }]
+        }
+    },
+    props:{
+      secondData:{
+          type:Array,
+          default:[],
       }
     },
+    mounted () {
+      this.$bus.$on('getSearchItem',(data)=>{
+          console.log('22',data)
+      });
+    },
+    watch: {
+        secondData(newValue, oldValue) {
+          this.tableData=newValue
+        }
+    },
     methods: {
-        view(){
+        view() {
             alert(111)
         },
     }
-    }
+}
 </script>
 
-<style lang="sass" scoped>
+<style lang="scss" scoped>
+::v-deep .el-table__fixed, ::v-deep .el-table__fixed-right ::before{
+   height: 0px !important;
 
+}
 </style>
\ No newline at end of file
diff --git a/src/views/userCenter/processCenter/gencyProcess.vue b/src/views/userCenter/processCenter/gencyProcess.vue
index 21ea321..cf313b3 100644
--- a/src/views/userCenter/processCenter/gencyProcess.vue
+++ b/src/views/userCenter/processCenter/gencyProcess.vue
@@ -1,96 +1,93 @@
 <template>
-    <div>
-    <el-table
-    :data="tableData"
-    style="width: 100%"
-    border
-    :header-cell-style="{background:'#DFE6EC',fontWeight:'700',color:'#1F2D3D'}"
-    >
-    <el-table-column
-      prop="processId"
-      label="流程编号"
-      width="150"
-      align="center"
-      >
-    </el-table-column>
-    <el-table-column
-      prop="processName"
-      label="流程名称"
-      
-      align="left"
-      >
-    </el-table-column>
-    <el-table-column
-      prop="processPerson"
-      label="发起人"
-      width="390"
-      align="center"
-      
-      >
-    </el-table-column>
-    <el-table-column
-      prop="createTime"
-      label="创建时间"
-      width="260"
-      sortable
-      align="center"
-      
-      >
-    </el-table-column>
-    <el-table-column
-      fixed="right"
-      label="操作"
-      width="120"
-      align="center">
-      <template slot-scope="scope">
-        <el-button
-          @click.native.prevent="handle(scope.$index, tableData)"
-          type="text"
-          size="small">
-          办理
-        </el-button>
-      </template>
+  <div>
+    <el-table :data="tableData" style="width: 100%" border :header-cell-style="{
+      background: '#DFE6EC',
+      fontWeight: '700',
+      color: '#1F2D3D',
+    }">
+      <el-table-column prop="processId" label="流程编号"  align="center">
       </el-table-column>
-  </el-table>
-    </div>
+      <el-table-column prop="processName" label="流程名称" align="left">
+      </el-table-column>
+      <el-table-column prop="processPerson" label="发起人"  align="center">
+      </el-table-column>
+      <el-table-column prop="createTime" label="创建时间" sortable align="center">
+      </el-table-column>
+      <el-table-column  label="操作" width="120" align="center">
+        <template slot-scope="scope">
+          <el-button @click.native.prevent="handle(scope.$index, tableData)" type="text" size="small">
+            办理
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
 </template>
 
 <script>
-    export default {
-        name:'gencyProcess',
-        data() {
-      return {
-        tableData: [{
-            processId: '2016-05-1',
-            processName: '王小虎',
-            processPerson: '上海市普陀区金沙江路 1518 弄',
-            createTime:'2023-1-1'
-        }, {
-            processId: '2016-05-2',
-            processName: '王小虎',
-            processPerson: '上海市普陀区金沙江路 1518 弄',
-            createTime:'2023-1-2'
-        }, {
-            processId: '2016-05-3',
-            processName: '王小虎',
-            processPerson: '上海市普陀区金沙江路 1518 弄',
-            createTime:'2023-1-3'
-        }, {
-            processId: '2016-05-4',
-            processName: '王小虎',
-            processPerson: '上海市普陀区金沙江路 1518 弄',
-            createTime:'2023-1-4'
-        }]
+export default {
+  name: "gencyProcess",
+  data() {
+    return {
+      tableData: [
+        {
+          processId: "2016-05-1",
+          processName: "王小虎",
+          processPerson: "上海市普陀区金沙江路 1518 弄",
+          createTime: "2023-1-1",
+        },
+        {
+          processId: "2016-05-2",
+          processName: "王小虎",
+          processPerson: "上海市普陀区金沙江路 1518 弄",
+          createTime: "2023-1-2",
+        },
+        {
+          processId: "2016-05-3",
+          processName: "王小虎",
+          processPerson: "上海市普陀区金沙江路 1518 弄",
+          createTime: "2023-1-3",
+        },
+        {
+          processId: "2016-05-4",
+          processName: "王小虎",
+          processPerson: "上海市普陀区金沙江路 1518 弄",
+          createTime: "2023-1-4",
+        },
+      ],
+    };
+  },
+  props:{
+      firstData:{
+          type:Array,
+          default:[],
       }
     },
-    methods: {
-        handle(){
-            alert(111)
+
+    watch: {
+      firstData(newValue, oldValue) {
+          this.tableData=newValue
         }
-    }
-    }
+    },
+    mounted () {
+      this.$bus.$on('getSearchItem',(data)=>{
+          console.log('11',data)
+      });
+    },
+  methods: {
+    handle() {
+      alert(111);
+    },
+  },
+  beforeDestroy(){
+    this.$bus.$off('getSearchItem')
+  }
+};
 </script>
 
-<style lang="sass" scoped>
+<style lang="scss" scoped>
+::v-deep .el-table__fixed, ::v-deep .el-table__fixed-right ::before{
+   height: 0px !important;
 
+}
 </style>
\ No newline at end of file
diff --git a/src/views/userCenter/processCenter/monitorProcesses.vue b/src/views/userCenter/processCenter/monitorProcesses.vue
index 50609bf..d196497 100644
--- a/src/views/userCenter/processCenter/monitorProcesses.vue
+++ b/src/views/userCenter/processCenter/monitorProcesses.vue
@@ -1,130 +1,93 @@
 <template>
     <div>
-    <el-table
-    :data="tableData"
-    style="width: 100%"
-    border
-    :header-cell-style="{background:'#DFE6EC',fontWeight:'700',color:'#1F2D3D'}"
-    >
-    <el-table-column
-      prop="processId"
-      label="流程编号"
-     
-      align="center"
-      >
-    </el-table-column>
-    <el-table-column
-      prop="processName"
-      label="流程名称"
-      width="220"
-      align="center"
-      >
-    </el-table-column>
-    <el-table-column
-      prop="processPerson"
-      label="发起人"
-      width="220"
-      align="center"
-      
-      >
-    </el-table-column>
-    <el-table-column
-      prop="now"
-      label="当前处理人"
-      width="190"
-      align="center"
-      
-      >
-    </el-table-column>
-      <el-table-column
-      prop="last"
-      label="上一处理人"
-      width="180"
-      align="center"
-      
-      >
-    </el-table-column>
-    <el-table-column
-      prop="createTime"
-      label="创建时间"
-      width="180"
-      sortable
-      align="center"
-      
-      >
-    </el-table-column>
-    <el-table-column
-      prop="endTime"
-      label="完成时间"
-      width="170"
-      sortable
-      align="center"
-      
-      >
-    </el-table-column>
-    <el-table-column
-      prop="status"
-      label="状态"
-      width="125"
-      align="center"
-      
-      >
-    </el-table-column>
-    <el-table-column
-      fixed="right"
-      label="操作"
-      width="120"
-      align="center">
-      <template slot-scope="scope" >
-        <el-button
-          @click.native.prevent="view(scope.$index, tableData)"
-          type="text"
-          size="small"
-          >
-          <span>查看</span>
-        </el-button>
-      </template>
-      </el-table-column>
-  </el-table>
+        <el-table :data="tableData" style="width: 100%" border
+            :header-cell-style="{ background: '#DFE6EC', fontWeight: '700', color: '#1F2D3D' }">
+            <el-table-column prop="processId" label="流程编号" align="center">
+            </el-table-column>
+            <el-table-column prop="processName" label="流程名称"  align="center">
+            </el-table-column>
+            <el-table-column prop="processPerson" label="发起人" align="center">
+            </el-table-column>
+            <el-table-column prop="now" label="当前处理人"  align="center">
+            </el-table-column>
+            <el-table-column prop="last" label="上一处理人"  align="center">
+            </el-table-column>
+            <el-table-column prop="createTime" label="创建时间"  sortable align="center">
+            </el-table-column>
+            <el-table-column prop="endTime" label="完成时间"  sortable align="center">
+            </el-table-column>
+            <el-table-column prop="status" label="状态"  align="center">
+            </el-table-column>
+            <el-table-column  label="操作" width="120" align="center">
+                <template slot-scope="scope">
+                    <el-button @click.native.prevent="view(scope.$index, tableData)" type="text" size="small">
+                        查看
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
     </div>
 </template>
-
 <script>
-    export default {
-        name:'monitorProcess',
-        data() {
-      return {
-        tableData: [{
-            processId: '2016-05-1',
-            processName: '王小虎',
-            processPerson: '上海市普陀区金沙江路 1518 弄',
-            createTime:'2023-1-1'
-        }, {
-            processId: '2016-05-2',
-            processName: '王小虎',
-            processPerson: '上海市普陀区金沙江路 1518 弄',
-            createTime:'2023-1-2'
-        }, {
-            processId: '2016-05-3',
-            processName: '王小虎',
-            processPerson: '上海市普陀区金沙江路 1518 弄',
-            createTime:'2023-1-3'
-        }, {
-            processId: '2016-05-4',
-            processName: '王小虎',
-            processPerson: '上海市普陀区金沙江路 1518 弄',
-            createTime:'2023-1-4'
-        }]
+export default {
+    name: 'monitorProcess',
+    data() {
+        return {
+            tableData: [{
+                processId: '2016-05-1',
+                processName: '王小虎',
+                processPerson: '上海市普陀区金沙江路 1518 弄',
+                createTime: '2023-1-1'
+            }, {
+                processId: '2016-05-2',
+                processName: '王小虎',
+                processPerson: '上海市普陀区金沙江路 1518 弄',
+                createTime: '2023-1-2'
+            }, {
+                processId: '2016-05-3',
+                processName: '王小虎',
+                processPerson: '上海市普陀区金沙江路 1518 弄',
+                createTime: '2023-1-3'
+            }, {
+                processId: '2016-05-4',
+                processName: '王小虎',
+                processPerson: '上海市普陀区金沙江路 1518 弄',
+                createTime: '2023-1-4'
+            }]
+        }
+    },
+    props:{
+      fourthData:{
+          type:Array,
+          default:[],
       }
     },
+    watch: {
+        fourthData(newValue, oldValue) {
+          this.tableData=newValue
+        }
+    },
+    mounted () {
+      this.$bus.$on('getSearchItem',(data)=>{
+          console.log('44',data)
+      });
+    },
     methods: {
-        view(){
-            alert(111)
+        view() {
+          this.$router.push({
+            path: 'monitorViews',
+            query:{
+                id: this.$route.query.id
+            }
+          })
         }
     }
-    }
+}
 </script>
 
-<style lang="sass" scoped>
+<style lang="scss" scoped>
+ ::v-deep .el-table__fixed,.el-table__fixed-right ::before{
+   height: 0px !important;
 
+}
 </style>
\ No newline at end of file
diff --git a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue
new file mode 100644
index 0000000..ddc7449
--- /dev/null
+++ b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue
@@ -0,0 +1,98 @@
+<template>
+    <div>
+        <el-dialog title="调整处理人" :visible.sync="dialogVisible" :before-close="handleClose">
+            <div class="form-container">
+                <el-form ref="form" :model="form" label-width="80px" :rules="rules">
+                    <el-form-item label="选择人员" prop="select" >
+                        <el-select v-model="form.select" placeholder="请选择调整处理人">
+                            <el-option label="张三" value="1"></el-option>
+                            <el-option label="李四" value="2"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false" class="btn">取 消</el-button>
+                <el-button type="primary" @click="submit" class="btn">确 定</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'modal',
+    data() {
+        return {
+            dialogVisible: false,
+            form: {},
+            rules: {
+                select: [
+                    {
+                        required: 'true',
+                        trigger: 'change',
+                        message: '请选择调整处理人'
+                    }
+                ]
+            }
+        };
+    },
+    methods: {
+        handleClose(done) {
+            this.$confirm('确认关闭？')
+                .then(_ => {
+                    done();
+                })
+                .catch(_ => { });
+        },
+        open() {
+            this.dialogVisible = true
+        },
+        submit() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    alert(11)
+                    this.dialogVisible = false
+                }
+            })
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.dialog-footer {
+    display: flex;
+    justify-content: center;
+    margin-bottom: 30px;
+
+}
+
+::v-deep .el-dialog {
+    width: 600px;
+
+}
+
+::v-deep .el-dialog .el-dialog__body {
+    font-size: 50px;
+    height: 230px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+::v-deep .el-input__inner {
+    height: 40px;
+    line-height: 40px;
+}
+
+::v-deep .el-form-item--mini .el-form-item__label {
+    line-height: 40px !important;
+}
+
+::v-deep .btn {
+    width: 90px;
+    height: 40px;
+    border-radius: 30px;
+    margin-right: 30px;
+}</style>
\ No newline at end of file
diff --git a/src/views/userCenter/processCenter/monitorProcesses/monitorViews.vue b/src/views/userCenter/processCenter/monitorProcesses/monitorViews.vue
new file mode 100644
index 0000000..32a1b5b
--- /dev/null
+++ b/src/views/userCenter/processCenter/monitorProcesses/monitorViews.vue
@@ -0,0 +1,84 @@
+<template>
+    <div class="content">
+       <div class="map">
+       </div>
+       <div class="btn">
+        <el-button type="primary" class="inner-btn" @click="showDialog">
+            调整处理人
+        </el-button>
+       </div>
+       <div class="table">
+        <el-table :data="tableData" style="width: 100%" border
+            :header-cell-style="{ background: '#DFE6EC', fontWeight: '700', color: '#1F2D3D' }">
+            <el-table-column
+            type="selection"
+            width="55">
+            </el-table-column>
+            <el-table-column prop="step" label="任务步骤"  align="center">
+            </el-table-column>
+            <el-table-column prop="missionPer" label="任务受理人"  align="center">
+            </el-table-column>
+            <el-table-column prop="createTime" label="创建时间"  sortable align="center">
+            </el-table-column>
+            <el-table-column prop="endTime" label="完成时间"  sortable align="center">
+            </el-table-column>
+            <el-table-column prop="status" label="状态"  align="center">
+            </el-table-column>
+        </el-table>
+       </div>
+       <monitorModal ref="monitorModal"></monitorModal>
+    </div>
+</template>
+
+<script>
+import monitorModal from './monitorModal.vue'
+    export default {
+        name:'monitorViews',
+        components:{
+            monitorModal
+        },
+        data() {
+            return {
+                tableData: [
+                    {
+                        step:'1',
+                        missionPer:'王五',
+                        createTime:'2023-1-1',
+                        endTime:'2023-5-1',
+                        status:'待定'
+                    }
+                ]
+            }
+        },
+        methods: {
+            showDialog() {
+                this.$refs.monitorModal.open()
+            }
+        },
+    }
+</script>
+
+<style lang="scss" scoped>
+.content{
+    min-height: calc(100vh - 60px - 20px);
+    box-shadow: 0 6px 11px 0 rgba(163, 163, 163, 0.2);
+    border-radius: 6px;
+    background: #FFFFFF;
+    .map{
+        width: 100%;
+        height: 360px;
+        border: 1px red solid;
+    }
+    .btn{
+        padding: 20px 13px;
+     .inner-btn{
+        width: 100px;
+        height: 40px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+    }
+    
+}
+</style>
\ No newline at end of file
diff --git a/src/views/userCenter/processCenter/sentProcess.vue b/src/views/userCenter/processCenter/sentProcess.vue
index 4d7e19b..d219037 100644
--- a/src/views/userCenter/processCenter/sentProcess.vue
+++ b/src/views/userCenter/processCenter/sentProcess.vue
@@ -1,145 +1,110 @@
 <template>
     <div>
-    <el-table
-    :data="tableData"
-    style="width: 100%"
-    border
-    :header-cell-style="{background:'#DFE6EC',fontWeight:'700',color:'#1F2D3D'}"
-    >
-    <el-table-column
-      prop="processId"
-      label="流程编号"
-      width="150"
-      align="center"
-      >
-    </el-table-column>
-    <el-table-column
-      prop="processName"
-      label="流程名称"
-      
-      align="center"
-      >
-    </el-table-column>
-    <el-table-column
-      prop="processPerson"
-      label="发起人"
-      width="220"
-      align="center"
-      
-      >
-    </el-table-column>
-    <el-table-column
-      prop="now"
-      label="当前处理人"
-      width="190"
-      align="center"
-      
-      >
-    </el-table-column>
-      <el-table-column
-      prop="last"
-      label="上一处理人"
-      width="180"
-      align="center"
-      
-      >
-    </el-table-column>
-    <el-table-column
-      prop="createTime"
-      label="创建时间"
-      width="180"
-      sortable
-      align="center"
-      
-      >
-    </el-table-column>
-    <el-table-column
-      prop="endTime"
-      label="完成时间"
-      width="170"
-      sortable
-      align="center"
-      
-      >
-    </el-table-column>
-    <el-table-column
-      prop="status"
-      label="状态"
-      width="125"
-      align="center"
-      >
-    </el-table-column>
-    <el-table-column
-      fixed="right"
-      label="操作"
-      width="120"
-      align="center">
-      <template slot-scope="scope" >
-            <el-button
-          @click.native.prevent="view(scope.$index, tableData)"
-          type="text"
-          size="small"
-          >
-          <span>查看</span>
-        </el-button>
+        <el-table :data="tableData" style="width: 100%" border :header-cell-style="{
+            background: '#DFE6EC',
+            fontWeight: '700',
+            color: '#1F2D3D',
+        }">
+            <el-table-column prop="processId" label="流程编号"  align="center">
+            </el-table-column>
+            <el-table-column prop="processName" label="流程名称" align="center">
+            </el-table-column>
+            <el-table-column prop="processPerson" label="发起人"  align="center">
+            </el-table-column>
+            <el-table-column prop="now" label="当前处理人"  align="center">
+            </el-table-column>
+            <el-table-column prop="last" label="上一处理人"  align="center">
+            </el-table-column>
+            <el-table-column prop="createTime" label="创建时间"  sortable align="center">
+            </el-table-column>
+            <el-table-column prop="endTime" label="完成时间" sortable align="center">
+            </el-table-column>
+            <el-table-column prop="status" label="状态"  align="center">
+            </el-table-column>
+            <el-table-column  label="操作" width="120" align="center">
+                <template slot-scope="scope">
+                    <el-button @click.native.prevent="view(scope.$index, tableData)" type="text" size="small">
+                        查看
+                    </el-button>
 
-        <el-button
-          @click.native.prevent="back(scope.$index, tableData)"
-          type="text"
-          size="small"
-          >
-          <span>强制撤回</span>
-        </el-button>
-      
-      </template>
-    </el-table-column>
-
-    
-  </el-table>
+                    <el-button :disabled="tableData[scope.$index].status=='已完成'" @click.native.prevent="back(scope.$index, tableData)" type="text" size="small"
+                        >
+                        <span :style="tableData[scope.$index].status=='已完成' ?  {color:icolor } :{color:color}" >强制撤回</span>
+                      
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
     </div>
 </template>
 
 <script>
-    export default {
-        name:'sentProcess',
-        data() {
-      return {
-        tableData: [{
-            processId: '2016-05-1',
-            processName: '王小虎',
-            processPerson: '上海市普陀区金沙江路 1518 弄',
-            createTime:'2023-1-1'
-        }, {
-            processId: '2016-05-2',
-            processName: '王小虎',
-            processPerson: '上海市普陀区金沙江路 1518 弄',
-            createTime:'2023-1-2'
-        }, {
-            processId: '2016-05-3',
-            processName: '王小虎',
-            processPerson: '上海市普陀区金沙江路 1518 弄',
-            createTime:'2023-1-3'
-        }, {
-            processId: '2016-05-4',
-            processName: '王小虎',
-            processPerson: '上海市普陀区金沙江路 1518 弄',
-            createTime:'2023-1-4'
-        }]
+export default {
+    name: "sentProcess",
+    data() {
+        return {
+            color:'rgb(236, 128, 141)',
+            icolor:'rgb(119,136,153)',
+            tableData: [
+                {
+                    processId: "2016-05-1",
+                    processName: "王小虎",
+                    processPerson: "上海市普陀区金沙江路 1518 弄",
+                    createTime: "2023-1-1",
+                    status:'已完成'
+                },
+                {
+                    processId: "2016-05-2",
+                    processName: "王小虎",
+                    processPerson: "上海市普陀区金沙江路 1518 弄",
+                    createTime: "2023-1-2",
+                },
+                {
+                    processId: "2016-05-3",
+                    processName: "王小虎",
+                    processPerson: "上海市普陀区金沙江路 1518 弄",
+                    createTime: "2023-1-3",
+                },
+                {
+                    processId: "2016-05-4",
+                    processName: "王小虎",
+                    processPerson: "上海市普陀区金沙江路 1518 弄",
+                    createTime: "2023-1-4",
+                },
+            ],
+        };
+    },
+    props:{
+      thirdData:{
+          type:Array,
+          default:[],
       }
     },
-    methods: {
-        view(){
-            alert(111)
-        },
-        back(){
-            alert(222)
+    watch: {
+        thirdData(newValue, oldValue) {
+          this.tableData=newValue
         }
-    }
-    }
+    },
+    mounted () {
+      this.$bus.$on('getSearchItem',(data)=>{
+          console.log('33',data)
+      });
+    },
+    methods: {
+        view() {
+            alert(111);
+        },
+        back(index,tableData) {
+            console.log('index',index);
+            console.log('tableData',tableData);
+        },
+    },
+};
 </script>
 
 <style lang="scss" scoped>
-.slot{
-  
+::v-deep .el-table__fixed, ::v-deep .el-table__fixed-right ::before{
+   height: 0px !important;
+
 }
 </style>
\ No newline at end of file
diff --git a/src/views/userCenter/processCenter/tabs.vue b/src/views/userCenter/processCenter/tabs.vue
index 1f7e23f..0bf3b03 100644
--- a/src/views/userCenter/processCenter/tabs.vue
+++ b/src/views/userCenter/processCenter/tabs.vue
@@ -2,16 +2,16 @@
     <div>
         <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="待办流程" name="first">
-                <gencyProcess></gencyProcess>
+                <gencyProcess :firstData="firstData" v-if="activeName=='first'"></gencyProcess>
             </el-tab-pane>
             <el-tab-pane label="已办流程" name="second">
-                <finishProcess></finishProcess>
+                <finishProcess :secondData="secondData" v-if="activeName=='second'"></finishProcess>
             </el-tab-pane>
             <el-tab-pane label="已发流程" name="third">
-                <sentProcess></sentProcess>
+                <sentProcess :thirdData="thirdData" v-if="activeName=='third'"></sentProcess>
             </el-tab-pane>
             <el-tab-pane label="监控流程" name="fourth">
-                <monitorProcesses></monitorProcesses>
+                <monitorProcesses :fourthData="fourthData" v-if="activeName=='fourth'"></monitorProcesses>
             </el-tab-pane>
         </el-tabs>
     </div>
@@ -30,11 +30,34 @@ export default {
         monitorProcesses,
         sentProcess
     },
+    props:{
+        tableData:{
+            type:Array,
+            default:[],
+        }
+    },
     data() {
         return {
-            activeName: 'first'
+            activeName: 'first',
+            firstData:[],
+            secondData:[],
+            thirdData:[],
+            fourthData:[],
         };
     },
+    watch: {
+        tableData(newValue, oldValue) {
+          if(this.activeName == 'first'){
+             this.firstData=newValue
+          }else if(this.activeName == 'second'){
+            this.secondData=newValue
+          }else if(this.activeName == 'third'){
+            this.thirdData=newValue
+          }else{
+            this.fourthData=newValue
+          }
+        }
+    },
     created () {
         ;
     },
@@ -43,7 +66,7 @@ export default {
     },
     methods: {
         handleClick(tab, event) {
-            // console.log(tab, event);
+            this.$bus.$emit('clearForm')
         }
     }
 }