From aab82baa8471837303dc44f99353706fda227a1a Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Fri, 20 May 2022 11:46:40 +0800
Subject: [PATCH 1/9] =?UTF-8?q?[update]=20=E5=8F=82=E6=95=B0=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E5=A4=8D=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   2 +
 jero-web/src/common/lang/zh-cn.js             |   2 +
 .../components/TaskParameterCollection.vue    |  12 +-
 .../dialog/ParameterTemplateCody.vue          | 343 ++++++++++++++++++
 4 files changed, 357 insertions(+), 2 deletions(-)
 create mode 100644 jero-web/src/views/projectManagement/dialog/ParameterTemplateCody.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 894c43a0d..5ed1d3e16 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -708,6 +708,8 @@ module.exports = {
   uploadTime: 'Upload time',
   enclosure: 'enclosure',
   // 认证
+  ListTitle: 'List Title',
+  CopyProjectCollectionparameters: 'Copy Project Collection parameters',
   from: 'from',
   ReferenceTo: 'Reference To',
   checkTheDeadline: 'Select the collection deadline of the parameter item',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index bbf1a6890..8c06b73b6 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -718,6 +718,8 @@ module.exports = {
   uploadTime: '上传时间',
   enclosure: '附件',
   // 认证
+  ListTitle: '清单标题',
+  CopyProjectCollectionparameters: '复制项目收集参数',
   from: '从',
   ReferenceTo: '引用到',
   checkTheDeadline: '选中参数项收集截止时间',
diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
index 85e856662..10451e395 100644
--- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
@@ -83,12 +83,18 @@
     <a-modal v-model="historicalVisible" :title="$t('historicalVersion')" width='750px' :footer="null">
       <historical-version v-if='historicalVisible' :historicalRow='historicalRow'></historical-version>
     </a-modal>
+    <!--    复制参数模板-->
+    <a-modal v-model="areaVisibleCody" :title="$t('CopyProjectCollectionparameters')" width='750px' :footer="null">
+      <parameter-template-cody v-if='areaVisibleCody' @areaVisible='handleCancel' :templateTitle='templatetitle'
+                               :selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version' :projectId='this.$route.query.id'></parameter-template-cody>
+    </a-modal>
   </a-card>
 </template>
 
 <script>
   import ImportFile from '@/components/ImportFile/index'
   import ParameterTemplateAdd from '../dialog/ParameterTemplateAdd'
+  import ParameterTemplateCody from '../dialog/ParameterTemplateCody'
   import HistoricalVersion from '../dialog/historicalVersion'
   import { getAction,postAction } from '../../../api/manage'
   import Configure from '../dialog/configure'
@@ -100,7 +106,8 @@
       ImportFile,
       ParameterTemplateAdd,
       Configure,
-      HistoricalVersion
+      HistoricalVersion,
+      ParameterTemplateCody
     },
     data(){
        return{
@@ -176,6 +183,7 @@
          itemId: '',
          historicalVisible: false,
          historicalRow: {}, // 历史版本得数据
+         areaVisibleCody: false, // 复制参数清单得弹框
        }
     },
     mounted() {
@@ -283,7 +291,7 @@
         }
       },
       handleCody() {
-
+        this.areaVisibleCody = true
       },
       getPersonnelList(){
 
diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateCody.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateCody.vue
new file mode 100644
index 000000000..f1dc780b5
--- /dev/null
+++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateCody.vue
@@ -0,0 +1,343 @@
+<template>
+  <div class='diolag-area'>
+    <a-spin :spinning='spinLoading'>
+      <a-form-model
+        class='tag-module'
+        ref='ruleForm'
+        :model='form'
+        :rules='rules'
+        :label-col='labelCol'
+        :wrapper-col='wrapperCol'
+      >
+        <a-row :gutter='24'>
+          <a-col :span='9'>
+            <a-form-model-item :label="$t('title')" prop='templatetitle' :rules='rules'>
+              <a-input style='width: 420px'
+                       v-model='templatetitle' />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span='9'>
+          </a-col>
+        </a-row>
+        <a-row :gutter='24'>
+          <a-col :span='9'>
+            <a-form-model-item ref='paramsTemplateName' :label="$t('entryName')" prop='paramsTemplateName'>
+              <a-input
+                v-model='form.paramsTemplateName' />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span='9'>
+          </a-col>
+          <a-col :span='6'>
+            <a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
+            <a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+    <a-table
+      class='table-area'
+      ref='table'
+      size='middle'
+      rowKey='id'
+      :columns='columns'
+      :dataSource='areaTable'
+      :pagination='false'
+      :loading='loading'
+      :scroll='{x: 600}'
+      :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
+      @change='handleTableChange'>
+      <a slot='name' slot-scope='text'>{{ text }}</a>
+      <span slot='action' slot-scope='text, record'>
+          <a class='action-edit' @click='editArea(record.id)' v-has="'area:edit'">{{ $t('edit') }}</a>
+          <a style='color:red' href='javascript:;' @click=' deleteArea(record.id)'
+             v-has="'area:delete'">{{ $t('delete') }}</a>
+      </span>
+    </a-table>
+    <div class='drawer-bootom-button'>
+      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
+      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
+import axios from 'axios'
+import Vue from 'vue'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
+
+export default {
+  name: 'parametertemplatecopy',
+  components: {},
+  data() {
+    return {
+      token:Vue.ls.get(ACCESS_TOKEN),
+      title: this.$t('add'),
+      total: 0,
+      selectedRowKeysDate: {},
+      loading: false,
+      editId: '',
+      columns: [
+        {
+          title: this.$t('entryName'),
+          dataIndex: 'region_dictText',
+          key: 'showArea',
+          align: 'center',
+          ellipsis: true
+        },
+        {
+          title: this.$t('ListTitle'),
+          align: 'center',
+          dataIndex: 'paramsTemplateName',
+          ellipsis: true
+        },
+        {
+          title: this.$t('parameterTemplate'),
+          align: 'center',
+          dataIndex: 'paramsTemplateName',
+          ellipsis: true
+        }
+      ],
+      newVisible: false,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 14 }
+      },
+      form: {},
+      rules: {
+        // templatetitle: [
+        //   { required: true, message: this.$t('enterTitle'), trigger: 'blur' }
+        // ]
+      },
+      areaTable: [],
+      flag: false,  //表单提交标识
+      spinLoading: false,
+      confirmLoading: false,
+      templatetitle: '',
+      selectedRowKeys: []
+    }
+  },
+  props: {
+    templateTitle: {
+      type: String,
+      default: '',
+      required: false
+    },
+    selectedRowKeyS: {
+      type: Array,
+      default: '',
+      required: false
+    },
+    rowId: {
+      type: String,
+      default: '',
+      required: false
+    },
+    version: {
+      type: Number,
+      default: '',
+      required: false
+    },
+    projectId: {
+      type: String,
+      default: '',
+      require: true
+    }
+  },
+  mounted() {
+    this.loadData()
+  },
+  methods: {
+    loadData() {
+      this.loading = true
+      let params = {
+        ...this.form
+      }
+      getAction(`params/manifest/getParamsTemplateList`, params).then(res => {
+        if (res.success) {
+          this.areaTable = [...res.result]
+          this.total = res.result.total
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    searchQuery() {
+      this.loadData()
+    },
+    searchReset() {
+      this.form = {}
+      this.loadData()
+    },
+    handleCancel() {
+      this.$emit('areaVisible', false)
+    },
+    onSelectChange(selectedRowKeys, selectedRowKeysDate) {
+      this.selectedRowKeysDate = selectedRowKeysDate
+      this.selectedRowKeys = selectedRowKeys
+    },
+    handleTableChange(val) {
+    },
+    showModal() {
+      this.title = this.$t('add')
+      this.newVisible = true
+      this.form = {}
+    },
+    //新增
+    handleSubmit() {
+      if (this.selectedRowKeys.length == 0) {
+        this.$message.warning(this.$t('pleaseSelectData'))
+      } else if (this.selectedRowKeys.length > 1) {
+        this.$message.warning(this.$t('OnlyOneSelected'))
+      } else {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            this.flag = true
+            this.spinLoading = true
+            // 新增編輯之前 判断 标题唯一
+            getAction(`params/manifest/verifyTitle?projectId=${this.$route.query.id}
+                  &title=${this.templatetitle}`, {})
+              .then(res => {
+                if (res.success) {
+                  let postDate = {
+                    // sourceManifestId:
+                    paramsTemplateId: this.rowId || this.selectedRowKeysDate[0].id,
+                    paramsTemplatePublishVersion: this.version || this.selectedRowKeysDate[0].version,
+                    projectId: this.projectId
+                  }
+                  let _this = this
+                  axios({
+                    url: `/jero-boot/params/manifest/copy`,
+                    method: 'post',
+                    data: postDate,
+                    transformRequest: [function (data) {
+                      let ret = ''
+                      for (let it in data) {
+                        ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+                      }
+                      return ret
+                    }],
+                    headers: {
+                      'Content-Type': 'application/x-www-form-urlencoded',
+                      'X-Access-Token':_this.token
+                    }
+                  })
+                    .then( (res) =>{
+                      if (res.data.success) {
+                        _this.$message.success(res.data.result)
+                      }else{
+                        _this.$message.warning(res.data.result)
+                      }
+                    })
+                    .catch( (error) =>{
+                      console.log(error);
+                    });
+                } else {
+                  this.$message.warning(res.message)
+                }
+              }).finally(() => {
+              this.loading = false
+            })
+          } else {
+            return false
+          }
+        })
+      }
+    },
+    cancelModel() {
+      this.newVisible = false
+      this.$refs.ruleForm.resetFields()
+    },
+    //删除按钮
+    deleteArea(val) {
+      this.$confirm({
+        title: this.$t('confirmDeletion'),
+        content: '',
+        onOk:
+          async () => {
+            getAction(`tag/onlCgformArea/delete`, { id: val }).then((res) => {
+              if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                if (this.areaTable.length == 1 && this.queryParams.pageNo != 1) {
+                  this.queryParams.pageNo = this.queryParams.pageNo - 1
+                }
+                this.loadData()
+              } else {
+                // this.$message.warning(res.message)
+                if (res.message == '该展示区域有关联数据，无法删除！') {
+                  this.$message.warning(this.$t('noDelete'))
+                } else {
+                  this.$message.warning(this.$t('operationFailed'))
+                }
+              }
+            })
+          }
+      })
+    },
+    //编辑按钮
+    editArea(val) {
+      this.title = this.$t('edit')
+      this.newVisible = true
+      let params = {
+        id: val
+      }
+      getAction(`tag/onlCgformArea/queryById`, params).then((res) => {
+        if (res.success) {
+          this.form = { ...res.result }
+          // this.$emit('updateOk',res.result)
+
+        }
+      })
+    }
+  },
+  watch: {
+    templateTitle(val) {
+      this.templatetitle = val
+    },
+    selectedRowKeyS(val) {
+      this.selectedRowKeys = val
+    }
+  }
+
+}
+</script>
+
+<style lang='less' scoped>
+@import '~@assets/less/common.less';
+
+.diolag-area {
+  .table-area {
+    margin: 20px 0;
+
+    .action-edit {
+      margin-right: 10px;
+    }
+  }
+
+  .table-del {
+    color: red;
+  }
+}
+.drawer-bootom-button{
+  display: flex;
+  justify-content: center;
+}
+</style>
+<style lang='less'>
+.area-module {
+  .ant-modal-wrap {
+    .ant-modal {
+      .ant-modal-content {
+        .ant-modal-footer {
+          text-align: center;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file

From 4018235232e6876a7cc7b5b85355aaa99fe0d536 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 20 May 2022 11:49:14 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=9A=84=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/engineeringConfirmation.vue    | 19 +++++++++----------
 .../components/taskCirculationHistory.vue     | 16 +++++++++++-----
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index 2d99ea0fc..6b67761cf 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -319,7 +319,7 @@
         pageLoading: false,
         dataSource: [],
         dataSourceTable: [],
-        pageSize: 10,
+        pageSize: 3,
         pageNo: 1,
         total: 0,
         distributionEngineerList: [],
@@ -386,37 +386,36 @@
         visibleDetails: false,
         columnsAll: [
           {
-            title: this.$t('serialNumber'),
+            title: 'ID',
             dataIndex: 'index',
             key: 'index',
-            align: 'center',
+            align: 'left',
             width: 140,
-            fixed: 'left',
             customRender: (text, record, index) => `${index + 1}`
           },
           {
             title: this.$t('completedBy'),
             dataIndex: 'createBy',
             ellipsis: true,
-            align: 'center'
+            align: 'left'
           },
           {
             title: this.$t('completedTime'),
             dataIndex: 'createTime',
             ellipsis: true,
-            align: 'center'
+            align: 'left'
           },
           {
             title: this.$t('feedbackFromTheEngineer'),
             dataIndex: 'engineerFeedbackContent',
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             scopedSlots: { customRender: 'engineerFeedbackContent' }
           },
           {
             title: this.$t('Deliverables'),
             dataIndex: 'fileId',
-            align: 'center',
+            align: 'left',
             ellipsis: true,
             scopedSlots: { customRender: 'Deliverables' }
           },
@@ -424,11 +423,11 @@
             title: this.$t('replyFromProjectContactPerson'),
             dataIndex: 'engineeringInterfacePersonReply',
             ellipsis: true,
-            align: 'center'
+            align: 'left'
           },
           {
             title: this.$t('operation'),
-            align: 'center',
+            align: 'left',
             width: 300,
             scopedSlots: { customRender: 'operation' }
           }
diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
index 4efb871ed..900d7d4c6 100644
--- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
+++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
@@ -45,28 +45,34 @@
           {
             title: this.$t('operationNode'),
             dataIndex: 'name',
-            align: 'center'
+            align: 'left',
+            width:'20%',
           },
           {
             title: this.$t('Operator'),
             dataIndex: 'assignee',
-            align: 'center'
+            align: 'left',
+            width:'20%',
           },
           {
             title: this.$t('result'),
             dataIndex: 'reviewResult',
-            align: 'center',
+            align: 'left',
+            width:'20%',
             scopedSlots: { customRender: 'reviewResult' }
           },
           {
             title: this.$t('opinion'),
             dataIndex: 'approvalOpinion',
-            align: 'center'
+            align: 'left',
+            width:'20%',
           },
           {
             title: this.$t('operationTime'),
             dataIndex: 'operatorTime',
-            align: 'center',
+            align: 'left',
+            width:200,
+            fixed: 'right',
             customRender: function(t, r, index) {
               return moment(t).format('YYYY-MM-DD HH:mm:ss')
             }

From 97442aef18014bb7209d2335864d651c439b646f Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 20 May 2022 11:52:43 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=9A=84=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/processCenter/processForm/taskListProcess/index.vue  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index ee7046a05..3da6f00a4 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -270,7 +270,6 @@
           fileId: val.fileId,
           flowType: this.$route.query.flowType,
           actiProcInstId: this.$route.query.actiProcInstId,
-          projectTaskInventoryId: this.$route.query.projectTaskInventoryId,
           deliveryRequirements: val.deliveryRequirements
         }
         putAction(this.url.dreSubmit, query).then((res) => {
@@ -281,7 +280,7 @@
               path: '/ProjectDetails',
               query: this.$route.query
             })
-          }else{
+          } else {
             this.loading = false
             this.$message.warning(this.$t('operationFailed'))
           }

From 46013d0800a03d3c20df3fb49ae9e163eaa9091e Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Fri, 20 May 2022 12:04:32 +0800
Subject: [PATCH 4/9] =?UTF-8?q?[update]=20=E5=8F=98=E6=9B=B4=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/TaskParameterCollection.vue    | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
index 10451e395..2eaa7539c 100644
--- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
@@ -99,7 +99,8 @@
   import { getAction,postAction } from '../../../api/manage'
   import Configure from '../dialog/configure'
   import axios from 'axios'
-
+  import Vue from 'vue'
+  import { ACCESS_TOKEN } from '@/store/mutation-types'
   export default {
     name: 'TaskParameterCollection',
     components:{
@@ -156,6 +157,7 @@
              scopedSlots: { customRender: 'operation' }
            }
          ],
+         token:Vue.ls.get(ACCESS_TOKEN),
          selectedRowKeys: [],
          queryParam: {},
          url: {
@@ -265,7 +267,32 @@
         this.areaVisible = true
       },
       handleModule(){
-
+        let _this = this
+        axios({
+          url: `/jero-boot/params/manifest/changeExtension?id=${this.selectedRowKeys[0]}`,
+          method: 'get',
+          transformRequest: [function (data) {
+            let ret = ''
+            for (let it in data) {
+              ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+            }
+            return ret
+          }],
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'X-Access-Token':_this.token
+          }
+        })
+          .then( (res) =>{
+            if (res.data.success) {
+              _this.$message.success(res.data.message)
+            }else{
+              _this.$message.warning(res.data.message)
+            }
+          })
+          .catch( (error) =>{
+            console.log(error);
+          });
       },
       handleDel(){
         let param={

From 88d0c18c3150d2ebb9e513548349128752dea65f Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 20 May 2022 13:39:03 +0800
Subject: [PATCH 5/9] =?UTF-8?q?der=E6=8F=90=E4=BA=A4=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/layouts/TabLayout.vue |   1 +
 jero-web/src/views/dashboard/Analysis.vue     |  20 +-
 jero-web/src/views/dashboard/IndexBdc.vue     | 519 ------------------
 jero-web/src/views/dashboard/IndexChart.vue   | 268 ---------
 jero-web/src/views/dashboard/IndexTask.vue    | 372 -------------
 jero-web/src/views/dashboard/Monitor.vue      |  15 -
 jero-web/src/views/dashboard/Workplace.vue    | 360 ------------
 .../processForm/taskListProcess/index.vue     |   3 +-
 8 files changed, 6 insertions(+), 1552 deletions(-)
 delete mode 100644 jero-web/src/views/dashboard/IndexBdc.vue
 delete mode 100644 jero-web/src/views/dashboard/IndexChart.vue
 delete mode 100644 jero-web/src/views/dashboard/IndexTask.vue
 delete mode 100644 jero-web/src/views/dashboard/Monitor.vue
 delete mode 100644 jero-web/src/views/dashboard/Workplace.vue

diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue
index 6e2f408d4..e76180cd4 100644
--- a/jero-web/src/components/layouts/TabLayout.vue
+++ b/jero-web/src/components/layouts/TabLayout.vue
@@ -94,6 +94,7 @@
           this.$route.path == '/ProjectDetails' ||
           this.$route.path == '/handshakeProcess' ||
           this.$route.path == '/historicalVersion' ||
+          this.$route.path == '/dashboard/analysis' ||
           this.$route.path == '/processDetails') {
           return false
         } else {
diff --git a/jero-web/src/views/dashboard/Analysis.vue b/jero-web/src/views/dashboard/Analysis.vue
index 955165f4e..1b9ab1cce 100644
--- a/jero-web/src/views/dashboard/Analysis.vue
+++ b/jero-web/src/views/dashboard/Analysis.vue
@@ -1,30 +1,16 @@
 <template>
   <div>
-<!--    <index-chart v-if="indexStyle==1"></index-chart>-->
-<!--    <index-bdc v-if="indexStyle==2"></index-bdc>-->
-<!--    <index-task v-if="indexStyle==3"></index-task>-->
-<!--    <div style="width: 100%;text-align: right;margin-top: 20px">-->
-<!--      请选择首页样式：-->
-<!--      <a-radio-group v-model="indexStyle">-->
-<!--        <a-radio :value="1">统计图表</a-radio>-->
-<!--        <a-radio :value="2">统计图表2</a-radio>-->
-<!--        <a-radio :value="3">任务表格</a-radio>-->
-<!--      </a-radio-group>-->
-<!--    </div>-->
+
   </div>
 </template>
 
 <script>
-  import IndexChart from './IndexChart'
-  import IndexTask from "./IndexTask"
-  import IndexBdc from './IndexBdc'
+
 
   export default {
     name: "Analysis",
     components: {
-      IndexChart,
-      IndexTask,
-      IndexBdc
+
     },
     data() {
       return {
diff --git a/jero-web/src/views/dashboard/IndexBdc.vue b/jero-web/src/views/dashboard/IndexBdc.vue
deleted file mode 100644
index fa8edeab4..000000000
--- a/jero-web/src/views/dashboard/IndexBdc.vue
+++ /dev/null
@@ -1,519 +0,0 @@
-<template>
-  <div class="page-header-index-wide">
-    <a-row :gutter="24">
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="受理量" :total="cardCount.sll | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <mini-area :data-source="chartData.sll" />
-          </div>
-          <template slot="footer">今日受理量：<span>{{ todaySll }}</span></template>
-        </chart-card>
-      </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="办结量" :total="cardCount.bjl | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <mini-area :data-source="chartData.bjl"/>
-          </div>
-          <template slot="footer">今日办结量：<span>{{ todayBjl }}</span></template>
-        </chart-card>
-      </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="用户受理量" :total="cardCount.isll | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <mini-bar :datasource="chartData.isll" :height="50"/>
-          </div>
-          <template slot="footer">用户今日受理量：<span>{{ todayISll }}</span></template>
-        </chart-card>
-      </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="用户办结量" :total="cardCount.ibjl | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <mini-bar :datasource="chartData.ibjl" :height="50"/>
-          </div>
-          <template slot="footer">用户今日办结量：<span>{{ todayIBjl }}</span></template>
-        </chart-card>
-      </a-col>
-    </a-row>
-
-    <a-card :loading="loading" :bordered="false" :body-style="{padding: '0'}">
-      <div class="salesCard">
-        <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
-          <div class="extra-wrapper" slot="tabBarExtraContent">
-            <div class="extra-item">
-              <a>今日</a>
-              <a>本周</a>
-              <a>本月</a>
-              <a>本年</a>
-            </div>
-            <a-range-picker :style="{width: '256px'}" />
-          </div>
-
-          <a-tab-pane loading="true" tab="受理监管" key="1">
-            <a-row>
-              <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
-                <index-bar title="受理量统计" />
-              </a-col>
-              <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
-
-                <a-card title="快速开始 / 便捷导航" style="margin-bottom: 24px" :bordered="false" :body-style="{padding: 0}">
-                  <div class="item-group">
-                    <a-row>
-                      <a-col :class="'more-btn'" :span="12" v-for="(item,index) in registerTypeList" :key=" 'registerType'+index ">
-                        <a-button @click="goPage(index)" style="margin-bottom:10px" size="small" type="primary" ghost>{{ item.text }}</a-button>
-                      </a-col>
-                    </a-row>
-                  </div>
-                </a-card>
-
-              </a-col>
-            </a-row>
-          </a-tab-pane>
-
-          <a-tab-pane tab="交互监管" key="2">
-            <a-row>
-              <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
-                <bar-multid :sourceData="jhjgData" :fields="jhjgFields" title="平台与部门交互量统计"></bar-multid>
-              </a-col>
-              <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
-
-                <a-card title="快速开始 / 便捷导航" style="margin-bottom: 24px" :bordered="false" :body-style="{padding: 0}">
-                  <div class="item-group">
-                    <a-row>
-                      <a-col :class="'more-btn'" :span="12" v-for="(item,index) in registerTypeList" :key=" 'registerType'+index ">
-                        <a-button @click="goPage(index)" style="margin-bottom:10px" size="small" type="primary" ghost>{{ item.text }}</a-button>
-                      </a-col>
-                    </a-row>
-                  </div>
-                </a-card>
-
-              </a-col>
-            </a-row>
-          </a-tab-pane>
-
-          <a-tab-pane tab="存储监管" key="4">
-            <a-row>
-              <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
-                <a-row>
-                  <template v-if="diskInfo && diskInfo.length>0">
-                    <a-col :span="12" v-for="(item,index) in diskInfo" :key=" 'diskInfo'+index ">
-                      <dash-chart-demo :title="item.name" :datasource="item.restPPT"></dash-chart-demo>
-                    </a-col>
-                  </template>
-                </a-row>
-              </a-col>
-
-              <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
-
-                <a-card title="快速开始 / 便捷导航" style="margin-bottom: 24px" :bordered="false" :body-style="{padding: 0}">
-                  <div class="item-group">
-                    <a-row>
-                      <a-col :class="'more-btn'" :span="10" v-for="(item,index) in registerTypeList" :key=" 'registerType'+index ">
-                        <a-button @click="goPage(index)" style="margin-bottom:10px" size="small" type="primary" ghost>{{ item.text }}</a-button>
-                      </a-col>
-                    </a-row>
-                  </div>
-                </a-card>
-
-              </a-col>
-            </a-row>
-          </a-tab-pane>
-
-        </a-tabs>
-
-      </div>
-    </a-card>
-
-    <a-row :gutter="12">
-      <a-card :loading="loading" :class="{ 'anty-list-cust':true }" :bordered="false" :style="{ marginTop: '24px' }">
-
-        <a-tabs v-model="indexBottomTab" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
-          <div class="extra-wrapper" slot="tabBarExtraContent">
-            <a-radio-group v-model="indexRegisterType" @change="changeRegisterType">
-              <a-radio-button value="转移登记">转移登记</a-radio-button>
-              <a-radio-button value="抵押登记">抵押登记</a-radio-button>
-              <a-radio-button value="">所有</a-radio-button>
-            </a-radio-group>
-          </div>
-
-          <a-tab-pane loading="true" tab="业务流程限时监管" key="1">
-
-            <a-table :dataSource="dataSource1" size="default" rowKey="id" :columns="columns" :pagination="ipagination1" @change="tableChange1">
-              <template slot="flowRate" slot-scope="text, record, index">
-                <a-progress :strokeColor="getPercentColor(record.flowRate)" :format="getPercentFormat" :percent="getFlowRateNumber(record.flowRate)" style="width:80px" />
-              </template>
-            </a-table>
-          </a-tab-pane>
-
-          <a-tab-pane loading="true" tab="业务节点限时监管" key="2">
-            <a-table :dataSource="dataSource2" size="default" rowKey="id" :columns="columns2" :pagination="ipagination2" @change="tableChange2">
-              <template slot="flowRate" slot-scope="text, record, index">
-                <span style="color: red;">{{ record.flowRate }}小时</span>
-              </template>
-            </a-table>
-          </a-tab-pane>
-
-        </a-tabs>
-
-
-      </a-card>
-    </a-row>
-
-  </div>
-</template>
-
-<script>
-
-  import ACol from "ant-design-vue/es/grid/Col"
-  import ATooltip from "ant-design-vue/es/tooltip/Tooltip"
-  import ChartCard from '@/components/ChartCard'
-  import MiniBar from '@/components/chart/MiniBar'
-  import MiniArea from '@/components/chart/MiniArea'
-  import IndexBar from '@/components/chart/IndexBar'
-  import BarMultid from '@/components/chart/BarMultid'
-  import DashChartDemo from '@/components/chart/DashChartDemo'
-
-  const jhjgData = [
-    { type: '房管', '1月': 900, '2月': 1120, '3月': 1380, '4月': 1480, '5月': 1450, '6月': 1100, '7月':1300, '8月':900,'9月':1000 ,'10月':1200 ,'11月':600 ,'12月':900 },
-    { type: '税务', '1月':1200, '2月': 1500, '3月': 1980, '4月': 2000, '5月': 1000, '6月': 600, '7月':900, '8月':1100,'9月':1300 ,'10月':2000 ,'11月':900 ,'12月':1100 },
-    { type: '不动产', '1月':2000, '2月': 1430, '3月': 1300, '4月': 1400, '5月': 900, '6月': 500, '7月':600, '8月':1000,'9月':600 ,'10月':1000 ,'11月':1500 ,'12月':1200 }
-  ]
-
-  const jhjgFields=[
-    '1月','2月','3月','4月','5月','6月',
-    '7月','8月','9月','10月','11月','12月'
-  ]
-
-  const xljgData = [
-    {type:'一月',"房管":1.12,"税务":1.55,"不动产":1.2},
-    {type:'二月',"房管":1.65,"税务":1.32,"不动产":1.42},
-    {type:'三月',"房管":1.85,"税务":1.1,"不动产":1.5},
-
-    {type:'四月',"房管":1.33,"税务":1.63,"不动产":1.4},
-    {type:'五月',"房管":1.63,"税务":1.8,"不动产":1.7},
-    {type:'六月',"房管":1.85,"税务":1.98,"不动产":1.8},
-
-    {type:'七月',"房管":1.98,"税务":1.5,"不动产":1.76},
-    {type:'八月',"房管":1.48,"税务":1.2,"不动产":1.3},
-    {type:'九月',"房管":1.41,"税务":1.9,"不动产":1.6},
-
-    {type:'十月',"房管":1.1,"税务":1.1,"不动产":1.4},
-    {type:'十一月',"房管":1.85,"税务":1.6,"不动产":1.5},
-    {type:'十二月',"房管":1.5,"税务":1.4,"不动产":1.3}
-  ]
-  const xljgFields=["房管","税务","不动产"]
-
-  const dataCol1 = [{
-    title: '业务号',
-    align:"center",
-    dataIndex: 'reBizCode'
-  },{
-    title: '业务类型',
-    align:"center",
-    dataIndex: 'type'
-  },{
-    title: '受理人',
-    align:"center",
-    dataIndex: 'acceptBy'
-  },{
-    title: '受理时间',
-    align:"center",
-    dataIndex: 'acceptDate'
-  },{
-    title: '当前节点',
-    align:"center",
-    dataIndex: 'curNode'
-  },{
-    title: '办理时长',
-    align:"center",
-    dataIndex: 'flowRate',
-    scopedSlots: { customRender: 'flowRate' }
-  }];
-  const dataSource1=[
-    {reBizCode:"1",type:"转移登记",acceptBy:'张三',acceptDate:"2019-01-22",curNode:"任务分派",flowRate:60},
-    {reBizCode:"2",type:"抵押登记",acceptBy:'李四',acceptDate:"2019-01-23",curNode:"领导审核",flowRate:30},
-    {reBizCode:"3",type:"转移登记",acceptBy:'王武',acceptDate:"2019-01-25",curNode:"任务处理",flowRate:20},
-    {reBizCode:"4",type:"转移登记",acceptBy:'赵楼',acceptDate:"2019-11-22",curNode:"部门审核",flowRate:80},
-    {reBizCode:"5",type:"转移登记",acceptBy:'钱就',acceptDate:"2019-12-12",curNode:"任务分派",flowRate:90},
-    {reBizCode:"6",type:"转移登记",acceptBy:'孙吧',acceptDate:"2019-03-06",curNode:"任务处理",flowRate:10},
-    {reBizCode:"7",type:"抵押登记",acceptBy:'周大',acceptDate:"2019-04-13",curNode:"任务分派",flowRate:100},
-    {reBizCode:"8",type:"抵押登记",acceptBy:'吴二',acceptDate:"2019-05-09",curNode:"任务上报",flowRate:50},
-    {reBizCode:"9",type:"抵押登记",acceptBy:'郑爽',acceptDate:"2019-07-12",curNode:"任务处理",flowRate:63},
-    {reBizCode:"20",type:"抵押登记",acceptBy:'林有',acceptDate:"2019-12-12",curNode:"任务打回",flowRate:59},
-    {reBizCode:"11",type:"转移登记",acceptBy:'码云',acceptDate:"2019-09-10",curNode:"任务签收",flowRate:87},
-  ]
-
-  const dataCol2 = [{
-    title: '业务号',
-    align:"center",
-    dataIndex: 'reBizCode'
-  },{
-    title: '受理人',
-    align:"center",
-    dataIndex: 'acceptBy'
-  },{
-    title: '发起时间',
-    align:"center",
-    dataIndex: 'acceptDate'
-  },{
-    title: '当前节点',
-    align:"center",
-    dataIndex: 'curNode'
-  },{
-    title: '超时时间',
-    align:"center",
-    dataIndex: 'flowRate',
-    scopedSlots: { customRender: 'flowRate' }
-  }];
-  const dataSource2=[
-    {reBizCode:"A001",type:"转移登记",acceptBy:'张四',acceptDate:"2019-01-22",curNode:"任务分派",flowRate:12},
-    {reBizCode:"A002",type:"抵押登记",acceptBy:'李吧',acceptDate:"2019-01-23",curNode:"任务签收",flowRate:3},
-    {reBizCode:"A003",type:"转移登记",acceptBy:'王三',acceptDate:"2019-01-25",curNode:"任务处理",flowRate:24},
-    {reBizCode:"A004",type:"转移登记",acceptBy:'赵二',acceptDate:"2019-11-22",curNode:"部门审核",flowRate:10},
-    {reBizCode:"A005",type:"转移登记",acceptBy:'钱大',acceptDate:"2019-12-12",curNode:"任务签收",flowRate:8},
-    {reBizCode:"A006",type:"转移登记",acceptBy:'孙就',acceptDate:"2019-03-06",curNode:"任务处理",flowRate:10},
-    {reBizCode:"A007",type:"抵押登记",acceptBy:'周晕',acceptDate:"2019-04-13",curNode:"部门审核",flowRate:24},
-    {reBizCode:"A008",type:"抵押登记",acceptBy:'吴有',acceptDate:"2019-05-09",curNode:"部门审核",flowRate:30},
-    {reBizCode:"A009",type:"抵押登记",acceptBy:'郑武',acceptDate:"2019-07-12",curNode:"任务分派",flowRate:1},
-    {reBizCode:"A0010",type:"抵押登记",acceptBy:'林爽',acceptDate:"2019-12-12",curNode:"部门审核",flowRate:16},
-    {reBizCode:"A0011",type:"转移登记",acceptBy:'码楼',acceptDate:"2019-09-10",curNode:"部门审核",flowRate:7},
-  ]
-
-  export default {
-    name: "IndexBdc",
-    components: {
-      ATooltip,
-      ACol,
-      ChartCard,
-      MiniArea,
-      MiniBar,
-      DashChartDemo,
-      BarMultid,
-      IndexBar
-    },
-    data() {
-      return {
-        loading: true,
-        cardCount:{
-          sll:100,
-          bjl:87,
-          isll:15,
-          ibjl:9
-        },
-
-        todaySll:60,
-        todayBjl:54,
-        todayISll:13,
-        todayIBjl:7,
-
-        chartData:{
-          sll:[],
-          bjl:[],
-          isll:[],
-          ibjl:[]
-        },
-        jhjgFields,
-        jhjgData,
-
-        xljgData,
-        xljgFields,
-
-        diskInfo:[
-          {name:"C盘",restPPT:7},
-          {name:"D盘",restPPT:5}
-        ],
-
-        registerTypeList:[{
-          text:"业务受理"
-        },{
-          text:"业务管理"
-        },{
-          text:"文件管理"
-        },{
-          text:"信息查询"
-        }],
-
-        dataSource1:[],
-        dataSource2:[],
-        columns:dataCol1,
-        columns2:dataCol2,
-        ipagination1:{
-          current: 1,
-          pageSize: 5,
-          pageSizeOptions: ['10', '20', '30'],
-          showTotal: (total, range) => {
-            return range[0] + "-" + range[1] + " 共" + total + "条"
-          },
-          showQuickJumper: true,
-          showSizeChanger: true,
-          total: 0,
-
-        },
-        ipagination2:{
-          current: 1,
-          pageSize: 5,
-          pageSizeOptions: ['10', '20', '30'],
-          showTotal: (total, range) => {
-            return range[0] + "-" + range[1] + " 共" + total + "条"
-          },
-          showQuickJumper: true,
-          showSizeChanger: true,
-          total: 0,
-        },
-        indexRegisterType:"转移登记",
-        indexBottomTab:"1"
-
-      }
-    },
-    methods:{
-      goPage(){
-        this.$message.success("根据业务自行处理跳转页面!")
-      },
-      changeRegisterType(e){
-        this.indexRegisterType = e.target.value
-        if(this.indexBottomTab=="1"){
-          this.loadDataSource1()
-        }else{
-          this.loadDataSource2()
-        }
-      },
-      tableChange1(pagination){
-        this.ipagination1.current = pagination.current
-        this.ipagination1.pageSize = pagination.pageSize
-        this.queryTimeoutInfo()
-      },
-      tableChange2(pagination){
-        this.ipagination2.current = pagination.current
-        this.ipagination2.pageSize = pagination.pageSize
-        this.queryNodeTimeoutInfo()
-      },
-      getFlowRateNumber(value){
-        return Number(value)
-      },
-      getPercentFormat(value){
-        if(value==100){
-          return "超时"
-        }else{
-          return value+"%"
-        }
-      },
-      getPercentColor(value){
-        let p = Number(value)
-        if(p>=90 && p<100){
-          return 'rgb(244, 240, 89)'
-        }else if(p>=100){
-          return 'red'
-        }else{
-          return 'rgb(16, 142, 233)'
-        }
-      },
-
-      loadDataSource1(){
-        this.dataSource1 = dataSource1.filter(item=>{
-          if(!this.indexRegisterType){
-            return true
-          }
-          return item.type==this.indexRegisterType
-        })
-      },
-      loadDataSource2(){
-        this.dataSource2 = dataSource2.filter(item=>{
-          if(!this.indexRegisterType){
-            return true
-          }
-          return item.type==this.indexRegisterType
-        })
-      }
-    },
-    created() {
-      this.loadDataSource1()
-      this.loadDataSource2()
-      setTimeout(() => {
-        this.loading = !this.loading
-      }, 1000)
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-  .extra-wrapper {
-    line-height: 55px;
-    padding-right: 24px;
-
-    .extra-item {
-      display: inline-block;
-      margin-right: 24px;
-
-      a {
-        margin-left: 24px;
-      }
-    }
-  }
-
-  .item-group {
-    padding: 20px 0 8px 24px;
-    font-size: 0;
-    a {
-      color: rgba(0, 0, 0, 0.65);
-      display: inline-block;
-      font-size: 14px;
-      margin-bottom: 13px;
-      width: 25%;
-    }
-  }
-
-  .item-group {
-    .more-btn {
-      margin-bottom: 13px;
-      text-align: center;
-    }
-  }
-
-  .list-content-item {
-    color: rgba(0, 0, 0, .45);
-    display: inline-block;
-    vertical-align: middle;
-    font-size: 14px;
-    margin-left: 40px;
-  }
-
-  @media only screen and (min-width: 1600px) {
-    .list-content-item{
-      margin-left:60px;
-    }
-  }
-
-  @media only screen and (max-width: 1300px) {
-    .list-content-item{
-      margin-left:20px;
-    }
-    .width-hidden4{
-      display:none
-    }
-  }
-  .list-content-item{
-    span{line-height: 20px;}
-  }
-  .list-content-item{
-    p{margin-top: 4px;margin-bottom:0;line-height:22px;}
-  }
-  .anty-list-cust {
-    .ant-list-item-meta{flex: 0.3 !important;}
-  }
-  .anty-list-cust {
-    .ant-list-item-content{flex:1 !important; justify-content:flex-start !important;margin-left: 20px;}
-  }
-
-
-</style>
\ No newline at end of file
diff --git a/jero-web/src/views/dashboard/IndexChart.vue b/jero-web/src/views/dashboard/IndexChart.vue
deleted file mode 100644
index 60ac1f545..000000000
--- a/jero-web/src/views/dashboard/IndexChart.vue
+++ /dev/null
@@ -1,268 +0,0 @@
-<template>
-  <div class="page-header-index-wide">
-    <a-row :gutter="24">
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="总销售额" total="￥126,560">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <trend flag="up" style="margin-right: 16px;">
-              <span slot="term">周同比</span>
-              12%
-            </trend>
-            <trend flag="down">
-              <span slot="term">日同比</span>
-              11%
-            </trend>
-          </div>
-          <template slot="footer">日均销售额<span>￥ 234.56</span></template>
-        </chart-card>
-      </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="订单量" :total="8846 | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <mini-area />
-          </div>
-          <template slot="footer">日订单量<span> {{ '1234' | NumberFormat }}</span></template>
-        </chart-card>
-      </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="支付笔数" :total="6560 | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <mini-bar :height="40" />
-          </div>
-          <template slot="footer">转化率 <span>60%</span></template>
-        </chart-card>
-      </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="运营活动效果" total="78%">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <mini-progress color="rgb(19, 194, 194)" :target="80" :percentage="78" :height="8" />
-          </div>
-          <template slot="footer">
-            <trend flag="down" style="margin-right: 16px;">
-              <span slot="term">同周比</span>
-              12%
-            </trend>
-            <trend flag="up">
-              <span slot="term">日环比</span>
-              80%
-            </trend>
-          </template>
-        </chart-card>
-      </a-col>
-    </a-row>
-
-    <a-card :loading="loading" :bordered="false" :body-style="{padding: '0'}">
-      <div class="salesCard">
-        <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
-          <div class="extra-wrapper" slot="tabBarExtraContent">
-            <div class="extra-item">
-              <a>今日</a>
-              <a>本周</a>
-              <a>本月</a>
-              <a>本年</a>
-            </div>
-            <a-range-picker :style="{width: '256px'}" />
-          </div>
-          <a-tab-pane loading="true" tab="销售额" key="1">
-            <a-row>
-              <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
-                <bar title="销售额排行" :dataSource="barData"/>
-              </a-col>
-              <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
-                <rank-list title="门店销售排行榜" :list="rankList"/>
-              </a-col>
-            </a-row>
-          </a-tab-pane>
-          <a-tab-pane tab="销售趋势" key="2">
-            <a-row>
-              <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
-                <bar title="销售额趋势" :dataSource="barData"/>
-              </a-col>
-              <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
-                <rank-list title="门店销售排行榜" :list="rankList"/>
-              </a-col>
-            </a-row>
-          </a-tab-pane>
-        </a-tabs>
-      </div>
-    </a-card>
-
-    <a-row>
-      <a-col :span="24">
-        <a-card :loading="loading" :bordered="false" title="最近一周访问量统计" :style="{ marginTop: '24px' }">
-          <a-row>
-            <a-col :span="6">
-              <head-info title="今日IP" :content="loginfo.todayIp"></head-info>
-            </a-col>
-            <a-col :span="2">
-              <a-spin class='circle-cust'>
-                <a-icon slot="indicator" type="environment" style="font-size: 24px"  />
-              </a-spin>
-            </a-col>
-            <a-col :span="6">
-              <head-info title="今日访问" :content="loginfo.todayVisitCount"></head-info>
-            </a-col>
-            <a-col :span="2">
-              <a-spin class='circle-cust'>
-                <a-icon slot="indicator" type="team" style="font-size: 24px"  />
-              </a-spin>
-            </a-col>
-            <a-col :span="6">
-              <head-info title="总访问量" :content="loginfo.totalVisitCount"></head-info>
-            </a-col>
-            <a-col :span="2">
-              <a-spin class='circle-cust'>
-                <a-icon slot="indicator" type="rise" style="font-size: 24px"  />
-              </a-spin>
-            </a-col>
-          </a-row>
-          <line-chart-multid :fields="visitFields" :dataSource="visitInfo"></line-chart-multid>
-        </a-card>
-      </a-col>
-    </a-row>
-  </div>
-</template>
-
-<script>
-  import ChartCard from '@/components/ChartCard'
-  import ACol from "ant-design-vue/es/grid/Col"
-  import ATooltip from "ant-design-vue/es/tooltip/Tooltip"
-  import MiniArea from '@/components/chart/MiniArea'
-  import MiniBar from '@/components/chart/MiniBar'
-  import MiniProgress from '@/components/chart/MiniProgress'
-  import RankList from '@/components/chart/RankList'
-  import Bar from '@/components/chart/Bar'
-  import LineChartMultid from '@/components/chart/LineChartMultid'
-  import HeadInfo from '@/components/tools/HeadInfo.vue'
-
-  import Trend from '@/components/Trend'
-  import { getLoginfo,getVisitInfo } from '@/api/api'
-
-  const rankList = []
-  for (let i = 0; i < 7; i++) {
-    rankList.push({
-      name: '白鹭岛 ' + (i+1) + ' 号店',
-      total: 1234.56 - i * 100
-    })
-  }
-  const barData = []
-  for (let i = 0; i < 12; i += 1) {
-    barData.push({
-      x: `${i + 1}月`,
-      y: Math.floor(Math.random() * 1000) + 200
-    })
-  }
-  export default {
-    name: "IndexChart",
-    components: {
-      ATooltip,
-      ACol,
-      ChartCard,
-      MiniArea,
-      MiniBar,
-      MiniProgress,
-      RankList,
-      Bar,
-      Trend,
-      LineChartMultid,
-      HeadInfo
-    },
-    data() {
-      return {
-        loading: true,
-        center: null,
-        rankList,
-        barData,
-        loginfo:{},
-        visitFields:['ip','visit'],
-        visitInfo:[],
-        indicator: <a-icon type="loading" style="font-size: 24px" spin />
-      }
-    },
-    created() {
-      setTimeout(() => {
-        this.loading = !this.loading
-      }, 1000)
-      this.initLogInfo();
-    },
-    methods: {
-      initLogInfo () {
-        getLoginfo(null).then((res)=>{
-          if(res.success){
-            Object.keys(res.result).forEach(key=>{
-              res.result[key] =res.result[key]+""
-            })
-            this.loginfo = res.result;
-          }
-        })
-        getVisitInfo().then(res=>{
-          if(res.success){
-             this.visitInfo = res.result;
-           }
-         })
-      },
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-  .circle-cust{
-    position: relative;
-    top: 28px;
-    left: -100%;
-  }
-  .extra-wrapper {
-    line-height: 55px;
-    padding-right: 24px;
-
-    .extra-item {
-      display: inline-block;
-      margin-right: 24px;
-
-      a {
-        margin-left: 24px;
-      }
-    }
-  }
-
-  /* 首页访问量统计 */
-  .head-info {
-    position: relative;
-    text-align: left;
-    padding: 0 32px 0 0;
-    min-width: 125px;
-
-    &.center {
-      text-align: center;
-      padding: 0 32px;
-    }
-
-    span {
-      color: rgba(0, 0, 0, .45);
-      display: inline-block;
-      font-size: .95rem;
-      line-height: 42px;
-      margin-bottom: 4px;
-    }
-    p {
-      line-height: 42px;
-      margin: 0;
-      a {
-        font-weight: 600;
-        font-size: 1rem;
-      }
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/jero-web/src/views/dashboard/IndexTask.vue b/jero-web/src/views/dashboard/IndexTask.vue
deleted file mode 100644
index 76a6b1abd..000000000
--- a/jero-web/src/views/dashboard/IndexTask.vue
+++ /dev/null
@@ -1,372 +0,0 @@
-<template>
-  <div class="index-container-ty">
-    <a-spin :spinning="loading">
-      <a-row type="flex" justify="start" :gutter="3">
-        <a-col :sm="24" :lg="12">
-          <a-card>
-            <div slot="title" class="index-md-title">
-              <img src="../../assets/daiban.png"/>
-              我的待办【{{ dataSource1.length }}】
-            </div>
-            <div slot="extra">
-              <a v-if="dataSource1 && dataSource1.length>0" slot="footer" @click="goPage">更多 <a-icon type="double-right" /></a>
-            </div>
-            <a-table
-              :class="'my-index-table tytable1'"
-              ref="table1"
-              size="small"
-              rowKey="id"
-              :columns="columns"
-              :dataSource="dataSource1"
-              :pagination="false">
-              <template slot="ellipsisText" slot-scope="text">
-                <j-ellipsis :value="text" :length="textMaxLength"></j-ellipsis>
-              </template>
-
-              <template slot="dayWarnning" slot-scope="text,record">
-                <a-icon type="bulb" theme="twoTone" style="font-size:22px" :twoToneColor="getTipColor(record)"/>
-              </template>
-
-              <span slot="action" slot-scope="text, record">
-                <a @click="handleData">办理</a>
-              </span>
-
-            </a-table>
-          </a-card>
-        </a-col>
-
-        <a-col :sm="24" :lg="12">
-          <a-card>
-            <div slot="title" class="index-md-title">
-              <img src="../../assets/zaiban.png"/>
-              我的在办【{{ dataSource2.length }}】
-            </div>
-            <div slot="extra">
-              <a v-if="dataSource2 && dataSource2.length>0" slot="footer" @click="goPage">更多 <a-icon type="double-right" /></a>
-            </div>
-            <a-table
-              :class="'my-index-table tytable2'"
-              ref="table2"
-              size="small"
-              rowKey="id"
-              :columns="columns"
-              :dataSource="dataSource2"
-              :pagination="false">
-              <template slot="ellipsisText" slot-scope="text">
-                <j-ellipsis :value="text" :length="textMaxLength"></j-ellipsis>
-              </template>
-
-              <template slot="dayWarnning" slot-scope="text,record">
-                <a-icon type="bulb" theme="twoTone" style="font-size:22px" :twoToneColor="getTipColor(record)"/>
-              </template>
-
-              <span slot="action" slot-scope="text, record">
-                <a @click="handleData">办理</a>
-              </span>
-
-            </a-table>
-          </a-card>
-        </a-col>
-
-        <a-col :span="24">
-          <div style="height: 5px;"></div>
-        </a-col>
-
-        <a-col :sm="24" :lg="12">
-          <a-card>
-            <div slot="title" class="index-md-title">
-              <img src="../../assets/guaz.png"/>
-              我的挂账【{{ dataSource4.length }}】
-            </div>
-            <a-table
-              :class="'my-index-table tytable4'"
-              ref="table4"
-              size="small"
-              rowKey="id"
-              :columns="columns"
-              :dataSource="dataSource4"
-              :pagination="false">
-              <template slot="ellipsisText" slot-scope="text">
-                <j-ellipsis :value="text" :length="textMaxLength"></j-ellipsis>
-              </template>
-
-              <template slot="dayWarnning" slot-scope="text,record">
-                <a-icon type="bulb" theme="twoTone" style="font-size:22px" :twoToneColor="getTipColor(record)"/>
-              </template>
-
-              <span slot="action" slot-scope="text, record">
-                <a @click="handleData">办理</a>
-              </span>
-
-            </a-table>
-          </a-card>
-        </a-col>
-
-        <a-col :sm="24" :lg="12">
-          <a-card>
-            <div slot="title" class="index-md-title">
-              <img src="../../assets/duban.png"/>
-              我的督办【{{ dataSource3.length }}】
-            </div>
-            <a-table
-              :class="'my-index-table tytable3'"
-              ref="table3"
-              size="small"
-              rowKey="id"
-              :columns="columns"
-              :dataSource="dataSource3"
-              :pagination="false">
-              <template slot="ellipsisText" slot-scope="text">
-                <j-ellipsis :value="text" :length="textMaxLength"></j-ellipsis>
-              </template>
-
-              <template slot="dayWarnning" slot-scope="text,record">
-                <a-icon type="bulb" theme="twoTone" style="font-size:22px" :twoToneColor="getTipColor(record)"/>
-              </template>
-
-              <span slot="action" slot-scope="text, record">
-                <a @click="handleData">办理</a>
-              </span>
-
-            </a-table>
-          </a-card>
-        </a-col>
-
-      </a-row>
-    </a-spin>
-
-  </div>
-</template>
-
-<script>
-  import noDataPng from '@/assets/nodata.png'
-  import JEllipsis from '@/components/jero/JEllipsis'
-
-  const tempSs1=[{
-    id:"001",
-    orderNo:"电[1]1267102",
-    orderTitle:"药品出问题了",
-    restDay:1
-  },{
-    id:"002",
-    orderNo:"电[4]5967102",
-    orderTitle:"吃了xxx医院的药，病情越来越严重",
-    restDay:0
-  },{
-    id:"003",
-    orderNo:"电[3]5988987",
-    orderTitle:"今天去超市买鸡蛋，鸡蛋都是坏的",
-    restDay:7
-  },{
-    id:"004",
-    orderNo:"电[2]5213491",
-    orderTitle:"xx宝实体店高价售卖xx",
-    restDay:5
-  },{
-    id:"005",
-    orderNo:"电[1]1603491",
-    orderTitle:"以红利相诱，答应退保后扣一年费用",
-    restDay:0
-  }]
-
-  const tempSs2=[{
-    id:"001",
-    orderTitle:"我要投诉这个大超市",
-    orderNo:"电[1]10299456",
-    restDay:6
-  },{
-    id:"002",
-    orderTitle:"xxx医院乱开药方,售卖假药",
-    orderNo:"电[2]20235691",
-    restDay:0
-  },{
-    id:"003",
-    orderTitle:"我想问问这家店是干啥的",
-    orderNo:"电[3]495867322",
-    restDay:7
-  },{
-    id:"004",
-    orderTitle:"我要举报朝阳区奥森公园酒店",
-    orderNo:"电[2]1193849",
-    restDay:3
-  },{
-    id:"005",
-    orderTitle:"我今天吃饭吃到一个石头子",
-    orderNo:"电[4]56782344",
-    restDay:9
-  }]
-
-  //4-7天
-  const tip_green = "rgba(0, 255, 0, 1)"
-  //1-3天
-  const tip_yellow = "rgba(255, 255, 0, 1)"
-  //超期
-  const tip_red = "rgba(255, 0, 0, 1)"
-
-  export default {
-    name: "IndexTask",
-    components:{ JEllipsis },
-    data() {
-      return {
-        loading:false,
-        textMaxLength:8,
-        dataSource1:[],
-        dataSource2:[],
-        dataSource3:[],
-        dataSource4:[],
-        columns: [
-          {
-            title: '',
-            dataIndex: '',
-            key:'rowIndex',
-            width:50,
-            fixed:'left',
-            align:"center",
-            scopedSlots: {customRender: "dayWarnning"}
-          },
-          {
-            title:'剩余天数',
-            align:"center",
-            dataIndex: 'restDay',
-            width:80
-          },
-          {
-            title:'工单标题',
-            align:"center",
-            dataIndex: 'orderTitle',
-            scopedSlots: {customRender: "ellipsisText"}
-          },
-          {
-            title:'工单编号',
-            align:"center",
-            dataIndex: 'orderNo',
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' }
-          }
-        ]
-
-      }
-    },
-    created() {
-      this.mock();
-    },
-    mounted(){
-
-    },
-    methods: {
-      getTipColor(rd){
-        let num = rd.restDay
-        if(num<=0){
-          return tip_red
-        }else if(num>=1 && num<4){
-          return tip_yellow
-        }else if(num>=4){
-          return tip_green
-        }
-      },
-      goPage(){
-        this.$message.success("请根据具体业务跳转页面")
-        //this.$router.push({ path: '/comp/mytask' })
-      },
-      mock(){
-        this.dataSource1=tempSs1
-        this.dataSource2=tempSs2
-        this.dataSource3=tempSs1
-        this.dataSource4=[]
-        this.ifNullDataSource(this.dataSource4,'.tytable4')
-      },
-
-      ifNullDataSource(ds,tb){
-        this.$nextTick(()=>{
-          if(!ds || ds.length==0){
-            var tmp = document.createElement('img');
-            tmp.src=noDataPng
-            tmp.width=300
-            let tbclass=`${tb} .ant-table-placeholder`
-            document.querySelector(tbclass).innerHTML=""
-            document.querySelector(tbclass).appendChild(tmp)
-          }
-        })
-      },
-      handleData(){
-        this.$message.success("办理完成")
-      }
-
-
-
-
-    }
-  }
-</script>
-
-<style>
-  .my-index-table{height:270px}
-  .my-index-table table{font-size: 14px !important;}
-
-  .index-container-ty .ant-card-head-title{padding-top: 6px;padding-bottom: 6px;}
-  .index-container-ty .ant-card-extra{padding:0}
-  .index-container-ty .ant-card-extra a{color:#fff}
-  .index-container-ty .ant-card-extra a:hover{color:#152ede}
-  .index-container-ty .ant-card-head-wrapper,.index-container-ty .ant-card-head{
-    line-height:24px;
-    min-height:24px;
-    /*background: #90aeff;*/
-    background: #7196fb;
-  }
-  .index-container-ty .ant-card-body{padding: 10px 12px 0px 12px}
-
-  /* .index-container-ty .ant-card-actions{background: #fff}
-   .index-container-ty .ant-card-actions li {margin:2px 0;}
-   .index-container-ty .ant-card-actions > li > span{width: 100%}*/
-
-
-  .index-container-ty .ant-table-footer{text-align: right;padding:6px 12px 6px 6px;background: #fff;border-top: 2px solid #f7f1f1;}
-
-  .index-md-title{
-    postion:relative;
-    padding-left:24px;
-    width: 100%;
-    color: #fff;
-    font-size: 21px;
-    font-family: cursive;
-  }
-  .index-md-title img{
-    position: absolute;
-    height:32px;
-    top: 2px;
-    left:14px;
-  }
-
-  .index-container-ty .ant-card-body{
-    /*border-left:1px solid #90aeff;
-    /*border-right:1px solid #90aeff;
-    border-bottom:1px solid #90aeff;*/
-  }
-
-
-  .index-container-ty .ant-table-thead > tr > th,
-  .index-container-ty .ant-table-tbody > tr > td{
-    border-bottom: 1px solid #90aeff;
-  }
-
-  .index-container-ty .ant-table-small > .ant-table-content > .ant-table-fixed-left > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th,
-  .index-container-ty .ant-table-small > .ant-table-content > .ant-table-fixed-right > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th{
-    border-bottom: 1px solid #90aeff;
-  }
-
-  .index-container-ty  .ant-table-small > .ant-table-content > .ant-table-scroll > .ant-table-body > table > .ant-table-thead > tr > th{
-    border-bottom: 1px solid #90aeff;
-  }
-
-  .index-container-ty .ant-table-small{
-    border: 1px solid #90aeff;
-  }
-
-  .index-container-ty .ant-table-placeholder {
-    padding: 0
-  }
-</style>
\ No newline at end of file
diff --git a/jero-web/src/views/dashboard/Monitor.vue b/jero-web/src/views/dashboard/Monitor.vue
deleted file mode 100644
index 144e237ec..000000000
--- a/jero-web/src/views/dashboard/Monitor.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<template>
-  <div>
-    Monitor
-  </div>
-</template>
-
-<script>
-  export default {
-    name: "Monitor"
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/jero-web/src/views/dashboard/Workplace.vue b/jero-web/src/views/dashboard/Workplace.vue
deleted file mode 100644
index 57d0a06e2..000000000
--- a/jero-web/src/views/dashboard/Workplace.vue
+++ /dev/null
@@ -1,360 +0,0 @@
-<template>
-  <page-layout :avatar="avatar">
-    <div slot="headerContent">
-      <div class="title">{{ timeFix }}，{{ nickname() }}<span class="welcome-text">，{{ welcome() }}</span></div>
-      <div>前端工程师 | 蚂蚁金服 - 某某某事业群 - VUE平台</div>
-    </div>
-    <div slot="extra">
-      <a-row class="more-info">
-        <a-col :span="8">
-          <head-info title="项目数" content="56" :center="false" :bordered="false"/>
-        </a-col>
-        <a-col :span="8">
-          <head-info title="团队排名" content="8/24" :center="false" :bordered="false"/>
-        </a-col>
-        <a-col :span="8">
-          <head-info title="项目访问" content="2,223" :center="false" />
-        </a-col>
-      </a-row>
-    </div>
-
-    <div>
-      <a-row :gutter="24">
-        <a-col :xl="16" :lg="24" :md="24" :sm="24" :xs="24">
-          <a-card
-            class="project-list"
-            :loading="loading"
-            style="margin-bottom: 24px;"
-            :bordered="false"
-            title="进行中的项目"
-            :body-style="{ padding: 0 }">
-            <a slot="extra">全部项目</a>
-            <div>
-              <a-card-grid class="project-card-grid" :key="i" v-for="(item, i) in projects">
-                <a-card :bordered="false" :body-style="{ padding: 0 }">
-                  <a-card-meta>
-                    <div slot="title" class="card-title">
-                      <a-avatar size="small" :src="item.cover"/>
-                      <a>{{ item.title }}</a>
-                    </div>
-                    <div slot="description" class="card-description">
-                      {{ item.description }}
-                    </div>
-                  </a-card-meta>
-                  <div class="project-item">
-                    <a href="/#/">科学搬砖组</a>
-                    <span class="datetime">9小时前</span>
-                  </div>
-                </a-card>
-              </a-card-grid>
-            </div>
-          </a-card>
-
-          <a-card :loading="loading" title="动态" :bordered="false">
-            <a-list>
-              <a-list-item :key="index" v-for="(item, index) in activities">
-                <a-list-item-meta>
-                  <a-avatar slot="avatar" :src="item.user.avatar" />
-                  <div slot="title">
-                    <span>{{ item.user.nickname }}</span>&nbsp;
-                    在&nbsp;<a href="#">{{ item.project.name }}</a>&nbsp;
-                    <span>{{ item.project.action }}</span>&nbsp;
-                    <a href="#">{{ item.project.event }}</a>
-                  </div>
-                  <div slot="description">{{ item.time }}</div>
-                </a-list-item-meta>
-              </a-list-item>
-            </a-list>
-          </a-card>
-        </a-col>
-        <a-col
-          style="padding: 0 12px"
-          :xl="8"
-          :lg="24"
-          :md="24"
-          :sm="24"
-          :xs="24">
-          <a-card title="快速开始 / 便捷导航" style="margin-bottom: 24px" :bordered="false" :body-style="{padding: 0}">
-            <div class="item-group">
-              <a>操作一</a>
-              <a>操作二</a>
-              <a>操作三</a>
-              <a>操作四</a>
-              <a>操作五</a>
-              <a>操作六</a>
-              <a-button size="small" type="primary" ghost icon="plus">添加</a-button>
-            </div>
-          </a-card>
-          <a-card title="XX 指数" style="margin-bottom: 24px" :loading="radarLoading" :bordered="false" :body-style="{ padding: 0 }">
-            <div style="min-height: 400px;">
-              <!-- :scale="scale" :axis1Opts="axis1Opts" :axis2Opts="axis2Opts"  -->
-              <radar :data="radarData" />
-            </div>
-          </a-card>
-          <a-card :loading="loading" title="团队" :bordered="false">
-            <div class="members">
-              <a-row>
-                <a-col :span="12" v-for="(item, index) in teams" :key="index">
-                  <a>
-                    <a-avatar size="small" :src="item.avatar" />
-                    <span class="member">{{ item.name }}</span>
-                  </a>
-                </a-col>
-              </a-row>
-            </div>
-          </a-card>
-        </a-col>
-      </a-row>
-    </div>
-  </page-layout>
-</template>
-
-<script>
-  import { timeFix } from "@/utils/util"
-  import {mapGetters} from "vuex"
-
-  import PageLayout from '@/components/page/PageLayout'
-  import HeadInfo from '@/components/tools/HeadInfo'
-  import Radar from '@/components/chart/Radar'
-  import { getRoleList, getServiceList, getFileAccessHttpUrl } from "@/api/manage"
-
-  const DataSet = require('@antv/data-set')
-
-  export default {
-    name: "Workplace",
-    components: {
-      PageLayout,
-      HeadInfo,
-      Radar
-    },
-    data() {
-      return {
-        timeFix: timeFix(),
-        avatar: '',
-        user: {},
-
-        projects: [],
-        loading: true,
-        radarLoading: true,
-        activities: [],
-        teams: [],
-
-        // data
-        axis1Opts: {
-          dataKey: 'item',
-          line: null,
-          tickLine: null,
-          grid: {
-            lineStyle: {
-              lineDash: null
-            },
-            hideFirstLine: false
-          }
-        },
-        axis2Opts: {
-          dataKey: 'score',
-          line: null,
-          tickLine: null,
-          grid: {
-            type: 'polygon',
-            lineStyle: {
-              lineDash: null
-            }
-          }
-        },
-        scale: [{
-          dataKey: 'score',
-          min: 0,
-          max: 80
-        }],
-        axisData: [
-          { item: '引用', a: 70, b: 30, c: 40 },
-          { item: '口碑', a: 60, b: 70, c: 40 },
-          { item: '产量', a: 50, b: 60, c: 40 },
-          { item: '贡献', a: 40, b: 50, c: 40 },
-          { item: '热度', a: 60, b: 70, c: 40 },
-          { item: '引用', a: 70, b: 50, c: 40 }
-        ],
-        radarData: []
-      }
-    },
-    computed: {
-      userInfo() {
-        return this.$store.getters.userInfo
-      }
-    },
-    created() {
-      this.user = this.userInfo
-      this.avatar = getFileAccessHttpUrl(this.userInfo.avatar)
-      console.log('this.avatar :'+ this.avatar)
-
-      getRoleList().then(res => {
-        console.log('workplace -> call getRoleList()', res)
-      })
-
-      getServiceList().then(res => {
-        console.log('workplace -> call getServiceList()', res)
-      })
-    },
-    mounted() {
-      this.getProjects()
-      this.getActivity()
-      this.getTeams()
-      this.initRadar()
-    },
-    methods: {
-      ...mapGetters(["nickname", "welcome"]),
-      getProjects() {
-        this.$http.get('/mock/api/list/search/projects')
-          .then(res => {
-            this.projects = res.result && res.result.data
-            this.loading = false
-          })
-      },
-      getActivity() {
-        this.$http.get('/mock/api/workplace/activity')
-          .then(res => {
-            this.activities = res.result
-          })
-      },
-      getTeams() {
-        this.$http.get('/mock/api/workplace/teams')
-          .then(res => {
-            this.teams = res.result
-          })
-      },
-      initRadar() {
-        this.radarLoading = true
-
-        this.$http.get('/mock/api/workplace/radar')
-          .then(res => {
-
-            const dv = new DataSet.View().source(res.result)
-            dv.transform({
-              type: 'fold',
-              fields: ['个人', '团队', '部门'],
-              key: 'user',
-              value: 'score'
-            })
-
-            this.radarData = dv.rows
-            this.radarLoading = false
-          })
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-  .project-list {
-
-    .card-title {
-      font-size: 0;
-
-      a {
-        color: rgba(0, 0, 0, 0.85);
-        margin-left: 12px;
-        line-height: 24px;
-        height: 24px;
-        display: inline-block;
-        vertical-align: top;
-        font-size: 14px;
-
-        &:hover {
-          color: #1890ff;
-        }
-      }
-    }
-    .card-description {
-      color: rgba(0, 0, 0, 0.45);
-      height: 44px;
-      line-height: 22px;
-      overflow: hidden;
-    }
-    .project-item {
-      display: flex;
-      margin-top: 8px;
-      overflow: hidden;
-      font-size: 12px;
-      height: 20px;
-      line-height: 20px;
-      a {
-        color: rgba(0, 0, 0, 0.45);
-        display: inline-block;
-        flex: 1 1 0;
-
-        &:hover {
-          color: #1890ff;
-        }
-      }
-      .datetime {
-        color: rgba(0, 0, 0, 0.25);
-        flex: 0 0 auto;
-        float: right;
-      }
-    }
-    .ant-card-meta-description {
-      color: rgba(0, 0, 0, 0.45);
-      height: 44px;
-      line-height: 22px;
-      overflow: hidden;
-    }
-  }
-
-  .item-group {
-    padding: 20px 0 8px 24px;
-    font-size: 0;
-    a {
-      color: rgba(0, 0, 0, 0.65);
-      display: inline-block;
-      font-size: 14px;
-      margin-bottom: 13px;
-      width: 25%;
-    }
-  }
-
-  .members {
-    a {
-      display: block;
-      margin: 12px 0;
-      line-height: 24px;
-      height: 24px;
-      .member {
-        font-size: 14px;
-        color: rgba(0, 0, 0, .65);
-        line-height: 24px;
-        max-width: 100px;
-        vertical-align: top;
-        margin-left: 12px;
-        transition: all 0.3s;
-        display: inline-block;
-      }
-      &:hover {
-        span {
-          color: #1890ff;
-        }
-      }
-    }
-  }
-
-  .mobile {
-
-    .project-list {
-
-      .project-card-grid {
-        width: 100%;
-      }
-    }
-
-    .more-info {
-      border: 0;
-      padding-top: 16px;
-      margin: 16px 0 16px;
-    }
-
-    .headerContent .title .welcome-text {
-      display: none;
-    }
-  }
-
-</style>
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index 3da6f00a4..1b3629873 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -270,7 +270,8 @@
           fileId: val.fileId,
           flowType: this.$route.query.flowType,
           actiProcInstId: this.$route.query.actiProcInstId,
-          deliveryRequirements: val.deliveryRequirements
+          deliveryRequirements: val.deliveryRequirements,
+          engineeringInterfacePersonReply: this.queryPersonInCharge.engineeringInterfacePersonReply
         }
         putAction(this.url.dreSubmit, query).then((res) => {
           if (res.success) {

From 5a9cfd76e07bd434f5db24912c67b39b97a029af Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 20 May 2022 13:51:16 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E5=A1=AB=E5=86=99=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=20-=20=E7=94=9F=E6=88=90=E5=BA=8F=E5=8F=B7(?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7)=20=E6=9F=A5=E8=AF=A2=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=8E=92=E5=BA=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FeedbackHistoryController.java |  3 +-
 .../ProjectTaskInventoryFeedbackEO.java       |  3 ++
 ...ProjectTaskInventoryFeedbackEOService.java |  2 ++
 ...ojectTaskInventoryDetailEOServiceImpl.java |  5 ++++
 ...ectTaskInventoryFeedbackEOServiceImpl.java | 29 ++++++++++++++++++-
 5 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/FeedbackHistoryController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/FeedbackHistoryController.java
index c8c2f7328..67e9dfd93 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/FeedbackHistoryController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/FeedbackHistoryController.java
@@ -35,7 +35,7 @@ import com.jero.common.aspect.annotation.AutoLog;
 public class FeedbackHistoryController extends JeroController<FeedbackHistory, IFeedbackHistoryService> {
 	@Autowired
 	private IFeedbackHistoryService feedbackHistoryService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -54,6 +54,7 @@ public class FeedbackHistoryController extends JeroController<FeedbackHistory, I
 								   HttpServletRequest req) {
 		QueryWrapper<FeedbackHistory> queryWrapper = QueryGenerator.initQueryWrapper(feedbackHistory, req.getParameterMap());
 		Page<FeedbackHistory> page = new Page<FeedbackHistory>(pageNo, pageSize);
+		queryWrapper.orderByDesc("create_time");
 		IPage<FeedbackHistory> pageList = feedbackHistoryService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java
index 5d5087d44..a7d172da4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java
@@ -104,4 +104,7 @@ public class ProjectTaskInventoryFeedbackEO implements Serializable {
     /**待办、已办标识**/
     @TableField(exist = false)
     private String status;
+
+    @ApiModelProperty(value = "序号")
+    private String serialNumber;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java
index b73956bf6..27013944a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java
@@ -65,4 +65,6 @@ public interface IProjectTaskInventoryFeedbackEOService extends IService<Project
 	 * @param projectTaskInventoryFeedbackEO
 	 */
     void dreSubmit(ProjectTaskInventoryFeedbackEO projectTaskInventoryFeedbackEO);
+
+    String createSerialNumber();
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
index a2aa07f22..f26e8c986 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
@@ -80,6 +80,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 
 			List<ProjectTaskInventoryFeedbackEO> projectTaskInventoryFeedbackEOList = new ArrayList<>();
 
+			String serialNumber = projectTaskInventoryFeedbackEOService.createSerialNumber();
 			for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOList) {
 				QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
 				sysUserQueryWrapper.lambda().eq(SysUser::getId,projectTaskInventoryDetailEO.getUserId());
@@ -94,9 +95,13 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 					projectTaskInventoryFeedbackEO.setProjectTaskInventoryId(projectTaskInventoryDetailEO.getId());
 					projectTaskInventoryFeedbackEO.setFlowType(projectTaskInventoryDetailEO.getFlowType());
 					projectTaskInventoryFeedbackEO.setDeliveryRequirements(projectTaskInventoryDetailEO.getDeliveryInstructions());
+					projectTaskInventoryFeedbackEO.setSerialNumber(serialNumber);
 					projectTaskInventoryFeedbackEOList.add(projectTaskInventoryFeedbackEO);
 
 					createByList.add(userName);
+
+					long number = Long.parseLong(serialNumber) + 1;
+					serialNumber = String.valueOf(number);
 				}
 			}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
index f3ef5040c..7fdcf6a2d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
@@ -16,6 +16,8 @@ import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Date;
 import java.util.Map;
@@ -50,7 +52,9 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
         Date now = new Date();
         projectTaskInventoryFeedbackEO.setCreateTime(now);
         projectTaskInventoryFeedbackEO.setUpdateTime(now);
-        save(projectTaskInventoryFeedbackEO);
+		String serialNumber = createSerialNumber();
+		projectTaskInventoryFeedbackEO.setSerialNumber(serialNumber);
+		save(projectTaskInventoryFeedbackEO);
     }
 
 	/**
@@ -162,4 +166,27 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 
 		this.baseMapper.updateById(projectTaskInventoryFeedbackEO);
 	}
+
+	/**
+	 * 创建序号
+	 *
+	 * @return  serialNumber : 生成规则
+	 * 				年 + 月 + 日 + 三位流水号
+	 */
+	@Override
+	public String createSerialNumber(){
+		String serialNumber = "001";
+		String currentDay = new SimpleDateFormat("yyyyMMdd").format(new Date());
+		QueryWrapper<ProjectTaskInventoryFeedbackEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().like(ProjectTaskInventoryFeedbackEO::getSerialNumber,currentDay);
+		Integer feedbackCount = this.baseMapper.selectCount(queryWrapper);
+
+		int serialNumberSize = 3;
+		if(feedbackCount > 0){
+			serialNumber = currentDay + String.format("%0" + serialNumberSize + "d", (Integer.parseInt(serialNumber) + feedbackCount));
+		}else {
+			serialNumber = currentDay + serialNumber;
+		}
+		return serialNumber;
+	}
 }

From 2cc812b9b0c285a461f96135ce73d1ce333ffa3b Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 20 May 2022 14:04:53 +0800
Subject: [PATCH 7/9] =?UTF-8?q?der=E6=8F=90=E4=BA=A4=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/engineeringConfirmation.vue    | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index 6b67761cf..1c889d789 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -186,11 +186,18 @@
         </a-button>
       </template>
       <div class="engineeringBox" v-if="detailsList.length > 0">
-        <div style="width: calc(100% - 12px)" v-for="(item,index) in detailsList">
-          <div class="title-header-text" v-if="index == 0">
+        <div style="width: calc(100% - 12px);margin-bottom: 40px" v-for="(item,index) in detailsList">
+          <div class="title-header-text" v-if="index == 0 && detailsList[0].dataStatus == 'current'">
             {{$t('currentInformation')}}
           </div>
-          <div class="title-header-text" style="margin-top: 40px" v-if="index == 1">
+          <div class="title-header-text" style="margin-top: 40px"
+               v-if="index == 1 && detailsList[1].dataStatus == 'history'"
+          >
+            {{$t('deliveryHistory')}}
+          </div>
+          <div class="title-header-text"
+               v-if="detailsList[0].dataStatus == 'history'"
+          >
             {{$t('deliveryHistory')}}
           </div>
           <a-row :gutter="24" style="margin-bottom: 18px">
@@ -443,7 +450,8 @@
           remindDispose: '/project/projectTaskInventoryEO/remindDispose',
           page: '/project/feedbackHistory/page',
           confirmEdit: '/project/projectTaskInventoryDetailEO/edit'
-        }
+        },
+        feedbackId: ''
       }
     },
     mounted() {
@@ -641,13 +649,14 @@
       },
       detailsClick(val) {
         this.visibleDetails = true
-        this.getDetails(val)
+        this.feedbackId = val.id
+        this.getDetails()
       },
-      getDetails(row) {
+      getDetails() {
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
-          feedbackId: row.id
+          feedbackId: this.feedbackId
         }
         this.pageLoading = true
         getAction(this.url.page, query).then((res) => {

From 9e8a9c0c2c325f37cbd9d35f18bfd2091bbbda84 Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Fri, 20 May 2022 14:11:18 +0800
Subject: [PATCH 8/9] =?UTF-8?q?[update]=20=E6=8C=89=E9=92=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/parameter/ParameterTemplate/index.vue  | 10 +++++-----
 .../src/views/parameter/parameterlist/index.vue  | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue
index f049d42ad..8fc2112dd 100644
--- a/jero-web/src/views/parameter/ParameterTemplate/index.vue
+++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue
@@ -42,15 +42,15 @@
       </a-row>
     </div>
     <div class="table-operator">
-      <div @click="handleAdd" class="operator-text" v-has="'document:getInfoById'">
+      <div @click="handleAdd" class="operator-text" v-has="'params:template:add'">
         <a-icon type="plus"/>
         {{$t('add')}}
       </div>
-      <div @click="handlecody" class="operator-text" v-has="'document:getInfoById'">
+      <div @click="handlecody" class="operator-text" v-has="'params:template:copy'">
         <a-icon type="copy"/>
         {{$t('copy')}}
       </div>
-      <div @click="handleDel" class="operator-text" v-has="'document:deleteBatch'">
+      <div @click="handleDel" class="operator-text" v-has="'params:template:delete'">
         <a-icon type="delete"/>
         {{$t('BatchDelete')}}
       </div>
@@ -71,8 +71,8 @@
           <a @click="entryNameClick(record)">{{text}}</a>
         </span>
         <span slot="operation" slot-scope="text,record">
-            <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
-            <a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
+            <a class="text-operation" v-has="'params:template:edit'" @click="edit(record)">{{$t('edit')}}</a>
+            <a class="text-operation" v-has="'params:template:delete'" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
         </span>
       </a-table>
     </div>
diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue
index 3ffbe4089..01eea1069 100644
--- a/jero-web/src/views/parameter/parameterlist/index.vue
+++ b/jero-web/src/views/parameter/parameterlist/index.vue
@@ -40,26 +40,26 @@
       </a-row>
     </div>
     <div class="table-operator">
-      <div @click="handleAdd" class="operator-text" v-has="'document:getInfoById'">
+      <div @click="handleAdd" class="operator-text" v-has="'params:paramsInfo:add'">
         <a-icon type="plus"/>
         {{$t('add')}}
       </div>
-      <div @click="handleExport" class="operator-text" v-has="'document:exportExcel'">
+      <div @click="handleExport" class="operator-text" v-has="'params:paramsInfo:import'">
         <a-icon type="export" :rotate="-90"/>
         {{$t('dataExport')}}
       </div>
-      <div @click="handleModule" class="operator-text" v-has="'document:exportTemplate'">
+      <div @click="handleModule" class="operator-text" v-has="'params:paramsInfo:template'">
         <a-icon type="download"/>
         {{$t('templateDownload')}}
       </div>
-      <div class="operator-text" v-has="'document:importZip'">
+      <div class="operator-text" v-has="'params:paramsInfo:import'">
         <ImportFile :url="url" :isTrue="false" :accept="'.zip'" :paramsTemplateId='this.$route.query.id'/>
       </div>
-      <div @click="releaseVersion" class="operator-text" v-has="'document:exportTemplate'">
+      <div @click="releaseVersion" class="operator-text" v-has="'params:paramsInfo:publish'">
         <a-icon type="rocket"/>
         {{$t('releaseVersion')}}
       </div>
-      <div @click="handleDel" class="operator-text" v-has="'document:deleteBatch'">
+      <div @click="handleDel" class="operator-text" v-has="'params:paramsInfo:deleteBatch'">
         <a-icon type="delete"/>
         {{$t('BatchDelete')}}
       </div>
@@ -81,8 +81,8 @@
                   {{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }}
         </span>
         <span slot="operation" slot-scope="text,record">
-            <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
-            <a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
+            <a class="text-operation" v-has="'params:paramsInfo:edit'" @click="edit(record)">{{$t('edit')}}</a>
+            <a class="text-operation" v-has="'params:paramsInfo:delete'" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
         </span>
       </a-table>
     </div>

From f55adecded60838d830a429eae2b1b92c78873a2 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 20 May 2022 14:27:36 +0800
Subject: [PATCH 9/9] =?UTF-8?q?der=E6=8F=90=E4=BA=A4=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/engineeringConfirmation.vue    |  3 ++-
 .../reviewedByThePersonInCharge.vue           | 24 +++++++++++++++----
 .../components/taskCirculationHistory.vue     |  2 +-
 .../processForm/taskListProcess/index.vue     | 12 +++++++++-
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index 1c889d789..896903852 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -53,7 +53,7 @@
            {{$t('edit')}}
          </a>
            <a class="text"
-              v-if="$route.query.TaskKey == 'zrrclrw'"
+              v-if="$route.query.TaskKey == 'zrrclrw' && result.status"
               :disabled="!result.status"
               @click="confirm(result)">
              <span v-if="result.status == 'NotDone'">
@@ -607,6 +607,7 @@
                 this.dataSourceTable.forEach(val => {
                   this.distributionEngineerList.push({
                     name: val.userName,
+                    id:val.id,
                     userId: val.userId,
                     deliveryInstructions: val.deliveryInstructions
                   })
diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
index 8a919040e..1631f0d12 100644
--- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
@@ -2,7 +2,8 @@
   <div class="box">
     <div class="box-text">
       <div class="header-text">
-        {{$route.query.TaskKey == 'zrrclrw' ? $t('personLiableConfirm'):$t('fillInProjectDelivery')}}
+        {{$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'fqrsh'
+        ? $t('personLiableConfirm'):$t('fillInProjectDelivery')}}
       </div>
     </div>
     <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
@@ -110,7 +111,7 @@
             </div>
             <a-form-model-item class="itemModel">
               <span class="text-header">
-                 爱上克里夫就的撒开了房间圣诞快乐房价士大夫打扫房间圣诞快乐房价是罚款乱收费考虑是否就但是考虑
+                {{reviewResult[formInline.reviewResult]}}
               </span>
             </a-form-model-item>
           </div>
@@ -170,6 +171,14 @@
     data() {
       return {
         formInline: {},
+        reviewResult: {
+          'launch': this.$t('Launch'),
+          'Compliance': this.$t('accord'),
+          'Non-Compliance': this.$t('nonConformity'),
+          'To be tracked': this.$t('Tracked'),
+          'NA': this.$t('notInvolved'),
+          'No rating': this.$t('toBeConfirmed')
+        },
         isTrue: false,
         rules: {
           reviewResult: [
@@ -210,17 +219,22 @@
     },
     mounted() {
       this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay)
-      if (this.queryBy) {
+      if (this.queryBy && this.$route.query.TaskKey == 'fqrsh') {
         this.formInline.reviewResult = this.queryBy.reviewResult || undefined
-        this.formInline.approvalOpinion = ''
+        this.formInline.approvalOpinion = this.queryBy.approvalOpinion
         this.formInline = { ...this.formInline }
       }
-      if (this.queryPersonInCharge) {
+      if (this.queryPersonInCharge && this.$route.query.TaskKey == 'dreDispose') {
         this.formInline.deliveryRequirements = this.queryPersonInCharge.deliveryRequirements
         this.formInline.engineerFeedbackContent = this.queryPersonInCharge.engineerFeedbackContent
         this.formInline.fileId = this.queryPersonInCharge.fileId
         this.formInline = { ...this.formInline }
       }
+      if (this.queryBy && this.$route.query.TaskKey == 'zrrclrw') {
+        this.formInline.reviewResult = this.queryBy.reviewResult || undefined
+        this.formInline.approvalOpinion = this.queryBy.approvalOpinion
+        this.formInline = { ...this.formInline }
+      }
     },
     methods: {
       submit(callBack) {
diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
index 900d7d4c6..ad4dd00b0 100644
--- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
+++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
@@ -15,7 +15,7 @@
         :columns="columns"
       >
         <span slot="reviewResult" slot-scope="text,result">
-            {{reviewResult[text]}}
+            {{text}}
         </span>
       </a-table>
     </div>
diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index 1b3629873..2bd386343 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -20,6 +20,7 @@
         />
         <engineeringConfirmation
           v-if="isDisplay"
+          ref="engineeringConfirmationRef"
         />
         <reviewedByThePersonInCharge
           v-if="isDisplay"
@@ -257,7 +258,16 @@
           this.loading = true
           res.operatorTime = operatorTime
           if (this.$route.query.TaskKey == 'dreDispose') {
-            this.dreSubmit(res)
+            let dataSource = this.$refs.engineeringConfirmationRef.dataSource
+            let isTrue
+            for (let i = 0; i < dataSource.length; i++) {
+              if (dataSource[i].status == 'status' || !dataSource[i].status) {
+
+              }
+            }
+            if (isTrue) {
+              this.dreSubmit(res)
+            }
           } else {
             this.completeTask(res)
           }