diff --git a/.env.development b/.env.development
index 1edba8c..3becbe6 100644
--- a/.env.development
+++ b/.env.development
@@ -5,8 +5,8 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
 ENV = 'development'
 
 # 金鸡湖现代服务业品牌管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.110:9040'
-# VUE_APP_BASE_API = 'http://39.101.188.84:9040'
+# VUE_APP_BASE_API = 'http://192.168.0.108:9040'
+VUE_APP_BASE_API = 'http://39.101.188.84:9040'
 # VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'
 
 # 路由懒加载
diff --git a/.env.production b/.env.production
index b1a6f2b..928897b 100644
--- a/.env.production
+++ b/.env.production
@@ -6,7 +6,7 @@ ENV = 'production'
 
 # 金鸡湖现代服务业品牌管理系统/生产环境
 # VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_API = 'http://39.101.188.84:9040'
+# VUE_APP_BASE_API = 'http://39.101.188.84:9040'
 # VUE_APP_BASE_API = 'http://192.114.0.197/api'
 
-# VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'
+VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'
diff --git a/package.json b/package.json
index 0f74c49..8641d9b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "1.0.202407230921",
+  "version": "1.0.202407290914",
   "description": "金鸡湖现代服务业品牌管理系统",
   "author": "若依",
   "license": "MIT",
@@ -37,6 +37,8 @@
   },
   "dependencies": {
     "@riophae/vue-treeselect": "0.4.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^1.0.2",
     "autofit.js": "^3.1.0",
     "axios": "0.24.0",
     "clipboard": "2.0.8",
@@ -45,12 +47,13 @@
     "element-ui": "2.15.14",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
-    "highlight.js": "9.18.5",
+    "highlight.js": "10.5.0",
     "html2canvas": "^1.4.1",
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
     "jspdf": "^2.5.1",
+    "lodash": "^4.17.21",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
@@ -62,7 +65,9 @@
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0",
-    "xlsx": "^0.18.5"
+    "xlsx": "^0.18.5",
+    "xml-js": "1.6.11",
+    "bpmn-js-token-simulation": "0.10.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",
@@ -70,6 +75,8 @@
     "@vue/cli-service": "4.4.6",
     "babel-eslint": "10.1.0",
     "babel-plugin-dynamic-import-node": "2.3.3",
+    "bpmn-js": "7.5.0",
+    "bpmn-js-properties-panel": "0.37.2",
     "chalk": "4.1.0",
     "compression-webpack-plugin": "5.0.2",
     "connect": "3.6.6",
diff --git a/public/static/企业库数据模板.xlsx b/public/static/企业库数据模板.xlsx
new file mode 100644
index 0000000..3aa6219
Binary files /dev/null and b/public/static/企业库数据模板.xlsx differ
diff --git a/src/App.vue b/src/App.vue
index b1a9742..ad6f99e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,15 +1,17 @@
 <template>
-  <div id="app">
-    <router-view />
-  </div>
+  <!-- <ScaleBox> -->
+    <div id="app">
+      <router-view />
+    </div>
+  <!-- </ScaleBox> -->
 </template>
 
 <script>
 import autofit from "autofit.js";
-
+// import ScaleBox from "@/components/scaleBox";
 export default {
   name: "App",
-
+  // components:{ ScaleBox },
   mounted() {
     autofit.init({
       dh: 919,
diff --git a/src/api/jin_ji_hu/dataCloudMap/index.js b/src/api/jin_ji_hu/dataCloudMap/index.js
new file mode 100644
index 0000000..d56d3e7
--- /dev/null
+++ b/src/api/jin_ji_hu/dataCloudMap/index.js
@@ -0,0 +1,46 @@
+import request from "@/utils/request"
+
+// 数据云图项目追踪情况
+export function servicesDevelop(params) {
+  return request({
+    url: "/jjh/dataScreen/servicesDevelop",
+    method: "get",
+    params
+  })
+}
+
+// 数据云图行业纵深情况
+export function getIndustryDepth(params) {
+  return request({
+    url: "/jjh/dataScreen/getIndustryDepth",
+    method: "get",
+    params
+  })
+}
+
+// 数据云图行业纵深情况
+export function getAllIndustry(params) {
+  return request({
+    url: "/jjh/dataScreen/getAllIndustry",
+    method: "get",
+    params
+  })
+}
+
+// 数据云图荣誉情况
+export function honor(params) {
+  return request({
+    url: "/jjh/dataScreen/honor",
+    method: "get",
+    params
+  })
+}
+
+// 数据云图项目追踪情况
+export function projectTracking(params) {
+  return request({
+    url: "/jjh/dataScreen/projectTracking",
+    method: "get",
+    params
+  })
+}
\ No newline at end of file
diff --git a/src/api/jin_ji_hu/enterList/index.js b/src/api/jin_ji_hu/enterList/index.js
index 74f9af6..4e9c2a5 100644
--- a/src/api/jin_ji_hu/enterList/index.js
+++ b/src/api/jin_ji_hu/enterList/index.js
@@ -21,8 +21,8 @@ export function enterpriseBasicInfoNew(data) {
 // 修改企业基础信息
 export function enterpriseBasicInfoChange(data) {
   return request({
-    url: "/system/enterpriseBasicInfo",
-    method: "put",
+    url: "/system/enterpriseBasicInfo/edit",
+    method: "post",
     data
   })
 }
@@ -39,7 +39,7 @@ export function enterpriseBasicInfoId(id) {
 export function enterpriseBasicInfoDel(params) {
   return request({
     url: "/system/enterpriseBasicInfo" + id,
-    method: "delete",
+    method: "post",
     params
   })
 }
diff --git a/src/api/jin_ji_hu/infoMaintain/index.js b/src/api/jin_ji_hu/infoMaintain/index.js
index 3815a65..1ebe5fe 100644
--- a/src/api/jin_ji_hu/infoMaintain/index.js
+++ b/src/api/jin_ji_hu/infoMaintain/index.js
@@ -18,11 +18,11 @@ export function jEnterpriseContactNew(data) {
   })
 }
 
-// 删除企业联系人
+// 修改企业联系人
 export function jEnterpriseContactChange(data) {
   return request({
-    url: "/jjh/jEnterpriseContact",
-    method: "put",
+    url: "/jjh/jEnterpriseContact/edit",
+    method: "post",
     data
   })
 }
@@ -36,10 +36,9 @@ export function jEnterpriseContactId(id) {
 }
 
 // 删除企业联系人
-export function jEnterpriseContactDel(params) {
+export function jEnterpriseContactDel(id) {
   return request({
-    url: "/jjh/jEnterpriseContact",
-    method: "delete",
-    params
+    url: "/jjh/jEnterpriseContact/" + id,
+    method: "post",
   })
 }
\ No newline at end of file
diff --git a/src/api/jin_ji_hu/intelligentReminder/index.js b/src/api/jin_ji_hu/intelligentReminder/index.js
new file mode 100644
index 0000000..f2c53fc
--- /dev/null
+++ b/src/api/jin_ji_hu/intelligentReminder/index.js
@@ -0,0 +1,80 @@
+import request from "@/utils/request"
+
+// 分页查询智能提醒
+export function getjSmartReminders(params) {
+  return request({
+    url: "/jjh/jSmartReminders",
+    method: "get",
+    params
+  })
+}
+
+// 新增智能提醒
+export function jSmartRemindersNew(data) {
+  return request({
+    url: "/jjh/jSmartReminders",
+    method: "post",
+    data
+  })
+}
+
+// 修改不定期智能提醒
+export function updateNdqChange(data) {
+  return request({
+    url: "/jjh/jSmartReminders/updateNdq",
+    method: "post",
+    data
+  })
+}
+
+// 修改定期智能提醒
+export function updateDqChange(data) {
+  return request({
+    url: "/jjh/jSmartReminders/updateDq",
+    method: "post",
+    data
+  })
+}
+
+// 根据主键查询智能提醒
+export function jSmartRemindersId(id) {
+  return request({
+    url: "/jjh/jSmartReminders/" + id,
+    method: "get",
+  })
+}
+
+// 删除智能提醒
+export function jSmartRemindersDel(id) {
+  return request({
+    url: "/jjh/jSmartReminders/" + id,
+    method: "post",
+  })
+}
+
+// 政务端首页智能提醒查询所有数据
+export function chiefAll(params){
+  return request({
+    url:"/jjh/jSmartReminders/chiefAll",
+    method:"get",
+    params
+  }) 
+}
+
+// 企业端搜也我智能提醒查询所有数据
+export function enterpriseAll(params){
+  return request({
+    url:"/jjh/jSmartReminders/enterpriseAll",
+    method:"get",
+    params
+  }) 
+}
+
+// 修改状态为已读
+export function changeIsRead(params){
+  return request({
+    url:"/jjh/jSmartReminders/changeIsRead",
+    method:"get",
+    params
+  }) 
+}
\ No newline at end of file
diff --git a/src/api/jin_ji_hu/policyDocument/index.js b/src/api/jin_ji_hu/policyDocument/index.js
index ab4e172..7f14c33 100644
--- a/src/api/jin_ji_hu/policyDocument/index.js
+++ b/src/api/jin_ji_hu/policyDocument/index.js
@@ -21,8 +21,8 @@ export function jPolicyFileNew(data) {
 // 修改政策文件
 export function jPolicyFileChange(data) {
   return request({
-    url: "/jjh/jPolicyFile",
-    method: "put",
+    url: "/jjh/jPolicyFile/edit",
+    method: "post",
     data
   })
 }
@@ -36,10 +36,9 @@ export function jPolicyFileId(id) {
 }
 
 // 删除政策文件
-export function jPolicyFileDel(params) {
+export function jPolicyFileDel(id) {
   return request({
-    url: "/jjh/jPolicyFile",
-    method: "delete",
-    params
+    url: "/jjh/jPolicyFile/" + id,
+    method: "post",
   })
 }
\ No newline at end of file
diff --git a/src/api/jin_ji_hu/project/index.js b/src/api/jin_ji_hu/project/index.js
index 91ef48e..fc39501 100644
--- a/src/api/jin_ji_hu/project/index.js
+++ b/src/api/jin_ji_hu/project/index.js
@@ -16,11 +16,10 @@ export function jProjectId(id) {
   })
 }
 // 删除单个项目
-export function jProjectDel(params) {
+export function jProjectDel(id) {
   return request({
-    url: "/jjh/jProject",
-    method: "delete",
-    params
+    url: "/jjh/jProject/" + id,
+    method: "post",
   })
 }
 
@@ -71,17 +70,16 @@ export function postJMemorandum(data) {
 // 修改备忘录
 export function putJMemorandum(data) {
   return request({
-    url: "/jjh/jMemorandum",
-    method: "put",
+    url: "/jjh/jMemorandum/edit",
+    method: "post",
     data
   })
 }
 // 删除备忘录
-export function delJMemorandum(params) {
+export function delJMemorandum(id) {
   return request({
-    url: "/jjh/jMemorandum",
-    method: "delete",
-    params
+    url: "/jjh/jMemorandum" + id,
+    method: "post",
   })
 }
 
diff --git a/src/api/monitor/cache.js b/src/api/monitor/cache.js
index 72c5f6a..e73e3fd 100644
--- a/src/api/monitor/cache.js
+++ b/src/api/monitor/cache.js
@@ -36,7 +36,7 @@ export function getCacheValue(cacheName, cacheKey) {
 export function clearCacheName(cacheName) {
   return request({
     url: '/monitor/cache/clearCacheName/' + cacheName,
-    method: 'delete'
+    method: 'post'
   })
 }
 
@@ -44,7 +44,7 @@ export function clearCacheName(cacheName) {
 export function clearCacheKey(cacheKey) {
   return request({
     url: '/monitor/cache/clearCacheKey/' + cacheKey,
-    method: 'delete'
+    method: 'post'
   })
 }
 
@@ -52,6 +52,6 @@ export function clearCacheKey(cacheKey) {
 export function clearCacheAll() {
   return request({
     url: '/monitor/cache/clearCacheAll',
-    method: 'delete'
+    method: 'post'
   })
 }
diff --git a/src/api/monitor/job.js b/src/api/monitor/job.js
index 3815569..aaf90c0 100644
--- a/src/api/monitor/job.js
+++ b/src/api/monitor/job.js
@@ -29,8 +29,8 @@ export function addJob(data) {
 // 修改定时任务调度
 export function updateJob(data) {
   return request({
-    url: '/monitor/job',
-    method: 'put',
+    url: '/monitor/job/edit',
+    method: 'post',
     data: data
   })
 }
@@ -39,7 +39,7 @@ export function updateJob(data) {
 export function delJob(jobId) {
   return request({
     url: '/monitor/job/' + jobId,
-    method: 'delete'
+    method: 'post'
   })
 }
 
@@ -51,7 +51,7 @@ export function changeJobStatus(jobId, status) {
   }
   return request({
     url: '/monitor/job/changeStatus',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -65,7 +65,7 @@ export function runJob(jobId, jobGroup) {
   }
   return request({
     url: '/monitor/job/run',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
\ No newline at end of file
diff --git a/src/api/monitor/jobLog.js b/src/api/monitor/jobLog.js
index 6e0be61..7909baa 100644
--- a/src/api/monitor/jobLog.js
+++ b/src/api/monitor/jobLog.js
@@ -13,7 +13,7 @@ export function listJobLog(query) {
 export function delJobLog(jobLogId) {
   return request({
     url: '/monitor/jobLog/' + jobLogId,
-    method: 'delete'
+    method: 'post'
   })
 }
 
@@ -21,6 +21,6 @@ export function delJobLog(jobLogId) {
 export function cleanJobLog() {
   return request({
     url: '/monitor/jobLog/clean',
-    method: 'delete'
+    method: 'post'
   })
 }
diff --git a/src/api/monitor/logininfor.js b/src/api/monitor/logininfor.js
index 4d112b7..6135a13 100644
--- a/src/api/monitor/logininfor.js
+++ b/src/api/monitor/logininfor.js
@@ -13,7 +13,7 @@ export function list(query) {
 export function delLogininfor(infoId) {
   return request({
     url: '/monitor/logininfor/' + infoId,
-    method: 'delete'
+    method: 'post'
   })
 }
 
@@ -29,6 +29,6 @@ export function unlockLogininfor(userName) {
 export function cleanLogininfor() {
   return request({
     url: '/monitor/logininfor/clean',
-    method: 'delete'
+    method: 'post'
   })
 }
diff --git a/src/api/monitor/online.js b/src/api/monitor/online.js
index bd22137..5cc55ab 100644
--- a/src/api/monitor/online.js
+++ b/src/api/monitor/online.js
@@ -13,6 +13,6 @@ export function list(query) {
 export function forceLogout(tokenId) {
   return request({
     url: '/monitor/online/' + tokenId,
-    method: 'delete'
+    method: 'post'
   })
 }
diff --git a/src/api/monitor/operlog.js b/src/api/monitor/operlog.js
index a04bca8..b8c2fda 100644
--- a/src/api/monitor/operlog.js
+++ b/src/api/monitor/operlog.js
@@ -13,7 +13,7 @@ export function list(query) {
 export function delOperlog(operId) {
   return request({
     url: '/monitor/operlog/' + operId,
-    method: 'delete'
+    method: 'post'
   })
 }
 
@@ -21,6 +21,6 @@ export function delOperlog(operId) {
 export function cleanOperlog() {
   return request({
     url: '/monitor/operlog/clean',
-    method: 'delete'
+    method: 'post'
   })
 }
diff --git a/src/api/onlineDeclartion/declarationManagement.js b/src/api/onlineDeclartion/declarationManagement.js
index 2cac525..7f284f0 100644
--- a/src/api/onlineDeclartion/declarationManagement.js
+++ b/src/api/onlineDeclartion/declarationManagement.js
@@ -1,5 +1,23 @@
 import request from '@/utils/request'
 
+// 新增模板管理列表
+export function templateInfo(data) {
+  return request({
+    url: '/system/templateInfo',
+    method: 'post',
+    data
+  })
+}
+
+// 修改模板管理列表
+export function templateInfoChange(data) {
+  return request({
+    url: '/system/templateInfo/edit',
+    method: 'post',
+    data
+  })
+}
+
 // 查询在线申报管理列表
 export function listInfo(query) {
   return request({
diff --git a/src/api/onlineDeclartion/declareAddContent.js b/src/api/onlineDeclartion/declareAddContent.js
index a832815..800ab61 100644
--- a/src/api/onlineDeclartion/declareAddContent.js
+++ b/src/api/onlineDeclartion/declareAddContent.js
@@ -103,8 +103,8 @@ export function addProjectSettlementAward(data) {
 // 编辑-项目落户奖补-1
 export function putProjectSettlementAward(data) {
   return request({
-    url: '/system/projectSettlementAward',
-    method: 'put',
+    url: '/system/projectSettlementAward/edit',
+    method: 'post',
     data: data
   })
 }
@@ -121,8 +121,8 @@ export function addBigStrongAward(data) {
 // 编辑-做大做强奖补-2
 export function putBigStrongAward(data) {
   return request({
-    url: '/system/bigStrongAward',
-    method: 'put',
+    url: '/system/bigStrongAward/edit',
+    method: 'post',
     data: data
   })
 }
@@ -139,8 +139,8 @@ export function addCarrierConstructionAward(data) {
 // 编辑-载体建设奖补-3
 export function putCarrierConstructionAward(data) {
   return request({
-    url: '/system/carrierConstructionAward',
-    method: 'put',
+    url: '/system/carrierConstructionAward/edit',
+    method: 'post',
     data: data
   })
 }
@@ -157,8 +157,8 @@ export function addPlatformConstructionAward(data) {
 // 编辑-平台建设奖补-4
 export function putPlatformConstructionAward(data) {
   return request({
-    url: '/system/platformConstructionAward',
-    method: 'put',
+    url: '/system/platformConstructionAward/edit',
+    method: 'post',
     data: data
   })
 }
@@ -175,8 +175,8 @@ export function addBrandingAward(data) {
 // 编辑-品牌打造奖补-5
 export function putBrandingAward(data) {
   return request({
-    url: '/system/brandingAward',
-    method: 'put',
+    url: '/system/brandingAward/edit',
+    method: 'post',
     data: data
   })
 }
@@ -193,8 +193,8 @@ export function addSceneOpeningAward(data) {
 // 编辑-场景开放奖补-6
 export function putSceneOpeningAward(data) {
   return request({
-    url: '/system/sceneOpeningAward',
-    method: 'put',
+    url: '/system/sceneOpeningAward/edit',
+    method: 'post',
     data: data
   })
 }
@@ -211,8 +211,8 @@ export function addCreditManagement(data) {
 // 编辑-信用管理奖补-7
 export function putCreditManagement(data) {
   return request({
-    url: '/system/creditManagement',
-    method: 'put',
+    url: '/system/creditManagement/edit',
+    method: 'post',
     data: data
   })
 }
@@ -229,8 +229,8 @@ export function addIndustrialInternetAward(data) {
 // 编辑-5G+工业互联网奖补-8
 export function putIndustrialInternetAward(data) {
   return request({
-    url: '/system/industrialInternetAward',
-    method: 'put',
+    url: '/system/industrialInternetAward/edit',
+    method: 'post',
     data: data
   })
 }
@@ -247,8 +247,8 @@ export function addManufacturingServicesAward(data) {
 // 编辑-制造服务业有效投入奖补-9
 export function putManufacturingServicesAward(data) {
   return request({
-    url: '/system/manufacturingServicesAward',
-    method: 'put',
+    url: '/system/manufacturingServicesAward/edit',
+    method: 'post',
     data: data
   })
 }
@@ -265,8 +265,8 @@ export function addLogisticsDevelopmentAward(data) {
 // 编辑-物流发展奖补-10
 export function putLogisticsDevelopmentAward(data) {
   return request({
-    url: '/system/logisticsDevelopmentAward',
-    method: 'put',
+    url: '/system/logisticsDevelopmentAward/edit',
+    method: 'post',
     data: data
   })
 }
@@ -283,8 +283,8 @@ export function addIntegrationIndustries(data) {
 // 编辑-两业融合奖补-11
 export function putIntegrationIndustries(data) {
   return request({
-    url: '/system/integrationIndustries',
-    method: 'put',
+    url: '/system/integrationIndustries/edit',
+    method: 'post',
     data: data
   })
 }
@@ -301,8 +301,8 @@ export function addOutQuitProducts(data) {
 // 编辑-2024年度淘汰落后和退出低端低效产能装备清单模板-12
 export function putOutQuitProducts(data) {
   return request({
-    url: '/system/outQuitProducts',
-    method: 'put',
+    url: '/system/outQuitProducts/edit',
+    method: 'post',
     data: data
   })
 }
@@ -313,7 +313,7 @@ export function putOutQuitProducts(data) {
 export function templateOneUpdata(data){
   return request({
     url: '/system/projectSettlementAward/update',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -322,7 +322,7 @@ export function templateOneUpdata(data){
 export function templateTwoUpdata(data){
   return request({
     url: '/system/bigStrongAward/update',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -331,7 +331,7 @@ export function templateTwoUpdata(data){
 export function templateThreeUpdata(data){
   return request({
     url: '/system/carrierConstructionAward/update',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -340,7 +340,7 @@ export function templateThreeUpdata(data){
 export function templateFourUpdata(data){
   return request({
     url: '/system/platformConstructionAward/update',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -349,7 +349,7 @@ export function templateFourUpdata(data){
 export function templateFiveUpdata(data){
   return request({
     url: '/system/brandingAward/update',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -358,7 +358,7 @@ export function templateFiveUpdata(data){
 export function templateSixUpdata(data){
   return request({
     url: '/system/sceneOpeningAward/update',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -367,7 +367,7 @@ export function templateSixUpdata(data){
 export function templateSevenUpdata(data){
   return request({
     url: '/system/creditManagement/update',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -376,7 +376,7 @@ export function templateSevenUpdata(data){
 export function templateEightUpdata(data){
   return request({
     url: '/system/industrialInternetAward/update',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -385,7 +385,7 @@ export function templateEightUpdata(data){
 export function templateNineUpdata(data){
   return request({
     url: '/system/manufacturingServicesAward/update',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -394,7 +394,7 @@ export function templateNineUpdata(data){
 export function templateTenUpdata(data){
   return request({
     url: '/system/logisticsDevelopmentAward/update',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -403,7 +403,7 @@ export function templateTenUpdata(data){
 export function templateElevenUpdata(data){
   return request({
     url: '/system/integrationIndustries/update',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -412,7 +412,7 @@ export function templateElevenUpdata(data){
 export function templateProductsUpdata(data){
   return request({
     url: '/system/outQuitProducts/update',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
diff --git a/src/api/onlineDeclartion/enterpriseDirectory.js b/src/api/onlineDeclartion/enterpriseDirectory.js
index 20f1938..414fefc 100644
--- a/src/api/onlineDeclartion/enterpriseDirectory.js
+++ b/src/api/onlineDeclartion/enterpriseDirectory.js
@@ -49,8 +49,8 @@ export function addTemplateRecord(data) {
 // 编辑企业名录
 export function putTemplateRecord(data) {
   return request({
-    url: '/system/templateRecord',
-    method: 'put',
+    url: '/system/templateRecord/edit',
+    method: 'post',
     data: data
   })
 }
diff --git a/src/api/onlineDeclartion/pendingReview.js b/src/api/onlineDeclartion/pendingReview.js
index 7a14f02..aebe50e 100644
--- a/src/api/onlineDeclartion/pendingReview.js
+++ b/src/api/onlineDeclartion/pendingReview.js
@@ -40,7 +40,7 @@ export function addTemplateRecord(data) {
 export function approvalEdit(data) {
   return request({
     url: '/system/declarationRecords/approvalEdit',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
diff --git a/src/api/onlineDeclartion/records.js b/src/api/onlineDeclartion/records.js
index 32642f8..1dab9c8 100644
--- a/src/api/onlineDeclartion/records.js
+++ b/src/api/onlineDeclartion/records.js
@@ -63,7 +63,7 @@ export function uploadFile(data) {
 export function putMunicipalBureauReview(data) {
   return request({
     url: '/system/declarationRecords/municipalReviewNew',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
diff --git a/src/api/system/bigStrongAward.js b/src/api/system/bigStrongAward.js
index 564c17d..7af40c1 100644
--- a/src/api/system/bigStrongAward.js
+++ b/src/api/system/bigStrongAward.js
@@ -29,8 +29,8 @@ export function addBigStrongAward(data) {
 // 修改做大做强奖详情
 export function updateBigStrongAward(data) {
   return request({
-    url: '/system/bigStrongAward',
-    method: 'put',
+    url: '/system/bigStrongAward/edit',
+    method: 'post',
     data: data
   })
 }
@@ -39,6 +39,6 @@ export function updateBigStrongAward(data) {
 export function delBigStrongAward(id) {
   return request({
     url: '/system/bigStrongAward/' + id,
-    method: 'delete'
+    method: 'post'
   })
 }
diff --git a/src/api/system/brandingAward.js b/src/api/system/brandingAward.js
index 592e7f6..369e5aa 100644
--- a/src/api/system/brandingAward.js
+++ b/src/api/system/brandingAward.js
@@ -29,8 +29,8 @@ export function addBrandingAward(data) {
 // 修改品牌打造奖补
 export function updateBrandingAward(data) {
   return request({
-    url: '/system/brandingAward',
-    method: 'put',
+    url: '/system/brandingAward/edit',
+    method: 'post',
     data: data
   })
 }
@@ -39,6 +39,6 @@ export function updateBrandingAward(data) {
 export function delBrandingAward(id) {
   return request({
     url: '/system/brandingAward/' + id,
-    method: 'delete'
+    method: 'post'
   })
 }
diff --git a/src/api/system/carrierConstructionAward.js b/src/api/system/carrierConstructionAward.js
index a189c95..816da6a 100644
--- a/src/api/system/carrierConstructionAward.js
+++ b/src/api/system/carrierConstructionAward.js
@@ -29,8 +29,8 @@ export function addCarrierConstructionAward(data) {
 // 修改载体建设奖补
 export function updateCarrierConstructionAward(data) {
   return request({
-    url: '/system/carrierConstructionAward',
-    method: 'put',
+    url: '/system/carrierConstructionAward/edit',
+    method: 'post',
     data: data
   })
 }
@@ -39,6 +39,6 @@ export function updateCarrierConstructionAward(data) {
 export function delCarrierConstructionAward(id) {
   return request({
     url: '/system/carrierConstructionAward/' + id,
-    method: 'delete'
+    method: 'post'
   })
 }
diff --git a/src/api/system/config.js b/src/api/system/config.js
index a404d82..1f46ed9 100644
--- a/src/api/system/config.js
+++ b/src/api/system/config.js
@@ -37,8 +37,8 @@ export function addConfig(data) {
 // 修改参数配置
 export function updateConfig(data) {
   return request({
-    url: '/system/config',
-    method: 'put',
+    url: '/system/config/edit',
+    method: 'post',
     data: data
   })
 }
@@ -47,7 +47,7 @@ export function updateConfig(data) {
 export function delConfig(configId) {
   return request({
     url: '/system/config/' + configId,
-    method: 'delete'
+    method: ' post'
   })
 }
 
@@ -55,6 +55,6 @@ export function delConfig(configId) {
 export function refreshCache() {
   return request({
     url: '/system/config/refreshCache',
-    method: 'delete'
+    method: ' post'
   })
 }
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index fc943cd..1013027 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -37,8 +37,8 @@ export function addDept(data) {
 // 修改部门
 export function updateDept(data) {
   return request({
-    url: '/system/dept',
-    method: 'put',
+    url: '/system/dept/edit',
+    method: 'post',
     data: data
   })
 }
@@ -47,6 +47,6 @@ export function updateDept(data) {
 export function delDept(deptId) {
   return request({
     url: '/system/dept/' + deptId,
-    method: 'delete'
+    method: 'post'
   })
 }
\ No newline at end of file
diff --git a/src/api/system/dict/data.js b/src/api/system/dict/data.js
index 6c9eb79..a211f0d 100644
--- a/src/api/system/dict/data.js
+++ b/src/api/system/dict/data.js
@@ -1,5 +1,14 @@
 import request from '@/utils/request'
 
+// 查询字典不带分页的数据列表
+export function getAllList(query) {
+  return request({
+    url: '/system/dict/data/getAllList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询字典数据列表
 export function listData(query) {
   return request({
@@ -37,8 +46,8 @@ export function addData(data) {
 // 修改字典数据
 export function updateData(data) {
   return request({
-    url: '/system/dict/data',
-    method: 'put',
+    url: '/system/dict/data/edit',
+    method: 'post',
     data: data
   })
 }
@@ -47,6 +56,6 @@ export function updateData(data) {
 export function delData(dictCode) {
   return request({
     url: '/system/dict/data/' + dictCode,
-    method: 'delete'
+    method: 'post'
   })
 }
diff --git a/src/api/system/dict/type.js b/src/api/system/dict/type.js
index a7a6e01..5b07d5d 100644
--- a/src/api/system/dict/type.js
+++ b/src/api/system/dict/type.js
@@ -29,8 +29,8 @@ export function addType(data) {
 // 修改字典类型
 export function updateType(data) {
   return request({
-    url: '/system/dict/type',
-    method: 'put',
+    url: '/system/dict/type/edit',
+    method: 'post',
     data: data
   })
 }
@@ -39,7 +39,7 @@ export function updateType(data) {
 export function delType(dictId) {
   return request({
     url: '/system/dict/type/' + dictId,
-    method: 'delete'
+    method: 'post'
   })
 }
 
@@ -47,7 +47,7 @@ export function delType(dictId) {
 export function refreshCache() {
   return request({
     url: '/system/dict/type/refreshCache',
-    method: 'delete'
+    method: 'post'
   })
 }
 
diff --git a/src/api/system/enterpriseBasicInfo.js b/src/api/system/enterpriseBasicInfo.js
index ffd8f16..b1d2d96 100644
--- a/src/api/system/enterpriseBasicInfo.js
+++ b/src/api/system/enterpriseBasicInfo.js
@@ -29,8 +29,8 @@ export function addEnterpriseBasicInfo(data) {
 // 修改企业基础信息
 export function updateEnterpriseBasicInfo(data) {
   return request({
-    url: '/system/enterpriseBasicInfo',
-    method: 'put',
+    url: '/system/enterpriseBasicInfo/edit',
+    method: 'post',
     data: data
   })
 }
@@ -39,6 +39,6 @@ export function updateEnterpriseBasicInfo(data) {
 export function delEnterpriseBasicInfo(id) {
   return request({
     url: '/system/enterpriseBasicInfo/' + id,
-    method: 'delete'
+    method: 'post'
   })
 }
diff --git a/src/api/system/fundingInfo.js b/src/api/system/fundingInfo.js
index b3f518c..3944306 100644
--- a/src/api/system/fundingInfo.js
+++ b/src/api/system/fundingInfo.js
@@ -29,8 +29,8 @@ export function addFundingInfo(data) {
 // 修改资金信息
 export function updateFundingInfo(data) {
   return request({
-    url: '/system/fundingInfo',
-    method: 'put',
+    url: '/system/fundingInfo/edit',
+    method: 'post',
     data: data
   })
 }
@@ -39,6 +39,6 @@ export function updateFundingInfo(data) {
 export function delFundingInfo(id) {
   return request({
     url: '/system/fundingInfo/' + id,
-    method: 'delete'
+    method: 'post'
   })
 }
diff --git a/src/api/system/industrialInternetAward.js b/src/api/system/industrialInternetAward.js
index 0d2225b..042c5fb 100644
--- a/src/api/system/industrialInternetAward.js
+++ b/src/api/system/industrialInternetAward.js
@@ -29,8 +29,8 @@ export function addIndustrialInternetAward(data) {
 // 修改5G+工业互联网奖补
 export function updateIndustrialInternetAward(data) {
   return request({
-    url: '/system/industrialInternetAward',
-    method: 'put',
+    url: '/system/industrialInternetAward/edit',
+    method: 'post',
     data: data
   })
 }
@@ -39,6 +39,6 @@ export function updateIndustrialInternetAward(data) {
 export function delIndustrialInternetAward(id) {
   return request({
     url: '/system/industrialInternetAward/' + id,
-    method: 'delete'
+    method: 'post'
   })
 }
diff --git a/src/api/system/logininfor.js b/src/api/system/logininfor.js
index e010dc3..f17013c 100644
--- a/src/api/system/logininfor.js
+++ b/src/api/system/logininfor.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询登录日志列表
 export function list(query) {
   return request({
-    url: '/system/logininfor/list',
+    url: '/monitor/logininfor/list',
     method: 'get',
     params: query
   })
@@ -12,22 +12,22 @@ export function list(query) {
 // 删除登录日志
 export function delLogininfor(infoId) {
   return request({
-    url: '/system/logininfor/' + infoId,
-    method: 'delete'
+    url: '/monitor/logininfor/' + infoId,
+    method: 'post'
   })
 }
 
 // 解锁用户登录状态
 export function unlockLogininfor(userName) {
   return request({
-    url: '/system/logininfor/unlock/' + userName,
+    url: '/monitor/logininfor/unlock/' + userName,
     method: 'get'
   })
 }
 // 清空登录日志
 export function cleanLogininfor() {
   return request({
-    url: '/system/logininfor/clean',
-    method: 'delete'
+    url: '/monitor/logininfor/clean',
+    method: 'post'
   })
 }
diff --git a/src/api/system/logisticsDevelopmentAward.js b/src/api/system/logisticsDevelopmentAward.js
index 9daddec..1497f28 100644
--- a/src/api/system/logisticsDevelopmentAward.js
+++ b/src/api/system/logisticsDevelopmentAward.js
@@ -29,8 +29,8 @@ export function addLogisticsDevelopmentAward(data) {
 // 修改物流发展奖补
 export function updateLogisticsDevelopmentAward(data) {
   return request({
-    url: '/system/logisticsDevelopmentAward',
-    method: 'put',
+    url: '/system/logisticsDevelopmentAward/edit',
+    method: 'post',
     data: data
   })
 }
@@ -39,6 +39,6 @@ export function updateLogisticsDevelopmentAward(data) {
 export function delLogisticsDevelopmentAward(id) {
   return request({
     url: '/system/logisticsDevelopmentAward/' + id,
-    method: 'delete'
+    method: 'post'
   })
 }
diff --git a/src/api/system/manufacturingServicesAward.js b/src/api/system/manufacturingServicesAward.js
index e4f8b28..ac2f9e6 100644
--- a/src/api/system/manufacturingServicesAward.js
+++ b/src/api/system/manufacturingServicesAward.js
@@ -29,8 +29,8 @@ export function addManufacturingServicesAward(data) {
 // 修改制造服务业有效投入奖补
 export function updateManufacturingServicesAward(data) {
   return request({
-    url: '/system/manufacturingServicesAward',
-    method: 'put',
+    url: '/system/manufacturingServicesAward/edit',
+    method: 'post',
     data: data
   })
 }
@@ -39,6 +39,6 @@ export function updateManufacturingServicesAward(data) {
 export function delManufacturingServicesAward(id) {
   return request({
     url: '/system/manufacturingServicesAward/' + id,
-    method: 'delete'
+    method: 'post'
   })
 }
diff --git a/src/api/system/menu.js b/src/api/system/menu.js
index f6415c6..0736e25 100644
--- a/src/api/system/menu.js
+++ b/src/api/system/menu.js
@@ -1,3 +1,11 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: JC9527
+ * @Date: 2024-03-19 11:31:40
+ * @LastEditors: JC9527
+ * @LastEditTime: 2024-07-18 14:01:11
+ */
 import request from '@/utils/request'
 
 // 查询菜单列表
@@ -45,8 +53,8 @@ export function addMenu(data) {
 // 修改菜单
 export function updateMenu(data) {
   return request({
-    url: '/system/menu',
-    method: 'put',
+    url: '/system/menu/edit',
+    method: 'post',
     data: data
   })
 }
@@ -55,6 +63,6 @@ export function updateMenu(data) {
 export function delMenu(menuId) {
   return request({
     url: '/system/menu/' + menuId,
-    method: 'delete'
+    method: 'post'
   })
 }
\ No newline at end of file
diff --git a/src/api/system/notice.js b/src/api/system/notice.js
index c274ea5..74c06e2 100644
--- a/src/api/system/notice.js
+++ b/src/api/system/notice.js
@@ -29,8 +29,8 @@ export function addNotice(data) {
 // 修改公告
 export function updateNotice(data) {
   return request({
-    url: '/system/notice',
-    method: 'put',
+    url: '/system/notice/edit',
+    method: 'post',
     data: data
   })
 }
@@ -39,6 +39,6 @@ export function updateNotice(data) {
 export function delNotice(noticeId) {
   return request({
     url: '/system/notice/' + noticeId,
-    method: 'delete'
+    method: 'post'
   })
 }
\ No newline at end of file
diff --git a/src/api/system/operlog.js b/src/api/system/operlog.js
index 51a4cc3..b8c2fda 100644
--- a/src/api/system/operlog.js
+++ b/src/api/system/operlog.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询操作日志列表
 export function list(query) {
   return request({
-    url: '/system/operlog/list',
+    url: '/monitor/operlog/list',
     method: 'get',
     params: query
   })
@@ -12,15 +12,15 @@ export function list(query) {
 // 删除操作日志
 export function delOperlog(operId) {
   return request({
-    url: '/system/operlog/' + operId,
-    method: 'delete'
+    url: '/monitor/operlog/' + operId,
+    method: 'post'
   })
 }
 
 // 清空操作日志
 export function cleanOperlog() {
   return request({
-    url: '/system/operlog/clean',
-    method: 'delete'
+    url: '/monitor/operlog/clean',
+    method: 'post'
   })
 }
diff --git a/src/api/system/platformConstructionAward.js b/src/api/system/platformConstructionAward.js
index ec478e0..6b85c8a 100644
--- a/src/api/system/platformConstructionAward.js
+++ b/src/api/system/platformConstructionAward.js
@@ -29,8 +29,8 @@ export function addPlatformConstructionAward(data) {
 // 修改平台建设奖补
 export function updatePlatformConstructionAward(data) {
   return request({
-    url: '/system/platformConstructionAward',
-    method: 'put',
+    url: '/system/platformConstructionAward/edit',
+    method: 'post',
     data: data
   })
 }
@@ -39,6 +39,6 @@ export function updatePlatformConstructionAward(data) {
 export function delPlatformConstructionAward(id) {
   return request({
     url: '/system/platformConstructionAward/' + id,
-    method: 'delete'
+    method: 'post'
   })
 }
diff --git a/src/api/system/post.js b/src/api/system/post.js
index 1a8e9ca..38f439f 100644
--- a/src/api/system/post.js
+++ b/src/api/system/post.js
@@ -29,8 +29,8 @@ export function addPost(data) {
 // 修改岗位
 export function updatePost(data) {
   return request({
-    url: '/system/post',
-    method: 'put',
+    url: '/system/post/edit',
+    method: 'post',
     data: data
   })
 }
@@ -39,6 +39,6 @@ export function updatePost(data) {
 export function delPost(postId) {
   return request({
     url: '/system/post/' + postId,
-    method: 'delete'
+    method: 'post'
   })
 }
diff --git a/src/api/system/projectSettlementAward.js b/src/api/system/projectSettlementAward.js
index dbd5ba3..f9d124c 100644
--- a/src/api/system/projectSettlementAward.js
+++ b/src/api/system/projectSettlementAward.js
@@ -29,8 +29,8 @@ export function addProjectSettlementAward(data) {
 // 修改项目落户奖补
 export function updateProjectSettlementAward(data) {
   return request({
-    url: '/system/projectSettlementAward',
-    method: 'put',
+    url: '/system/projectSettlementAward/edit',
+    method: 'post',
     data: data
   })
 }
@@ -39,6 +39,6 @@ export function updateProjectSettlementAward(data) {
 export function delProjectSettlementAward(id) {
   return request({
     url: '/system/projectSettlementAward/' + id,
-    method: 'delete'
+    method: 'post'
   })
 }
diff --git a/src/api/system/role.js b/src/api/system/role.js
index f13e6f4..2adc4c4 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -29,8 +29,8 @@ export function addRole(data) {
 // 修改角色
 export function updateRole(data) {
   return request({
-    url: '/system/role',
-    method: 'put',
+    url: '/system/role/edit',
+    method: 'post',
     data: data
   })
 }
@@ -39,7 +39,7 @@ export function updateRole(data) {
 export function dataScope(data) {
   return request({
     url: '/system/role/dataScope',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -52,7 +52,7 @@ export function changeRoleStatus(roleId, status) {
   }
   return request({
     url: '/system/role/changeStatus',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -61,7 +61,7 @@ export function changeRoleStatus(roleId, status) {
 export function delRole(roleId) {
   return request({
     url: '/system/role/' + roleId,
-    method: 'delete'
+    method: 'post'
   })
 }
 
@@ -87,7 +87,7 @@ export function unallocatedUserList(query) {
 export function authUserCancel(data) {
   return request({
     url: '/system/role/authUser/cancel',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -96,7 +96,7 @@ export function authUserCancel(data) {
 export function authUserCancelAll(data) {
   return request({
     url: '/system/role/authUser/cancelAll',
-    method: 'put',
+    method: 'post',
     params: data
   })
 }
@@ -105,7 +105,7 @@ export function authUserCancelAll(data) {
 export function authUserSelectAll(data) {
   return request({
     url: '/system/role/authUser/selectAll',
-    method: 'put',
+    method: 'post',
     params: data
   })
 }
diff --git a/src/api/system/sceneOpeningAward.js b/src/api/system/sceneOpeningAward.js
index 2217501..87d1ef3 100644
--- a/src/api/system/sceneOpeningAward.js
+++ b/src/api/system/sceneOpeningAward.js
@@ -29,8 +29,8 @@ export function addSceneOpeningAward(data) {
 // 修改场景开放奖补
 export function updateSceneOpeningAward(data) {
   return request({
-    url: '/system/sceneOpeningAward',
-    method: 'put',
+    url: '/system/sceneOpeningAward/edit',
+    method: 'post',
     data: data
   })
 }
@@ -39,6 +39,6 @@ export function updateSceneOpeningAward(data) {
 export function delSceneOpeningAward(id) {
   return request({
     url: '/system/sceneOpeningAward/' + id,
-    method: 'delete'
+    method: 'post'
   })
 }
diff --git a/src/api/system/templateInfo.js b/src/api/system/templateInfo.js
index 16b57d9..85ccbea 100644
--- a/src/api/system/templateInfo.js
+++ b/src/api/system/templateInfo.js
@@ -29,8 +29,8 @@ export function addTemplateInfo(data) {
 // 修改申报模板信息
 export function updateTemplateInfo(data) {
   return request({
-    url: '/system/templateInfo',
-    method: 'put',
+    url: '/system/templateInfo/edit',
+    method: 'psot',
     data: data
   })
 }
@@ -39,6 +39,6 @@ export function updateTemplateInfo(data) {
 export function delTemplateInfo(id) {
   return request({
     url: '/system/templateInfo/' + id,
-    method: 'delete'
+    method: 'post'
   })
 }
diff --git a/src/api/system/user.js b/src/api/system/user.js
index f2f76ef..f581c29 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -30,8 +30,8 @@ export function addUser(data) {
 // 修改用户
 export function updateUser(data) {
   return request({
-    url: '/system/user',
-    method: 'put',
+    url: '/system/user/edit',
+    method: 'post',
     data: data
   })
 }
@@ -40,7 +40,7 @@ export function updateUser(data) {
 export function delUser(userId) {
   return request({
     url: '/system/user/' + userId,
-    method: 'delete'
+    method: 'post'
   })
 }
 
@@ -52,7 +52,7 @@ export function resetUserPwd(userId, password) {
   }
   return request({
     url: '/system/user/resetPwd',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -65,7 +65,7 @@ export function changeUserStatus(userId, status) {
   }
   return request({
     url: '/system/user/changeStatus',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -82,7 +82,7 @@ export function getUserProfile() {
 export function updateUserProfile(data) {
   return request({
     url: '/system/user/profile',
-    method: 'put',
+    method: 'psot',
     data: data
   })
 }
@@ -95,7 +95,7 @@ export function updateUserPwd(oldPassword, newPassword) {
   }
   return request({
     url: '/system/user/profile/updatePwd',
-    method: 'put',
+    method: 'post',
     params: data
   })
 }
@@ -121,7 +121,7 @@ export function getAuthRole(userId) {
 export function updateAuthRole(data) {
   return request({
     url: '/system/user/authRole',
-    method: 'put',
+    method: 'psot',
     params: data
   })
 }
diff --git a/src/api/tool/gen.js b/src/api/tool/gen.js
index 2075677..7fd6e66 100644
--- a/src/api/tool/gen.js
+++ b/src/api/tool/gen.js
@@ -28,8 +28,8 @@ export function getGenTable(tableId) {
 // 修改代码生成信息
 export function updateGenTable(data) {
   return request({
-    url: '/tool/gen',
-    method: 'put',
+    url: '/tool/gen/edit',
+    method: 'post',
     data: data
   })
 }
@@ -64,7 +64,7 @@ export function previewTable(tableId) {
 export function delTable(tableId) {
   return request({
     url: '/tool/gen/' + tableId,
-    method: 'delete'
+    method: ' post'
   })
 }
 
diff --git a/src/assets/images/Mapi.png b/src/assets/images/Mapi.png
new file mode 100644
index 0000000..f26c5cb
Binary files /dev/null and b/src/assets/images/Mapi.png differ
diff --git a/src/assets/images/mapIconEight.png b/src/assets/images/mapIconEight.png
new file mode 100644
index 0000000..d5e3ae5
Binary files /dev/null and b/src/assets/images/mapIconEight.png differ
diff --git a/src/assets/images/mapIconFive.png b/src/assets/images/mapIconFive.png
new file mode 100644
index 0000000..e3575de
Binary files /dev/null and b/src/assets/images/mapIconFive.png differ
diff --git a/src/assets/images/mapIconFour.png b/src/assets/images/mapIconFour.png
new file mode 100644
index 0000000..1c4e382
Binary files /dev/null and b/src/assets/images/mapIconFour.png differ
diff --git a/src/assets/images/mapIconNine.png b/src/assets/images/mapIconNine.png
new file mode 100644
index 0000000..a985d5f
Binary files /dev/null and b/src/assets/images/mapIconNine.png differ
diff --git a/src/assets/images/mapIconOne.png b/src/assets/images/mapIconOne.png
new file mode 100644
index 0000000..aeaea18
Binary files /dev/null and b/src/assets/images/mapIconOne.png differ
diff --git a/src/assets/images/mapIconSeven.png b/src/assets/images/mapIconSeven.png
new file mode 100644
index 0000000..9b3914c
Binary files /dev/null and b/src/assets/images/mapIconSeven.png differ
diff --git a/src/assets/images/mapIconSix.png b/src/assets/images/mapIconSix.png
new file mode 100644
index 0000000..1094bc7
Binary files /dev/null and b/src/assets/images/mapIconSix.png differ
diff --git a/src/assets/images/mapIconThree.png b/src/assets/images/mapIconThree.png
new file mode 100644
index 0000000..ebab502
Binary files /dev/null and b/src/assets/images/mapIconThree.png differ
diff --git a/src/assets/images/mapIconTwo.png b/src/assets/images/mapIconTwo.png
new file mode 100644
index 0000000..b8404e4
Binary files /dev/null and b/src/assets/images/mapIconTwo.png differ
diff --git a/src/assets/images/warn-blue.png b/src/assets/images/warn-blue.png
new file mode 100644
index 0000000..7320fa9
Binary files /dev/null and b/src/assets/images/warn-blue.png differ
diff --git a/src/assets/images/warn-green.png b/src/assets/images/warn-green.png
new file mode 100644
index 0000000..79868a8
Binary files /dev/null and b/src/assets/images/warn-green.png differ
diff --git a/src/assets/images/warn-orange.png b/src/assets/images/warn-orange.png
new file mode 100644
index 0000000..39f6738
Binary files /dev/null and b/src/assets/images/warn-orange.png differ
diff --git a/src/assets/images/workbench.png b/src/assets/images/workbench.png
index bab740a..fa06df3 100644
Binary files a/src/assets/images/workbench.png and b/src/assets/images/workbench.png differ
diff --git a/src/assets/images/workbench1.png b/src/assets/images/workbench1.png
new file mode 100644
index 0000000..bab740a
Binary files /dev/null and b/src/assets/images/workbench1.png differ
diff --git a/src/assets/styles/font.css b/src/assets/styles/font.css
index a2b8e83..faea076 100644
--- a/src/assets/styles/font.css
+++ b/src/assets/styles/font.css
@@ -1,4 +1,40 @@
 @font-face {
-  font-family: "PingFang-SC";
+  font-family: "PingFang-SC-Heavy";
   src: url("./font/PingFang_Heavy.ttf");
+}
+/* @font-face {
+  font-family: "PingFang-SC";
+  src: url("./font/PingFang_Regular.ttf");
+} */
+/* @font-face {
+  font-family: "PingFang-SC";
+  src: url("./font/PingFang_Light.ttf");
+} */
+/* @font-face {
+  font-family: "PingFang-SC";
+  src: url("./font/PingFang_ExtraLight.ttf");
+} */
+@font-face {
+  font-family: "PingFang-SC-Medium";
+  src: url("./font/PingFang_Medium.ttf");
+}
+@font-face {
+  font-family: "PingFang-SC";
+  src: url("./font/PingFang_Bold.ttf");
+}
+@font-face {
+  font-family: "AlibabaPuHuiTiB";
+  src: url("./font/Alibaba-PuHuiTi-Bold.ttf");
+}
+@font-face {
+  font-family: "AlibabaPuHuiTiR";
+  src: url("./font/Alibaba-PuHuiTi-Regular.ttf");
+}
+@font-face {
+  font-family: "AlibabaPuHuiTiM";
+  src: url("./font/Alibaba-PuHuiTi-Medium.ttf");
+}
+@font-face {
+  font-family: "DINCondensed";
+  src: url("./font/DIN_CONDENSED_BOLD.TTF");
 }
\ No newline at end of file
diff --git a/src/assets/styles/font/Alibaba-PuHuiTi-Bold.ttf b/src/assets/styles/font/Alibaba-PuHuiTi-Bold.ttf
new file mode 100644
index 0000000..dcca29c
Binary files /dev/null and b/src/assets/styles/font/Alibaba-PuHuiTi-Bold.ttf differ
diff --git a/src/assets/styles/font/Alibaba-PuHuiTi-Medium.ttf b/src/assets/styles/font/Alibaba-PuHuiTi-Medium.ttf
new file mode 100644
index 0000000..4bb46dd
Binary files /dev/null and b/src/assets/styles/font/Alibaba-PuHuiTi-Medium.ttf differ
diff --git a/src/assets/styles/font/Alibaba-PuHuiTi-Regular.ttf b/src/assets/styles/font/Alibaba-PuHuiTi-Regular.ttf
new file mode 100644
index 0000000..4261e49
Binary files /dev/null and b/src/assets/styles/font/Alibaba-PuHuiTi-Regular.ttf differ
diff --git a/src/assets/styles/font/DIN_CONDENSED_BOLD.TTF b/src/assets/styles/font/DIN_CONDENSED_BOLD.TTF
new file mode 100644
index 0000000..f05a1a9
Binary files /dev/null and b/src/assets/styles/font/DIN_CONDENSED_BOLD.TTF differ
diff --git a/src/assets/styles/font/PingFang_Bold.ttf b/src/assets/styles/font/PingFang_Bold.ttf
new file mode 100644
index 0000000..accaf1f
Binary files /dev/null and b/src/assets/styles/font/PingFang_Bold.ttf differ
diff --git a/src/assets/styles/font/PingFang_ExtraLight.ttf b/src/assets/styles/font/PingFang_ExtraLight.ttf
new file mode 100644
index 0000000..d9b574b
Binary files /dev/null and b/src/assets/styles/font/PingFang_ExtraLight.ttf differ
diff --git a/src/assets/styles/font/PingFang_Light.ttf b/src/assets/styles/font/PingFang_Light.ttf
new file mode 100644
index 0000000..a513705
Binary files /dev/null and b/src/assets/styles/font/PingFang_Light.ttf differ
diff --git a/src/assets/styles/font/PingFang_Medium.ttf b/src/assets/styles/font/PingFang_Medium.ttf
new file mode 100644
index 0000000..982661b
Binary files /dev/null and b/src/assets/styles/font/PingFang_Medium.ttf differ
diff --git a/src/assets/styles/font/PingFang_Regular.ttf b/src/assets/styles/font/PingFang_Regular.ttf
new file mode 100644
index 0000000..8790adb
Binary files /dev/null and b/src/assets/styles/font/PingFang_Regular.ttf differ
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 656cae0..ff8ce58 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -201,24 +201,202 @@ div::-webkit-scrollbar {
 section::-webkit-scrollbar {
   display: none;
 }
-
-.detail_content {
-  display: flex;
-  justify-content: space-between;
-  // height: calc(100vh - 160px);
-  height: calc(100% - 40px);
-  .left_content {
-    // height: calc(100vh - 160px);
-    height: 100%;
-    width: 69.5%;
-    overflow: auto;
-    background-color: #fff;
-    padding: 20px;
+html::-webkit-scrollbar {
+  display: none;
+}
+body::-webkit-scrollbar {
+  display: none;
+}
+#app::-webkit-scrollbar {
+  display: none;
+}
+.scale-box::-webkit-scrollbar {
+  display: none;
+}
+// 荣誉情况弹窗样式
+.honor-dialog,.collectDialog-dialog,.headquarterEnterprise-dialog,.serviceIndustry-dialog {
+  section {
+    div::-webkit-scrollbar {
+      display: block;
+    }
+    .el-table::-webkit-scrollbar {
+      display: block;
+      width: 6px;
+      height: 6px;
+    }
+    
+    .el-table::-webkit-scrollbar-track {
+      background-color: #f1f1f1;
+    }
+    
+    .el-table::-webkit-scrollbar-thumb {
+      background-color: #c0c0c0;
+      border-radius: 3px;
+    }
+  }
+}
+.process-dialog {
+  height: 90vh;
+}
+.process-dialog {
+  height: 90vh;
+  .el-dialog__body {
+    height: calc(100% - 30px);
   }
-  .right_content {
+}
+#detail_content_two {
+  width: 100%;
+  #reportId {
+    display: flex;
+    justify-content: space-between;
     // height: calc(100vh - 160px);
-    height: 100%;
-    width: 30%;
-    background-color: #fff;
+    width: 100%;
+    .left_content {
+      // height: calc(100vh - 160px);
+      width: 69.5%;
+      background-color: #fff;
+      padding: 20px;
+    }
+    .right_content {
+      // height: calc(100vh - 160px);
+      width: 30%;
+      background-color: #fff;
+      .left_title {
+        height: 77px;
+        padding-top: 20px;
+        background-color: #fff;
+        margin-bottom: 4px;
+      }
+      .tab_content {
+        // height: calc(100vh - 240px);
+        height: calc(100% - 77px);
+        // overflow: auto;
+        background-color: #fff;
+        padding: 0 20px;
+        ::v-deep .el-tabs__content {
+          padding: 0;
+          height: calc(100% - 50px);
+          .el-tab-pane {
+            height: 100%;
+          }
+        }
+        .empty {
+          // height: calc(100vh - 300px);
+          // height: calc(100% - 100px);
+          height: 100%;
+          padding: 10px 15px 0 15px;
+          overflow: auto;
+          .top {
+            font-size: 12px;
+            color: #737373;
+            margin-bottom: 10px;
+          }
+          .bottom {
+            text-align: center;
+            color: #737373;
+          }
+          .step_contain {
+            position: relative;
+            line-height: 35px;
+            border-left: 2px solid green;
+            padding-bottom: 40px;
+            z-index: 2;
+            .drop_style {
+              position: absolute;
+              width: 24px;
+              height: 24px;
+              top: -4px;
+              left: -12px;
+              background-color: #fff;
+              border-radius: 12px;
+              box-shadow: 0 0 10px #ccc;
+              z-index: 2;
+            }
+  
+            .out_drop_style {
+              position: absolute;
+              width: 6px;
+              height: 6px;
+              top: 6px;
+              left: -3px;
+              background-color: #4eb997;
+              border-radius: 3px;
+              z-index: 2;
+            }
+            .out_drop_style_one {
+              background-color: #000;
+            }
+            .contain_main {
+              background-color: #f8fafb;
+              color: #192a92;
+              margin-left: 25px;
+              border-radius: 2px;
+              width: 100%;
+              .attach {
+                // display: flex;
+                width: 100%;
+                // padding-right: 100px;
+                position: relative;
+                .attach_left {
+                  position: absolute;
+                  width: 140px;
+                }
+                .attach_right {
+                  // flex: 1;
+                  // flex-direction: column;
+                  // justify-content: space-between;
+                  padding: 0 80px 0 50px;
+                  .attach_item {
+                    width: 85%;
+                    display: flex;
+                    // justify-content: space-between;
+                    align-items: center;
+                    padding: 0 5px;
+                    color: inherit;
+                    border: 1px solid #e4e7ed;
+                    border-radius: 2px;
+                    margin: 10px 20px 10px 0;
+                    a {
+                      display: flex;
+                      // justify-content: space-between;
+                      align-items: center;
+                    }
+                    .li_img {
+                      width: 25px;
+                      height: 30px;
+                      margin-right: 10px;
+                      padding: 2px;
+                    }
+                    .icon_name {
+                      text-overflow: ellipsis;
+                      overflow: hidden;
+                      word-wrap: break-word;
+                      white-space: nowrap;
+                    }
+                  }
+                }
+              }
+            }
+            .right-img {
+              position: absolute;
+              z-index: 2;
+              top: 0;
+              bottom: 40px;
+              right: 20px;
+              display: flex;
+              align-items: center;
+  
+              .approval_img {
+                width: 85px;
+                height: 80px;
+              }
+            }
+          }
+          .step_contain_one {
+            border: none;
+          }
+        }
+      }
+    }
   }
 }
diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss
index f527965..99e42cf 100644
--- a/src/assets/styles/public.scss
+++ b/src/assets/styles/public.scss
@@ -1,3 +1,5 @@
+@import "@/assets/styles/utils.scss";
+
 // 面包屑样式
 .my-L-breadcrumb {
   // height: 55px;
@@ -119,6 +121,9 @@
     background-color: #fff;
     header {
       margin-bottom: 25px;
+      // .project_big_type {
+      //   width: 400px;
+      // }
       .btnss {
         display: flex;
         align-items: center;
@@ -143,13 +148,13 @@
     .el-table {
       margin-bottom: 25px;
       th {
-        font-family: PingFang-SC, PingFang-SC;
+        // font-family: PingFang-SC, PingFang-SC;
         font-weight: bold;
         font-size: 14px;
         color: #000000;
       }
       td {
-        font-family: PingFang-SC, PingFang-SC;
+        // font-family: PingFang-SC, PingFang-SC;
         font-weight: 500;
         font-size: 14px;
         color: #666666;
@@ -159,7 +164,7 @@
       }
       .project-name {
         text-decoration: underline;
-        font-family: PingFang-SC, PingFang-SC;
+        // font-family: PingFang-SC, PingFang-SC;
         font-weight: 500;
         font-size: 14px;
         color: #1890FF;
@@ -184,35 +189,35 @@
     height: calc(100% - 40px);
   }
   .left-info{
-    height: calc(25% - 5px);
+    height: calc(30% - 5px);
     background-color: white;
     padding: 28px 28px 0 28px;
     .project-info-title {
       margin-bottom: 28px;
-      font-family: PingFang-SC, PingFang-SC;
+      // font-family: PingFang-SC, PingFang-SC;
       font-weight: bold;
       font-size: 14px;
       color: #333333;
     }
     .el-descriptions-item__label {
       background: #F5F8FA;
-      width: 230px;
-      font-family: PingFang-SC, PingFang-SC;
+      width: 180px;
+      // font-family: PingFang-SC, PingFang-SC;
       font-weight: 500;
       font-size: 14px;
       color: #333333;
     }
     .el-descriptions-item__content {
-      font-family: PingFang-SC, PingFang-SC;
+      // font-family: PingFang-SC, PingFang-SC;
       font-weight: 500;
-      width: 430px;
+      width: 480px;
       font-size: 14px;
       color: #333333;
     }
     .info-link {
       // display: flex;
       // align-items: center;
-      font-family: PingFang-SC, PingFang-SC;
+      // font-family: PingFang-SC, PingFang-SC;
       font-weight: 500;
       font-size: 14px;
       color: #333;
@@ -225,10 +230,22 @@
         margin-left: 0;
         color: #1890FF;
       }
+      .project_info_box {
+        .dict_type {
+          min-width: 32%;
+          overflow: hidden; 
+          white-space: nowrap; 
+          text-overflow: ellipsis;
+          cursor: pointer;
+        }
+      }
     }
   }
+  .enter-left-info {
+    height: calc(25% - 5px);
+  }
   .left-tabs{
-    height: calc(75% - 5px);
+    height: calc(70% - 5px);
     margin-top: 10px;
     background-color: white;
     .tabs-top {
@@ -238,7 +255,7 @@
       border-bottom: 1px solid #E4E7ED;
       .tabs-top-item {
         padding: 5px 34px;
-        font-family: PingFang-SC, PingFang-SC;
+        // font-family: PingFang-SC, PingFang-SC;
         font-weight: bold;
         font-size: 14px;
         color: #999999;
@@ -247,7 +264,7 @@
       .active-item {
         background: #1890FF;
         border-radius: 5px 5px 5px 5px;
-        font-family: PingFang-SC, PingFang-SC;
+        // font-family: PingFang-SC, PingFang-SC;
         font-weight: bold;
         font-size: 14px;
         color: #FFFFFF;
@@ -255,25 +272,46 @@
     }
     .tabs-bottom {
       padding: 20px 28px 0 28px;
+      // 申报单位信息
+      .L-unitInfo {
+        height: 100%;
+        .a-primary {
+          text-decoration: underline;
+          margin-left: 0;
+          color: #1890FF;
+        }
+      }
+      .enter-contacts-list {
+        .el-row {
+          height: 80px;
+        }
+        .el-form-item {
+          margin-top: 20px;
+          margin-bottom: 28px;
+          .el-form-item__content {
+            width: 300px;
+          }
+        }
+      }
       .tabOneLabel,.tabOneContent {
         width: 220px;
       }
       .el-descriptions-item__label {
         background: #F5F8FA;
         width: 220px;
-        font-family: PingFang-SC, PingFang-SC;
+        // font-family: PingFang-SC, PingFang-SC;
         font-weight: 500;
         font-size: 14px;
         color: #333333;
       }
       .el-descriptions-item__content {
-        font-family: PingFang-SC, PingFang-SC;
+        // font-family: PingFang-SC, PingFang-SC;
         font-weight: 500;
         font-size: 14px;
         color: #333333;
       }
       .tabOneFileLabel {
-        font-family: PingFang-SC, PingFang-SC;
+        // font-family: PingFang-SC, PingFang-SC;
         font-weight: 500;
         font-size: 16px;
         color: #333333;
@@ -282,7 +320,7 @@
       }
       .tabOneFileContent {
         a {
-          font-family: PingFang-SC, PingFang-SC;
+          // font-family: PingFang-SC, PingFang-SC;
           font-weight: 500;
           font-size: 16px;
           color: #333333;
@@ -290,26 +328,24 @@
       }
       .project-info-title {
         margin-bottom: 28px;
-        font-family: PingFang-SC, PingFang-SC;
+        // font-family: PingFang-SC, PingFang-SC;
         font-weight: bold;
         font-size: 14px;
         color: #333333;
       }
+      // 企业库的企业基本信息
+      .enter-one-top {
+        // overflow-y: auto;
+        .el-descriptions__body {
+          // height: 100%;
+        }
+      }
       .file-info-content {
         display: flex;
       }
       .margin-top-file {
         margin-top: 20px;
       }
-      // 申报单位信息
-      .L-unitInfo {
-        height: 100%;
-        .a-primary {
-          text-decoration: underline;
-          margin-left: 0;
-          color: #1890FF;
-        }
-      }
     }
   }
   .enter-tabs {
@@ -332,7 +368,7 @@
         display: flex;
         align-items: center;
         .project-info {
-          font-family: PingFang-SC, PingFang-SC;
+          // font-family: PingFang-SC, PingFang-SC;
           font-weight: bold;
           font-size: 14px;
           color: #333333;
@@ -377,13 +413,13 @@
             flex-direction: column;
             span {
               &:nth-of-type(1) {
-                font-family: PingFang-SC, PingFang-SC;
+                // font-family: PingFang-SC, PingFang-SC;
                 font-weight: bold;
                 font-size: 14px;
                 color: #333333;
               }
               &:nth-of-type(2) {
-                font-family: PingFang-SC, PingFang-SC;
+                // font-family: PingFang-SC, PingFang-SC;
                 font-weight: 500;
                 font-size: 12px;
                 color: #737373;
@@ -419,13 +455,13 @@
           padding: 20px 15px 10px 15px;
           border-bottom: 1px solid #D9D9D9;
           .memo-keyword-title {
-            font-family: PingFang-SC, PingFang-SC;
+            // font-family: PingFang-SC, PingFang-SC;
             font-weight: bold;
             font-size: 14px;
             color: #333333;
           }
           .memo-keyword-content {
-            font-family: PingFang-SC, PingFang-SC;
+            // font-family: PingFang-SC, PingFang-SC;
             font-weight: 500;
             font-size: 12px;
             color: #737373;
@@ -437,13 +473,13 @@
         .memo-content {
           padding: 20px 15px 10px 15px;
           .memo-content-title {
-            font-family: PingFang-SC, PingFang-SC;
+            // font-family: PingFang-SC, PingFang-SC;
             font-weight: bold;
             font-size: 14px;
             color: #333333;
           }
           .memo-content-content {
-            font-family: PingFang-SC, PingFang-SC;
+            // font-family: PingFang-SC, PingFang-SC;
             font-weight: 500;
             font-size: 12px;
             color: #737373;
@@ -455,11 +491,106 @@
       }
     }
   }
+  // 项目库详情的智能提醒
+  .smart-remind {
+    height: 100%;
+    .remind-top {
+      display: flex;
+      align-items: center;
+      margin-bottom: 30px;
+      .remind-title {
+        font-weight: bold;
+        font-size: 14px;
+        color: #333333;
+        margin-right: 20px;
+      }
+    }
+    .remind-timeline {
+      display: grid;
+      grid-template-columns: 1fr;
+      grid-gap: 10px;
+      .el-card {
+        background-color: #F5F8FA;
+        border: none;
+      }
+      .el-card-border {
+        border: 1px solid rgba(245, 95, 95, 0.4); // #FD5F5F
+      }
+      .warn-main {
+        display: flex;
+        justify-content: space-between;
+        .warn-main-left {
+          display: flex;
+          .warn-main-img {
+            padding-top: 3px;
+            img {
+              width: 20px;
+              height: 20px;
+              margin-right: 10px;
+            }
+          }
+          .warn-main-content {
+            .content-title {
+              font-weight: bold;
+              font-size: 15px;
+              color: #333333;
+            }
+            .content-middle {
+              font-weight: bold;
+              font-size: 15px;
+              color: #333333;
+              margin: 10px 0;
+            }
+            .content-time {
+              font-weight: 500;
+              font-size: 14px;
+              color: #737373;
+            }
+          }
+        }
+        .different-left {
+          .warn-main-content {
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+          }
+        }
+        .warn-main-right {
+          padding-right: 10px;
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
+          .warn-main-right-chakan {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            background: rgba(19,78,230,0.1);
+            padding: 5px 15px;
+            cursor: pointer;
+            border-radius: 50px;
+            font-weight: 500;
+            font-size: 14px;
+            color: #134EE6;
+            margin-bottom: 10px;
+          }
+          .warn-main-right-status {
+            padding: 5px 15px;
+            font-weight: 500;
+            font-size: 14px;
+            color: #4EB997;
+          }
+          .status-unread {
+            color: #FD5F5F;
+          }
+        }
+      }
+    }
+  }
   // 资金拨付进度
   .money-schedule {
     height: 100%;
     .schedule-title {
-      font-family: PingFang-SC, PingFang-SC;
+      // font-family: PingFang-SC, PingFang-SC;
       font-weight: bold;
       font-size: 14px;
       color: #333333;
@@ -479,7 +610,7 @@
           display: flex;
           align-items: center;
           .schedule-card-title {
-            font-family: PingFang-SC, PingFang-SC;
+            // font-family: PingFang-SC, PingFang-SC;
             font-weight: bold;
             font-size: 14px;
             color: #333333;
@@ -488,7 +619,7 @@
             margin-left: 20px;
             padding: 5px 7px;
             border-radius: 2px 2px 2px 2px;
-            font-family: PingFang-SC, PingFang-SC;
+            // font-family: PingFang-SC, PingFang-SC;
             font-weight: bold;
             font-size: 12px;
             color: #FFFFFF;
@@ -505,7 +636,7 @@
           }
         }
         .schedule-time {
-          font-family: PingFang-SC, PingFang-SC;
+          // font-family: PingFang-SC, PingFang-SC;
           font-weight: 500;
           font-size: 12px;
           color: #737373;
@@ -520,12 +651,38 @@
     height: 100%;
     background-color: #fff;
     padding: 27px 24px 0 27px;
+    .el-step__head.is-process {
+      color: #192a92;
+    }
+    .el-step__line {
+      background-color: #192a92;
+    }
+    .el-step__icon{
+      border: 2px solid #192A92;
+    }
+    .el-tabs--border-card {
+      border: none;
+      box-shadow: none;
+      -webkit-box-shadow: none;
+      height: 100%;
+    }
+    .el-step__title {
+      font-size: 12px;
+      color: #192a92;
+      border-color: none;
+    }
     .projectProgress-title {
-      font-family: PingFang-SC, PingFang-SC;
+      // font-family: PingFang-SC, PingFang-SC;
       font-weight: bold;
       font-size: 14px;
       color: #333333;
-      margin-bottom: 47px;
+      // margin-bottom: 47px;
+    }
+    .left_title {
+      height: 77px;
+      padding-top: 20px;
+      background-color: #fff;
+      margin-bottom: 4px;
     }
     .schedule-timeline {
       overflow-y: scroll;
@@ -577,7 +734,7 @@
           .card-content-left {
             flex: 1;
             .schedule-card-title {
-              font-family: PingFang-SC, PingFang-SC;
+              // font-family: PingFang-SC, PingFang-SC;
               font-weight: bold;
               font-size: 14px;
               color: #333333;
@@ -585,7 +742,7 @@
             .card-content-one,.card-content-two {
               margin-top: 10px;
               span {
-                font-family: PingFang-SC, PingFang-SC;
+                // font-family: PingFang-SC, PingFang-SC;
                 font-weight: 500;
                 font-size: 12px;
                 &:nth-of-type(1) {
@@ -598,7 +755,7 @@
                 }
               }
               a {
-                font-family: PingFang-SC, PingFang-SC;
+                // font-family: PingFang-SC, PingFang-SC;
                 font-weight: 500;
                 font-size: 12px;
                 color: #192A92;
@@ -606,14 +763,14 @@
             }
             .card-content-three {
               margin-top: 20px;
-              font-family: PingFang-SC, PingFang-SC;
+              // font-family: PingFang-SC, PingFang-SC;
               font-weight: 500;
               font-size: 12px;
               color: #737373;
             }
             .card-content-three-red {
               margin-top: 40px;
-              font-family: PingFang-SC, PingFang-SC;
+              // font-family: PingFang-SC, PingFang-SC;
               font-weight: 500;
               font-size: 12px;
               color: #FF1818;
@@ -635,7 +792,7 @@
           }
         }
         .schedule-time {
-          font-family: PingFang-SC, PingFang-SC;
+          // font-family: PingFang-SC, PingFang-SC;
           font-weight: 500;
           font-size: 12px;
           color: #737373;
@@ -652,7 +809,7 @@
       text-align: left;
     }
     .el-form-item__content {
-      .el-select,.el-date-editor {
+      .el-select,.el-date-editor,.el-cascader {
         // width: 280px;
         width: calc(100% - 20px);
       }
@@ -670,7 +827,7 @@
             background: #F1D78C;
             border: none;
             border-radius: 5px 5px 5px 5px;
-            font-family: PingFang-SC, PingFang-SC;
+            // font-family: PingFang-SC, PingFang-SC;
             font-weight: bold;
             font-size: 14px;
             color: #000000;
@@ -702,7 +859,7 @@
 }
 .importExplain {
   .importExplain-title {
-    font-family: PingFang-SC, PingFang-SC;
+    // font-family: PingFang-SC, PingFang-SC;
     font-weight: bold;
     font-size: 14px;
     color: #666666;
@@ -710,7 +867,7 @@
   .importExplain-content {
     margin: 10px 0;
     span {
-      font-family: PingFang-SC, PingFang-SC;
+      // font-family: PingFang-SC, PingFang-SC;
       font-weight: 500;
       font-size: 12px;
       color: #666666;
@@ -724,7 +881,7 @@
 
     th, td {
       border: 1px solid #cccccc;
-      width: 80px;
+      width: 100px;
       height: 37px;
       text-align: center;
     }
@@ -738,7 +895,7 @@
   .el-form-item__content {
     .el-textarea {
       textarea {
-        font-family: PingFang-SC, PingFang-SC;
+        // font-family: PingFang-SC, PingFang-SC;
         font-weight: 500;
         font-size: 14px;
         color: #333333;
@@ -760,7 +917,7 @@
   height: 1px;
 }
 
-// 新增发文
+// 新增发文/智能提醒
 .newArticle {
   .el-date-editor {
     width: 100%;
@@ -768,6 +925,52 @@
   .el-select {
     width: 100%;
   }
+  .intelligentReminder_radio {
+    padding-top: 10px;
+    .el-radio-group {
+      display: flex;
+      flex-direction: column;
+      label {
+        margin-bottom: 10px;
+      }
+    }
+    .intelligentReminder_text {
+      span {
+        color: red;
+      }
+      .el-input-number {
+        width: 70px;
+        margin: 0 5px;
+        .el-input__inner {
+          height: 30px;
+        }
+      }
+    }
+  }
+}
+.intelligentReminder-form {
+  .reminder-project {
+    display: flex;
+    width: 100%;
+    // align-items: center;
+    margin-bottom: 18px;
+    .new-label {
+      width: 180px;
+      padding-right: 12px;
+      text-align: right;
+      font-size: 14px;
+      font-weight: 700;
+      color: #606266;
+    }
+    .new-value {
+      // margin-left: 180px;
+      flex: 1;
+      font-size: 14px;
+      color: #606266;
+      display: flex;
+      align-items: center;
+    }
+  }
 }
 
 // 发文详情
@@ -778,14 +981,14 @@
   .info-content {
     padding: 10px 20px;
     .info-title {
-      font-family: PingFang-SC, PingFang-SC;
+      // font-family: PingFang-SC, PingFang-SC;
       font-weight: bold;
       font-size: 20px;
       color: #000000;
       text-align: center;
     }
     .info-content-top {
-      font-family: PingFang-SC, PingFang-SC;
+      // font-family: PingFang-SC, PingFang-SC;
       font-weight: 500;
       font-size: 12px;
       color: #999999;
@@ -793,13 +996,11 @@
       display: flex;
       align-items: center;
       div {
-        &:first-child {
-          width: 200px;
-        }
+        margin-right: 60px;
       }
     }
     .info-content-content {
-      font-family: PingFang-SC, PingFang-SC;
+      // font-family: PingFang-SC, PingFang-SC;
       font-weight: 500;
       font-size: 12px;
       color: #000000;
@@ -810,7 +1011,7 @@
   .el-dialog__header {
     border-bottom: 1px solid #DDDDDD;
     span {
-      font-family: PingFang-SC, PingFang-SC;
+      // font-family: PingFang-SC, PingFang-SC;
       font-weight: 800;
       font-size: 16px;
       color: #000000;
@@ -837,8 +1038,9 @@
 // 工作台
 .workbench-box {
   height: 100%;
+  overflow-y: scroll;
   header {
-    height: 32%;
+    height: 32vh;
     background: url("../images/workbench.png");
     background-size: 100% 100%;
     display: flex;
@@ -879,7 +1081,7 @@
             cursor: pointer;
             // background: radial-gradient( farthest-side at 40px 40px, #1B84D2 20%, #30CEF5 100%);
             background: linear-gradient( to right, #1B84D2, #30CEF5);
-            font-family: PingFang-SC, PingFang-SC;
+            // font-family: PingFang-SC, PingFang-SC;
             font-weight: bold;
             font-size: 16px;
             color: #FFFFFF;
@@ -888,21 +1090,152 @@
       }
     }
   }
-  main {
+  // 工作台
+  .home-main {
     padding: 10px;
-    height: calc(100% - 38%);
-    overflow-y: scroll;
+    // height: calc(100% - 32%);
+    // height: 100%;
+    // overflow-y: scroll;
     .main-row {
-      height: 100%;
+      // height: 100%;
+      height: 580px;
       display: flex;
       background-color: #f6f7f9;
       .work-main-left {
         background-color: #fff;
-        margin-right: 10px;
+        border-radius: 10px;
+        margin-right: 20px;
         height: 100%;
+        .main-left {
+          padding: 10px 20px;
+          height: 100%;
+          .left-header {
+            // display: flex;
+            // justify-content: space-between;
+            // align-items: center;
+            // padding: 5px 0 10px;
+            margin-bottom: 10px;
+            display: flex;
+            // align-items: center;
+            align-items: flex-end;
+            justify-content: space-between;
+            .left-header-titleS {
+              display: flex;
+              align-items: center;
+              .dataCloudMap-birght {
+                width:  6px;
+                height: 18px;
+                background: #0086FF;
+                box-shadow: 3px 0 3px 0px #0086FF;
+                border-radius: 5px 5px 5px 5px;
+              }
+              .left-header-title {
+                font-family: AlibabaPuHuiTiB;
+                margin: 0 10px;
+                font-weight: bold;
+                font-size: 18px;
+                color: #333333;
+              }
+            }
+            .el-button {
+              font-family: PingFang-SC-Medium;
+              font-weight: 500;
+              font-size: 14px;
+              color: #0086FF;
+            }
+          }
+          .left-main {
+            // display: grid;
+            // grid-template-columns: 1fr;
+            // grid-column-gap: 10px;
+            height: calc(100% - 55px);
+            overflow-y: auto;
+            .el-card {
+              background-color: #F5F8FA;
+              border: none;
+              height: 90px;
+              margin-bottom: 10px;
+            }
+            .el-card-border {
+              border: 1px solid rgba(245, 95, 95, 0.4); // #FD5F5F
+            }
+            .warn-main {
+              display: flex;
+              justify-content: space-between;
+              .warn-main-left {
+                display: flex;
+                .warn-main-img {
+                  padding-top: 3px;
+                  img {
+                    width: 20px;
+                    height: 20px;
+                    margin-right: 10px;
+                  }
+                }
+                .warn-main-content {
+                  .content-title {
+                    font-weight: bold;
+                    font-size: 15px;
+                    color: #333333;
+                  }
+                  .content-middle {
+                    font-weight: bold;
+                    font-size: 15px;
+                    color: #333333;
+                    margin: 10px 0;
+                  }
+                  .content-time {
+                    font-weight: 500;
+                    font-size: 14px;
+                    color: #737373;
+                  }
+                }
+              }
+              .different-left {
+                .warn-main-content {
+                  display: flex;
+                  flex-direction: column;
+                  justify-content: space-between;
+                }
+              }
+              .warn-main-right {
+                padding-right: 10px;
+                display: flex;
+                flex-direction: column;
+                justify-content: space-between;
+                .warn-main-right-chakan {
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
+                  background: rgba(19,78,230,0.1);
+                  padding: 5px 15px;
+                  cursor: pointer;
+                  border-radius: 50px;
+                  font-weight: 500;
+                  font-size: 14px;
+                  color: #134EE6;
+                  margin-bottom: 10px;
+                }
+                .warn-main-right-status {
+                  padding: 5px 15px;
+                  font-weight: 500;
+                  font-size: 14px;
+                  color: #4EB997;
+                }
+                .status-unread {
+                  color: #FD5F5F;
+                }
+              }
+            }
+          }
+        }
+      }
+      .service-left {
+        padding: 10px 20px;
       }
       .work-main-right {
         background-color: #fff;
+        border-radius: 10px;
         height: 100%;
         .main-right {
           padding: 10px 20px;
@@ -911,17 +1244,29 @@
             justify-content: space-between;
             align-items: center;
             margin-bottom: 15px;
-            .title {
-              font-family: PingFang-SC, PingFang-SC;
-              font-weight: bold;
-              font-size: 14px;
-              color: #333333;
+            .right-header-box {
+              display: flex;
+              align-items: center;
+              .dataCloudMap-birght {
+                width:  6px;
+                height: 18px;
+                background: #0086FF;
+                box-shadow: 3px 0 3px 0px #0086FF;
+                border-radius: 5px 5px 5px 5px;
+              }
+              .right-header-title {
+                font-family: AlibabaPuHuiTiB;
+                margin: 0 10px;
+                font-weight: bold;
+                font-size: 18px;
+                color: #333333;
+              }
             }
             .el-button {
-              font-family: PingFang-SC, PingFang-SC;
+              font-family: PingFang-SC-Medium;
               font-weight: 500;
               font-size: 14px;
-              color: #134EE6;
+              color: #0086FF;
             }
           }
           .right-main {
@@ -942,19 +1287,31 @@
                 white-space: nowrap;
                 text-overflow: ellipsis;
                 -o-text-overflow:ellipsis;
-                font-family: PingFang-SC, PingFang-SC;
+                // font-family: PingFang-SC, PingFang-SC;
                 font-weight: 500;
                 font-size: 14px;
                 color: #666666;
-                &:last-child {
-                  width: 20%;
-                  font-family: PingFang-SC, PingFang-SC;
-                  font-weight: 500;
-                  font-size: 14px;
-                  color: #1890FF;
-                  text-decoration: underline;
-                  cursor: pointer;
-                }
+                // &:last-child {
+                //   width: 20%;
+                //   // font-family: PingFang-SC, PingFang-SC;
+                //   font-weight: 500;
+                //   font-size: 14px;
+                //   color: #1890FF;
+                //   text-decoration: underline;
+                //   cursor: pointer;
+                // }
+              }
+              .last_child_item {
+                width: 20%;
+                // font-family: PingFang-SC, PingFang-SC;
+                font-weight: 500;
+                font-size: 14px;
+                color: #1890FF;
+                text-decoration: underline;
+                cursor: pointer;
+              }
+              .tab-red {
+                color: #C51717;
               }
             }
             .main-item {
@@ -964,6 +1321,21 @@
         }
       }
     }
+    .main-two-row {
+      height: 100%;
+      flex-direction: column;
+      // align-content: space-between;
+      justify-content: space-between;
+    }
+    // 招商信息分析
+    .main-row-two {
+    }
+  }
+  // 企业端首页
+  .home-index-main {
+    height: calc(100% - 55px);
+    padding: 10px;
+    box-sizing: border-box;
   }
 }
 
@@ -973,4 +1345,1056 @@
   .btn-prev,.btn-next {
     padding: 0px 15px;
   }
+}
+
+.team-main {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 15px;
+
+  &>div:nth-of-type(1) {
+    color: #8E9298;
+    width: 25%;
+    text-align: right;
+  }
+
+  &>div:nth-of-type(2) {
+    color: #292F38;
+    width: 70%;
+  }
+
+  .activityContent {
+    p {
+      margin: 0;
+    }
+  }
+}
+
+// 数据云图样式
+.dataCloudMap {
+  // height: calc(100% - 55px);
+  height: 100%;
+  padding: 10px;
+  box-sizing: border-box;
+  background-color: #f1f5f8;
+  .dataCloudMap-main {
+    height: 100%;
+    display: flex;
+    .dataCloudMap-main-left {
+      margin-right: 10px;
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      .dataCloudMap-left-top {
+        height: 50%;
+        // flex: 1;
+        background-color: #fff;
+        border-radius: 10px;
+        padding: 10px 20px;
+      }
+      // 行业纵深情况
+      .dataCloudMap-left-bottom {
+        height: 49%;
+        margin-top: 10px;
+        background-color: #fff;
+        border-radius: 10px;
+        padding: 10px 20px;
+        .industry-title {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          .bottom-left-title {
+            display: flex;
+            align-items: flex-end; /* 底部对齐 */
+            .L-title-left {
+              display: flex;
+              align-items: center;
+              .dataCloudMap-birght {
+                width:  6px;
+                height: 18px;
+                background: #0086FF;
+                box-shadow: 3px 0 3px 0px #0086FF;
+                border-radius: 5px 5px 5px 5px;
+              }
+              .dataCloudMap-title {
+                font-family: AlibabaPuHuiTiB;
+                font-size: 18px;
+                color: #333333;
+                margin: 0 10px;
+              }
+            }
+            .dataCloudMap-data {
+              font-family: AlibabaPuHuiTiR;
+              font-size: 14px;
+              color: #999999;
+              line-height: 22px;
+            }
+          }
+          .rightBtn {
+            font-family: PingFang-SC-Medium;
+            font-weight: 500;
+            font-size: 12px;
+            color: #0086FF;
+            cursor: pointer;
+            font-style: normal;
+            text-decoration-line: underline;
+            text-transform: none;
+          }
+        }
+        section {
+          margin-top: 15px;
+          // width: 100%;
+          // height: calc(100% - 20px);
+          // overflow-y: auto;
+          // padding-bottom: 20px;
+          .el-table::before {
+            height: 0;
+          }
+          .el-table {
+            th {
+              font-family: AlibabaPuHuiTiM;
+              // font-weight: bold;
+              font-size: 14px;
+              color: #333333;
+              .Table-header {
+                font-size: 14px;
+                color: #333333;
+              }
+              .Table-unit {
+                font-family: AlibabaPuHuiTiR;
+                font-size: 12px;
+                font-weight: 400;
+                color: #333333;
+              }
+            }
+            td {
+              font-family: PingFang-SC, PingFang-SC;
+              // font-weight: bold;
+              font-size: 15px;
+              color: #666666;
+              border-bottom: none;
+            }
+            .evenNumber-row {
+              background-color: #F6F9FD;
+            }
+            .project-trace-table-number {
+              font-family: DINCondensed, DINCondensed;
+              // font-weight: bold;
+              font-size: 20px;
+              span {
+                font-family: PingFang-SC-Heavy;
+                font-size: 14px;
+                font-weight: bold;
+                line-height: 18px;
+                color: #666666;
+              }
+            }
+          }
+        }
+      }
+    }
+    .dataCloudMap-main-right {
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+
+      // 企业情况
+      .dataCloudMap-right-top {
+        height: 42%;
+        background-color: #fff;
+        border-radius: 10px;
+        padding: 10px 20px 15px;
+        // padding: 1vh 20px 1.5vh;
+        // padding: 1rem 2rem 1rem;
+        display: flex;
+        flex-direction: column;
+        // justify-content: space-between;
+        align-content: space-between;
+        .dataCloudMap-right-top-box {
+          flex: 1;
+        }
+        .right-top-title {
+          display: flex;
+          align-items: flex-end; /* 底部对齐 */
+          .L-title-left {
+            display: flex;
+            align-items: center;
+            .dataCloudMap-birght {
+              width:  6px;
+              height: 18px;
+              background: #0086FF;
+              box-shadow: 3px 0 3px 0px #0086FF;
+              border-radius: 5px 5px 5px 5px;
+            }
+            .dataCloudMap-title {
+              font-family: AlibabaPuHuiTiB;
+              font-size: 18px;
+              color: #333333;
+              margin: 0 10px;
+            }
+          }
+          .dataCloudMap-data {
+            font-family: AlibabaPuHuiTiR;
+            font-size: 14px;
+            color: #999999;
+            line-height: 22px;
+          }
+        }
+        .dataCloudMap-enterprise-bottom {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          // justify-content: space-between;
+          align-content: space-between;
+        }
+        .dataCloudMap-enterprise {
+          flex: 1;
+          margin-top: 15px;
+          // margin-top: 2vh;
+          display: grid;
+          grid-template-columns: 1fr 1fr 1fr 1fr;
+          grid-column-gap: 10px;
+
+          .el-card {
+            background-color: #fff;
+            border: none;
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            // justify-content: space-between;
+            align-content: space-between;
+            .el-card__header {
+              border-bottom: none;
+              padding: 10px 15px 3px;
+              // padding: 1vh 15px 1vh;
+              .clearfix {
+                text-align: center;
+                font-family: PingFang-SC, PingFang-SC;
+                font-weight: bold;
+                font-size: 16px;
+                color: #333333;
+              }
+            }
+            .el-card__body {
+              padding: 7px 20px 20px 20px;
+              flex: 1;
+              // padding: 0.7vh 1vw 1.2vh 1vw;
+              // display: flex;
+              // flex-direction: column;
+              // justify-content: space-between;
+              // align-content: space-between;
+              display: grid;
+              grid-template-columns: 1fr;
+              grid-row-gap: 10px;
+            }
+            .card-items {
+              // margin-bottom: 0.5vw;
+              // margin-bottom: 10px;
+              padding: 7px 10px;
+              // padding: 0.7vh 10px;
+              background-color: #F6F9FD;
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+              .card-item-left {
+                display: flex;
+                align-items: center;
+                .card-img {
+                  width: 15px;
+                  height: 15px;
+                  // height: 1.5vh;
+                  background-image: url("../images/mapIconFour.png");
+                  margin-right: 5px;
+                  background-size: contain; /* 图片大小适应容器 */
+                  background-position: center; /* 图片居中 */
+                  background-repeat: no-repeat; /* 不重复显示背景图 */
+                }
+                .card-type {
+                  font-size: 12px;
+                  // font-size: 1.5vh;
+                  font-family: PingFang-SC, PingFang-SC;
+                  font-weight: 500;
+                  color: #666666;
+                }
+                .card-img-two {
+                  background-image: url("../images/mapIconFive.png");
+                }
+                .card-img-three {
+                  background-image: url("../images/mapIconSix.png");
+                }
+              }
+              .card-item-right {
+                display: flex;
+                align-items: flex-end;
+                .card-number {
+                  font-family: DINCondensed, DINCondensed;
+                  font-weight: bold;
+                  font-size: 26px;
+                  // font-size: 2.6vh;
+                  color: #0086FF;
+                  margin-right: 5px;
+                  cursor: pointer;
+                  font-style: normal;
+                  text-decoration-line: underline;
+                  text-transform: none;
+                }
+                .card-unit {
+                  font-family: PingFang-SC, PingFang-SC;
+                  font-weight: bold;
+                  font-size: 12px;
+                  // font-size: 1.5vh;
+                  color: #999999;
+                }
+                .number-two {
+                  color: #FF9600;
+                  text-decoration-line: none;
+                }
+                .number-three {
+                  color: #32B16C;
+                  text-decoration-line: none;
+                }
+                .unit-two {
+                  line-height: 24px;
+                  // line-height: 2.4vh;
+                }
+              }
+            }
+          }
+        }
+        .dataCloudMap-statistics {
+          margin-top: 15px;
+          // margin-top: 1.5vh;
+          display: grid;
+          grid-template-columns: 1fr 1fr 1fr 1fr;
+          background: radial-gradient( 0% 0% at 0% 0%, #E8F3FC 0%, #F6F9FD 0%), #E8F3FC;
+          padding: 10px 0;
+          // padding: 1.5vh 1vh;
+          width: 100%;
+          .statistics-title {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            border-right: 1px solid #C7DAEE;
+            font-family: AlibabaPuHuiTiM;
+            font-size: 18px;
+            // font-size: 1.8vh;
+            color: #333333;
+          }
+          .statistics-items {
+            border-right: 1px solid #C7DAEE;
+            .statistics-item {
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              .statistics-item-img {
+                width: 15px;
+                height: 15px;
+                // height: 1.5vh;
+                background-image: url("../images/mapIconSeven.png");
+                margin-right: 5px;
+                background-size: contain; /* 图片大小适应容器 */
+                background-position: center; /* 图片居中 */
+                background-repeat: no-repeat; /* 不重复显示背景图 */
+              }
+              .item-img-two {
+                background-image: url("../images/mapIconEight.png");
+              }
+              .item-img-three {
+                background-image: url("../images/mapIconNine.png");
+              }
+              .statistics-item-type {
+                font-family: PingFang-SC, PingFang-SC;
+                font-weight: bold;
+                font-size: 15px;
+                // font-size: 1.5vh;
+                margin-right: 10px;
+                color: #666666;
+              }
+              .statistics-item-right {
+                display: flex;
+                align-items: flex-end;
+                .statistics-item-number {
+                  font-family: DINCondensed, DINCondensed;
+                  font-weight: bold;
+                  font-size: 26px;
+                  // font-size: 2.6vh;
+                  color: #0086FF;
+                  margin-right: 5px;
+                  cursor: pointer;
+                  font-style: normal;
+                  text-decoration-line: underline;
+                  text-transform: none;
+                }
+                .statistics-item-unit {
+                  font-family: PingFang-SC, PingFang-SC;
+                  font-weight: bold;
+                  font-size: 12px;
+                  // font-size: 1.5vh;
+                  line-height: 20px;
+                  color: #999999;
+                  .popover-Tooltip {
+                    font-family: PingFang-SC-Medium;
+                    font-weight: 500;
+                    font-size: 5px;
+                    // font-size: 0.7vh;
+                    color: #333333;
+                  }
+                }
+                .number-two {
+                  color: #FF9600;
+                  text-decoration-line: none;
+                }
+                .number-three {
+                  color: #32B16C;
+                  text-decoration-line: none;
+                }
+                .unit-two {
+                  line-height: 24px;
+                  // line-height: 2.4vh;
+                  position: relative;
+                  img {
+                    position: absolute;
+                    top: -5px;
+                    right: -9px;
+                    width: 9px;
+                    height: 9px;
+                    cursor: pointer;
+                  }
+                }
+              }
+            }
+          }
+          .statistics-items-none {
+            border-right: none;
+          }
+        }
+      }
+      // 荣誉情况
+      .dataCloudMap-right-middle {
+        width: 100%;
+        height: 27%;
+        background-color: #fff;
+        border-radius: 10px;
+        padding: 10px 20px 20px;
+        // padding: 1vh 20px 2vh;
+        display: flex;
+        flex-direction: column;
+        .honor-title {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          .right-middle-title {
+            // display: grid;
+            // grid-template-columns: 1fr 6fr; /* 自动列宽  auto auto*/
+            // align-items: end; /* 垂直对齐方式：底部对齐 */
+            display: flex;
+            align-items: flex-end; /* 底部对齐 */
+            .L-title-left {
+              display: flex;
+              align-items: center;
+              .dataCloudMap-birght {
+                width:  6px;
+                height: 18px;
+                background: #0086FF;
+                box-shadow: 3px 0 3px 0px #0086FF;
+                border-radius: 5px 5px 5px 5px;
+              }
+              .dataCloudMap-title {
+                font-family: AlibabaPuHuiTiB;
+                font-size: 18px;
+                color: #333333;
+                margin: 0 10px;
+              }
+            }
+            .dataCloudMap-data {
+              font-family: AlibabaPuHuiTiR;
+              font-size: 14px;
+              color: #999999;
+              line-height: 22px;
+            }
+          }
+          .rightBtn {
+            font-family: PingFang-SC-Medium;
+            font-weight: 500;
+            font-size: 12px;
+            color: #0086FF;
+            cursor: pointer;
+            font-style: normal;
+            text-decoration-line: underline;
+            text-transform: none;
+          }
+        }
+        .honor-data {
+          margin-top: 15px;
+          // margin-top: 2vh;
+          flex: 1;
+          display: grid;
+          grid-template-columns: 1fr 1fr 1fr;
+          grid-gap: 15px;
+          // grid-column-gap: 1.5vh;
+          // grid-row-gap: 1.5vh;
+          // flex: 1;
+          // display: flex;
+          // flex-wrap: wrap;
+          // justify-content: space-between;
+          // align-content: space-between;
+          .honor-item {
+            // width: 32%;
+            display: flex;
+            padding: 20px;
+            // padding: 2vh 1.5vw;
+            // padding: vh(25) vw(30);
+            align-items: center;
+            justify-content: space-between;
+            background-color: #F6F9FD;
+            .honor-item-left {
+              font-family: PingFang-SC, PingFang-SC;
+              font-weight: bold;
+              font-size: 16px;
+              // font-size: 1.5vh;
+              color: #666666;
+            }
+            .honor-item-right {
+              display: flex;
+              align-items: flex-end;
+              .honor-item-number {
+                font-family: DINCondensed, DINCondensed;
+                font-weight: bold;
+                font-size: 26px;
+                // font-size: 2.6vh;
+                color: #0086FF;
+                margin-right: 5px;
+              }
+              .honor-item-home {
+                font-family: PingFang-SC, PingFang-SC;
+                font-weight: bold;
+                font-size: 12px;
+                // font-size: 1.5vh;
+                line-height: 24px;
+                // line-height: 2.4vh;
+                color: #999999;
+              }
+            }
+          }
+        }
+      }
+      // 项目追踪情况
+      .dataCloudMap-right-bottom {
+        height: 29%;
+        background-color: #fff;
+        border-radius: 10px;
+        padding: 10px 20px;
+        .project-trace-title {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          .right-bottom-title {
+            display: flex;
+            // grid-template-columns: min-content max-content; /* 自动列宽 */
+            // align-items: end; /* 垂直对齐方式：底部对齐 */
+            align-items: flex-end; /* 底部对齐 */
+            .L-title-left {
+              display: flex;
+              align-items: center;
+              .dataCloudMap-birght {
+                width: 6px;
+                height: 18px;
+                background: #0086FF;
+                box-shadow: 3px 0 3px 0px #0086FF;
+                border-radius: 5px 5px 5px 5px;
+              }
+              .dataCloudMap-title {
+                font-family: AlibabaPuHuiTiB;
+                font-size: 18px;
+                color: #333333;
+                margin: 0 10px;
+              }
+            }
+            .dataCloudMap-data {
+              font-family: AlibabaPuHuiTiR;
+              font-size: 14px;
+              color: #999999;
+              line-height: 22px;
+            }
+          }
+          .rightBtn {
+            font-family: PingFang-SC-Medium;
+            font-weight: 500;
+            font-size: 12px;
+            color: #0086FF;
+            font-style: normal;
+            cursor: pointer;
+            text-decoration-line: underline;
+            text-transform: none;
+          }
+        }
+        section {
+          margin-top: 15px;
+          .el-table::before {
+            height: 0;
+          }
+          .el-table {
+            margin-bottom: 25px;
+            th {
+              font-family: AlibabaPuHuiTiM;
+              // font-weight: bold;
+              font-size: 14px;
+              color: #333333;
+            }
+            td {
+              font-family: PingFang-SC, PingFang-SC;
+              // font-weight: bold;
+              font-size: 15px;
+              color: #666666;
+              border-bottom: none;
+            }
+            .evenNumber-row {
+              background-color: #F6F9FD;
+            }
+            .project-trace-table-number {
+              font-family: DINCondensed, DINCondensed;
+              // font-weight: bold;
+              font-size: 20px;
+              color: #FF844D;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+// 荣誉情况弹窗样式
+.honor-dialog {
+  .el-dialog__header {
+    border-bottom: 1px solid #F0F0F0;
+    .el-dialog__title {
+      font-family: PingFang-SC-Heavy;
+      font-weight: 800;
+      font-size: 16px;
+      color: #000000;
+    }
+  }
+  section {
+    .el-table--border {
+      border: 1px solid #dfe6ec;
+    }
+    .el-table { 
+      // tr:hover>td { 
+      //   background-color: initial !important;
+      // }
+      .project-trace-table-number {
+        font-family: PingFang-SC, PingFang-SC;
+        font-weight: 500;
+        font-size: 14px;
+        color: #134EE6;
+        font-style: normal;
+        text-decoration-line: underline;
+        text-transform: none;
+        cursor: pointer;
+      }
+      .grey-number {
+        color: #666666;
+        text-decoration-line: none;
+      }
+      .evenNumber-row {
+        background-color: #F6F9FD;
+      }
+      .evenNumber-row-border {
+        border-bottom: none;
+      }
+    }
+  }
+}
+
+// 数据云图总部企业弹框
+.headquarterEnterprise-dialog {
+  .el-dialog__body {
+    padding: 20px;
+  }
+  .el-dialog__header {
+    border-bottom: 1px solid #F0F0F0;
+    .el-dialog__title {
+      font-family: PingFang-SC-Heavy;
+      font-weight: 800;
+      font-size: 16px;
+      color: #000000;
+    }
+  }
+  .headquarterEnterprise-box {
+    .radio_btn {
+      margin: 10px 0;
+    }
+    .headquarterEnterprise-form {
+      .el-button--primary.is-active,
+      .el-button--primary:active {
+        background: oklab(0.7 -0.3 -0.4);
+        border-color: #1890FF;
+        color: #FFFEFE;
+      }
+      .el-button--primary {
+        background: #1890FF;
+        border-color: #1890FF;
+        color: #FFFEFE;
+      }
+      .el-button--primary:focus,
+      .el-button--primary:hover {
+        background: oklab(0.7 -0.3 -0.4);
+        border-color: #1890FF;
+        color: #FFFEFE;
+      }
+      .el-button--default:hover, 
+      .el-button--primary:hover {
+        background-color: oklab(0.65 -0.06 -0.18);
+        border-color: #1890FF;
+        color: #FFFEFE;
+      }
+      .el-button--default {
+        border-color: #1890FF;
+        color: #000000;
+      }
+    }
+    section {
+      .el-table { 
+        .project-trace-table-number {
+          font-family: PingFang-SC, PingFang-SC;
+          font-weight: 500;
+          font-size: 14px;
+          color: #134EE6;
+          font-style: normal;
+          text-decoration-line: underline;
+          text-transform: none;
+          cursor: pointer;
+        }
+        th {
+          font-weight: bold;
+          font-size: 14px;
+          color: #000;
+        }
+        td {
+          font-weight: 500;
+          font-size: 14px;
+          color: #666666;
+          border-bottom: none;
+        }
+        .evenNumber-row {
+          background-color: #F6F9FD;
+        }
+      }
+      .my-pagination-container {
+        margin-top: 10px;
+        .el-pagination.is-background .el-pager li:not(.is-disabled).active {
+
+          background-color: #1890FF; /*进行修改选中项背景和字体 */
+          
+          color: #fff;
+        }
+        .el-pagination {
+          .btn-prev,.btn-next {
+            padding: 0px 20px;
+          }
+        }
+      }
+    }
+  }
+}
+// 数据云图企业情况上方四个卡片弹框
+.serviceIndustry-dialog {
+  .el-dialog__body {
+    padding: 20px;
+  }
+  .el-dialog__header {
+    border-bottom: 1px solid #F0F0F0;
+    .el-dialog__title {
+      font-family: PingFang-SC-Heavy;
+      font-weight: 800;
+      font-size: 16px;
+      color: #000000;
+    }
+  }
+  .serviceIndustry-box {
+    .radio_btn {
+      margin: 10px 0;
+    }
+    .serviceIndustry-form {
+      .el-button--primary.is-active,
+      .el-button--primary:active {
+        background: oklab(0.7 -0.3 -0.4);
+        border-color: #1890FF;
+        color: #FFFEFE;
+      }
+      .el-button--primary {
+        background: #1890FF;
+        border-color: #1890FF;
+        color: #FFFEFE;
+      }
+      .el-button--primary:focus,
+      .el-button--primary:hover {
+        background: oklab(0.7 -0.3 -0.4);
+        border-color: #1890FF;
+        color: #FFFEFE;
+      }
+      .el-button--default:hover, 
+      .el-button--primary:hover {
+        background-color: oklab(0.65 -0.06 -0.18);
+        border-color: #1890FF;
+        color: #FFFEFE;
+      }
+      .el-button--default {
+        border-color: #1890FF;
+        color: #000000;
+      }
+    }
+    section {
+      .el-table { 
+        .project-trace-table-number {
+          font-family: PingFang-SC, PingFang-SC;
+          font-weight: 500;
+          font-size: 14px;
+          color: #134EE6;
+          font-style: normal;
+          text-decoration-line: underline;
+          text-transform: none;
+          cursor: pointer;
+        }
+        th {
+          font-weight: bold;
+          font-size: 14px;
+          color: #000;
+          text-align: center;
+        }
+        td {
+          font-weight: 500;
+          font-size: 14px;
+          color: #666666;
+          border-bottom: none;
+        }
+        .evenNumber-row-childred {
+          background-color: #E8F3FC;
+        }
+        .evenNumber-row {
+          background-color: #F6F9FD;
+        }
+      }
+      .my-pagination-container {
+        margin-top: 10px;
+        .el-pagination.is-background .el-pager li:not(.is-disabled).active {
+
+          background-color: #1890FF; /*进行修改选中项背景和字体 */
+          
+          color: #fff;
+        }
+        .el-pagination {
+          .btn-prev,.btn-next {
+            padding: 0px 20px;
+          }
+        }
+      }
+    }
+  }
+}
+// 行业纵深情况
+.collectDialog-dialog {
+  .el-dialog__body {
+    padding: 20px;
+  }
+  .el-dialog__header {
+    border-bottom: 1px solid #F0F0F0;
+    .el-dialog__title {
+      font-family: PingFang-SC-Heavy;
+      font-weight: 800;
+      font-size: 16px;
+      color: #000000;
+    }
+  }
+  .collectDialog-box {
+    .radio_btn {
+      margin: 10px 0;
+    }
+    section {
+      .el-table { 
+        .project-trace-table-number {
+          font-family: PingFang-SC, PingFang-SC;
+          font-weight: 500;
+          font-size: 14px;
+          color: #134EE6;
+          font-style: normal;
+          text-decoration-line: underline;
+          text-transform: none;
+          cursor: pointer;
+        }
+        th {
+          font-weight: bold;
+          font-size: 14px;
+          color: #000;
+          text-align: center;
+        }
+        td {
+          font-weight: 500;
+          font-size: 14px;
+          color: #666666;
+          border-bottom: none;
+        }
+        .evenNumber-row-childred {
+          background-color: #E8F3FC;
+        }
+        .evenNumber-row {
+          background-color: #F6F9FD;
+        }
+      }
+    }
+  }
+}
+
+// 服务业数据概览
+.echart-title {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .echart-left-title {
+    display: grid;
+    grid-template-columns: auto auto; /* 自动列宽 */
+    align-items: end; /* 垂直对齐方式：底部对齐 */
+    margin-top: -10px;
+    .L-title-left {
+      display: flex;
+      align-items: center;
+      .dataCloudMap-birght {
+        width:  6px;
+        height: 18px;
+        background: #0086FF;
+        box-shadow: 3px 0 3px 0px #0086FF;
+        border-radius: 5px 5px 5px 5px;
+      }
+      .dataCloudMap-title {
+        font-family: AlibabaPuHuiTiB;
+        font-size: 18px;
+        color: #333333;
+        margin: 0 10px;
+      }
+    }
+    .dataCloudMap-data {
+      font-family: AlibabaPuHuiTiR;
+      font-size: 14px;
+      color: #999999;
+      line-height: 22px;
+      // line-height: 31px;
+      // margin-top: 5px;
+    }
+  }
+  .rightBigNav {
+    padding: 2px;
+    box-sizing: border-box;
+    height: 33px;
+    // background: #fff;
+    .right-nav {
+      display: flex;
+      height: 100%;
+      font-size: 14px;
+      .tabStyle {
+        height: 100%;
+        background: #F6F9FD;
+        padding: 0 20px;
+        border-radius: 2px;
+        display: flex;
+        align-items: center;
+        cursor: pointer;
+        user-select: none;
+        color: #7a8599;
+        margin-right: 10px;
+        border-radius: 5px;
+
+        .change-grey-birght {
+          width: 8px;
+          height: 8px;
+          background: #C7DAEE;
+          border-radius: 50%;
+          margin-right: 5px;
+        }
+        .change-blue-birght {
+          background: #0086FF;
+        }
+        
+        .change-grey-text {
+          color: #94A9C0;
+          font-size: 14px;
+          font-weight: 500;
+        }
+        .change-blue-text {
+          color: #0086FF;
+          font-weight: bold;
+        }
+      }
+      .change-blue {
+        background: #E8F3FC;
+        color: #fff;
+      }
+    }
+  }
+}
+.components-box {
+  height: 100%;
+}
+.echarts-data-box {
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr;
+  margin: 15px 0 12px;
+  .E-box-item {
+    display: flex;
+    .img-box {
+      width: 50px;
+      height: 50px;
+      border-radius: 50%;
+      margin-right: 10px;
+      background-size: contain; /* 图片大小适应容器 */
+      background-position: center; /* 图片居中 */
+      background-repeat: no-repeat; /* 不重复显示背景图 */
+    }
+    .img-box-one {
+      background-image: url("../images/mapIconOne.png");
+    }
+    .img-box-two {
+      background-image: url("../images/mapIconTwo.png");
+    }
+    .img-box-three {
+      background-image: url("../images/mapIconThree.png");
+    }
+    .data-box {
+      display: flex;
+      justify-content: space-between;
+      flex-direction: column;
+      .box-number {
+        display: flex;
+        align-items: flex-end;
+        .number-yuan {
+          font-family: DINCondensed, DINCondensed;
+          font-weight: bold;
+          font-size: 36px;
+          line-height: 30px;
+          margin-right: 5px;
+          color: #333333;
+        }
+        .yuan-unit {
+          font-family: PingFang-SC, PingFang-SC;
+          font-weight: bold;
+          font-size: 12px;
+          line-height: 18px;
+          color: #666666;
+        }
+      }
+      .box-bottom {
+        font-family: PingFang-SC-Medium;
+        font-weight: 500;
+        font-size: 12px;
+        color: #666666;
+      }
+    }
+  }
+}
+#echarts {
+  width: 100%;
+  height: calc(100% - 110px);
+  // height: 30vh;
+  // height: 370px;
 }
\ No newline at end of file
diff --git a/src/assets/styles/utils.scss b/src/assets/styles/utils.scss
new file mode 100644
index 0000000..4fdc498
--- /dev/null
+++ b/src/assets/styles/utils.scss
@@ -0,0 +1,20 @@
+/** 
+解决大屏可视化适配问题
+设计稿：1920（宽度），1080（高度）
+*/
+
+// @function px2vw($px) {
+//     @return $px/1920*100vw;
+// }  
+
+// @function px2vh($px) { 
+//     @return $px/1920*100vh;
+// }  
+
+@function vw($px) {
+    @return $px/1920*100vw;
+}  
+
+@function vh($px) {
+    @return $px/1080*100vh;
+}  
\ No newline at end of file
diff --git a/src/components/ProcessDesigner/index.vue b/src/components/ProcessDesigner/index.vue
new file mode 100644
index 0000000..0eadee9
--- /dev/null
+++ b/src/components/ProcessDesigner/index.vue
@@ -0,0 +1,128 @@
+<template>
+  <div class="process-design" :style="'display: flex; height:' + height">
+    <bpmn-process-designer
+      v-model="xmlString"
+      v-bind="controlForm"
+      keyboard
+      ref="processDesigner"
+      :events="[
+        'element.click',
+        'connection.added',
+        'connection.removed',
+        'connection.changed'
+      ]"
+      @element-click="elementClick"
+      @init-finished="initModeler"
+      @event="handlerEvent"
+      @save="onSaveProcess"
+    />
+    <bmpn-process-penal :bpmn-modeler="modeler" :prefix="controlForm.prefix" class="process-panel" />
+  </div>
+</template>
+
+<script>
+import Vue from 'vue';
+import '@/plugins/package/theme/index.scss';
+import { BpmnProcessDesigner, BmpnProcessPenal } from '@/plugins/package/index';
+// 自定义元素选中时的弹出菜单（修改 默认任务 为 用户任务）
+import CustomContentPadProvider from '@/plugins/package/designer/plugins/content-pad';
+// 自定义左侧菜单（修改 默认任务 为 用户任务）
+import CustomPaletteProvider from '@/plugins/package/designer/plugins/palette';
+import { vuePlugin } from '@/plugins/package/highlight';
+import 'highlight.js/styles/atom-one-dark-reasonable.css';
+Vue.use(vuePlugin);
+
+export default {
+  name: 'ProcessDesigner',
+  props: {
+    bpmnXml: {
+      type: String,
+      required: true
+    },
+    designerForm: {
+      type: Object,
+      required: true
+    }
+  },
+  components: {
+    BpmnProcessDesigner,
+    BmpnProcessPenal
+  },
+  data () {
+    return {
+      // height: document.documentElement.clientHeight - 94.5 + "px;",
+      height: document.documentElement.clientHeight - 200 + "px;",
+      xmlString: this.bpmnXml,
+      modeler: null,
+      controlForm: {
+        processId: this.designerForm.processKey || '',
+        processName: this.designerForm.processName || '',
+        simulation: false,
+        labelEditing: false,
+        labelVisible: false,
+        prefix: 'flowable',
+        headerButtonSize: 'small',
+        additionalModel: [CustomContentPadProvider, CustomPaletteProvider]
+      }
+    }
+  },
+  methods: {
+    elementClick (element) {
+      this.element = element;
+    },
+    initModeler (modeler) {
+      setTimeout(() => {
+        this.modeler = modeler;
+      }, 10);
+    },
+    handlerEvent (eventName, element) {
+    },
+    onSaveProcess (saveData) {
+      this.$emit('save', saveData);
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+body {
+  overflow: auto !important;
+  margin: 0;
+  box-sizing: border-box;
+}
+body,
+body * {
+  /* 滚动条 */
+  &::-webkit-scrollbar-track-piece {
+    background-color: #fff; /*滚动条的背景颜色*/
+    -webkit-border-radius: 0; /*滚动条的圆角宽度*/
+  }
+
+  &::-webkit-scrollbar {
+    width: 10px; /*滚动条的宽度*/
+    height: 8px; /*滚动条的高度*/
+  }
+
+  &::-webkit-scrollbar-thumb:vertical {
+    /*垂直滚动条的样式*/
+    height: 50px;
+    background-color: rgba(153, 153, 153, 0.5);
+    -webkit-border-radius: 4px;
+    outline: 2px solid #fff;
+    outline-offset: -2px;
+    border: 2px solid #fff;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    /*滚动条的hover样式*/
+    background-color: rgba(159, 159, 159, 0.3);
+    -webkit-border-radius: 4px;
+  }
+
+  &::-webkit-scrollbar-thumb:hover {
+    /*滚动条的hover样式*/
+    background-color: rgba(159, 159, 159, 0.5);
+    -webkit-border-radius: 4px;
+  }
+}
+</style>
diff --git a/src/components/ProcessViewer/index.vue b/src/components/ProcessViewer/index.vue
new file mode 100644
index 0000000..3bc6594
--- /dev/null
+++ b/src/components/ProcessViewer/index.vue
@@ -0,0 +1,259 @@
+<template>
+  <div class="process-viewer">
+    <div class="process-canvas" style="height: 100%;" ref="processCanvas" v-show="!isLoading" />
+    <!-- 自定义箭头样式，用于成功状态下流程连线箭头 -->
+    <defs ref="customSuccessDefs">
+      <marker id="sequenceflow-end-white-success" viewBox="0 0 20 20" refX="11" refY="10" markerWidth="10" markerHeight="10" orient="auto">
+        <path class="success-arrow" d="M 1 5 L 11 10 L 1 15 Z" style="stroke-width: 1px; stroke-linecap: round; stroke-dasharray: 10000, 1;"></path>
+      </marker>
+      <marker id="conditional-flow-marker-white-success" viewBox="0 0 20 20" refX="-1" refY="10" markerWidth="10" markerHeight="10" orient="auto">
+        <path class="success-conditional" d="M 0 10 L 8 6 L 16 10 L 8 14 Z" style="stroke-width: 1px; stroke-linecap: round; stroke-dasharray: 10000, 1;"></path>
+      </marker>
+    </defs>
+    <!-- 自定义箭头样式，用于失败状态下流程连线箭头 -->
+    <defs ref="customFailDefs">
+      <marker id="sequenceflow-end-white-fail" viewBox="0 0 20 20" refX="11" refY="10" markerWidth="10" markerHeight="10" orient="auto">
+        <path class="fail-arrow" d="M 1 5 L 11 10 L 1 15 Z" style="stroke-width: 1px; stroke-linecap: round; stroke-dasharray: 10000, 1;"></path>
+      </marker>
+      <marker id="conditional-flow-marker-white-fail" viewBox="0 0 20 20" refX="-1" refY="10" markerWidth="10" markerHeight="10" orient="auto">
+        <path class="fail-conditional" d="M 0 10 L 8 6 L 16 10 L 8 14 Z" style="stroke-width: 1px; stroke-linecap: round; stroke-dasharray: 10000, 1;"></path>
+      </marker>
+    </defs>
+    <!-- 已完成节点悬浮弹窗 -->
+    <el-dialog class="comment-dialog" :title="dlgTitle || '审批记录'" :visible.sync="dialogVisible">
+      <el-row>
+        <el-table :data="taskCommentList" size="mini" border header-cell-class-name="table-header-gray">
+          <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" />
+          <el-table-column label="候选办理" prop="candidate" width="150px" align="center"/>
+          <el-table-column label="实际办理" prop="assigneeName" width="100px" align="center"/>
+          <el-table-column label="处理时间" prop="createTime" width="140px" align="center"/>
+          <el-table-column label="办结时间" prop="finishTime" width="140px" align="center" />
+          <el-table-column label="耗时" prop="duration" width="100px" align="center"/>
+          <el-table-column label="审批意见" align="center">
+            <template slot-scope="scope">
+              {{scope.row.commentList&&scope.row.commentList[0]?scope.row.commentList[0].fullMessage:''}}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-row>
+    </el-dialog>
+    <div style="position: absolute; top: 0px; left: 0px; width: 100%;">
+      <el-row type="flex" justify="end">
+        <el-button-group key="scale-control" size="medium">
+          <el-button size="medium" type="default" :plain="true" :disabled="defaultZoom <= 0.3" icon="el-icon-zoom-out" @click="processZoomOut()" />
+          <el-button size="medium" type="default" style="width: 90px;">{{ Math.floor(this.defaultZoom * 10 * 10) + "%" }}</el-button>
+          <el-button size="medium" type="default" :plain="true" :disabled="defaultZoom >= 3.9" icon="el-icon-zoom-in" @click="processZoomIn()" />
+          <el-button size="medium" type="default" icon="el-icon-c-scale-to-original" @click="processReZoom()" />
+          <slot />
+        </el-button-group>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+import '@/plugins/package/theme/index.scss';
+import BpmnViewer from 'bpmn-js/lib/Viewer';
+import MoveCanvasModule from 'diagram-js/lib/navigation/movecanvas';
+
+export default {
+  props: {
+    xml: {
+      type: String
+    },
+    finishedInfo: {
+      type: Object
+    },
+    // 所有节点审批记录
+    allCommentList: {
+      type: Array
+    }
+  },
+  data () {
+    return {
+      dialogVisible: false,
+      dlgTitle: undefined,
+      defaultZoom: 1,
+      // 是否正在加载流程图
+      isLoading: false,
+      bpmnViewer: undefined,
+      // 已完成流程元素
+      processNodeInfo: undefined,
+      // 当前任务id
+      selectTaskId: undefined,
+      // 任务节点审批记录
+      taskCommentList: [],
+      // 已完成任务悬浮延迟Timer
+      hoverTimer: null
+    }
+  },
+  watch: {
+    xml: {
+      handler(newXml) {
+        this.importXML(newXml);
+      },
+      immediate: true
+    },
+    finishedInfo: {
+      handler(newInfo) {
+        this.setProcessStatus(newInfo);
+      },
+      immediate: true
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.importXML(this.xml)
+      this.setProcessStatus(this.finishedInfo);
+    })
+  },
+  methods: {
+    processReZoom() {
+      this.defaultZoom = 1;
+      this.bpmnViewer.get('canvas').zoom('fit-viewport', 'auto');
+    },
+    processZoomIn(zoomStep = 0.1) {
+      let newZoom = Math.floor(this.defaultZoom * 100 + zoomStep * 100) / 100;
+      if (newZoom > 4) {
+        throw new Error('[Process Designer Warn ]: The zoom ratio cannot be greater than 4');
+      }
+      this.defaultZoom = newZoom;
+      this.bpmnViewer.get('canvas').zoom(this.defaultZoom);
+    },
+    processZoomOut(zoomStep = 0.1) {
+      let newZoom = Math.floor(this.defaultZoom * 100 - zoomStep * 100) / 100;
+      if (newZoom < 0.2) {
+        throw new Error('[Process Designer Warn ]: The zoom ratio cannot be less than 0.2');
+      }
+      this.defaultZoom = newZoom;
+      this.bpmnViewer.get('canvas').zoom(this.defaultZoom);
+    },
+    getOperationTagType(type) {
+      return 'success';
+      // switch (type) {
+      //   case this.SysFlowTaskOperationType.AGREE:
+      //   case this.SysFlowTaskOperationType.MULTI_AGREE:
+      //     return 'success';
+      //   case this.SysFlowTaskOperationType.REFUSE:
+      //   case this.SysFlowTaskOperationType.PARALLEL_REFUSE:
+      //   case this.SysFlowTaskOperationType.MULTI_REFUSE:
+      //     return 'warning';
+      //   case this.SysFlowTaskOperationType.STOP:
+      //     return 'danger'
+      //   default:
+      //     return 'primary';
+      // }
+    },
+    // 流程图预览清空
+    clearViewer() {
+      if (this.$refs.processCanvas) {
+        this.$refs.processCanvas.innerHTML = '';
+      }
+      if (this.bpmnViewer) {
+        this.bpmnViewer.destroy();
+      }
+      this.bpmnViewer = null;
+    },
+    // 添加自定义箭头
+    addCustomDefs() {
+      const canvas = this.bpmnViewer.get('canvas');
+      const svg = canvas._svg;
+      const customSuccessDefs = this.$refs.customSuccessDefs;
+      const customFailDefs = this.$refs.customFailDefs;
+      svg.appendChild(customSuccessDefs);
+      svg.appendChild(customFailDefs);
+    },
+    // 任务悬浮弹窗
+    onSelectElement(element) {
+      this.selectTaskId = undefined;
+      this.dlgTitle = undefined;
+
+      if (this.processNodeInfo == null || this.processNodeInfo.finishedTaskSet == null) return;
+
+      if (element == null || this.processNodeInfo.finishedTaskSet.indexOf(element.id) === -1) {
+        return;
+      }
+
+      this.selectTaskId = element.id;
+      this.dlgTitle = element.businessObject ? element.businessObject.name : undefined;
+      // 计算当前悬浮任务审批记录，如果记录为空不显示弹窗
+      this.taskCommentList = (this.allCommentList || []).filter(item => {
+        return item.activityId === this.selectTaskId;
+      });
+      this.dialogVisible = true;
+    },
+    // 显示流程图
+    async importXML(xml) {
+      this.clearViewer();
+      if (xml != null && xml !== '') {
+        try {
+          this.bpmnViewer = new BpmnViewer({
+            additionalModules: [
+              // 移动整个画布
+              MoveCanvasModule
+            ],
+            container: this.$refs.processCanvas,
+          });
+          // 任务节点悬浮事件
+          this.bpmnViewer.on('element.click', ({ element }) => {
+            this.onSelectElement(element);
+          });
+
+          this.isLoading = true;
+          await this.bpmnViewer.importXML(xml);
+          this.addCustomDefs();
+        } catch (e) {
+          this.clearViewer();
+        } finally {
+          this.isLoading = false;
+          this.setProcessStatus(this.processNodeInfo);
+        }
+      }
+    },
+    // 设置流程图元素状态
+    setProcessStatus (processNodeInfo) {
+      this.processNodeInfo = processNodeInfo;
+      if (this.isLoading || this.processNodeInfo == null || this.bpmnViewer == null) return;
+      let { finishedTaskSet, rejectedTaskSet, unfinishedTaskSet, finishedSequenceFlowSet } = this.processNodeInfo;
+      const canvas = this.bpmnViewer.get('canvas');
+      const elementRegistry = this.bpmnViewer.get('elementRegistry');
+      if (Array.isArray(finishedSequenceFlowSet)) {
+        finishedSequenceFlowSet.forEach(item => {
+          if (item != null) {
+            canvas.addMarker(item, 'success');
+            let element = elementRegistry.get(item);
+            const conditionExpression = element.businessObject.conditionExpression;
+            if (conditionExpression) {
+              canvas.addMarker(item, 'condition-expression');
+            }
+          }
+        });
+      }
+      if (Array.isArray(finishedTaskSet)) {
+        finishedTaskSet.forEach(item => canvas.addMarker(item, 'success'));
+      }
+      if (Array.isArray(unfinishedTaskSet)) {
+        unfinishedTaskSet.forEach(item => canvas.addMarker(item, 'primary'));
+      }
+      if (Array.isArray(rejectedTaskSet)) {
+        rejectedTaskSet.forEach(item => {
+          if (item != null) {
+            let element = elementRegistry.get(item);
+            if (element.type.includes('Task')) {
+              canvas.addMarker(item, 'danger');
+            } else {
+              canvas.addMarker(item, 'warning');
+            }
+          }
+        })
+      }
+    }
+  },
+  destroyed() {
+    this.clearViewer();
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/components/scaleBox/index.vue b/src/components/scaleBox/index.vue
new file mode 100644
index 0000000..01573a2
--- /dev/null
+++ b/src/components/scaleBox/index.vue
@@ -0,0 +1,63 @@
+<template>
+  <div v-bind:style="styleObject" class="scale-box">
+    <slot></slot>
+  </div>
+</template>
+ 
+<script>
+import debounce from "lodash.debounce";
+const that = this;
+export default {
+  name:"ScaleBox",
+  components: {},
+  data() {
+    return {
+      width: 1920,
+      height: 911,
+      scaleX: null,
+      scaleY: null,
+    };
+  },
+  computed: {
+    styleObject() {
+      let obj = {
+        transform: `scale(${this.scaleX},${this.scaleY}) translate(-50%, -50%)`,
+        WebkitTransform: `scale(${this.scaleX},${this.scaleY}) translate(-50%, -50%)`,
+        width: this.width + "px",
+        height: this.height + "px",
+        margin: '-1px -1px 0 0',
+      };
+      return obj;
+    },
+  },
+  mounted() {
+    this.getScale();
+    window.addEventListener("resize", this.setScale);
+  },
+  methods: {
+    getScale() {
+      // 分别计算X轴和Y轴的缩放比例
+      this.scaleX = window.innerWidth / this.width;
+      this.scaleY = window.innerHeight / this.height;
+    },
+ 
+    setScale: debounce(function () {
+      // 获取到缩放比，设置它
+      this.getScale();
+    }, 200),
+  },
+  beforeDestroy() {
+    window.addEventListener("resize", this.setScale);
+  },
+};
+</script>
+ 
+<style scoped lang="scss">
+.scale-box {
+  transform-origin: 0 0;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transition: 0.3s;
+}
+</style>
\ No newline at end of file
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index ace9f6f..0d0e678 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,5 +1,5 @@
 <template>
-  <section class="app-main" :class="breadcrumb ? '' : 'app-main-breadcrumb'">
+  <section :class="breadcrumb ? 'app-main-breadcrumb' : breadcrumbTwo ? 'app-main-breadcrumbTwo' : 'app-main'">
     <transition name="fade-transform" mode="out-in">
       <keep-alive :include="cachedViews">
         <router-view v-if="!$route.meta.link" :key="key" />
@@ -19,10 +19,13 @@ export default {
     $route: {
       handler(route) {
         // console.log(route,"route");
-        if(route.path == "/workbench") {
-          this.breadcrumb = false;
-        } else {
+        if((route.path == "/workbench" && this.userType == "01") || route.path == "/dataCloudMap") {
           this.breadcrumb = true;
+        } else if(route.path == "/workbench" && this.userType == "02") {
+          this.breadcrumbTwo = true;
+        } else {
+          this.breadcrumb = false;
+          this.breadcrumbTwo = false;
         }
       },
       immediate:true
@@ -31,6 +34,9 @@ export default {
   data() {
     return {
       breadcrumb: false,
+      breadcrumbTwo: false,
+      // 判断登陆用户是何身份⌈ 01 ： 企业  02 ： 政务 ⌋
+      userType: this.$store.state.user.userType,
     };
   },
   computed: {
@@ -54,10 +60,27 @@ export default {
   padding: 10px;
   background: #f6f7f9;
   overflow: hidden;
+  // margin-top: 60px;
 }
 .app-main-breadcrumb {
-  height: calc(100% - 1px);
-  padding: 0 0 10px 0;
+  // height: calc(100% - 1px);
+  height: calc(100% - 65px);
+  // padding: 0 0 10px 0;
+  width: 100%;
+  position: relative;
+  background: #f6f7f9;
+  padding: 0;
+  // margin-top: 60px;
+}
+
+.app-main-breadcrumbTwo {
+  padding: 0 0 20px;
+  width: 100%;
+  // height: 100%;
+  position: relative;
+  background: #f6f7f9;
+  overflow-y: scroll;
+  // margin-top: 60px;
 }
 
 .fixed-header + .app-main {
diff --git a/src/layout/components/FixedHeader/components/MenuMain/index.vue b/src/layout/components/FixedHeader/components/MenuMain/index.vue
index 424ac1d..5dfcb2a 100644
--- a/src/layout/components/FixedHeader/components/MenuMain/index.vue
+++ b/src/layout/components/FixedHeader/components/MenuMain/index.vue
@@ -7,7 +7,7 @@
     >
       <div
         class="menu-item"
-        v-if="!item.children || item.name == 'Project'"
+        v-if="!item.children"
         @click="handlerRouter(item.fullPath)"
       >
         {{ item.meta.title }}
@@ -33,6 +33,8 @@ export default {
   data() {
     return {
       topMenus: [],
+      // 判断登陆用户是何身份⌈ 01 ： 企业  02 ： 政务 ⌋
+      userType: this.$store.state.user.userType,
     };
   },
 
@@ -53,6 +55,9 @@ export default {
           }
         }
       });
+      if(this.userType == "01") {
+        this.topMenus[0].meta.title = "首页"
+      }
       this.addParentId(this.topMenus, null);
       this.$store.commit("SET_FIRST_ROUTER", this.topMenus[0].fullPath);
     },
@@ -75,6 +80,9 @@ export default {
 
     //是否当前路由
     isCurrentRoute(key) {
+      if((this.$route.path == '/user/projectInfo' || this.$route.path == '/user/enterpriselibraryInfo') && this.userType == '01' && key.indexOf("/enterpriseService") > -1) {
+        return true;
+      }
       return this.$route.path.indexOf(key) > -1;
     },
 
diff --git a/src/layout/components/FixedHeader/index.vue b/src/layout/components/FixedHeader/index.vue
index 055bed5..9af9b97 100644
--- a/src/layout/components/FixedHeader/index.vue
+++ b/src/layout/components/FixedHeader/index.vue
@@ -60,7 +60,7 @@ export default {
     $route: {
       handler(route) {
         // console.log(route,"route");
-        if(route.path == "/workbench") {
+        if(route.path == "/workbench" || route.path == "/dataCloudMap") {
           this.breadcrumbShow = false;
         } else {
           this.breadcrumbShow = true;
diff --git a/src/main.js b/src/main.js
index 329caac..40fb7d7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -81,7 +81,22 @@ if (!localVersion || version !== localVersion) {
   localStorage.clear()		// 清除缓存
   localStorage.setItem('projectVersion', version)
 }
+// var docEl = document.documentElement;
+// function setRemUnit () {
+//   var rem = docEl.clientWidth / 19.2; // 可根据不同电脑分辨率进行手动修改（如1920*1080 为19.2
+//   docEl.style.fontSize = rem + 'px'
+//   console.log(docEl);
+//   console.log(rem + 'px');
+// }
 
+// setRemUnit()
+
+// window.addEventListener('resize', setRemUnit)
+// window.addEventListener('pageshow', function (e) {
+//   if (e.persisted) {
+//     setRemUnit()
+//   }
+// })
 /**
  * If you don't want to use mock-server
  * you want to use MockJs for mock api
diff --git a/src/permission.js b/src/permission.js
index 9f524e6..877aeb7 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,9 +8,10 @@ import { isRelogin } from "@/utils/request";
 
 NProgress.configure({ showSpinner: false });
 
-const whiteList = ["/login", "/register"];
+const whiteList = ["/login", "/entLogin", "/register"];
 
 router.beforeEach((to, from, next) => {
+  console.log(window.location.href);
   NProgress.start();
   if (window.location.href.includes("clienttoken=")) {
     var reg = new RegExp(/[?&]clienttoken=([^&#]+)/);
@@ -22,7 +23,7 @@ router.beforeEach((to, from, next) => {
       store.dispatch("SingleSignOnGetInfo",{clientToken:clienttoken}).then(res => {
         isRelogin.show = false;
         let url = window.location.href;
-        var modifiedUrl = url.replace(/(\?appid&clienttoken=)[^&#]+/, '');
+        var modifiedUrl = url.replace(/(\&clienttoken=)[^&#]+/, '');
         // console.log(modifiedUrl,'modifiedUrl');
         window.location.href = modifiedUrl;
         // store.dispatch("GenerateRoutes").then((accessRoutes) => {
@@ -47,14 +48,29 @@ router.beforeEach((to, from, next) => {
               store.dispatch("LogOut").then(() => {
                 Message.error(err);
                 next({ path: "/" });
+                
               });
             });
         }
       }).catch((err) => {
+        // if(err.msg == "") {
+
+        // } else {
+
+        // }
         store.dispatch("LogOut").then(() => {
-          Message.error(err);
-          location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login"
+          // Message.error(err);
+          // let url = window.location.href;
+          // var modifiedUrl = url.replace(/(\?appid&clienttoken=)[^&#]+/, '');
+          // // console.log(modifiedUrl,'modifiedUrl');
+          // window.location.href = modifiedUrl;
+          window.location.href = "https://qytt.sipac.gov.cn/ecobrainportal/index.html";
+          next({ path: "/" });
         });
+        // store.dispatch("LogOut").then(() => {
+        //   Message.error(err);
+        //   location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login"
+        // });
       });
     } else {
       next();
@@ -111,18 +127,16 @@ router.beforeEach((to, from, next) => {
         // });
       });
     }
-  }
-  //  else if(window.location.href.includes("clienttoken=")){
-
-  // } 
-  else if (getToken()) {
+  } else if (getToken()) {
     to.meta.title && store.dispatch("settings/setTitle", to.meta.title);
     /* has token*/
-    if (to.path === "/login") {
+    if (to.path === "/entLogin") {
       next({ path: "/" });
       NProgress.done();
     } else if (whiteList.indexOf(to.path) !== -1) {
-      next();
+      next({ path: "/" });
+      NProgress.done();
+      // next();
     } else {
       if (store.getters.roles.length === 0) {
         isRelogin.show = true;
@@ -153,7 +167,7 @@ router.beforeEach((to, from, next) => {
       // 在免登录白名单，直接进入
       next();
     } else {
-      next(`/login?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页
+      next(`/entLogin?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页
       NProgress.done();
     }
     // store.dispatch("LogOut").then(() => {
diff --git a/src/plugins/package/designer/ProcessDesigner.vue b/src/plugins/package/designer/ProcessDesigner.vue
new file mode 100644
index 0000000..31309bd
--- /dev/null
+++ b/src/plugins/package/designer/ProcessDesigner.vue
@@ -0,0 +1,465 @@
+<template>
+  <div class="my-process-designer">
+    <div class="my-process-designer__header">
+      <slot name="control-header"></slot>
+      <template v-if="!$slots['control-header']">
+        <el-button-group key="file-control">
+          <el-button :size="headerButtonSize" :type="headerButtonType" icon="el-icon-edit-outline" @click="onSave">保存流程</el-button>
+          <el-button :size="headerButtonSize" :type="headerButtonType" icon="el-icon-folder-opened" @click="$refs.refFile.click()">打开文件</el-button>
+          <el-tooltip effect="light">
+            <div slot="content">
+              <el-button :size="headerButtonSize" type="text" @click="downloadProcessAsXml()">下载为XML文件</el-button>
+              <br />
+              <el-button :size="headerButtonSize" type="text" @click="downloadProcessAsSvg()">下载为SVG文件</el-button>
+              <br />
+              <el-button :size="headerButtonSize" type="text" @click="downloadProcessAsBpmn()">下载为BPMN文件</el-button>
+            </div>
+            <el-button :size="headerButtonSize" :type="headerButtonType" icon="el-icon-download">下载文件</el-button>
+          </el-tooltip>
+          <el-tooltip effect="light">
+            <div slot="content">
+              <el-button :size="headerButtonSize" type="text" @click="previewProcessXML">预览XML</el-button>
+              <br />
+              <el-button :size="headerButtonSize" type="text" @click="previewProcessJson">预览JSON</el-button>
+            </div>
+            <el-button :size="headerButtonSize" :type="headerButtonType" icon="el-icon-view">预览</el-button>
+          </el-tooltip>
+          <el-tooltip v-if="simulation" effect="light" :content="this.simulationStatus ? '退出模拟' : '开启模拟'">
+            <el-button :size="headerButtonSize" :type="headerButtonType" icon="el-icon-cpu" @click="processSimulation">
+              模拟
+            </el-button>
+          </el-tooltip>
+        </el-button-group>
+        <el-button-group key="align-control">
+          <el-tooltip effect="light" content="向左对齐">
+            <el-button :size="headerButtonSize" class="align align-left" icon="el-icon-s-data" @click="elementsAlign('left')" />
+          </el-tooltip>
+          <el-tooltip effect="light" content="向右对齐">
+            <el-button :size="headerButtonSize" class="align align-right" icon="el-icon-s-data" @click="elementsAlign('right')" />
+          </el-tooltip>
+          <el-tooltip effect="light" content="向上对齐">
+            <el-button :size="headerButtonSize" class="align align-top" icon="el-icon-s-data" @click="elementsAlign('top')" />
+          </el-tooltip>
+          <el-tooltip effect="light" content="向下对齐">
+            <el-button :size="headerButtonSize" class="align align-bottom" icon="el-icon-s-data" @click="elementsAlign('bottom')" />
+          </el-tooltip>
+          <el-tooltip effect="light" content="水平居中">
+            <el-button :size="headerButtonSize" class="align align-center" icon="el-icon-s-data" @click="elementsAlign('center')" />
+          </el-tooltip>
+          <el-tooltip effect="light" content="垂直居中">
+            <el-button :size="headerButtonSize" class="align align-middle" icon="el-icon-s-data" @click="elementsAlign('middle')" />
+          </el-tooltip>
+        </el-button-group>
+        <el-button-group key="scale-control">
+          <el-tooltip effect="light" content="缩小视图">
+            <el-button :size="headerButtonSize" :disabled="defaultZoom <= 0.3" icon="el-icon-zoom-out" @click="processZoomOut()" />
+          </el-tooltip>
+          <el-button :size="headerButtonSize">{{ Math.floor(this.defaultZoom * 10 * 10) + "%" }}</el-button>
+          <el-tooltip effect="light" content="放大视图">
+            <el-button :size="headerButtonSize" :disabled="defaultZoom >= 3.9" icon="el-icon-zoom-in" @click="processZoomIn()" />
+          </el-tooltip>
+          <el-tooltip effect="light" content="重置视图并居中">
+            <el-button :size="headerButtonSize" icon="el-icon-c-scale-to-original" @click="processReZoom()" />
+          </el-tooltip>
+        </el-button-group>
+        <el-button-group key="stack-control">
+          <el-tooltip effect="light" content="撤销">
+            <el-button :size="headerButtonSize" :disabled="!revocable" icon="el-icon-refresh-left" @click="processUndo()" />
+          </el-tooltip>
+          <el-tooltip effect="light" content="恢复">
+            <el-button :size="headerButtonSize" :disabled="!recoverable" icon="el-icon-refresh-right" @click="processRedo()" />
+          </el-tooltip>
+          <el-tooltip effect="light" content="重新绘制">
+            <el-button :size="headerButtonSize" icon="el-icon-refresh" @click="processRestart" />
+          </el-tooltip>
+        </el-button-group>
+      </template>
+      <!-- 用于打开本地文件-->
+      <input type="file" id="files" ref="refFile" style="display: none" accept=".xml, .bpmn" @change="importLocalFile" />
+    </div>
+    <div class="my-process-designer__container">
+      <div class="my-process-designer__canvas" ref="bpmn-canvas"></div>
+    </div>
+    <el-dialog title="预览" width="60%" :visible.sync="previewModelVisible" append-to-body destroy-on-close>
+      <highlightjs :language="previewType" :code="previewResult" style="height: 60vh" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+// 生产环境时优化
+// const BpmnModeler = window.BpmnJS;
+import BpmnModeler from "bpmn-js/lib/Modeler";
+import DefaultEmptyXML from "./plugins/defaultEmpty";
+// 翻译方法
+import customTranslate from "./plugins/translate/customTranslate";
+import translationsCN from "./plugins/translate/zh";
+// 模拟流转流程
+import tokenSimulation from "bpmn-js-token-simulation";
+// 标签解析构建器
+// import bpmnPropertiesProvider from "bpmn-js-properties-panel/lib/provider/bpmn";
+// 标签解析 Moddle
+import camundaModdleDescriptor from "./plugins/descriptor/camundaDescriptor.json";
+import activitiModdleDescriptor from "./plugins/descriptor/activitiDescriptor.json";
+import flowableModdleDescriptor from "./plugins/descriptor/flowableDescriptor.json";
+// 标签解析 Extension
+import camundaModdleExtension from "./plugins/extension-moddle/camunda";
+import activitiModdleExtension from "./plugins/extension-moddle/activiti";
+import flowableModdleExtension from "./plugins/extension-moddle/flowable";
+// 引入json转换与高亮
+import convert from "xml-js";
+
+export default {
+  name: "BpmnProcessDesigner",
+  componentName: "BpmnProcessDesigner",
+  props: {
+    value: String, // xml 字符串
+    processId: String,
+    processName: String,
+    translations: Object, // 自定义的翻译文件
+    additionalModel: [Object, Array], // 自定义model
+    moddleExtension: Object, // 自定义moddle
+    onlyCustomizeAddi: {
+      type: Boolean,
+      default: false
+    },
+    onlyCustomizeModdle: {
+      type: Boolean,
+      default: false
+    },
+    simulation: {
+      type: Boolean,
+      default: true
+    },
+    keyboard: {
+      type: Boolean,
+      default: true
+    },
+    prefix: {
+      type: String,
+      default: "flowable"
+    },
+    events: {
+      type: Array,
+      default: () => ["element.click"]
+    },
+    headerButtonSize: {
+      type: String,
+      default: "small",
+      validator: value => ["default", "medium", "small", "mini"].indexOf(value) !== -1
+    },
+    headerButtonType: {
+      type: String,
+      default: "primary",
+      validator: value => ["default", "primary", "success", "warning", "danger", "info"].indexOf(value) !== -1
+    }
+  },
+  data() {
+    return {
+      defaultZoom: 1,
+      previewModelVisible: false,
+      simulationStatus: false,
+      previewResult: "",
+      previewType: "xml",
+      recoverable: false,
+      revocable: false
+    };
+  },
+  computed: {
+    additionalModules() {
+      const Modules = [];
+      // 仅保留用户自定义扩展模块
+      if (this.onlyCustomizeAddi) {
+        if (Object.prototype.toString.call(this.additionalModel) === "[object Array]") {
+          return this.additionalModel || [];
+        }
+        return [this.additionalModel];
+      }
+
+      // 插入用户自定义扩展模块
+      if (Object.prototype.toString.call(this.additionalModel) === "[object Array]") {
+        Modules.push(...this.additionalModel);
+      } else {
+        this.additionalModel && Modules.push(this.additionalModel);
+      }
+
+      // 翻译模块
+      const TranslateModule = {
+        translate: ["value", customTranslate(this.translations || translationsCN)]
+      };
+      Modules.push(TranslateModule);
+
+      // 模拟流转模块
+      if (this.simulation) {
+        Modules.push(tokenSimulation);
+      }
+
+      // 根据需要的流程类型设置扩展元素构建模块
+      // if (this.prefix === "bpmn") {
+      //   Modules.push(bpmnModdleExtension);
+      // }
+      if (this.prefix === "camunda") {
+        Modules.push(camundaModdleExtension);
+      }
+      if (this.prefix === "flowable") {
+        Modules.push(flowableModdleExtension);
+      }
+      if (this.prefix === "activiti") {
+        Modules.push(activitiModdleExtension);
+      }
+
+      return Modules;
+    },
+    moddleExtensions() {
+      const Extensions = {};
+      // 仅使用用户自定义模块
+      if (this.onlyCustomizeModdle) {
+        return this.moddleExtension || null;
+      }
+
+      // 插入用户自定义模块
+      if (this.moddleExtension) {
+        for (let key in this.moddleExtension) {
+          Extensions[key] = this.moddleExtension[key];
+        }
+      }
+
+      // 根据需要的 "流程类型" 设置 对应的解析文件
+      if (this.prefix === "activiti") {
+        Extensions.activiti = activitiModdleDescriptor;
+      }
+      if (this.prefix === "flowable") {
+        Extensions.flowable = flowableModdleDescriptor;
+      }
+      if (this.prefix === "camunda") {
+        Extensions.camunda = camundaModdleDescriptor;
+      }
+
+      return Extensions;
+    }
+  },
+  mounted() {
+    this.initBpmnModeler();
+    this.createNewDiagram(this.value);
+    this.$once("hook:beforeDestroy", () => {
+      if (this.bpmnModeler) this.bpmnModeler.destroy();
+      this.$emit("destroy", this.bpmnModeler);
+      this.bpmnModeler = null;
+    });
+  },
+  methods: {
+    onSave () {
+      return new Promise((resolve, reject) => {
+        if (this.bpmnModeler == null) {
+          reject();
+        }
+        this.bpmnModeler.saveXML({ format: true }).then(({ xml }) => {
+          this.$emit('save', xml);
+          resolve(xml);
+        });
+      })
+    },
+    initBpmnModeler() {
+      if (this.bpmnModeler) return;
+      this.bpmnModeler = new BpmnModeler({
+        container: this.$refs["bpmn-canvas"],
+        keyboard: this.keyboard ? { bindTo: document } : null,
+        additionalModules: this.additionalModules,
+        moddleExtensions: this.moddleExtensions
+      });
+      this.$emit("init-finished", this.bpmnModeler);
+      this.initModelListeners();
+    },
+    initModelListeners() {
+      const EventBus = this.bpmnModeler.get("eventBus");
+      const that = this;
+      // 注册需要的监听事件, 将. 替换为 - , 避免解析异常
+      this.events.forEach(event => {
+        EventBus.on(event, function(eventObj) {
+          let eventName = event.replace(/\./g, "-");
+          let element = eventObj ? eventObj.element : null;
+          that.$emit(eventName, element, eventObj);
+          that.$emit('event', eventName, element, eventObj);
+        });
+      });
+      // 监听图形改变返回xml
+      EventBus.on("commandStack.changed", async event => {
+        try {
+          this.recoverable = this.bpmnModeler.get("commandStack").canRedo();
+          this.revocable = this.bpmnModeler.get("commandStack").canUndo();
+          let { xml } = await this.bpmnModeler.saveXML({ format: true });
+          this.$emit("commandStack-changed", event);
+          this.$emit("input", xml);
+          this.$emit("change", xml);
+        } catch (e) {
+          console.error(`[Process Designer Warn]: ${e.message || e}`);
+        }
+      });
+      // 监听视图缩放变化
+      this.bpmnModeler.on("canvas.viewbox.changed", ({ viewbox }) => {
+        this.$emit("canvas-viewbox-changed", { viewbox });
+        const { scale } = viewbox;
+        this.defaultZoom = Math.floor(scale * 100) / 100;
+      });
+    },
+    /* 创建新的流程图 */
+    async createNewDiagram(xml) {
+      // 将字符串转换成图显示出来
+      let newId = this.processId || `Process_${new Date().getTime()}`;
+      let newName = this.processName || `业务流程_${new Date().getTime()}`;
+      let xmlString = xml || DefaultEmptyXML(newId, newName, this.prefix);
+      try {
+        let { warnings } = await this.bpmnModeler.importXML(xmlString);
+        if (warnings && warnings.length) {
+          warnings.forEach(warn => console.warn(warn));
+        }
+      } catch (e) {
+        console.error(`[Process Designer Warn]: ${e.message || e}`);
+      }
+    },
+
+    // 下载流程图到本地
+    async downloadProcess(type, name) {
+      try {
+        const _this = this;
+        // 按需要类型创建文件并下载
+        if (type === "xml" || type === "bpmn") {
+          const { err, xml } = await this.bpmnModeler.saveXML();
+          // 读取异常时抛出异常
+          if (err) {
+            console.error(`[Process Designer Warn ]: ${err.message || err}`);
+          }
+          let { href, filename } = _this.setEncoded(type.toUpperCase(), name, xml);
+          downloadFunc(href, filename);
+        } else {
+          const { err, svg } = await this.bpmnModeler.saveSVG();
+          // 读取异常时抛出异常
+          if (err) {
+            return console.error(err);
+          }
+          let { href, filename } = _this.setEncoded("SVG", name, svg);
+          downloadFunc(href, filename);
+        }
+      } catch (e) {
+        console.error(`[Process Designer Warn ]: ${e.message || e}`);
+      }
+      // 文件下载方法
+      function downloadFunc(href, filename) {
+        if (href && filename) {
+          let a = document.createElement("a");
+          a.download = filename; //指定下载的文件名
+          a.href = href; //  URL对象
+          a.click(); // 模拟点击
+          URL.revokeObjectURL(a.href); // 释放URL 对象
+        }
+      }
+    },
+
+    // 根据所需类型进行转码并返回下载地址
+    setEncoded(type, filename = "diagram", data) {
+      const encodedData = encodeURIComponent(data);
+      return {
+        filename: `${filename}.${type}`,
+        href: `data:application/${type === "svg" ? "text/xml" : "bpmn20-xml"};charset=UTF-8,${encodedData}`,
+        data: data
+      };
+    },
+
+    // 加载本地文件
+    importLocalFile() {
+      const that = this;
+      const file = this.$refs.refFile.files[0];
+      const reader = new FileReader();
+      reader.readAsText(file);
+      reader.onload = function() {
+        let xmlStr = this.result;
+        that.createNewDiagram(xmlStr);
+      };
+    },
+    /* ------------------------------------------------ refs methods ------------------------------------------------------ */
+    downloadProcessAsXml() {
+      this.downloadProcess("xml");
+    },
+    downloadProcessAsBpmn() {
+      this.downloadProcess("bpmn");
+    },
+    downloadProcessAsSvg() {
+      this.downloadProcess("svg");
+    },
+    processSimulation() {
+      this.simulationStatus = !this.simulationStatus;
+      this.simulation && this.bpmnModeler.get("toggleMode").toggleMode();
+    },
+    processRedo() {
+      this.bpmnModeler.get("commandStack").redo();
+    },
+    processUndo() {
+      this.bpmnModeler.get("commandStack").undo();
+    },
+    processZoomIn(zoomStep = 0.1) {
+      let newZoom = Math.floor(this.defaultZoom * 100 + zoomStep * 100) / 100;
+      if (newZoom > 4) {
+        throw new Error("[Process Designer Warn ]: The zoom ratio cannot be greater than 4");
+      }
+      this.defaultZoom = newZoom;
+      this.bpmnModeler.get("canvas").zoom(this.defaultZoom);
+    },
+    processZoomOut(zoomStep = 0.1) {
+      let newZoom = Math.floor(this.defaultZoom * 100 - zoomStep * 100) / 100;
+      if (newZoom < 0.2) {
+        throw new Error("[Process Designer Warn ]: The zoom ratio cannot be less than 0.2");
+      }
+      this.defaultZoom = newZoom;
+      this.bpmnModeler.get("canvas").zoom(this.defaultZoom);
+    },
+    processZoomTo(newZoom = 1) {
+      if (newZoom < 0.2) {
+        throw new Error("[Process Designer Warn ]: The zoom ratio cannot be less than 0.2");
+      }
+      if (newZoom > 4) {
+        throw new Error("[Process Designer Warn ]: The zoom ratio cannot be greater than 4");
+      }
+      this.defaultZoom = newZoom;
+      this.bpmnModeler.get("canvas").zoom(newZoom);
+    },
+    processReZoom() {
+      this.defaultZoom = 1;
+      this.bpmnModeler.get("canvas").zoom("fit-viewport", "auto");
+    },
+    processRestart() {
+      this.recoverable = false;
+      this.revocable = false;
+      this.createNewDiagram(null).then(() => this.bpmnModeler.get("canvas").zoom(1, "auto"));
+    },
+    elementsAlign(align) {
+      const Align = this.bpmnModeler.get("alignElements");
+      const Selection = this.bpmnModeler.get("selection");
+      const SelectedElements = Selection.get();
+      if (!SelectedElements || SelectedElements.length <= 1) {
+        this.$message.warning("请按住 Ctrl 键选择多个元素对齐");
+        return;
+      }
+      this.$confirm("自动对齐可能造成图形变形，是否继续？", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => Align.trigger(SelectedElements, align));
+    },
+    /*-----------------------------    方法结束     ---------------------------------*/
+    previewProcessXML() {
+      this.bpmnModeler.saveXML({ format: true }).then(({ xml }) => {
+        this.previewResult = xml;
+        this.previewType = "xml";
+        this.previewModelVisible = true;
+      });
+    },
+    previewProcessJson() {
+      this.bpmnModeler.saveXML({ format: true }).then(({ xml }) => {
+        this.previewResult = convert.xml2json(xml, { spaces: 2 });
+        this.previewType = "json";
+        this.previewModelVisible = true;
+      });
+    }
+  }
+};
+</script>
diff --git a/src/plugins/package/designer/index.js b/src/plugins/package/designer/index.js
new file mode 100644
index 0000000..0566ee9
--- /dev/null
+++ b/src/plugins/package/designer/index.js
@@ -0,0 +1,7 @@
+import BpmnProcessDesigner from "./ProcessDesigner.vue";
+
+BpmnProcessDesigner.install = function(Vue) {
+  Vue.component(BpmnProcessDesigner.name, BpmnProcessDesigner);
+};
+
+export default BpmnProcessDesigner;
diff --git a/src/plugins/package/designer/plugins/content-pad/contentPadProvider.js b/src/plugins/package/designer/plugins/content-pad/contentPadProvider.js
new file mode 100644
index 0000000..447a99b
--- /dev/null
+++ b/src/plugins/package/designer/plugins/content-pad/contentPadProvider.js
@@ -0,0 +1,390 @@
+import { assign, forEach, isArray } from "min-dash";
+
+import { is } from "bpmn-js/lib/util/ModelUtil";
+
+import { isExpanded, isEventSubProcess } from "bpmn-js/lib/util/DiUtil";
+
+import { isAny } from "bpmn-js/lib/features/modeling/util/ModelingUtil";
+
+import { getChildLanes } from "bpmn-js/lib/features/modeling/util/LaneUtil";
+
+import { hasPrimaryModifier } from "diagram-js/lib/util/Mouse";
+
+/**
+ * A provider for BPMN 2.0 elements context pad
+ */
+export default function ContextPadProvider(
+  config,
+  injector,
+  eventBus,
+  contextPad,
+  modeling,
+  elementFactory,
+  connect,
+  create,
+  popupMenu,
+  canvas,
+  rules,
+  translate,
+  elementRegistry
+) {
+  config = config || {};
+
+  contextPad.registerProvider(this);
+
+  this._contextPad = contextPad;
+
+  this._modeling = modeling;
+
+  this._elementFactory = elementFactory;
+  this._connect = connect;
+  this._create = create;
+  this._popupMenu = popupMenu;
+  this._canvas = canvas;
+  this._rules = rules;
+  this._translate = translate;
+
+  if (config.autoPlace !== false) {
+    this._autoPlace = injector.get("autoPlace", false);
+  }
+
+  eventBus.on("create.end", 250, function(event) {
+    var context = event.context,
+      shape = context.shape;
+
+    if (!hasPrimaryModifier(event) || !contextPad.isOpen(shape)) {
+      return;
+    }
+
+    var entries = contextPad.getEntries(shape);
+
+    if (entries.replace) {
+      entries.replace.action.click(event, shape);
+    }
+  });
+}
+
+ContextPadProvider.$inject = [
+  "config.contextPad",
+  "injector",
+  "eventBus",
+  "contextPad",
+  "modeling",
+  "elementFactory",
+  "connect",
+  "create",
+  "popupMenu",
+  "canvas",
+  "rules",
+  "translate",
+  "elementRegistry"
+];
+
+ContextPadProvider.prototype.getContextPadEntries = function(element) {
+  var contextPad = this._contextPad,
+    modeling = this._modeling,
+    elementFactory = this._elementFactory,
+    connect = this._connect,
+    create = this._create,
+    popupMenu = this._popupMenu,
+    canvas = this._canvas,
+    rules = this._rules,
+    autoPlace = this._autoPlace,
+    translate = this._translate;
+
+  var actions = {};
+
+  if (element.type === "label") {
+    return actions;
+  }
+
+  var businessObject = element.businessObject;
+
+  function startConnect(event, element) {
+    connect.start(event, element);
+  }
+
+  function removeElement() {
+    modeling.removeElements([element]);
+  }
+
+  function getReplaceMenuPosition(element) {
+    var Y_OFFSET = 5;
+
+    var diagramContainer = canvas.getContainer(),
+      pad = contextPad.getPad(element).html;
+
+    var diagramRect = diagramContainer.getBoundingClientRect(),
+      padRect = pad.getBoundingClientRect();
+
+    var top = padRect.top - diagramRect.top;
+    var left = padRect.left - diagramRect.left;
+
+    var pos = {
+      x: left,
+      y: top + padRect.height + Y_OFFSET
+    };
+
+    return pos;
+  }
+
+  /**
+   * Create an append action
+   *
+   * @param {string} type
+   * @param {string} className
+   * @param {string} [title]
+   * @param {Object} [options]
+   *
+   * @return {Object} descriptor
+   */
+  function appendAction(type, className, title, options) {
+    if (typeof title !== "string") {
+      options = title;
+      title = translate("Append {type}", { type: type.replace(/^bpmn:/, "") });
+    }
+
+    function appendStart(event, element) {
+      var shape = elementFactory.createShape(assign({ type: type }, options));
+      create.start(event, shape, {
+        source: element
+      });
+    }
+
+    var append = autoPlace
+      ? function(event, element) {
+          var shape = elementFactory.createShape(assign({ type: type }, options));
+
+          autoPlace.append(element, shape);
+        }
+      : appendStart;
+
+    return {
+      group: "model",
+      className: className,
+      title: title,
+      action: {
+        dragstart: appendStart,
+        click: append
+      }
+    };
+  }
+
+  function splitLaneHandler(count) {
+    return function(event, element) {
+      // actual split
+      modeling.splitLane(element, count);
+
+      // refresh context pad after split to
+      // get rid of split icons
+      contextPad.open(element, true);
+    };
+  }
+
+  if (isAny(businessObject, ["bpmn:Lane", "bpmn:Participant"]) && isExpanded(businessObject)) {
+    var childLanes = getChildLanes(element);
+
+    assign(actions, {
+      "lane-insert-above": {
+        group: "lane-insert-above",
+        className: "bpmn-icon-lane-insert-above",
+        title: translate("Add Lane above"),
+        action: {
+          click: function(event, element) {
+            modeling.addLane(element, "top");
+          }
+        }
+      }
+    });
+
+    if (childLanes.length < 2) {
+      if (element.height >= 120) {
+        assign(actions, {
+          "lane-divide-two": {
+            group: "lane-divide",
+            className: "bpmn-icon-lane-divide-two",
+            title: translate("Divide into two Lanes"),
+            action: {
+              click: splitLaneHandler(2)
+            }
+          }
+        });
+      }
+
+      if (element.height >= 180) {
+        assign(actions, {
+          "lane-divide-three": {
+            group: "lane-divide",
+            className: "bpmn-icon-lane-divide-three",
+            title: translate("Divide into three Lanes"),
+            action: {
+              click: splitLaneHandler(3)
+            }
+          }
+        });
+      }
+    }
+
+    assign(actions, {
+      "lane-insert-below": {
+        group: "lane-insert-below",
+        className: "bpmn-icon-lane-insert-below",
+        title: translate("Add Lane below"),
+        action: {
+          click: function(event, element) {
+            modeling.addLane(element, "bottom");
+          }
+        }
+      }
+    });
+  }
+
+  if (is(businessObject, "bpmn:FlowNode")) {
+    if (is(businessObject, "bpmn:EventBasedGateway")) {
+      assign(actions, {
+        "append.receive-task": appendAction("bpmn:ReceiveTask", "bpmn-icon-receive-task", translate("Append ReceiveTask")),
+        "append.message-intermediate-event": appendAction(
+          "bpmn:IntermediateCatchEvent",
+          "bpmn-icon-intermediate-event-catch-message",
+          translate("Append MessageIntermediateCatchEvent"),
+          { eventDefinitionType: "bpmn:MessageEventDefinition" }
+        ),
+        "append.timer-intermediate-event": appendAction(
+          "bpmn:IntermediateCatchEvent",
+          "bpmn-icon-intermediate-event-catch-timer",
+          translate("Append TimerIntermediateCatchEvent"),
+          { eventDefinitionType: "bpmn:TimerEventDefinition" }
+        ),
+        "append.condition-intermediate-event": appendAction(
+          "bpmn:IntermediateCatchEvent",
+          "bpmn-icon-intermediate-event-catch-condition",
+          translate("Append ConditionIntermediateCatchEvent"),
+          { eventDefinitionType: "bpmn:ConditionalEventDefinition" }
+        ),
+        "append.signal-intermediate-event": appendAction(
+          "bpmn:IntermediateCatchEvent",
+          "bpmn-icon-intermediate-event-catch-signal",
+          translate("Append SignalIntermediateCatchEvent"),
+          { eventDefinitionType: "bpmn:SignalEventDefinition" }
+        )
+      });
+    } else if (isEventType(businessObject, "bpmn:BoundaryEvent", "bpmn:CompensateEventDefinition")) {
+      assign(actions, {
+        "append.compensation-activity": appendAction("bpmn:Task", "bpmn-icon-task", translate("Append compensation activity"), {
+          isForCompensation: true
+        })
+      });
+    } else if (
+      !is(businessObject, "bpmn:EndEvent") &&
+      !businessObject.isForCompensation &&
+      !isEventType(businessObject, "bpmn:IntermediateThrowEvent", "bpmn:LinkEventDefinition") &&
+      !isEventSubProcess(businessObject)
+    ) {
+      assign(actions, {
+        "append.end-event": appendAction("bpmn:EndEvent", "bpmn-icon-end-event-none", translate("Append EndEvent")),
+        "append.gateway": appendAction("bpmn:ExclusiveGateway", "bpmn-icon-gateway-none", translate("Append Gateway")),
+        "append.append-task": appendAction("bpmn:UserTask", "bpmn-icon-user-task", translate("Append Task")),
+        "append.intermediate-event": appendAction(
+          "bpmn:IntermediateThrowEvent",
+          "bpmn-icon-intermediate-event-none",
+          translate("Append Intermediate/Boundary Event")
+        )
+      });
+    }
+  }
+
+  if (!popupMenu.isEmpty(element, "bpmn-replace")) {
+    // Replace menu entry
+    assign(actions, {
+      replace: {
+        group: "edit",
+        className: "bpmn-icon-screw-wrench",
+        title: translate("Change type"),
+        action: {
+          click: function(event, element) {
+            var position = assign(getReplaceMenuPosition(element), {
+              cursor: { x: event.x, y: event.y }
+            });
+
+            popupMenu.open(element, "bpmn-replace", position);
+          }
+        }
+      }
+    });
+  }
+
+  if (isAny(businessObject, ["bpmn:FlowNode", "bpmn:InteractionNode", "bpmn:DataObjectReference", "bpmn:DataStoreReference"])) {
+    assign(actions, {
+      "append.text-annotation": appendAction("bpmn:TextAnnotation", "bpmn-icon-text-annotation"),
+
+      connect: {
+        group: "connect",
+        className: "bpmn-icon-connection-multi",
+        title: translate("Connect using " + (businessObject.isForCompensation ? "" : "Sequence/MessageFlow or ") + "Association"),
+        action: {
+          click: startConnect,
+          dragstart: startConnect
+        }
+      }
+    });
+  }
+
+  if (isAny(businessObject, ["bpmn:DataObjectReference", "bpmn:DataStoreReference"])) {
+    assign(actions, {
+      connect: {
+        group: "connect",
+        className: "bpmn-icon-connection-multi",
+        title: translate("Connect using DataInputAssociation"),
+        action: {
+          click: startConnect,
+          dragstart: startConnect
+        }
+      }
+    });
+  }
+
+  if (is(businessObject, "bpmn:Group")) {
+    assign(actions, {
+      "append.text-annotation": appendAction("bpmn:TextAnnotation", "bpmn-icon-text-annotation")
+    });
+  }
+
+  // delete element entry, only show if allowed by rules
+  var deleteAllowed = rules.allowed("elements.delete", { elements: [element] });
+
+  if (isArray(deleteAllowed)) {
+    // was the element returned as a deletion candidate?
+    deleteAllowed = deleteAllowed[0] === element;
+  }
+
+  if (deleteAllowed) {
+    assign(actions, {
+      delete: {
+        group: "edit",
+        className: "bpmn-icon-trash",
+        title: translate("Remove"),
+        action: {
+          click: removeElement
+        }
+      }
+    });
+  }
+
+  return actions;
+};
+
+// helpers /////////
+
+function isEventType(eventBo, type, definition) {
+  var isType = eventBo.$instanceOf(type);
+  var isDefinition = false;
+
+  var definitions = eventBo.eventDefinitions || [];
+  forEach(definitions, function(def) {
+    if (def.$type === definition) {
+      isDefinition = true;
+    }
+  });
+
+  return isType && isDefinition;
+}
diff --git a/src/plugins/package/designer/plugins/content-pad/index.js b/src/plugins/package/designer/plugins/content-pad/index.js
new file mode 100644
index 0000000..a9cf887
--- /dev/null
+++ b/src/plugins/package/designer/plugins/content-pad/index.js
@@ -0,0 +1,6 @@
+import CustomContextPadProvider from "./contentPadProvider";
+
+export default {
+  __init__: ["contextPadProvider"],
+  contextPadProvider: ["type", CustomContextPadProvider]
+};
diff --git a/src/plugins/package/designer/plugins/defaultEmpty.js b/src/plugins/package/designer/plugins/defaultEmpty.js
new file mode 100644
index 0000000..9ec1df1
--- /dev/null
+++ b/src/plugins/package/designer/plugins/defaultEmpty.js
@@ -0,0 +1,27 @@
+export default (key, name, type) => {
+  if (!type) type = "camunda";
+  const TYPE_TARGET = {
+    activiti: "http://activiti.org/bpmn",
+    camunda: "http://bpmn.io/schema/bpmn",
+    flowable: "http://flowable.org/bpmn"
+  };
+  return `
+    <?xml version="1.0" encoding="UTF-8"?>
+    <bpmn2:definitions 
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL"
+      xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
+      xmlns:dc="http://www.omg.org/spec/DD/20100524/DC"
+      xmlns:di="http://www.omg.org/spec/DD/20100524/DI"
+      xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+      id="diagram_${key}"
+      targetNamespace="${TYPE_TARGET[type]}">
+      <bpmn2:process id="${key}" name="${name}" isExecutable="true">
+      </bpmn2:process>
+      <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+        <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="${key}">
+        </bpmndi:BPMNPlane>
+      </bpmndi:BPMNDiagram>
+    </bpmn2:definitions>
+  `;
+};
diff --git a/src/plugins/package/designer/plugins/descriptor/activitiDescriptor.json b/src/plugins/package/designer/plugins/descriptor/activitiDescriptor.json
new file mode 100644
index 0000000..b765d3d
--- /dev/null
+++ b/src/plugins/package/designer/plugins/descriptor/activitiDescriptor.json
@@ -0,0 +1,1283 @@
+{
+  "name": "Activiti",
+  "uri": "http://activiti.org/bpmn",
+  "prefix": "activiti",
+  "xml": {
+    "tagAlias": "lowerCase"
+  },
+  "associations": [],
+  "types": [
+    {
+      "name": "Definitions",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:Definitions"
+      ],
+      "properties": [
+        {
+          "name": "diagramRelationId",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "InOutBinding",
+      "superClass": [
+        "Element"
+      ],
+      "isAbstract": true,
+      "properties": [
+        {
+          "name": "source",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "sourceExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "target",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "businessKey",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "local",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "variables",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "In",
+      "superClass": [
+        "InOutBinding"
+      ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:CallActivity"
+        ]
+      }
+    },
+    {
+      "name": "Out",
+      "superClass": [
+        "InOutBinding"
+      ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:CallActivity"
+        ]
+      }
+    },
+    {
+      "name": "AsyncCapable",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:Activity",
+        "bpmn:Gateway",
+        "bpmn:Event"
+      ],
+      "properties": [
+        {
+          "name": "async",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "asyncBefore",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "asyncAfter",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "exclusive",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": true
+        }
+      ]
+    },
+    {
+      "name": "JobPriorized",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:Process",
+        "activiti:AsyncCapable"
+      ],
+      "properties": [
+        {
+          "name": "jobPriority",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "SignalEventDefinition",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:SignalEventDefinition"
+      ],
+      "properties": [
+        {
+          "name": "async",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        }
+      ]
+    },
+    {
+      "name": "ErrorEventDefinition",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:ErrorEventDefinition"
+      ],
+      "properties": [
+        {
+          "name": "errorCodeVariable",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "errorMessageVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Error",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:Error"
+      ],
+      "properties": [
+        {
+          "name": "activiti:errorMessage",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "PotentialStarter",
+      "superClass": [
+        "Element"
+      ],
+      "properties": [
+        {
+          "name": "resourceAssignmentExpression",
+          "type": "bpmn:ResourceAssignmentExpression"
+        }
+      ]
+    },
+    {
+      "name": "FormSupported",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:StartEvent",
+        "bpmn:UserTask"
+      ],
+      "properties": [
+        {
+          "name": "formHandlerClass",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "formKey",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "TemplateSupported",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:Process",
+        "bpmn:FlowElement"
+      ],
+      "properties": [
+        {
+          "name": "modelerTemplate",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Initiator",
+      "isAbstract": true,
+      "extends": [ "bpmn:StartEvent" ],
+      "properties": [
+        {
+          "name": "initiator",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ScriptTask",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:ScriptTask"
+      ],
+      "properties": [
+        {
+          "name": "resultVariable",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Process",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:Process"
+      ],
+      "properties": [
+        {
+          "name": "candidateStarterGroups",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "candidateStarterUsers",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "processCategory",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "versionTag",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "historyTimeToLive",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "isStartableInTasklist",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": true
+        },
+        {
+          "name":"executionListener",
+          "isAbstract": true,
+          "type":"Expression"
+        }
+      ]
+    },
+    {
+      "name": "EscalationEventDefinition",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:EscalationEventDefinition"
+      ],
+      "properties": [
+        {
+          "name": "escalationCodeVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "FormalExpression",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:FormalExpression"
+      ],
+      "properties": [
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "multiinstance_type",
+      "superClass":[
+        "Element"
+      ]
+    },
+    {
+      "name": "multiinstance_condition",
+      "superClass":[
+        "Element"
+      ]
+    },
+    {
+      "name": "Assignable",
+      "extends": [ "bpmn:UserTask" ],
+      "properties": [
+        {
+          "name": "assignee",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "candidateUsers",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "candidateGroups",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "dueDate",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "followUpDate",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "priority",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "multiinstance_condition",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "CallActivity",
+      "extends": [ "bpmn:CallActivity" ],
+      "properties": [
+        {
+          "name": "calledElementBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "calledElementVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "calledElementVersionTag",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "calledElementTenantId",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseRef",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "caseVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseTenantId",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableMappingClass",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableMappingDelegateExpression",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ServiceTaskLike",
+      "extends": [
+        "bpmn:ServiceTask",
+        "bpmn:BusinessRuleTask",
+        "bpmn:SendTask",
+        "bpmn:MessageEventDefinition"
+      ],
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resultVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "DmnCapable",
+      "extends": [
+        "bpmn:BusinessRuleTask"
+      ],
+      "properties": [
+        {
+          "name": "decisionRef",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "decisionRefBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "decisionRefVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "mapDecisionResult",
+          "isAttr": true,
+          "type": "String",
+          "default": "resultList"
+        },
+        {
+          "name": "decisionRefTenantId",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ExternalCapable",
+      "extends": [
+        "activiti:ServiceTaskLike"
+      ],
+      "properties": [
+        {
+          "name": "type",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "topic",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "TaskPriorized",
+      "extends": [
+        "bpmn:Process",
+        "activiti:ExternalCapable"
+      ],
+      "properties": [
+        {
+          "name": "taskPriority",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Properties",
+      "superClass": [
+        "Element"
+      ],
+      "meta": {
+        "allowedIn": [ "*" ]
+      },
+      "properties": [
+        {
+          "name": "values",
+          "type": "Property",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Property",
+      "superClass": [
+        "Element"
+      ],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "value",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "Connector",
+      "superClass": [
+        "Element"
+      ],
+      "meta": {
+        "allowedIn": [
+          "activiti:ServiceTaskLike"
+        ]
+      },
+      "properties": [
+        {
+          "name": "inputOutput",
+          "type": "InputOutput"
+        },
+        {
+          "name": "connectorId",
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "InputOutput",
+      "superClass": [
+        "Element"
+      ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:FlowNode",
+          "activiti:Connector"
+        ]
+      },
+      "properties": [
+        {
+          "name": "inputOutput",
+          "type": "InputOutput"
+        },
+        {
+          "name": "connectorId",
+          "type": "String"
+        },
+        {
+          "name": "inputParameters",
+          "isMany": true,
+          "type": "InputParameter"
+        },
+        {
+          "name": "outputParameters",
+          "isMany": true,
+          "type": "OutputParameter"
+        }
+      ]
+    },
+    {
+      "name": "InputOutputParameter",
+      "properties": [
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        },
+        {
+          "name": "definition",
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "InputOutputParameterDefinition",
+      "isAbstract": true
+    },
+    {
+      "name": "List",
+      "superClass": [ "InputOutputParameterDefinition" ],
+      "properties": [
+        {
+          "name": "items",
+          "isMany": true,
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "Map",
+      "superClass": [ "InputOutputParameterDefinition" ],
+      "properties": [
+        {
+          "name": "entries",
+          "isMany": true,
+          "type": "Entry"
+        }
+      ]
+    },
+    {
+      "name": "Entry",
+      "properties": [
+        {
+          "name": "key",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        },
+        {
+          "name": "definition",
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "Value",
+      "superClass": [
+        "InputOutputParameterDefinition"
+      ],
+      "properties": [
+        {
+          "name": "id",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Script",
+      "superClass": [ "InputOutputParameterDefinition" ],
+      "properties": [
+        {
+          "name": "scriptFormat",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Field",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "activiti:ServiceTaskLike",
+          "activiti:ExecutionListener",
+          "activiti:TaskListener"
+        ]
+      },
+      "properties": [
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "expression",
+          "type": "String"
+        },
+        {
+          "name": "stringValue",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "string",
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "InputParameter",
+      "superClass": [ "InputOutputParameter" ]
+    },
+    {
+      "name": "OutputParameter",
+      "superClass": [ "InputOutputParameter" ]
+    },
+    {
+      "name": "Collectable",
+      "isAbstract": true,
+      "extends": [ "bpmn:MultiInstanceLoopCharacteristics" ],
+      "superClass": [ "activiti:AsyncCapable" ],
+      "properties": [
+        {
+          "name": "collection",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "elementVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "FailedJobRetryTimeCycle",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "activiti:AsyncCapable",
+          "bpmn:MultiInstanceLoopCharacteristics"
+        ]
+      },
+      "properties": [
+        {
+          "name": "body",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ExecutionListener",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:Task",
+          "bpmn:ServiceTask",
+          "bpmn:UserTask",
+          "bpmn:BusinessRuleTask",
+          "bpmn:ScriptTask",
+          "bpmn:ReceiveTask",
+          "bpmn:ManualTask",
+          "bpmn:ExclusiveGateway",
+          "bpmn:SequenceFlow",
+          "bpmn:ParallelGateway",
+          "bpmn:InclusiveGateway",
+          "bpmn:EventBasedGateway",
+          "bpmn:StartEvent",
+          "bpmn:IntermediateCatchEvent",
+          "bpmn:IntermediateThrowEvent",
+          "bpmn:EndEvent",
+          "bpmn:BoundaryEvent",
+          "bpmn:CallActivity",
+          "bpmn:SubProcess",
+          "bpmn:Process"
+        ]
+      },
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "event",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "script",
+          "type": "Script"
+        },
+        {
+          "name": "fields",
+          "type": "Field",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "TaskListener",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:UserTask"
+        ]
+      },
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "event",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "script",
+          "type": "Script"
+        },
+        {
+          "name": "fields",
+          "type": "Field",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "FormProperty",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:StartEvent",
+          "bpmn:UserTask"
+        ]
+      },
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "required",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "readable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "writable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "variable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "expression",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "datePattern",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "default",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "values",
+          "type": "Value",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "FormProperty",
+      "superClass": [ "Element" ],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "label",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "datePattern",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "defaultValue",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "properties",
+          "type": "Properties"
+        },
+        {
+          "name": "validation",
+          "type": "Validation"
+        },
+        {
+          "name": "values",
+          "type": "Value",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Validation",
+      "superClass": [ "Element" ],
+      "properties": [
+        {
+          "name": "constraints",
+          "type": "Constraint",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Constraint",
+      "superClass": [ "Element" ],
+      "properties": [
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "config",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "ExtensionElements",
+      "properties": [
+        {
+          "name": "operationList",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "OperationList",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:UserTask"
+        ]
+      },
+      "properties": [
+        {
+          "name": "operationList",
+          "type": "FormOperation",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "FormOperation",
+      "superClass": [ "Element" ],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "label",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "showOrder",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "multiSignAssignee",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "VariableList",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:UserTask"
+        ]
+      },
+      "properties": [
+        {
+          "name": "variableList",
+          "type": "FormVariable",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "FormVariable",
+      "superClass": [ "Element" ],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "DeptPostList",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:UserTask"
+        ]
+      },
+      "properties": [
+        {
+          "name": "deptPostList",
+          "type": "DeptPost",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "DeptPost",
+      "superClass": [ "Element" ],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "postId",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "deptPostId",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "UserCandidateGroups",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:UserTask"
+        ]
+      },
+      "properties": [
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "value",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "CustomCondition",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:SequenceFlow"
+        ]
+      },
+      "properties": [
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "operationType",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "parallelRefuse",
+          "type": "Boolean",
+          "isAttr": true,
+          "default": false
+        }
+      ]
+    },
+    {
+      "name": "AssigneeList",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:StartEvent",
+          "bpmn:UserTask"
+        ]
+      },
+      "properties": [
+        {
+          "name": "assigneeList",
+          "type": "Assignee",
+          "isMany": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "Assignee",
+      "superClass": [ "Element" ],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "ConditionalEventDefinition",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:ConditionalEventDefinition"
+      ],
+      "properties": [
+        {
+          "name": "variableName",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableEvent",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    }
+  ],
+  "emumerations": [ ]
+}
diff --git a/src/plugins/package/designer/plugins/descriptor/camundaDescriptor.json b/src/plugins/package/designer/plugins/descriptor/camundaDescriptor.json
new file mode 100644
index 0000000..a738cfd
--- /dev/null
+++ b/src/plugins/package/designer/plugins/descriptor/camundaDescriptor.json
@@ -0,0 +1,1092 @@
+{
+  "name": "Camunda",
+  "uri": "http://camunda.org/schema/1.0/bpmn",
+  "prefix": "camunda",
+  "xml": {
+    "tagAlias": "lowerCase"
+  },
+  "associations": [],
+  "types": [
+    {
+      "name": "Definitions",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:Definitions"
+      ],
+      "properties": [
+        {
+          "name": "diagramRelationId",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "InOutBinding",
+      "superClass": [
+        "Element"
+      ],
+      "isAbstract": true,
+      "properties": [
+        {
+          "name": "source",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "sourceExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "target",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "businessKey",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "local",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "variables",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "In",
+      "superClass": [
+        "InOutBinding"
+      ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:CallActivity",
+          "bpmn:SignalEventDefinition"
+        ]
+      }
+    },
+    {
+      "name": "Out",
+      "superClass": [
+        "InOutBinding"
+      ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:CallActivity"
+        ]
+      }
+    },
+    {
+      "name": "AsyncCapable",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:Activity",
+        "bpmn:Gateway",
+        "bpmn:Event"
+      ],
+      "properties": [
+        {
+          "name": "async",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "asyncBefore",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "asyncAfter",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "exclusive",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": true
+        }
+      ]
+    },
+    {
+      "name": "JobPriorized",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:Process",
+        "camunda:AsyncCapable"
+      ],
+      "properties": [
+        {
+          "name": "jobPriority",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "SignalEventDefinition",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:SignalEventDefinition"
+      ],
+      "properties": [
+        {
+          "name": "async",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        }
+      ]
+    },
+    {
+      "name": "ErrorEventDefinition",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:ErrorEventDefinition"
+      ],
+      "properties": [
+        {
+          "name": "errorCodeVariable",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "errorMessageVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Error",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:Error"
+      ],
+      "properties": [
+        {
+          "name": "camunda:errorMessage",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "PotentialStarter",
+      "superClass": [
+        "Element"
+      ],
+      "properties": [
+        {
+          "name": "resourceAssignmentExpression",
+          "type": "bpmn:ResourceAssignmentExpression"
+        }
+      ]
+    },
+    {
+      "name": "FormSupported",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:StartEvent",
+        "bpmn:UserTask"
+      ],
+      "properties": [
+        {
+          "name": "formHandlerClass",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "formKey",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "TemplateSupported",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:Process",
+        "bpmn:FlowElement"
+      ],
+      "properties": [
+        {
+          "name": "modelerTemplate",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "modelerTemplateVersion",
+          "isAttr": true,
+          "type": "Integer"
+        }
+      ]
+    },
+    {
+      "name": "Initiator",
+      "isAbstract": true,
+      "extends": [ "bpmn:StartEvent" ],
+      "properties": [
+        {
+          "name": "initiator",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ScriptTask",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:ScriptTask"
+      ],
+      "properties": [
+        {
+          "name": "resultVariable",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Process",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:Process"
+      ],
+      "properties": [
+        {
+          "name": "candidateStarterGroups",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "candidateStarterUsers",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "processCategory",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "versionTag",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "historyTimeToLive",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "isStartableInTasklist",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": true
+        }
+      ]
+    },
+    {
+      "name": "EscalationEventDefinition",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:EscalationEventDefinition"
+      ],
+      "properties": [
+        {
+          "name": "escalationCodeVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "FormalExpression",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:FormalExpression"
+      ],
+      "properties": [
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Assignable",
+      "extends": [ "bpmn:UserTask" ],
+      "properties": [
+        {
+          "name": "assignee",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "candidateUsers",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "candidateGroups",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "dueDate",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "followUpDate",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "priority",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "CallActivity",
+      "extends": [ "bpmn:CallActivity" ],
+      "properties": [
+        {
+          "name": "calledElementBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "calledElementVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "calledElementVersionTag",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "calledElementTenantId",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseRef",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "caseVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseTenantId",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableMappingClass",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableMappingDelegateExpression",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ServiceTaskLike",
+      "extends": [
+        "bpmn:ServiceTask",
+        "bpmn:BusinessRuleTask",
+        "bpmn:SendTask",
+        "bpmn:MessageEventDefinition"
+      ],
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resultVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "DmnCapable",
+      "extends": [
+        "bpmn:BusinessRuleTask"
+      ],
+      "properties": [
+        {
+          "name": "decisionRef",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "decisionRefBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "decisionRefVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "mapDecisionResult",
+          "isAttr": true,
+          "type": "String",
+          "default": "resultList"
+        },
+        {
+          "name": "decisionRefTenantId",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ExternalCapable",
+      "extends": [
+        "camunda:ServiceTaskLike"
+      ],
+      "properties": [
+        {
+          "name": "type",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "topic",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "TaskPriorized",
+      "extends": [
+        "bpmn:Process",
+        "camunda:ExternalCapable"
+      ],
+      "properties": [
+        {
+          "name": "taskPriority",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Properties",
+      "superClass": [
+        "Element"
+      ],
+      "meta": {
+        "allowedIn": [ "*" ]
+      },
+      "properties": [
+        {
+          "name": "values",
+          "type": "Property",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Property",
+      "superClass": [
+        "Element"
+      ],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "value",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "Connector",
+      "superClass": [
+        "Element"
+      ],
+      "meta": {
+        "allowedIn": [
+          "camunda:ServiceTaskLike"
+        ]
+      },
+      "properties": [
+        {
+          "name": "inputOutput",
+          "type": "InputOutput"
+        },
+        {
+          "name": "connectorId",
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "InputOutput",
+      "superClass": [
+        "Element"
+      ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:FlowNode",
+          "camunda:Connector"
+        ]
+      },
+      "properties": [
+        {
+          "name": "inputOutput",
+          "type": "InputOutput"
+        },
+        {
+          "name": "connectorId",
+          "type": "String"
+        },
+        {
+          "name": "inputParameters",
+          "isMany": true,
+          "type": "InputParameter"
+        },
+        {
+          "name": "outputParameters",
+          "isMany": true,
+          "type": "OutputParameter"
+        }
+      ]
+    },
+    {
+      "name": "InputOutputParameter",
+      "properties": [
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        },
+        {
+          "name": "definition",
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "InputOutputParameterDefinition",
+      "isAbstract": true
+    },
+    {
+      "name": "List",
+      "superClass": [ "InputOutputParameterDefinition" ],
+      "properties": [
+        {
+          "name": "items",
+          "isMany": true,
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "Map",
+      "superClass": [ "InputOutputParameterDefinition" ],
+      "properties": [
+        {
+          "name": "entries",
+          "isMany": true,
+          "type": "Entry"
+        }
+      ]
+    },
+    {
+      "name": "Entry",
+      "properties": [
+        {
+          "name": "key",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        },
+        {
+          "name": "definition",
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "Value",
+      "superClass": [
+        "InputOutputParameterDefinition"
+      ],
+      "properties": [
+        {
+          "name": "id",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Script",
+      "superClass": [ "InputOutputParameterDefinition" ],
+      "properties": [
+        {
+          "name": "scriptFormat",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Field",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "camunda:ServiceTaskLike",
+          "camunda:ExecutionListener",
+          "camunda:TaskListener"
+        ]
+      },
+      "properties": [
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "expression",
+          "type": "String"
+        },
+        {
+          "name": "stringValue",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "string",
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "InputParameter",
+      "superClass": [ "InputOutputParameter" ]
+    },
+    {
+      "name": "OutputParameter",
+      "superClass": [ "InputOutputParameter" ]
+    },
+    {
+      "name": "Collectable",
+      "isAbstract": true,
+      "extends": [ "bpmn:MultiInstanceLoopCharacteristics" ],
+      "superClass": [ "camunda:AsyncCapable" ],
+      "properties": [
+        {
+          "name": "collection",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "elementVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "FailedJobRetryTimeCycle",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "camunda:AsyncCapable",
+          "bpmn:MultiInstanceLoopCharacteristics"
+        ]
+      },
+      "properties": [
+        {
+          "name": "body",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ExecutionListener",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:Task",
+          "bpmn:ServiceTask",
+          "bpmn:UserTask",
+          "bpmn:BusinessRuleTask",
+          "bpmn:ScriptTask",
+          "bpmn:ReceiveTask",
+          "bpmn:ManualTask",
+          "bpmn:ExclusiveGateway",
+          "bpmn:SequenceFlow",
+          "bpmn:ParallelGateway",
+          "bpmn:InclusiveGateway",
+          "bpmn:EventBasedGateway",
+          "bpmn:StartEvent",
+          "bpmn:IntermediateCatchEvent",
+          "bpmn:IntermediateThrowEvent",
+          "bpmn:EndEvent",
+          "bpmn:BoundaryEvent",
+          "bpmn:CallActivity",
+          "bpmn:SubProcess",
+          "bpmn:Process"
+        ]
+      },
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "event",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "script",
+          "type": "Script"
+        },
+        {
+          "name": "fields",
+          "type": "Field",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "TaskListener",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:UserTask"
+        ]
+      },
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "event",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "script",
+          "type": "Script"
+        },
+        {
+          "name": "fields",
+          "type": "Field",
+          "isMany": true
+        },
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "eventDefinitions",
+          "type": "bpmn:TimerEventDefinition",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "FormProperty",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:StartEvent",
+          "bpmn:UserTask"
+        ]
+      },
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "required",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "readable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "writable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "variable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "expression",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "datePattern",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "default",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "values",
+          "type": "Value",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "FormData",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:StartEvent",
+          "bpmn:UserTask"
+        ]
+      },
+      "properties": [
+        {
+          "name": "fields",
+          "type": "FormField",
+          "isMany": true
+        },
+        {
+          "name": "businessKey",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "FormField",
+      "superClass": [ "Element" ],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "label",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "datePattern",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "defaultValue",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "properties",
+          "type": "Properties"
+        },
+        {
+          "name": "validation",
+          "type": "Validation"
+        },
+        {
+          "name": "values",
+          "type": "Value",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Validation",
+      "superClass": [ "Element" ],
+      "properties": [
+        {
+          "name": "constraints",
+          "type": "Constraint",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Constraint",
+      "superClass": [ "Element" ],
+      "properties": [
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "config",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "ConditionalEventDefinition",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:ConditionalEventDefinition"
+      ],
+      "properties": [
+        {
+          "name": "variableName",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableEvents",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    }
+  ],
+  "emumerations": [ ]
+}
diff --git a/src/plugins/package/designer/plugins/descriptor/flowableDescriptor.json b/src/plugins/package/designer/plugins/descriptor/flowableDescriptor.json
new file mode 100644
index 0000000..2db0b31
--- /dev/null
+++ b/src/plugins/package/designer/plugins/descriptor/flowableDescriptor.json
@@ -0,0 +1,1295 @@
+{
+  "name": "Flowable",
+  "uri": "http://flowable.org/bpmn",
+  "prefix": "flowable",
+  "xml": {
+    "tagAlias": "lowerCase"
+  },
+  "associations": [],
+  "types": [
+    {
+      "name": "InOutBinding",
+      "superClass": [
+        "Element"
+      ],
+      "isAbstract": true,
+      "properties": [
+        {
+          "name": "source",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "sourceExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "target",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "businessKey",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "local",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "variables",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "In",
+      "superClass": [
+        "InOutBinding"
+      ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:CallActivity"
+        ]
+      }
+    },
+    {
+      "name": "Out",
+      "superClass": [
+        "InOutBinding"
+      ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:CallActivity"
+        ]
+      }
+    },
+    {
+      "name": "AsyncCapable",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:Activity",
+        "bpmn:Gateway",
+        "bpmn:Event"
+      ],
+      "properties": [
+        {
+          "name": "async",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "asyncBefore",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "asyncAfter",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        },
+        {
+          "name": "exclusive",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": true
+        }
+      ]
+    },
+    {
+      "name": "JobPriorized",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:Process",
+        "flowable:AsyncCapable"
+      ],
+      "properties": [
+        {
+          "name": "jobPriority",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "SignalEventDefinition",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:SignalEventDefinition"
+      ],
+      "properties": [
+        {
+          "name": "async",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        }
+      ]
+    },
+    {
+      "name": "ErrorEventDefinition",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:ErrorEventDefinition"
+      ],
+      "properties": [
+        {
+          "name": "errorCodeVariable",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "errorMessageVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Error",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:Error"
+      ],
+      "properties": [
+        {
+          "name": "flowable:errorMessage",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "PotentialStarter",
+      "superClass": [
+        "Element"
+      ],
+      "properties": [
+        {
+          "name": "resourceAssignmentExpression",
+          "type": "bpmn:ResourceAssignmentExpression"
+        }
+      ]
+    },
+    {
+      "name": "FormSupported",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:StartEvent",
+        "bpmn:UserTask"
+      ],
+      "properties": [
+        {
+          "name": "formHandlerClass",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "formKey",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "localScope",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": false
+        }
+      ]
+    },
+    {
+      "name": "TemplateSupported",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:Process",
+        "bpmn:FlowElement"
+      ],
+      "properties": [
+        {
+          "name": "modelerTemplate",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Initiator",
+      "isAbstract": true,
+      "extends": [ "bpmn:StartEvent" ],
+      "properties": [
+        {
+          "name": "initiator",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ScriptTask",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:ScriptTask"
+      ],
+      "properties": [
+        {
+          "name": "resultVariable",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Process",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:Process"
+      ],
+      "properties": [
+        {
+          "name": "candidateStarterGroups",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "candidateStarterUsers",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "processCategory",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "versionTag",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "historyTimeToLive",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "isStartableInTasklist",
+          "isAttr": true,
+          "type": "Boolean",
+          "default": true
+        }
+      ]
+    },
+    {
+      "name": "EscalationEventDefinition",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:EscalationEventDefinition"
+      ],
+      "properties": [
+        {
+          "name": "escalationCodeVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "xcField",
+      "isAbstract": true,
+      "properties": [
+        {
+          "name": "xcString",
+          "isMany": true,
+          "type": "Element"
+        } ,
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "xcString",
+      "isAbstract": true,
+      "properties": [
+        {
+          "name": "body",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "FormalExpression",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:FormalExpression"
+      ],
+      "properties": [
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Assignable",
+      "extends": [ "bpmn:UserTask" ],
+      "properties": [
+        {
+          "name": "dataType",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "assignee",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "xcformKey",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "candidateUsers",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "candidateGroups",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "text",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "dueDate",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "followUpDate",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "priority",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "CallActivity",
+      "extends": [ "bpmn:CallActivity" ],
+      "properties": [
+        {
+          "name": "calledElementBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "calledElementVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "calledElementVersionTag",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "calledElementTenantId",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseRef",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "caseVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "caseTenantId",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableMappingClass",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableMappingDelegateExpression",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ServiceTaskLike",
+      "extends": [
+        "bpmn:ServiceTask",
+        "bpmn:BusinessRuleTask",
+        "bpmn:SendTask",
+        "bpmn:MessageEventDefinition"
+      ],
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resultVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "DmnCapable",
+      "extends": [
+        "bpmn:BusinessRuleTask"
+      ],
+      "properties": [
+        {
+          "name": "decisionRef",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "decisionRefBinding",
+          "isAttr": true,
+          "type": "String",
+          "default": "latest"
+        },
+        {
+          "name": "decisionRefVersion",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "mapDecisionResult",
+          "isAttr": true,
+          "type": "String",
+          "default": "resultList"
+        },
+        {
+          "name": "decisionRefTenantId",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ExternalCapable",
+      "extends": [
+        "flowable:ServiceTaskLike"
+      ],
+      "properties": [
+        {
+          "name": "type",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "topic",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "TaskPriorized",
+      "extends": [
+        "bpmn:Process",
+        "flowable:ExternalCapable"
+      ],
+      "properties": [
+        {
+          "name": "taskPriority",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Properties",
+      "superClass": [
+        "Element"
+      ],
+      "meta": {
+        "allowedIn": [ "*" ]
+      },
+      "properties": [
+        {
+          "name": "values",
+          "type": "Property",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Property",
+      "superClass": [
+        "Element"
+      ],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "value",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "Connector",
+      "superClass": [
+        "Element"
+      ],
+      "meta": {
+        "allowedIn": [
+          "flowable:ServiceTaskLike"
+        ]
+      },
+      "properties": [
+        {
+          "name": "inputOutput",
+          "type": "InputOutput"
+        },
+        {
+          "name": "connectorId",
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "InputOutput",
+      "superClass": [
+        "Element"
+      ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:FlowNode",
+          "flowable:Connector"
+        ]
+      },
+      "properties": [
+        {
+          "name": "inputOutput",
+          "type": "InputOutput"
+        },
+        {
+          "name": "connectorId",
+          "type": "String"
+        },
+        {
+          "name": "inputParameters",
+          "isMany": true,
+          "type": "InputParameter"
+        },
+        {
+          "name": "outputParameters",
+          "isMany": true,
+          "type": "OutputParameter"
+        }
+      ]
+    },
+    {
+      "name": "InputOutputParameter",
+      "properties": [
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        },
+        {
+          "name": "definition",
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "InputOutputParameterDefinition",
+      "isAbstract": true
+    },
+    {
+      "name": "List",
+      "superClass": [ "InputOutputParameterDefinition" ],
+      "properties": [
+        {
+          "name": "items",
+          "isMany": true,
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "Map",
+      "superClass": [ "InputOutputParameterDefinition" ],
+      "properties": [
+        {
+          "name": "entries",
+          "isMany": true,
+          "type": "Entry"
+        }
+      ]
+    },
+    {
+      "name": "Entry",
+      "properties": [
+        {
+          "name": "key",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        },
+        {
+          "name": "definition",
+          "type": "InputOutputParameterDefinition"
+        }
+      ]
+    },
+    {
+      "name": "Value",
+      "superClass": [
+        "InputOutputParameterDefinition"
+      ],
+      "properties": [
+        {
+          "name": "id",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Script",
+      "superClass": [ "InputOutputParameterDefinition" ],
+      "properties": [
+        {
+          "name": "scriptFormat",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "resource",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "value",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "Field",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "flowable:ServiceTaskLike",
+          "flowable:ExecutionListener",
+          "flowable:TaskListener"
+        ]
+      },
+      "properties": [
+        {
+          "name": "name",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "expression",
+          "type": "String"
+        },
+        {
+          "name": "stringValue",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "string",
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "InputParameter",
+      "superClass": [ "InputOutputParameter" ]
+    },
+    {
+      "name": "OutputParameter",
+      "superClass": [ "InputOutputParameter" ]
+    },
+    {
+      "name": "Collectable",
+      "isAbstract": true,
+      "extends": [ "bpmn:MultiInstanceLoopCharacteristics" ],
+      "superClass": [ "flowable:AsyncCapable" ],
+      "properties": [
+        {
+          "name": "collection",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "elementVariable",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "FailedJobRetryTimeCycle",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "flowable:AsyncCapable",
+          "bpmn:MultiInstanceLoopCharacteristics"
+        ]
+      },
+      "properties": [
+        {
+          "name": "body",
+          "isBody": true,
+          "type": "String"
+        }
+      ]
+    },
+    {
+      "name": "ExecutionListener",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:Task",
+          "bpmn:ServiceTask",
+          "bpmn:UserTask",
+          "bpmn:BusinessRuleTask",
+          "bpmn:ScriptTask",
+          "bpmn:ReceiveTask",
+          "bpmn:ManualTask",
+          "bpmn:ExclusiveGateway",
+          "bpmn:SequenceFlow",
+          "bpmn:ParallelGateway",
+          "bpmn:InclusiveGateway",
+          "bpmn:EventBasedGateway",
+          "bpmn:StartEvent",
+          "bpmn:IntermediateCatchEvent",
+          "bpmn:IntermediateThrowEvent",
+          "bpmn:EndEvent",
+          "bpmn:BoundaryEvent",
+          "bpmn:CallActivity",
+          "bpmn:SubProcess",
+          "bpmn:Process"
+        ]
+      },
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "event",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "script",
+          "type": "Script"
+        },
+        {
+          "name": "fields",
+          "type": "Field",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "TaskListener",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:UserTask"
+        ]
+      },
+      "properties": [
+        {
+          "name": "expression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "class",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "delegateExpression",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "event",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "script",
+          "type": "Script"
+        },
+        {
+          "name": "fields",
+          "type": "Field",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "FormProperty",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:StartEvent",
+          "bpmn:UserTask"
+        ]
+      },
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "required",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "readable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "writable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "variable",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "expression",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "datePattern",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "default",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "values",
+          "type": "Value",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "FormProperty",
+      "superClass": [ "Element" ],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "label",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "datePattern",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "defaultValue",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "properties",
+          "type": "Properties"
+        },
+        {
+          "name": "validation",
+          "type": "Validation"
+        },
+        {
+          "name": "values",
+          "type": "Value",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Validation",
+      "superClass": [ "Element" ],
+      "properties": [
+        {
+          "name": "constraints",
+          "type": "Constraint",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "Constraint",
+      "superClass": [ "Element" ],
+      "properties": [
+        {
+          "name": "name",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "config",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "ExtensionElements",
+      "properties": [
+        {
+          "name": "operationList",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "OperationList",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:UserTask"
+        ]
+      },
+      "properties": [
+        {
+          "name": "operationList",
+          "type": "FormOperation",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "FormOperation",
+      "superClass": [ "Element" ],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "label",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "showOrder",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "multiSignAssignee",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "VariableList",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:UserTask"
+        ]
+      },
+      "properties": [
+        {
+          "name": "variableList",
+          "type": "FormVariable",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "FormVariable",
+      "superClass": [ "Element" ],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "DeptPostList",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:UserTask"
+        ]
+      },
+      "properties": [
+        {
+          "name": "deptPostList",
+          "type": "DeptPost",
+          "isMany": true
+        }
+      ]
+    },
+    {
+      "name": "DeptPost",
+      "superClass": [ "Element" ],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "postId",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "deptPostId",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "UserCandidateGroups",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:UserTask"
+        ]
+      },
+      "properties": [
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "value",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "CustomCondition",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:SequenceFlow"
+        ]
+      },
+      "properties": [
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "operationType",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "parallelRefuse",
+          "type": "Boolean",
+          "isAttr": true,
+          "default": false
+        }
+      ]
+    },
+    {
+      "name": "AssigneeList",
+      "superClass": [ "Element" ],
+      "meta": {
+        "allowedIn": [
+          "bpmn:StartEvent",
+          "bpmn:UserTask"
+        ]
+      },
+      "properties": [
+        {
+          "name": "assigneeList",
+          "type": "Assignee",
+          "isMany": true
+        },
+        {
+          "name": "type",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "Assignee",
+      "superClass": [ "Element" ],
+      "properties": [
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        }
+      ]
+    },
+    {
+      "name": "ConditionalEventDefinition",
+      "isAbstract": true,
+      "extends": [
+        "bpmn:ConditionalEventDefinition"
+      ],
+      "properties": [
+        {
+          "name": "variableName",
+          "isAttr": true,
+          "type": "String"
+        },
+        {
+          "name": "variableEvent",
+          "isAttr": true,
+          "type": "String"
+        }
+      ]
+    }
+  ],
+  "emumerations": [ ]
+}
diff --git a/src/plugins/package/designer/plugins/extension-moddle/activiti/activitiExtension.js b/src/plugins/package/designer/plugins/extension-moddle/activiti/activitiExtension.js
new file mode 100644
index 0000000..1287e04
--- /dev/null
+++ b/src/plugins/package/designer/plugins/extension-moddle/activiti/activitiExtension.js
@@ -0,0 +1,74 @@
+"use strict";
+
+var some = require("min-dash").some;
+
+var ALLOWED_TYPES = {
+  FailedJobRetryTimeCycle: ["bpmn:StartEvent", "bpmn:BoundaryEvent", "bpmn:IntermediateCatchEvent", "bpmn:Activity"],
+  Connector: ["bpmn:EndEvent", "bpmn:IntermediateThrowEvent"],
+  Field: ["bpmn:EndEvent", "bpmn:IntermediateThrowEvent"]
+};
+
+function is(element, type) {
+  return element && typeof element.$instanceOf === "function" && element.$instanceOf(type);
+}
+
+function exists(element) {
+  return element && element.length;
+}
+
+function includesType(collection, type) {
+  return (
+    exists(collection) &&
+    some(collection, function(element) {
+      return is(element, type);
+    })
+  );
+}
+
+function anyType(element, types) {
+  return some(types, function(type) {
+    return is(element, type);
+  });
+}
+
+function isAllowed(propName, propDescriptor, newElement) {
+  var name = propDescriptor.name,
+    types = ALLOWED_TYPES[name.replace(/activiti:/, "")];
+
+  return name === propName && anyType(newElement, types);
+}
+
+function ActivitiModdleExtension(eventBus) {
+  eventBus.on(
+    "property.clone",
+    function(context) {
+      var newElement = context.newElement,
+        propDescriptor = context.propertyDescriptor;
+
+      this.canCloneProperty(newElement, propDescriptor);
+    },
+    this
+  );
+}
+
+ActivitiModdleExtension.$inject = ["eventBus"];
+
+ActivitiModdleExtension.prototype.canCloneProperty = function(newElement, propDescriptor) {
+  if (isAllowed("activiti:FailedJobRetryTimeCycle", propDescriptor, newElement)) {
+    return (
+      includesType(newElement.eventDefinitions, "bpmn:TimerEventDefinition") ||
+      includesType(newElement.eventDefinitions, "bpmn:SignalEventDefinition") ||
+      is(newElement.loopCharacteristics, "bpmn:MultiInstanceLoopCharacteristics")
+    );
+  }
+
+  if (isAllowed("activiti:Connector", propDescriptor, newElement)) {
+    return includesType(newElement.eventDefinitions, "bpmn:MessageEventDefinition");
+  }
+
+  if (isAllowed("activiti:Field", propDescriptor, newElement)) {
+    return includesType(newElement.eventDefinitions, "bpmn:MessageEventDefinition");
+  }
+};
+
+module.exports = ActivitiModdleExtension;
diff --git a/src/plugins/package/designer/plugins/extension-moddle/activiti/index.js b/src/plugins/package/designer/plugins/extension-moddle/activiti/index.js
new file mode 100644
index 0000000..6ce014a
--- /dev/null
+++ b/src/plugins/package/designer/plugins/extension-moddle/activiti/index.js
@@ -0,0 +1,9 @@
+/*
+ * @author igdianov
+ * address https://github.com/igdianov/activiti-bpmn-moddle
+ * */
+
+module.exports = {
+  __init__: ["ActivitiModdleExtension"],
+  ActivitiModdleExtension: ["type", require("./activitiExtension")]
+};
diff --git a/src/plugins/package/designer/plugins/extension-moddle/camunda/extension.js b/src/plugins/package/designer/plugins/extension-moddle/camunda/extension.js
new file mode 100644
index 0000000..a55236a
--- /dev/null
+++ b/src/plugins/package/designer/plugins/extension-moddle/camunda/extension.js
@@ -0,0 +1,148 @@
+"use strict";
+
+var isFunction = require("min-dash").isFunction,
+  isObject = require("min-dash").isObject,
+  some = require("min-dash").some;
+
+var WILDCARD = "*";
+
+function CamundaModdleExtension(eventBus) {
+  var self = this;
+
+  eventBus.on("moddleCopy.canCopyProperty", function(context) {
+    var property = context.property,
+      parent = context.parent;
+
+    return self.canCopyProperty(property, parent);
+  });
+}
+
+CamundaModdleExtension.$inject = ["eventBus"];
+
+/**
+ * Check wether to disallow copying property.
+ */
+CamundaModdleExtension.prototype.canCopyProperty = function(property, parent) {
+  // (1) check wether property is allowed in parent
+  if (isObject(property) && !isAllowedInParent(property, parent)) {
+    return false;
+  }
+
+  // (2) check more complex scenarios
+
+  if (is(property, "camunda:InputOutput") && !this.canHostInputOutput(parent)) {
+    return false;
+  }
+
+  if (isAny(property, ["camunda:Connector", "camunda:Field"]) && !this.canHostConnector(parent)) {
+    return false;
+  }
+
+  if (is(property, "camunda:In") && !this.canHostIn(parent)) {
+    return false;
+  }
+};
+
+CamundaModdleExtension.prototype.canHostInputOutput = function(parent) {
+  // allowed in camunda:Connector
+  var connector = getParent(parent, "camunda:Connector");
+
+  if (connector) {
+    return true;
+  }
+
+  // special rules inside bpmn:FlowNode
+  var flowNode = getParent(parent, "bpmn:FlowNode");
+
+  if (!flowNode) {
+    return false;
+  }
+
+  if (isAny(flowNode, ["bpmn:StartEvent", "bpmn:Gateway", "bpmn:BoundaryEvent"])) {
+    return false;
+  }
+
+  if (is(flowNode, "bpmn:SubProcess") && flowNode.get("triggeredByEvent")) {
+    return false;
+  }
+
+  return true;
+};
+
+CamundaModdleExtension.prototype.canHostConnector = function(parent) {
+  var serviceTaskLike = getParent(parent, "camunda:ServiceTaskLike");
+
+  if (is(serviceTaskLike, "bpmn:MessageEventDefinition")) {
+    // only allow on throw and end events
+    return getParent(parent, "bpmn:IntermediateThrowEvent") || getParent(parent, "bpmn:EndEvent");
+  }
+
+  return true;
+};
+
+CamundaModdleExtension.prototype.canHostIn = function(parent) {
+  var callActivity = getParent(parent, "bpmn:CallActivity");
+
+  if (callActivity) {
+    return true;
+  }
+
+  var signalEventDefinition = getParent(parent, "bpmn:SignalEventDefinition");
+
+  if (signalEventDefinition) {
+    // only allow on throw and end events
+    return getParent(parent, "bpmn:IntermediateThrowEvent") || getParent(parent, "bpmn:EndEvent");
+  }
+
+  return true;
+};
+
+module.exports = CamundaModdleExtension;
+
+// helpers //////////
+
+function is(element, type) {
+  return element && isFunction(element.$instanceOf) && element.$instanceOf(type);
+}
+
+function isAny(element, types) {
+  return some(types, function(t) {
+    return is(element, t);
+  });
+}
+
+function getParent(element, type) {
+  if (!type) {
+    return element.$parent;
+  }
+
+  if (is(element, type)) {
+    return element;
+  }
+
+  if (!element.$parent) {
+    return;
+  }
+
+  return getParent(element.$parent, type);
+}
+
+function isAllowedInParent(property, parent) {
+  // (1) find property descriptor
+  var descriptor = property.$type && property.$model.getTypeDescriptor(property.$type);
+
+  var allowedIn = descriptor && descriptor.meta && descriptor.meta.allowedIn;
+
+  if (!allowedIn || isWildcard(allowedIn)) {
+    return true;
+  }
+
+  // (2) check wether property has parent of allowed type
+  return some(allowedIn, function(type) {
+    return getParent(parent, type);
+  });
+}
+
+function isWildcard(allowedIn) {
+  return allowedIn.indexOf(WILDCARD) !== -1;
+}
diff --git a/src/plugins/package/designer/plugins/extension-moddle/camunda/index.js b/src/plugins/package/designer/plugins/extension-moddle/camunda/index.js
new file mode 100644
index 0000000..0a9e41c
--- /dev/null
+++ b/src/plugins/package/designer/plugins/extension-moddle/camunda/index.js
@@ -0,0 +1,6 @@
+"use strict";
+
+module.exports = {
+  __init__: ["camundaModdleExtension"],
+  camundaModdleExtension: ["type", require("./extension")]
+};
diff --git a/src/plugins/package/designer/plugins/extension-moddle/flowable/flowableExtension.js b/src/plugins/package/designer/plugins/extension-moddle/flowable/flowableExtension.js
new file mode 100644
index 0000000..4689024
--- /dev/null
+++ b/src/plugins/package/designer/plugins/extension-moddle/flowable/flowableExtension.js
@@ -0,0 +1,74 @@
+"use strict";
+
+var some = require("min-dash").some;
+
+var ALLOWED_TYPES = {
+  FailedJobRetryTimeCycle: ["bpmn:StartEvent", "bpmn:BoundaryEvent", "bpmn:IntermediateCatchEvent", "bpmn:Activity"],
+  Connector: ["bpmn:EndEvent", "bpmn:IntermediateThrowEvent"],
+  Field: ["bpmn:EndEvent", "bpmn:IntermediateThrowEvent"]
+};
+
+function is(element, type) {
+  return element && typeof element.$instanceOf === "function" && element.$instanceOf(type);
+}
+
+function exists(element) {
+  return element && element.length;
+}
+
+function includesType(collection, type) {
+  return (
+    exists(collection) &&
+    some(collection, function(element) {
+      return is(element, type);
+    })
+  );
+}
+
+function anyType(element, types) {
+  return some(types, function(type) {
+    return is(element, type);
+  });
+}
+
+function isAllowed(propName, propDescriptor, newElement) {
+  var name = propDescriptor.name,
+    types = ALLOWED_TYPES[name.replace(/flowable:/, "")];
+
+  return name === propName && anyType(newElement, types);
+}
+
+function FlowableModdleExtension(eventBus) {
+  eventBus.on(
+    "property.clone",
+    function(context) {
+      var newElement = context.newElement,
+        propDescriptor = context.propertyDescriptor;
+
+      this.canCloneProperty(newElement, propDescriptor);
+    },
+    this
+  );
+}
+
+FlowableModdleExtension.$inject = ["eventBus"];
+
+FlowableModdleExtension.prototype.canCloneProperty = function(newElement, propDescriptor) {
+  if (isAllowed("flowable:FailedJobRetryTimeCycle", propDescriptor, newElement)) {
+    return (
+      includesType(newElement.eventDefinitions, "bpmn:TimerEventDefinition") ||
+      includesType(newElement.eventDefinitions, "bpmn:SignalEventDefinition") ||
+      is(newElement.loopCharacteristics, "bpmn:MultiInstanceLoopCharacteristics")
+    );
+  }
+
+  if (isAllowed("flowable:Connector", propDescriptor, newElement)) {
+    return includesType(newElement.eventDefinitions, "bpmn:MessageEventDefinition");
+  }
+
+  if (isAllowed("flowable:Field", propDescriptor, newElement)) {
+    return includesType(newElement.eventDefinitions, "bpmn:MessageEventDefinition");
+  }
+};
+
+module.exports = FlowableModdleExtension;
diff --git a/src/plugins/package/designer/plugins/extension-moddle/flowable/index.js b/src/plugins/package/designer/plugins/extension-moddle/flowable/index.js
new file mode 100644
index 0000000..59837cc
--- /dev/null
+++ b/src/plugins/package/designer/plugins/extension-moddle/flowable/index.js
@@ -0,0 +1,9 @@
+/*
+ * @author igdianov
+ * address https://github.com/igdianov/activiti-bpmn-moddle
+ * */
+
+module.exports = {
+  __init__: ["FlowableModdleExtension"],
+  FlowableModdleExtension: ["type", require("./flowableExtension")]
+};
diff --git a/src/plugins/package/designer/plugins/palette/index.js b/src/plugins/package/designer/plugins/palette/index.js
new file mode 100644
index 0000000..c44874f
--- /dev/null
+++ b/src/plugins/package/designer/plugins/palette/index.js
@@ -0,0 +1,15 @@
+import PaletteModule from "diagram-js/lib/features/palette";
+import CreateModule from "diagram-js/lib/features/create";
+import SpaceToolModule from "diagram-js/lib/features/space-tool";
+import LassoToolModule from "diagram-js/lib/features/lasso-tool";
+import HandToolModule from "diagram-js/lib/features/hand-tool";
+import GlobalConnectModule from "diagram-js/lib/features/global-connect";
+import translate from "diagram-js/lib/i18n/translate";
+
+import PaletteProvider from "./paletteProvider";
+
+export default {
+  __depends__: [PaletteModule, CreateModule, SpaceToolModule, LassoToolModule, HandToolModule, GlobalConnectModule, translate],
+  __init__: ["paletteProvider"],
+  paletteProvider: ["type", PaletteProvider]
+};
diff --git a/src/plugins/package/designer/plugins/palette/paletteProvider.js b/src/plugins/package/designer/plugins/palette/paletteProvider.js
new file mode 100644
index 0000000..e0c3238
--- /dev/null
+++ b/src/plugins/package/designer/plugins/palette/paletteProvider.js
@@ -0,0 +1,160 @@
+import { assign } from "min-dash";
+
+/**
+ * A palette provider for BPMN 2.0 elements.
+ */
+export default function PaletteProvider(palette, create, elementFactory, spaceTool, lassoTool, handTool, globalConnect, translate) {
+  this._palette = palette;
+  this._create = create;
+  this._elementFactory = elementFactory;
+  this._spaceTool = spaceTool;
+  this._lassoTool = lassoTool;
+  this._handTool = handTool;
+  this._globalConnect = globalConnect;
+  this._translate = translate;
+
+  palette.registerProvider(this);
+}
+
+PaletteProvider.$inject = ["palette", "create", "elementFactory", "spaceTool", "lassoTool", "handTool", "globalConnect", "translate"];
+
+PaletteProvider.prototype.getPaletteEntries = function() {
+  var actions = {},
+    create = this._create,
+    elementFactory = this._elementFactory,
+    spaceTool = this._spaceTool,
+    lassoTool = this._lassoTool,
+    handTool = this._handTool,
+    globalConnect = this._globalConnect,
+    translate = this._translate;
+
+  function createAction(type, group, className, title, options) {
+    function createListener(event) {
+      var shape = elementFactory.createShape(assign({ type: type }, options));
+
+      if (options) {
+        shape.businessObject.di.isExpanded = options.isExpanded;
+      }
+
+      create.start(event, shape);
+    }
+
+    var shortType = type.replace(/^bpmn:/, "");
+
+    return {
+      group: group,
+      className: className,
+      title: title || translate("Create {type}", { type: shortType }),
+      action: {
+        dragstart: createListener,
+        click: createListener
+      }
+    };
+  }
+
+  function createSubprocess(event) {
+    var subProcess = elementFactory.createShape({
+      type: "bpmn:SubProcess",
+      x: 0,
+      y: 0,
+      isExpanded: true
+    });
+
+    var startEvent = elementFactory.createShape({
+      type: "bpmn:StartEvent",
+      x: 40,
+      y: 82,
+      parent: subProcess
+    });
+
+    create.start(event, [subProcess, startEvent], {
+      hints: {
+        autoSelect: [startEvent]
+      }
+    });
+  }
+
+  function createParticipant(event) {
+    create.start(event, elementFactory.createParticipantShape());
+  }
+
+  assign(actions, {
+    "hand-tool": {
+      group: "tools",
+      className: "bpmn-icon-hand-tool",
+      title: translate("Activate the hand tool"),
+      action: {
+        click: function(event) {
+          handTool.activateHand(event);
+        }
+      }
+    },
+    "lasso-tool": {
+      group: "tools",
+      className: "bpmn-icon-lasso-tool",
+      title: translate("Activate the lasso tool"),
+      action: {
+        click: function(event) {
+          lassoTool.activateSelection(event);
+        }
+      }
+    },
+    "space-tool": {
+      group: "tools",
+      className: "bpmn-icon-space-tool",
+      title: translate("Activate the create/remove space tool"),
+      action: {
+        click: function(event) {
+          spaceTool.activateSelection(event);
+        }
+      }
+    },
+    "global-connect-tool": {
+      group: "tools",
+      className: "bpmn-icon-connection-multi",
+      title: translate("Activate the global connect tool"),
+      action: {
+        click: function(event) {
+          globalConnect.toggle(event);
+        }
+      }
+    },
+    "tool-separator": {
+      group: "tools",
+      separator: true
+    },
+    "create.start-event": createAction("bpmn:StartEvent", "event", "bpmn-icon-start-event-none", translate("Create StartEvent")),
+    "create.intermediate-event": createAction(
+      "bpmn:IntermediateThrowEvent",
+      "event",
+      "bpmn-icon-intermediate-event-none",
+      translate("Create Intermediate/Boundary Event")
+    ),
+    "create.end-event": createAction("bpmn:EndEvent", "event", "bpmn-icon-end-event-none", translate("Create EndEvent")),
+    "create.exclusive-gateway": createAction("bpmn:ExclusiveGateway", "gateway", "bpmn-icon-gateway-none", translate("Create Gateway")),
+    "create.user-task": createAction("bpmn:UserTask", "activity", "bpmn-icon-user-task", translate("Create User Task")),
+    "create.data-object": createAction("bpmn:DataObjectReference", "data-object", "bpmn-icon-data-object", translate("Create DataObjectReference")),
+    "create.data-store": createAction("bpmn:DataStoreReference", "data-store", "bpmn-icon-data-store", translate("Create DataStoreReference")),
+    "create.subprocess-expanded": {
+      group: "activity",
+      className: "bpmn-icon-subprocess-expanded",
+      title: translate("Create expanded SubProcess"),
+      action: {
+        dragstart: createSubprocess,
+        click: createSubprocess
+      }
+    },
+    "create.participant-expanded": {
+      group: "collaboration",
+      className: "bpmn-icon-participant",
+      title: translate("Create Pool/Participant"),
+      action: {
+        dragstart: createParticipant,
+        click: createParticipant
+      }
+    },
+    "create.group": createAction("bpmn:Group", "artifact", "bpmn-icon-group", translate("Create Group"))
+  });
+
+  return actions;
+};
diff --git a/src/plugins/package/designer/plugins/translate/customTranslate.js b/src/plugins/package/designer/plugins/translate/customTranslate.js
new file mode 100644
index 0000000..508040d
--- /dev/null
+++ b/src/plugins/package/designer/plugins/translate/customTranslate.js
@@ -0,0 +1,41 @@
+// import translations from "./zh";
+//
+// export default function customTranslate(template, replacements) {
+//   replacements = replacements || {};
+//
+//   // Translate
+//   template = translations[template] || template;
+//
+//   // Replace
+//   return template.replace(/{([^}]+)}/g, function(_, key) {
+//     let str = replacements[key];
+//     if (
+//       translations[replacements[key]] !== null &&
+//       translations[replacements[key]] !== "undefined"
+//     ) {
+//       // eslint-disable-next-line no-mixed-spaces-and-tabs
+//       str = translations[replacements[key]];
+//       // eslint-disable-next-line no-mixed-spaces-and-tabs
+//     }
+//     return str || "{" + key + "}";
+//   });
+// }
+
+export default function customTranslate(translations) {
+  return function(template, replacements) {
+    replacements = replacements || {};
+    // Translate
+    template = translations[template] || template;
+
+    // Replace
+    return template.replace(/{([^}]+)}/g, function(_, key) {
+      let str = replacements[key];
+      if (translations[replacements[key]] !== null && translations[replacements[key]] !== undefined) {
+        // eslint-disable-next-line no-mixed-spaces-and-tabs
+        str = translations[replacements[key]];
+        // eslint-disable-next-line no-mixed-spaces-and-tabs
+      }
+      return str || "{" + key + "}";
+    });
+  };
+}
diff --git a/src/plugins/package/designer/plugins/translate/zh.js b/src/plugins/package/designer/plugins/translate/zh.js
new file mode 100644
index 0000000..855b561
--- /dev/null
+++ b/src/plugins/package/designer/plugins/translate/zh.js
@@ -0,0 +1,238 @@
+/**
+ * This is a sample file that should be replaced with the actual translation.
+ *
+ * Checkout https://github.com/bpmn-io/bpmn-js-i18n for a list of available
+ * translations and labels to translate.
+ */
+export default {
+  // 添加部分
+  "Append EndEvent": "追加结束事件",
+  "Append Gateway": "追加网关",
+  "Append Task": "追加任务",
+  "Append Intermediate/Boundary Event": "追加中间抛出事件/边界事件",
+
+  "Activate the global connect tool": "激活全局连接工具",
+  "Append {type}": "添加 {type}",
+  "Add Lane above": "在上面添加道",
+  "Divide into two Lanes": "分割成两个道",
+  "Divide into three Lanes": "分割成三个道",
+  "Add Lane below": "在下面添加道",
+  "Append compensation activity": "追加补偿活动",
+  "Change type": "修改类型",
+  "Connect using Association": "使用关联连接",
+  "Connect using Sequence/MessageFlow or Association": "使用顺序/消息流或者关联连接",
+  "Connect using DataInputAssociation": "使用数据输入关联连接",
+  Remove: "移除",
+  "Activate the hand tool": "激活抓手工具",
+  "Activate the lasso tool": "激活套索工具",
+  "Activate the create/remove space tool": "激活创建/删除空间工具",
+  "Create expanded SubProcess": "创建扩展子过程",
+  "Create IntermediateThrowEvent/BoundaryEvent": "创建中间抛出事件/边界事件",
+  "Create Pool/Participant": "创建池/参与者",
+  "Parallel Multi Instance": "并行多重事件",
+  "Sequential Multi Instance": "时序多重事件",
+  DataObjectReference: "数据对象参考",
+  DataStoreReference: "数据存储参考",
+  Loop: "循环",
+  "Ad-hoc": "即席",
+  "Create {type}": "创建 {type}",
+  Task: "任务",
+  "Send Task": "发送任务",
+  "Receive Task": "接收任务",
+  "User Task": "用户任务",
+  "Manual Task": "手工任务",
+  "Business Rule Task": "业务规则任务",
+  "Service Task": "服务任务",
+  "Script Task": "脚本任务",
+  "Call Activity": "调用活动",
+  "Sub Process (collapsed)": "子流程（折叠的）",
+  "Sub Process (expanded)": "子流程（展开的）",
+  "Start Event": "开始事件",
+  StartEvent: "开始事件",
+  "Intermediate Throw Event": "中间事件",
+  "End Event": "结束事件",
+  EndEvent: "结束事件",
+  "Create StartEvent": "创建开始事件",
+  "Create EndEvent": "创建结束事件",
+  "Create Task": "创建任务",
+  "Create User Task": "创建用户任务",
+  "Create Gateway": "创建网关",
+  "Create DataObjectReference": "创建数据对象",
+  "Create DataStoreReference": "创建数据存储",
+  "Create Group": "创建分组",
+  "Create Intermediate/Boundary Event": "创建中间/边界事件",
+  "Message Start Event": "消息开始事件",
+  "Timer Start Event": "定时开始事件",
+  "Conditional Start Event": "条件开始事件",
+  "Signal Start Event": "信号开始事件",
+  "Error Start Event": "错误开始事件",
+  "Escalation Start Event": "升级开始事件",
+  "Compensation Start Event": "补偿开始事件",
+  "Message Start Event (non-interrupting)": "消息开始事件（非中断）",
+  "Timer Start Event (non-interrupting)": "定时开始事件（非中断）",
+  "Conditional Start Event (non-interrupting)": "条件开始事件（非中断）",
+  "Signal Start Event (non-interrupting)": "信号开始事件（非中断）",
+  "Escalation Start Event (non-interrupting)": "升级开始事件（非中断）",
+  "Message Intermediate Catch Event": "消息中间捕获事件",
+  "Message Intermediate Throw Event": "消息中间抛出事件",
+  "Timer Intermediate Catch Event": "定时中间捕获事件",
+  "Escalation Intermediate Throw Event": "升级中间抛出事件",
+  "Conditional Intermediate Catch Event": "条件中间捕获事件",
+  "Link Intermediate Catch Event": "链接中间捕获事件",
+  "Link Intermediate Throw Event": "链接中间抛出事件",
+  "Compensation Intermediate Throw Event": "补偿中间抛出事件",
+  "Signal Intermediate Catch Event": "信号中间捕获事件",
+  "Signal Intermediate Throw Event": "信号中间抛出事件",
+  "Message End Event": "消息结束事件",
+  "Escalation End Event": "定时结束事件",
+  "Error End Event": "错误结束事件",
+  "Cancel End Event": "取消结束事件",
+  "Compensation End Event": "补偿结束事件",
+  "Signal End Event": "信号结束事件",
+  "Terminate End Event": "终止结束事件",
+  "Message Boundary Event": "消息边界事件",
+  "Message Boundary Event (non-interrupting)": "消息边界事件（非中断）",
+  "Timer Boundary Event": "定时边界事件",
+  "Timer Boundary Event (non-interrupting)": "定时边界事件（非中断）",
+  "Escalation Boundary Event": "升级边界事件",
+  "Escalation Boundary Event (non-interrupting)": "升级边界事件（非中断）",
+  "Conditional Boundary Event": "条件边界事件",
+  "Conditional Boundary Event (non-interrupting)": "条件边界事件（非中断）",
+  "Error Boundary Event": "错误边界事件",
+  "Cancel Boundary Event": "取消边界事件",
+  "Signal Boundary Event": "信号边界事件",
+  "Signal Boundary Event (non-interrupting)": "信号边界事件（非中断）",
+  "Compensation Boundary Event": "补偿边界事件",
+  "Exclusive Gateway": "互斥网关",
+  "Parallel Gateway": "并行网关",
+  "Inclusive Gateway": "相容网关",
+  "Complex Gateway": "复杂网关",
+  "Event based Gateway": "事件网关",
+  Transaction: "转运",
+  "Sub Process": "子流程",
+  "Event Sub Process": "事件子流程",
+  "Collapsed Pool": "折叠池",
+  "Expanded Pool": "展开池",
+
+  // Errors
+  "no parent for {element} in {parent}": "在{parent}里，{element}没有父类",
+  "no shape type specified": "没有指定的形状类型",
+  "flow elements must be children of pools/participants": "流元素必须是池/参与者的子类",
+  "out of bounds release": "out of bounds release",
+  "more than {count} child lanes": "子道大于{count} ",
+  "element required": "元素不能为空",
+  "diagram not part of bpmn:Definitions": "流程图不符合bpmn规范",
+  "no diagram to display": "没有可展示的流程图",
+  "no process or collaboration to display": "没有可展示的流程/协作",
+  "element {element} referenced by {referenced}#{property} not yet drawn": "由{referenced}#{property}引用的{element}元素仍未绘制",
+  "already rendered {element}": "{element} 已被渲染",
+  "failed to import {element}": "导入{element}失败",
+  //属性面板的参数
+  Id: "编号",
+  Name: "名称",
+  General: "常规",
+  Details: "详情",
+  "Message Name": "消息名称",
+  Message: "消息",
+  Initiator: "创建者",
+  "Asynchronous Continuations": "持续异步",
+  "Asynchronous Before": "异步前",
+  "Asynchronous After": "异步后",
+  "Job Configuration": "工作配置",
+  Exclusive: "排除",
+  "Job Priority": "工作优先级",
+  "Retry Time Cycle": "重试时间周期",
+  Documentation: "文档",
+  "Element Documentation": "元素文档",
+  "History Configuration": "历史配置",
+  "History Time To Live": "历史的生存时间",
+  Forms: "表单",
+  "Form Key": "表单key",
+  "Form Fields": "表单字段",
+  "Business Key": "业务key",
+  "Form Field": "表单字段",
+  ID: "编号",
+  Type: "类型",
+  Label: "名称",
+  "Default Value": "默认值",
+  "Default Flow": "默认流转路径",
+  "Conditional Flow": "条件流转路径",
+  "Sequence Flow": "普通流转路径",
+  Validation: "校验",
+  "Add Constraint": "添加约束",
+  Config: "配置",
+  Properties: "属性",
+  "Add Property": "添加属性",
+  Value: "值",
+  Listeners: "监听器",
+  "Execution Listener": "执行监听",
+  "Event Type": "事件类型",
+  "Listener Type": "监听器类型",
+  "Java Class": "Java类",
+  Expression: "表达式",
+  "Must provide a value": "必须提供一个值",
+  "Delegate Expression": "代理表达式",
+  Script: "脚本",
+  "Script Format": "脚本格式",
+  "Script Type": "脚本类型",
+  "Inline Script": "内联脚本",
+  "External Script": "外部脚本",
+  Resource: "资源",
+  "Field Injection": "字段注入",
+  Extensions: "扩展",
+  "Input/Output": "输入/输出",
+  "Input Parameters": "输入参数",
+  "Output Parameters": "输出参数",
+  Parameters: "参数",
+  "Output Parameter": "输出参数",
+  "Timer Definition Type": "定时器定义类型",
+  "Timer Definition": "定时器定义",
+  Date: "日期",
+  Duration: "持续",
+  Cycle: "循环",
+  Signal: "信号",
+  "Signal Name": "信号名称",
+  Escalation: "升级",
+  Error: "错误",
+  "Link Name": "链接名称",
+  Condition: "条件名称",
+  "Variable Name": "变量名称",
+  "Variable Event": "变量事件",
+  "Specify more than one variable change event as a comma separated list.": "多个变量事件以逗号隔开",
+  "Wait for Completion": "等待完成",
+  "Activity Ref": "活动参考",
+  "Version Tag": "版本标签",
+  Executable: "可执行文件",
+  "External Task Configuration": "扩展任务配置",
+  "Task Priority": "任务优先级",
+  External: "外部",
+  Connector: "连接器",
+  "Must configure Connector": "必须配置连接器",
+  "Connector Id": "连接器编号",
+  Implementation: "实现方式",
+  "Field Injections": "字段注入",
+  Fields: "字段",
+  "Result Variable": "结果变量",
+  Topic: "主题",
+  "Configure Connector": "配置连接器",
+  "Input Parameter": "输入参数",
+  Assignee: "代理人",
+  "Candidate Users": "候选用户",
+  "Candidate Groups": "候选组",
+  "Due Date": "到期时间",
+  "Follow Up Date": "跟踪日期",
+  Priority: "优先级",
+  "The follow up date as an EL expression (e.g. ${someDate} or an ISO date (e.g. 2015-06-26T09:54:00)":
+    "跟踪日期必须符合EL表达式，如： ${someDate} ,或者一个ISO标准日期，如：2015-06-26T09:54:00",
+  "The due date as an EL expression (e.g. ${someDate} or an ISO date (e.g. 2015-06-26T09:54:00)":
+    "跟踪日期必须符合EL表达式，如： ${someDate} ,或者一个ISO标准日期，如：2015-06-26T09:54:00",
+  Variables: "变量",
+  "Candidate Starter Configuration": "候选人起动器配置",
+  "Candidate Starter Groups": "候选人起动器组",
+  "This maps to the process definition key.": "这映射到流程定义键。",
+  "Candidate Starter Users": "候选人起动器的用户",
+  "Specify more than one user as a comma separated list.": "指定多个用户作为逗号分隔的列表。",
+  "Tasklist Configuration": "Tasklist配置",
+  Startable: "启动",
+  "Specify more than one group as a comma separated list.": "指定多个组作为逗号分隔的列表。"
+};
diff --git a/src/plugins/package/highlight/index.js b/src/plugins/package/highlight/index.js
new file mode 100644
index 0000000..bff9211
--- /dev/null
+++ b/src/plugins/package/highlight/index.js
@@ -0,0 +1,5 @@
+const hljs = require("highlight.js/lib/core");
+hljs.registerLanguage("xml", require("highlight.js/lib/languages/xml"));
+hljs.registerLanguage("json", require("highlight.js/lib/languages/json"));
+
+module.exports = hljs;
diff --git a/src/plugins/package/index.js b/src/plugins/package/index.js
new file mode 100644
index 0000000..d076cdd
--- /dev/null
+++ b/src/plugins/package/index.js
@@ -0,0 +1,7 @@
+import BpmnProcessDesigner from "./designer";
+import BmpnProcessPenal from "./penal";
+
+export {
+  BpmnProcessDesigner,
+  BmpnProcessPenal
+}
diff --git a/src/plugins/package/penal/PropertiesPanel.vue b/src/plugins/package/penal/PropertiesPanel.vue
new file mode 100644
index 0000000..4d88c83
--- /dev/null
+++ b/src/plugins/package/penal/PropertiesPanel.vue
@@ -0,0 +1,193 @@
+<template>
+  <div class="process-panel__container" :style="{ width: `${this.width}px` }">
+    <el-collapse v-model="activeTab">
+      <el-collapse-item name="base">
+        <div slot="title" class="panel-tab__title"><i class="el-icon-info"></i>常规</div>
+        <element-base-info :id-edit-disabled="idEditDisabled" :business-object="elementBusinessObject" :type="elementType" />
+      </el-collapse-item>
+      <el-collapse-item name="condition" v-if="elementType === 'Process'" key="message">
+        <div slot="title" class="panel-tab__title"><i class="el-icon-s-comment"></i>消息与信号</div>
+        <signal-and-massage />
+      </el-collapse-item>
+      <el-collapse-item name="condition" v-if="conditionFormVisible" key="condition">
+        <div slot="title" class="panel-tab__title"><i class="el-icon-s-promotion"></i>流转条件</div>
+        <flow-condition :business-object="elementBusinessObject" :type="elementType" />
+      </el-collapse-item>
+      <el-collapse-item name="condition" v-if="formVisible" key="form">
+        <div slot="title" class="panel-tab__title"><i class="el-icon-s-order"></i>表单</div>
+        <element-form :id="elementId" :type="elementType" />
+      </el-collapse-item>
+      <el-collapse-item name="task" v-if="elementType.indexOf('Task') !== -1" key="task">
+        <div slot="title" class="panel-tab__title"><i class="el-icon-s-claim"></i>任务</div>
+        <!-- <element-task :id="elementId" :type="elementType" /> -->
+      </el-collapse-item>
+      <el-collapse-item name="multiInstance" v-if="elementType.indexOf('Task') !== -1 && elementType !== 'UserTask'" key="multiInstance">
+        <div slot="title" class="panel-tab__title"><i class="el-icon-s-help"></i>多实例</div>
+        <element-multi-instance :business-object="elementBusinessObject" :type="elementType" />
+      </el-collapse-item>
+      <el-collapse-item name="listeners" key="listeners">
+        <div slot="title" class="panel-tab__title"><i class="el-icon-message-solid"></i>执行监听器</div>
+        <element-listeners :id="elementId" :type="elementType" />
+      </el-collapse-item>
+      <el-collapse-item name="taskListeners" v-if="elementType === 'UserTask'" key="taskListeners">
+        <div slot="title" class="panel-tab__title"><i class="el-icon-message-solid"></i>任务监听器</div>
+        <user-task-listeners :id="elementId" :type="elementType" />
+      </el-collapse-item>
+      <el-collapse-item name="extensions" key="extensions">
+        <div slot="title" class="panel-tab__title"><i class="el-icon-circle-plus"></i>扩展属性</div>
+        <element-properties :id="elementId" :type="elementType" />
+      </el-collapse-item>
+      <el-collapse-item name="other" key="other">
+        <div slot="title" class="panel-tab__title"><i class="el-icon-s-promotion"></i>其他</div>
+        <element-other-config :id="elementId" />
+      </el-collapse-item>
+    </el-collapse>
+  </div>
+</template>
+<script>
+import ElementBaseInfo from "./base/ElementBaseInfo";
+import ElementOtherConfig from "./other/ElementOtherConfig";
+// import ElementTask from "./task/ElementTask";
+import ElementMultiInstance from "./multi-instance/ElementMultiInstance";
+import FlowCondition from "./flow-condition/FlowCondition";
+import SignalAndMassage from "./signal-message/SignalAndMessage";
+import ElementListeners from "./listeners/ElementListeners";
+import ElementProperties from "./properties/ElementProperties";
+import ElementForm from "./form/ElementForm";
+import UserTaskListeners from "./listeners/UserTaskListeners";
+/**
+ * 侧边栏
+ * @Author MiyueFE
+ * @Home https://github.com/miyuesc
+ * @Date 2021年3月31日18:57:51
+ */
+export default {
+  name: "BpmnPropertiesPanel",
+  components: {
+    UserTaskListeners,
+    ElementForm,
+    ElementProperties,
+    ElementListeners,
+    SignalAndMassage,
+    FlowCondition,
+    ElementMultiInstance,
+    // ElementTask,
+    ElementOtherConfig,
+    ElementBaseInfo
+  },
+  componentName: "BpmnPropertiesPanel",
+  props: {
+    bpmnModeler: Object,
+    prefix: {
+      type: String,
+      default: "camunda"
+    },
+    width: {
+      type: Number,
+      default: 480
+    },
+    idEditDisabled: {
+      type: Boolean,
+      default: false
+    }
+  },
+  provide() {
+    return {
+      prefix: this.prefix,
+      width: this.width
+    };
+  },
+  data() {
+    return {
+      activeTab: "base",
+      elementId: "",
+      elementType: "",
+      elementBusinessObject: {}, // 元素 businessObject 镜像，提供给需要做判断的组件使用
+      conditionFormVisible: false, // 流转条件设置
+      formVisible: false // 表单配置
+    };
+  },
+  watch: {
+    elementId: {
+      handler() {
+        this.activeTab = "base";
+      }
+    }
+  },
+  created() {
+    this.initModels();
+  },
+  methods: {
+    initModels() {
+      // 初始化 modeler 以及其他 moddle
+      if (!this.bpmnModeler) {
+        // 避免加载时 流程图 并未加载完成
+        this.timer = setTimeout(() => this.initModels(), 10);
+        return;
+      }
+      if (this.timer) clearTimeout(this.timer);
+      window.bpmnInstances = {
+        modeler: this.bpmnModeler,
+        modeling: this.bpmnModeler.get("modeling"),
+        moddle: this.bpmnModeler.get("moddle"),
+        eventBus: this.bpmnModeler.get("eventBus"),
+        bpmnFactory: this.bpmnModeler.get("bpmnFactory"),
+        elementFactory: this.bpmnModeler.get("elementFactory"),
+        elementRegistry: this.bpmnModeler.get("elementRegistry"),
+        replace: this.bpmnModeler.get("replace"),
+        selection: this.bpmnModeler.get("selection")
+      };
+      this.getActiveElement();
+    },
+    getActiveElement() {
+      // 初始第一个选中元素 bpmn:Process
+      this.initFormOnChanged(null);
+      this.bpmnModeler.on("import.done", e => {
+        this.initFormOnChanged(null);
+      });
+      // 监听选择事件，修改当前激活的元素以及表单
+      this.bpmnModeler.on("selection.changed", ({ newSelection }) => {
+        this.initFormOnChanged(newSelection[0] || null);
+      });
+      this.bpmnModeler.on("element.changed", ({ element }) => {
+        // 保证 修改 "默认流转路径" 类似需要修改多个元素的事件发生的时候，更新表单的元素与原选中元素不一致。
+        if (element && element.id === this.elementId) {
+          this.initFormOnChanged(element);
+        }
+      });
+    },
+    // 初始化数据
+    initFormOnChanged(element) {
+      let activatedElement = element;
+      if (!activatedElement) {
+        activatedElement =
+          window.bpmnInstances.elementRegistry.find(el => el.type === "bpmn:Process") ??
+          window.bpmnInstances.elementRegistry.find(el => el.type === "bpmn:Collaboration");
+      }
+      if (!activatedElement) return;
+      // console.log(`
+      //         ----------
+      // select element changed:
+      //           id:  ${activatedElement.id}
+      //         type:  ${activatedElement.businessObject.$type}
+      //         ----------
+      //         `);
+      // console.log("businessObject: ", activatedElement.businessObject);
+      window.bpmnInstances.bpmnElement = activatedElement;
+      this.bpmnElement = activatedElement;
+      this.elementId = activatedElement.id;
+      this.elementType = activatedElement.type.split(":")[1] || "";
+      this.elementBusinessObject = JSON.parse(JSON.stringify(activatedElement.businessObject));
+      this.conditionFormVisible = !!(
+        this.elementType === "SequenceFlow" &&
+        activatedElement.source &&
+        activatedElement.source.type.indexOf("StartEvent") === -1
+      );
+      this.formVisible = this.elementType === "UserTask" || this.elementType === "StartEvent";
+    },
+    beforeDestroy() {
+      window.bpmnInstances = null;
+    }
+  }
+};
+</script>
diff --git a/src/plugins/package/penal/base/ElementBaseInfo.vue b/src/plugins/package/penal/base/ElementBaseInfo.vue
new file mode 100644
index 0000000..303d59d
--- /dev/null
+++ b/src/plugins/package/penal/base/ElementBaseInfo.vue
@@ -0,0 +1,76 @@
+<template>
+  <div class="panel-tab__content">
+    <el-form size="mini" label-width="90px" @submit.native.prevent>
+      <el-form-item label="ID">
+        <el-input
+          v-model="elementBaseInfo.id"
+          :disabled="idEditDisabled || elementBaseInfo.$type === 'bpmn:Process'"
+          clearable
+          @change="updateBaseInfo('id')"
+        />
+      </el-form-item>
+      <el-form-item label="名称">
+        <el-input v-model="elementBaseInfo.name" clearable @change="updateBaseInfo('name')" />
+      </el-form-item>
+      <!--流程的基础属性-->
+      <template v-if="elementBaseInfo.$type === 'bpmn:Process'">
+        <el-form-item label="版本标签">
+          <el-input v-model="elementBaseInfo.versionTag" clearable @change="updateBaseInfo('versionTag')" />
+        </el-form-item>
+        <el-form-item label="可执行">
+          <el-switch v-model="elementBaseInfo.isExecutable" active-text="是" inactive-text="否" @change="updateBaseInfo('isExecutable')" />
+        </el-form-item>
+      </template>
+    </el-form>
+  </div>
+</template>
+<script>
+
+export default {
+  name: "ElementBaseInfo",
+  props: {
+    businessObject: Object,
+    type: String,
+    idEditDisabled: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      elementBaseInfo: {},
+    };
+  },
+  watch: {
+    businessObject: {
+      immediate: false,
+      handler: function(val) {
+        if (val) {
+          this.$nextTick(() => this.resetBaseInfo());
+        }
+      }
+    }
+  },
+  methods: {
+    resetBaseInfo() {
+      this.bpmnElement = window?.bpmnInstances?.bpmnElement;
+      this.elementBaseInfo = JSON.parse(JSON.stringify(this.bpmnElement.businessObject));
+    },
+    updateBaseInfo(key) {
+      const attrObj = Object.create(null);
+      attrObj[key] = this.elementBaseInfo[key];
+      if (key === "id") {
+        window.bpmnInstances.modeling.updateProperties(this.bpmnElement, {
+          id: this.elementBaseInfo[key],
+          di: { id: `${this.elementBaseInfo[key]}_di` }
+        });
+      } else {
+        window.bpmnInstances.modeling.updateProperties(this.bpmnElement, attrObj);
+      }
+    }
+  },
+  beforeDestroy() {
+    this.bpmnElement = null;
+  }
+};
+</script>
diff --git a/src/plugins/package/penal/flow-condition/FlowCondition.vue b/src/plugins/package/penal/flow-condition/FlowCondition.vue
new file mode 100644
index 0000000..94cf823
--- /dev/null
+++ b/src/plugins/package/penal/flow-condition/FlowCondition.vue
@@ -0,0 +1,142 @@
+<template>
+  <div class="panel-tab__content">
+    <el-form :model="flowConditionForm" label-width="90px" size="mini" @submit.native.prevent>
+      <el-form-item label="流转类型">
+        <el-select v-model="flowConditionForm.type" @change="updateFlowType">
+          <el-option label="普通流转路径" value="normal" />
+          <el-option label="默认流转路径" value="default" />
+          <el-option label="条件流转路径" value="condition" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="条件格式" v-if="flowConditionForm.type === 'condition'" key="condition">
+        <el-select v-model="flowConditionForm.conditionType">
+          <el-option label="表达式" value="expression" />
+          <el-option label="脚本" value="script" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="表达式" v-if="flowConditionForm.conditionType && flowConditionForm.conditionType === 'expression'" key="express">
+        <el-input v-model="flowConditionForm.body" clearable @change="updateFlowCondition" />
+      </el-form-item>
+      <template v-if="flowConditionForm.conditionType && flowConditionForm.conditionType === 'script'">
+        <el-form-item label="脚本语言" key="language">
+          <el-input v-model="flowConditionForm.language" clearable @change="updateFlowCondition" />
+        </el-form-item>
+        <el-form-item label="脚本类型" key="scriptType">
+          <el-select v-model="flowConditionForm.scriptType">
+            <el-option label="内联脚本" value="inlineScript" />
+            <el-option label="外部脚本" value="externalScript" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="脚本" v-if="flowConditionForm.scriptType === 'inlineScript'" key="body">
+          <el-input v-model="flowConditionForm.body" type="textarea" clearable @change="updateFlowCondition" />
+        </el-form-item>
+        <el-form-item label="资源地址" v-if="flowConditionForm.scriptType === 'externalScript'" key="resource">
+          <el-input v-model="flowConditionForm.resource" clearable @change="updateFlowCondition" />
+        </el-form-item>
+      </template>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "FlowCondition",
+  props: {
+    businessObject: Object,
+    type: String
+  },
+  data() {
+    return {
+      flowConditionForm: {}
+    };
+  },
+  watch: {
+    businessObject: {
+      immediate: true,
+      handler() {
+        this.$nextTick(() => this.resetFlowCondition());
+      }
+    }
+  },
+  methods: {
+    resetFlowCondition() {
+      this.bpmnElement = window.bpmnInstances.bpmnElement;
+      this.bpmnElementSource = this.bpmnElement.source;
+      this.bpmnElementSourceRef = this.bpmnElement.businessObject.sourceRef;
+      if (this.bpmnElementSourceRef && this.bpmnElementSourceRef.default && this.bpmnElementSourceRef.default.id === this.bpmnElement.id) {
+        // 默认
+        this.flowConditionForm = { type: "default" };
+      } else if (!this.bpmnElement.businessObject.conditionExpression) {
+        // 普通
+        this.flowConditionForm = { type: "normal" };
+      } else {
+        // 带条件
+        const conditionExpression = this.bpmnElement.businessObject.conditionExpression;
+        this.flowConditionForm = { ...conditionExpression, type: "condition" };
+        // resource 可直接标识 是否是外部资源脚本
+        if (this.flowConditionForm.resource) {
+          this.$set(this.flowConditionForm, "conditionType", "script");
+          this.$set(this.flowConditionForm, "scriptType", "externalScript");
+          return;
+        }
+        if (conditionExpression.language) {
+          this.$set(this.flowConditionForm, "conditionType", "script");
+          this.$set(this.flowConditionForm, "scriptType", "inlineScript");
+          return;
+        }
+        this.$set(this.flowConditionForm, "conditionType", "expression");
+      }
+    },
+    updateFlowType(flowType) {
+      // 正常条件类
+      if (flowType === "condition") {
+        this.flowConditionRef = window.bpmnInstances.moddle.create("bpmn:FormalExpression");
+        window.bpmnInstances.modeling.updateProperties(this.bpmnElement, {
+          conditionExpression: this.flowConditionRef
+        });
+        return;
+      }
+      // 默认路径
+      if (flowType === "default") {
+        window.bpmnInstances.modeling.updateProperties(this.bpmnElement, {
+          conditionExpression: null
+        });
+        window.bpmnInstances.modeling.updateProperties(this.bpmnElementSource, {
+          default: this.bpmnElement
+        });
+        return;
+      }
+      // 正常路径，如果来源节点的默认路径是当前连线时，清除父元素的默认路径配置
+      if (this.bpmnElementSourceRef.default && this.bpmnElementSourceRef.default.id === this.bpmnElement.id) {
+        window.bpmnInstances.modeling.updateProperties(this.bpmnElementSource, {
+          default: null
+        });
+      }
+      window.bpmnInstances.modeling.updateProperties(this.bpmnElement, {
+        conditionExpression: null
+      });
+    },
+    updateFlowCondition() {
+      let { conditionType, scriptType, body, resource, language } = this.flowConditionForm;
+      let condition;
+      if (conditionType === "expression") {
+        condition = window.bpmnInstances.moddle.create("bpmn:FormalExpression", { body });
+      } else {
+        if (scriptType === "inlineScript") {
+          condition = window.bpmnInstances.moddle.create("bpmn:FormalExpression", { body, language });
+          this.$set(this.flowConditionForm, "resource", "");
+        } else {
+          this.$set(this.flowConditionForm, "body", "");
+          condition = window.bpmnInstances.moddle.create("bpmn:FormalExpression", { resource, language });
+        }
+      }
+      window.bpmnInstances.modeling.updateProperties(this.bpmnElement, { conditionExpression: condition });
+    }
+  },
+  beforeDestroy() {
+    this.bpmnElement = null;
+    this.bpmnElementSource = null;
+    this.bpmnElementSourceRef = null;
+  }
+};
+</script>
diff --git a/src/plugins/package/penal/form/ElementForm.vue b/src/plugins/package/penal/form/ElementForm.vue
new file mode 100644
index 0000000..a59d8e3
--- /dev/null
+++ b/src/plugins/package/penal/form/ElementForm.vue
@@ -0,0 +1,390 @@
+<template>
+  <div class="panel-tab__content">
+    <el-form size="mini" label-width="90px" @submit.native.prevent>
+      <el-form-item label="表单" prop="formKey">
+        <el-select v-model="formKey" placeholder="请选择表单" @change="updateElementFormKey" clearable>
+          <el-option v-for="item in formOptions" :key="item.formId" :label="item.formName" :value="`key_${item.formId}`" />
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="localScope">
+        <span slot="label">
+          <el-tooltip content="若为节点表单，则表单信息仅在此节点可用，默认为全局表单，表单信息在整个流程实例中可用" placement="top-start">
+            <i class="header-icon el-icon-info"></i>
+          </el-tooltip>
+          <span>节点表单</span>
+        </span>
+        <el-switch :disabled="type === 'StartEvent'" v-model="localScope" active-text="是" inactive-text="否" @change="updateElementFormScope()" />
+      </el-form-item>
+<!--      <el-form-item label="表单标识">-->
+<!--        <el-input v-model="formKey" clearable @change="updateElementFormKey" />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="业务标识">-->
+<!--        <el-select v-model="businessKey" @change="updateElementBusinessKey">-->
+<!--          <el-option v-for="i in fieldList" :key="i.id" :value="i.id" :label="i.label" />-->
+<!--          <el-option label="无" value="" />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+    </el-form>
+
+    <!--字段列表-->
+<!--    <div class="element-property list-property">-->
+<!--      <el-divider><i class="el-icon-coin"></i> 表单字段</el-divider>-->
+<!--      <el-table :data="fieldList" size="mini" max-height="240" border fit>-->
+<!--        <el-table-column label="序号" type="index" width="50px" />-->
+<!--        <el-table-column label="字段名称" prop="label" min-width="80px" show-overflow-tooltip />-->
+<!--        <el-table-column label="字段类型" prop="type" min-width="80px" :formatter="row => fieldType[row.type] || row.type" show-overflow-tooltip />-->
+<!--        <el-table-column label="默认值" prop="defaultValue" min-width="80px" show-overflow-tooltip />-->
+<!--        <el-table-column label="操作" width="90px">-->
+<!--          <template slot-scope="{ row, $index }">-->
+<!--            <el-button size="mini" type="text" @click="openFieldForm(row, $index)">编辑</el-button>-->
+<!--            <el-divider direction="vertical" />-->
+<!--            <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeField(row, $index)">移除</el-button>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--      </el-table>-->
+<!--    </div>-->
+<!--    <div class="element-drawer__button">-->
+<!--      <el-button size="mini" type="primary" icon="el-icon-plus" @click="openFieldForm(null, -1)">添加字段</el-button>-->
+<!--    </div>-->
+
+    <!--字段配置侧边栏-->
+<!--    <el-drawer :visible.sync="fieldModelVisible" title="字段配置" :size="`${width}px`" append-to-body destroy-on-close>-->
+<!--      <el-form :model="formFieldForm" label-width="90px" size="mini" @submit.native.prevent>-->
+<!--        <el-form-item label="字段ID">-->
+<!--          <el-input v-model="formFieldForm.id" clearable />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="类型">-->
+<!--          <el-select v-model="formFieldForm.typeType" placeholder="请选择字段类型" clearable @change="changeFieldTypeType">-->
+<!--            <el-option v-for="(value, key) of fieldType" :label="value" :value="key" :key="key" />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="类型名称" v-if="formFieldForm.typeType === 'custom'">-->
+<!--          <el-input v-model="formFieldForm.type" clearable />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="名称">-->
+<!--          <el-input v-model="formFieldForm.label" clearable />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="时间格式" v-if="formFieldForm.typeType === 'date'">-->
+<!--          <el-input v-model="formFieldForm.datePattern" clearable />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="默认值">-->
+<!--          <el-input v-model="formFieldForm.defaultValue" clearable />-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
+
+<!--      &lt;!&ndash; 枚举值设置 &ndash;&gt;-->
+<!--      <template v-if="formFieldForm.type === 'enum'">-->
+<!--        <el-divider key="enum-divider" />-->
+<!--        <p class="listener-filed__title" key="enum-title">-->
+<!--          <span><i class="el-icon-menu"></i>枚举值列表：</span>-->
+<!--          <el-button size="mini" type="primary" @click="openFieldOptionForm(null, -1, 'enum')">添加枚举值</el-button>-->
+<!--        </p>-->
+<!--        <el-table :data="fieldEnumList" size="mini" key="enum-table" max-height="240" border fit>-->
+<!--          <el-table-column label="序号" width="50px" type="index" />-->
+<!--          <el-table-column label="枚举值编号" prop="id" min-width="100px" show-overflow-tooltip />-->
+<!--          <el-table-column label="枚举值名称" prop="name" min-width="100px" show-overflow-tooltip />-->
+<!--          <el-table-column label="操作" width="90px">-->
+<!--            <template slot-scope="{ row, $index }">-->
+<!--              <el-button size="mini" type="text" @click="openFieldOptionForm(row, $index, 'enum')">编辑</el-button>-->
+<!--              <el-divider direction="vertical" />-->
+<!--              <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'enum')">移除</el-button>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--        </el-table>-->
+<!--      </template>-->
+
+<!--      &lt;!&ndash; 校验规则 &ndash;&gt;-->
+<!--      <el-divider key="validation-divider" />-->
+<!--      <p class="listener-filed__title" key="validation-title">-->
+<!--        <span><i class="el-icon-menu"></i>约束条件列表：</span>-->
+<!--        <el-button size="mini" type="primary" @click="openFieldOptionForm(null, -1, 'constraint')">添加约束</el-button>-->
+<!--      </p>-->
+<!--      <el-table :data="fieldConstraintsList" size="mini" key="validation-table" max-height="240" border fit>-->
+<!--        <el-table-column label="序号" width="50px" type="index" />-->
+<!--        <el-table-column label="约束名称" prop="name" min-width="100px" show-overflow-tooltip />-->
+<!--        <el-table-column label="约束配置" prop="config" min-width="100px" show-overflow-tooltip />-->
+<!--        <el-table-column label="操作" width="90px">-->
+<!--          <template slot-scope="{ row, $index }">-->
+<!--            <el-button size="mini" type="text" @click="openFieldOptionForm(row, $index, 'constraint')">编辑</el-button>-->
+<!--            <el-divider direction="vertical" />-->
+<!--            <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'constraint')">移除</el-button>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--      </el-table>-->
+
+<!--      &lt;!&ndash; 表单属性 &ndash;&gt;-->
+<!--      <el-divider key="property-divider" />-->
+<!--      <p class="listener-filed__title" key="property-title">-->
+<!--        <span><i class="el-icon-menu"></i>字段属性列表：</span>-->
+<!--        <el-button size="mini" type="primary" @click="openFieldOptionForm(null, -1, 'property')">添加属性</el-button>-->
+<!--      </p>-->
+<!--      <el-table :data="fieldPropertiesList" size="mini" key="property-table" max-height="240" border fit>-->
+<!--        <el-table-column label="序号" width="50px" type="index" />-->
+<!--        <el-table-column label="属性编号" prop="id" min-width="100px" show-overflow-tooltip />-->
+<!--        <el-table-column label="属性值" prop="value" min-width="100px" show-overflow-tooltip />-->
+<!--        <el-table-column label="操作" width="90px">-->
+<!--          <template slot-scope="{ row, $index }">-->
+<!--            <el-button size="mini" type="text" @click="openFieldOptionForm(row, $index, 'property')">编辑</el-button>-->
+<!--            <el-divider direction="vertical" />-->
+<!--            <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeFieldOptionItem(row, $index, 'property')">移除</el-button>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--      </el-table>-->
+
+<!--      &lt;!&ndash; 底部按钮 &ndash;&gt;-->
+<!--      <div class="element-drawer__button">-->
+<!--        <el-button size="mini">取 消</el-button>-->
+<!--        <el-button size="mini" type="primary" @click="saveField">保 存</el-button>-->
+<!--      </div>-->
+<!--    </el-drawer>-->
+
+    <el-dialog :visible.sync="fieldOptionModelVisible" :title="optionModelTitle" width="600px" append-to-body destroy-on-close>
+      <el-form :model="fieldOptionForm" size="mini" label-width="96px" @submit.native.prevent>
+        <el-form-item label="编号/ID" v-if="fieldOptionType !== 'constraint'" key="option-id">
+          <el-input v-model="fieldOptionForm.id" clearable />
+        </el-form-item>
+        <el-form-item label="名称" v-if="fieldOptionType !== 'property'" key="option-name">
+          <el-input v-model="fieldOptionForm.name" clearable />
+        </el-form-item>
+        <el-form-item label="配置" v-if="fieldOptionType === 'constraint'" key="option-config">
+          <el-input v-model="fieldOptionForm.config" clearable />
+        </el-form-item>
+        <el-form-item label="值" v-if="fieldOptionType === 'property'" key="option-value">
+          <el-input v-model="fieldOptionForm.value" clearable />
+        </el-form-item>
+      </el-form>
+      <template slot="footer">
+        <el-button size="mini" @click="fieldOptionModelVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="saveFieldOption">确 定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+// import { listForm } from "@/api/workflow/form";
+
+export default {
+  name: "ElementForm",
+  props: {
+    id: String,
+    type: String
+  },
+  inject: {
+    prefix: "prefix",
+    width: "width"
+  },
+  data() {
+    return {
+      formOptions: [],
+      formKey: "",
+      localScope: false,
+      businessKey: "",
+      optionModelTitle: "",
+      fieldList: [],
+      formFieldForm: {},
+      fieldType: {
+        long: "长整型",
+        string: "字符串",
+        boolean: "布尔类",
+        date: "日期类",
+        enum: "枚举类",
+        custom: "自定义类型"
+      },
+      formFieldIndex: -1, // 编辑中的字段， -1 为新增
+      formFieldOptionIndex: -1, // 编辑中的字段配置项， -1 为新增
+      fieldModelVisible: false,
+      fieldOptionModelVisible: false,
+      fieldOptionForm: {}, // 当前激活的字段配置项数据
+      fieldOptionType: "", // 当前激活的字段配置项弹窗 类型
+      fieldEnumList: [], // 枚举值列表
+      fieldConstraintsList: [], // 约束条件列表
+      fieldPropertiesList: [] // 绑定属性列表
+    };
+  },
+  watch: {
+    id: {
+      immediate: true,
+      handler(val) {
+        val && val.length && this.$nextTick(() => this.resetFormList());
+      }
+    }
+  },
+  created() {
+    /** 查询流程分类列表 */
+    // this.getFormList();
+  },
+  methods: {
+    /** 查询表单列表 */
+    // getFormList() {
+    //   listForm().then(response => this.formOptions = response.rows)
+    // },
+    resetFormList() {
+      this.bpmnELement = window.bpmnInstances.bpmnElement;
+      this.formKey = this.bpmnELement.businessObject.formKey;
+      this.localScope = this.bpmnELement.businessObject.localScope;
+      // 获取元素扩展属性 或者 创建扩展属性
+      this.elExtensionElements =
+        this.bpmnELement.businessObject.get("extensionElements") || window.bpmnInstances.moddle.create("bpmn:ExtensionElements", { values: [] });
+      // 获取元素表单配置 或者 创建新的表单配置
+      // this.formData =
+      //   this.elExtensionElements.values.filter(ex => ex.$type === `${this.prefix}:FormData`)?.[0] ||
+      //   window.bpmnInstances.moddle.create(`${this.prefix}:FormData`, { fields: [] });
+      // 业务标识 businessKey， 绑定在 formData 中
+      // this.businessKey = this.formData.businessKey;
+
+      // 保留剩余扩展元素，便于后面更新该元素对应属性
+      this.otherExtensions = this.elExtensionElements.values.filter(ex => ex.$type !== `${this.prefix}:FormData`);
+
+      // 复制原始值，填充表格
+      // this.fieldList = JSON.parse(JSON.stringify(this.formData.fields || []));
+
+      // 更新元素扩展属性，避免后续报错
+      // this.updateElementExtensions();
+    },
+    updateElementFormKey() {
+      window.bpmnInstances.modeling.updateProperties(this.bpmnELement, { formKey: this.formKey });
+    },
+    updateElementFormScope() {
+      window.bpmnInstances.modeling.updateProperties(this.bpmnELement, { localScope: this.localScope });
+    },
+    updateElementBusinessKey() {
+      window.bpmnInstances.modeling.updateModdleProperties(this.bpmnELement, this.formData, { businessKey: this.businessKey });
+    },
+    // 根据类型调整字段type
+    changeFieldTypeType(type) {
+      this.$set(this.formFieldForm, "type", type === "custom" ? "" : type);
+    },
+
+    // 打开字段详情侧边栏
+    openFieldForm(field, index) {
+      this.formFieldIndex = index;
+      if (index !== -1) {
+        const FieldObject = this.formData.fields[index];
+        this.formFieldForm = JSON.parse(JSON.stringify(field));
+        // 设置自定义类型
+        this.$set(this.formFieldForm, "typeType", !this.fieldType[field.type] ? "custom" : field.type);
+        // 初始化枚举值列表
+        field.type === "enum" && (this.fieldEnumList = JSON.parse(JSON.stringify(FieldObject?.values || [])));
+        // 初始化约束条件列表
+        this.fieldConstraintsList = JSON.parse(JSON.stringify(FieldObject?.validation?.constraints || []));
+        // 初始化自定义属性列表
+        this.fieldPropertiesList = JSON.parse(JSON.stringify(FieldObject?.properties?.values || []));
+      } else {
+        this.formFieldForm = {};
+        // 初始化枚举值列表
+        this.fieldEnumList = [];
+        // 初始化约束条件列表
+        this.fieldConstraintsList = [];
+        // 初始化自定义属性列表
+        this.fieldPropertiesList = [];
+      }
+      this.fieldModelVisible = true;
+    },
+    // 打开字段 某个 配置项 弹窗
+    openFieldOptionForm(option, index, type) {
+      this.fieldOptionModelVisible = true;
+      this.fieldOptionType = type;
+      this.formFieldOptionIndex = index;
+      if (type === "property") {
+        this.fieldOptionForm = option ? JSON.parse(JSON.stringify(option)) : {};
+        return (this.optionModelTitle = "属性配置");
+      }
+      if (type === "enum") {
+        this.fieldOptionForm = option ? JSON.parse(JSON.stringify(option)) : {};
+        return (this.optionModelTitle = "枚举值配置");
+      }
+      this.fieldOptionForm = option ? JSON.parse(JSON.stringify(option)) : {};
+      return (this.optionModelTitle = "约束条件配置");
+    },
+
+    // 保存字段 某个 配置项
+    saveFieldOption() {
+      if (this.formFieldOptionIndex === -1) {
+        if (this.fieldOptionType === "property") {
+          this.fieldPropertiesList.push(this.fieldOptionForm);
+        }
+        if (this.fieldOptionType === "constraint") {
+          this.fieldConstraintsList.push(this.fieldOptionForm);
+        }
+        if (this.fieldOptionType === "enum") {
+          this.fieldEnumList.push(this.fieldOptionForm);
+        }
+      } else {
+        this.fieldOptionType === "property" && this.fieldPropertiesList.splice(this.formFieldOptionIndex, 1, this.fieldOptionForm);
+        this.fieldOptionType === "constraint" && this.fieldConstraintsList.splice(this.formFieldOptionIndex, 1, this.fieldOptionForm);
+        this.fieldOptionType === "enum" && this.fieldEnumList.splice(this.formFieldOptionIndex, 1, this.fieldOptionForm);
+      }
+      this.fieldOptionModelVisible = false;
+      this.fieldOptionForm = {};
+    },
+    // 保存字段配置
+    saveField() {
+      const { id, type, label, defaultValue, datePattern } = this.formFieldForm;
+      const Field = window.bpmnInstances.moddle.create(`${this.prefix}:FormField`, { id, type, label });
+      defaultValue && (Field.defaultValue = defaultValue);
+      datePattern && (Field.datePattern = datePattern);
+      // 构建属性
+      if (this.fieldPropertiesList && this.fieldPropertiesList.length) {
+        const fieldPropertyList = this.fieldPropertiesList.map(fp => {
+          return window.bpmnInstances.moddle.create(`${this.prefix}:Property`, { id: fp.id, value: fp.value });
+        });
+        Field.properties = window.bpmnInstances.moddle.create(`${this.prefix}:Properties`, { values: fieldPropertyList });
+      }
+      // 构建校验规则
+      if (this.fieldConstraintsList && this.fieldConstraintsList.length) {
+        const fieldConstraintList = this.fieldConstraintsList.map(fc => {
+          return window.bpmnInstances.moddle.create(`${this.prefix}:Constraint`, { name: fc.name, config: fc.config });
+        });
+        Field.validation = window.bpmnInstances.moddle.create(`${this.prefix}:Validation`, { constraints: fieldConstraintList });
+      }
+      // 构建枚举值
+      if (this.fieldEnumList && this.fieldEnumList.length) {
+        Field.values = this.fieldEnumList.map(fe => {
+          return window.bpmnInstances.moddle.create(`${this.prefix}:Value`, { name: fe.name, id: fe.id });
+        });
+      }
+      // 更新数组 与 表单配置实例
+      if (this.formFieldIndex === -1) {
+        this.fieldList.push(this.formFieldForm);
+        this.formData.fields.push(Field);
+      } else {
+        this.fieldList.splice(this.formFieldIndex, 1, this.formFieldForm);
+        this.formData.fields.splice(this.formFieldIndex, 1, Field);
+      }
+      this.updateElementExtensions();
+      this.fieldModelVisible = false;
+    },
+
+    // 移除某个 字段的 配置项
+    removeFieldOptionItem(option, index, type) {
+      if (type === "property") {
+        this.fieldPropertiesList.splice(index, 1);
+        return;
+      }
+      if (type === "enum") {
+        this.fieldEnumList.splice(index, 1);
+        return;
+      }
+      this.fieldConstraintsList.splice(index, 1);
+    },
+    // 移除 字段
+    removeField(field, index) {
+      this.fieldList.splice(index, 1);
+      this.formData.fields.splice(index, 1);
+      this.updateElementExtensions();
+    },
+
+    updateElementExtensions() {
+      // 更新回扩展元素
+      const newElExtensionElements = window.bpmnInstances.moddle.create(`bpmn:ExtensionElements`, {
+        values: this.otherExtensions.concat(this.formData)
+      });
+      // 更新到元素上
+      window.bpmnInstances.modeling.updateProperties(this.bpmnELement, {
+        extensionElements: newElExtensionElements
+      });
+    }
+  }
+};
+</script>
diff --git a/src/plugins/package/penal/index.js b/src/plugins/package/penal/index.js
new file mode 100644
index 0000000..9b398b2
--- /dev/null
+++ b/src/plugins/package/penal/index.js
@@ -0,0 +1,7 @@
+import BpmnPropertiesPanel from "./PropertiesPanel.vue";
+
+BpmnPropertiesPanel.install = function(Vue) {
+  Vue.component(BpmnPropertiesPanel.name, BpmnPropertiesPanel);
+};
+
+export default BpmnPropertiesPanel;
diff --git a/src/plugins/package/penal/listeners/ElementListeners.vue b/src/plugins/package/penal/listeners/ElementListeners.vue
new file mode 100644
index 0000000..16f5099
--- /dev/null
+++ b/src/plugins/package/penal/listeners/ElementListeners.vue
@@ -0,0 +1,296 @@
+<template>
+  <div class="panel-tab__content">
+    <el-table :data="elementListenersList" size="mini" border>
+      <el-table-column label="序号" width="50px" type="index" />
+      <el-table-column label="事件类型" min-width="100px" prop="event" />
+      <el-table-column label="监听器类型" min-width="100px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" />
+      <el-table-column label="操作" width="90px">
+        <template slot-scope="{ row, $index }">
+          <el-button size="mini" type="text" @click="openListenerForm(row, $index)">编辑</el-button>
+          <el-divider direction="vertical" />
+          <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="element-drawer__button">
+      <el-button size="mini" type="primary" icon="el-icon-plus" @click="openListenerForm(null)">添加监听器</el-button>
+    </div>
+
+    <!-- 监听器 编辑/创建 部分 -->
+    <el-drawer :visible.sync="listenerFormModelVisible" title="执行监听器" :size="`${width}px`" append-to-body destroy-on-close>
+      <el-form size="mini" :model="listenerForm" label-width="96px" ref="listenerFormRef" @submit.native.prevent>
+        <el-form-item label="事件类型" prop="event" :rules="{ required: true, trigger: ['blur', 'change'] }">
+          <el-select v-model="listenerForm.event">
+            <el-option label="start" value="start" />
+            <el-option label="end" value="end" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="监听器类型" prop="listenerType" :rules="{ required: true, trigger: ['blur', 'change'] }">
+          <el-select v-model="listenerForm.listenerType">
+            <el-option v-for="i in Object.keys(listenerTypeObject)" :key="i" :label="listenerTypeObject[i]" :value="i" />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'classListener'"
+          label="Java类"
+          prop="class"
+          key="listener-class"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.class" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'expressionListener'"
+          label="表达式"
+          prop="expression"
+          key="listener-expression"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.expression" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'delegateExpressionListener'"
+          label="代理表达式"
+          prop="delegateExpression"
+          key="listener-delegate"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.delegateExpression" clearable />
+        </el-form-item>
+        <template v-if="listenerForm.listenerType === 'scriptListener'">
+          <el-form-item
+            label="脚本格式"
+            prop="scriptFormat"
+            key="listener-script-format"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写脚本格式' }"
+          >
+            <el-input v-model="listenerForm.scriptFormat" clearable />
+          </el-form-item>
+          <el-form-item
+            label="脚本类型"
+            prop="scriptType"
+            key="listener-script-type"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请选择脚本类型' }"
+          >
+            <el-select v-model="listenerForm.scriptType">
+              <el-option label="内联脚本" value="inlineScript" />
+              <el-option label="外部脚本" value="externalScript" />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-if="listenerForm.scriptType === 'inlineScript'"
+            label="脚本内容"
+            prop="value"
+            key="listener-script"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写脚本内容' }"
+          >
+            <el-input v-model="listenerForm.value" clearable />
+          </el-form-item>
+          <el-form-item
+            v-if="listenerForm.scriptType === 'externalScript'"
+            label="资源地址"
+            prop="resource"
+            key="listener-resource"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写资源地址' }"
+          >
+            <el-input v-model="listenerForm.resource" clearable />
+          </el-form-item>
+        </template>
+      </el-form>
+      <el-divider />
+      <p class="listener-filed__title">
+        <span><i class="el-icon-menu"></i>注入字段：</span>
+        <el-button size="mini" type="primary" @click="openListenerFieldForm(null)">添加字段</el-button>
+      </p>
+      <el-table :data="fieldsListOfListener" size="mini" max-height="240" border fit style="flex: none">
+        <el-table-column label="序号" width="50px" type="index" />
+        <el-table-column label="字段名称" min-width="100px" prop="name" />
+        <el-table-column label="字段类型" min-width="80px" show-overflow-tooltip :formatter="row => fieldTypeObject[row.fieldType]" />
+        <el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" />
+        <el-table-column label="操作" width="100px">
+          <template slot-scope="{ row, $index }">
+            <el-button size="mini" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button>
+            <el-divider direction="vertical" />
+            <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="element-drawer__button">
+        <el-button size="mini" @click="listenerFormModelVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="saveListenerConfig">保 存</el-button>
+      </div>
+    </el-drawer>
+
+    <!-- 注入西段 编辑/创建 部分 -->
+    <el-dialog title="字段配置" :visible.sync="listenerFieldFormModelVisible" width="600px" append-to-body destroy-on-close>
+      <el-form :model="listenerFieldForm" size="mini" label-width="96px" ref="listenerFieldFormRef" style="height: 136px" @submit.native.prevent>
+        <el-form-item label="字段名称：" prop="name" :rules="{ required: true, trigger: ['blur', 'change'] }">
+          <el-input v-model="listenerFieldForm.name" clearable />
+        </el-form-item>
+        <el-form-item label="字段类型：" prop="fieldType" :rules="{ required: true, trigger: ['blur', 'change'] }">
+          <el-select v-model="listenerFieldForm.fieldType">
+            <el-option v-for="i in Object.keys(fieldTypeObject)" :key="i" :label="fieldTypeObject[i]" :value="i" />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="listenerFieldForm.fieldType === 'string'"
+          label="字段值："
+          prop="string"
+          key="field-string"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerFieldForm.string" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerFieldForm.fieldType === 'expression'"
+          label="表达式："
+          prop="expression"
+          key="field-expression"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerFieldForm.expression" clearable />
+        </el-form-item>
+      </el-form>
+      <template slot="footer">
+        <el-button size="mini" @click="listenerFieldFormModelVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="saveListenerFiled">确 定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { createListenerObject, updateElementExtensions } from "../../utils";
+import { initListenerType, initListenerForm, listenerType, fieldType } from "./utilSelf";
+
+export default {
+  name: "ElementListeners",
+  props: {
+    id: String,
+    type: String
+  },
+  inject: {
+    prefix: "prefix",
+    width: "width"
+  },
+  data() {
+    return {
+      elementListenersList: [], // 监听器列表
+      listenerForm: {}, // 监听器详情表单
+      listenerFormModelVisible: false, // 监听器 编辑 侧边栏显示状态
+      fieldsListOfListener: [],
+      listenerFieldForm: {}, // 监听器 注入字段 详情表单
+      listenerFieldFormModelVisible: false, // 监听器 注入字段表单弹窗 显示状态
+      editingListenerIndex: -1, // 监听器所在下标，-1 为新增
+      editingListenerFieldIndex: -1, // 字段所在下标，-1 为新增
+      listenerTypeObject: listenerType,
+      fieldTypeObject: fieldType
+    };
+  },
+  watch: {
+    id: {
+      immediate: true,
+      handler(val) {
+        val && val.length && this.$nextTick(() => this.resetListenersList());
+      }
+    }
+  },
+  methods: {
+    resetListenersList() {
+      this.bpmnElement = window.bpmnInstances.bpmnElement;
+      this.otherExtensionList = [];
+      this.bpmnElementListeners =
+        this.bpmnElement.businessObject?.extensionElements?.values?.filter(ex => ex.$type === `${this.prefix}:ExecutionListener`) ?? [];
+      this.elementListenersList = this.bpmnElementListeners.map(listener => initListenerType(listener));
+    },
+    // 打开 监听器详情 侧边栏
+    openListenerForm(listener, index) {
+      if (listener) {
+        this.listenerForm = initListenerForm(listener);
+        this.editingListenerIndex = index;
+      } else {
+        this.listenerForm = {};
+        this.editingListenerIndex = -1; // 标记为新增
+      }
+      if (listener && listener.fields) {
+        this.fieldsListOfListener = listener.fields.map(field => ({ ...field, fieldType: field.string ? "string" : "expression" }));
+      } else {
+        this.fieldsListOfListener = [];
+        this.$set(this.listenerForm, "fields", []);
+      }
+      // 打开侧边栏并清楚验证状态
+      this.listenerFormModelVisible = true;
+      this.$nextTick(() => {
+        if (this.$refs["listenerFormRef"]) this.$refs["listenerFormRef"].clearValidate();
+      });
+    },
+    // 打开监听器字段编辑弹窗
+    openListenerFieldForm(field, index) {
+      this.listenerFieldForm = field ? JSON.parse(JSON.stringify(field)) : {};
+      this.editingListenerFieldIndex = field ? index : -1;
+      this.listenerFieldFormModelVisible = true;
+      this.$nextTick(() => {
+        if (this.$refs["listenerFieldFormRef"]) this.$refs["listenerFieldFormRef"].clearValidate();
+      });
+    },
+    // 保存监听器注入字段
+    async saveListenerFiled() {
+      let validateStatus = await this.$refs["listenerFieldFormRef"].validate();
+      if (!validateStatus) return; // 验证不通过直接返回
+      if (this.editingListenerFieldIndex === -1) {
+        this.fieldsListOfListener.push(this.listenerFieldForm);
+        this.listenerForm.fields.push(this.listenerFieldForm);
+      } else {
+        this.fieldsListOfListener.splice(this.editingListenerFieldIndex, 1, this.listenerFieldForm);
+        this.listenerForm.fields.splice(this.editingListenerFieldIndex, 1, this.listenerFieldForm);
+      }
+      this.listenerFieldFormModelVisible = false;
+      this.$nextTick(() => (this.listenerFieldForm = {}));
+    },
+    // 移除监听器字段
+    removeListenerField(field, index) {
+      this.$confirm("确认移除该字段吗？", "提示", {
+        confirmButtonText: "确 认",
+        cancelButtonText: "取 消"
+      })
+        .then(() => {
+          this.fieldsListOfListener.splice(index, 1);
+          this.listenerForm.fields.splice(index, 1);
+        })
+        .catch(() => console.info("操作取消"));
+    },
+    // 移除监听器
+    removeListener(listener, index) {
+      this.$confirm("确认移除该监听器吗？", "提示", {
+        confirmButtonText: "确 认",
+        cancelButtonText: "取 消"
+      })
+        .then(() => {
+          this.bpmnElementListeners.splice(index, 1);
+          this.elementListenersList.splice(index, 1);
+          updateElementExtensions(this.bpmnElement, this.otherExtensionList.concat(this.bpmnElementListeners));
+        })
+        .catch(() => console.info("操作取消"));
+    },
+    // 保存监听器配置
+    async saveListenerConfig() {
+      let validateStatus = await this.$refs["listenerFormRef"].validate();
+      if (!validateStatus) return; // 验证不通过直接返回
+      const listenerObject = createListenerObject(this.listenerForm, false, this.prefix);
+      if (this.editingListenerIndex === -1) {
+        this.bpmnElementListeners.push(listenerObject);
+        this.elementListenersList.push(this.listenerForm);
+      } else {
+        this.bpmnElementListeners.splice(this.editingListenerIndex, 1, listenerObject);
+        this.elementListenersList.splice(this.editingListenerIndex, 1, this.listenerForm);
+      }
+      // 保存其他配置
+      this.otherExtensionList = this.bpmnElement.businessObject?.extensionElements?.values?.filter(ex => ex.$type !== `${this.prefix}:ExecutionListener`) ?? [];
+      updateElementExtensions(this.bpmnElement, this.otherExtensionList.concat(this.bpmnElementListeners));
+      // 4. 隐藏侧边栏
+      this.listenerFormModelVisible = false;
+      this.listenerForm = {};
+    }
+  }
+};
+</script>
diff --git a/src/plugins/package/penal/listeners/UserTaskListeners.vue b/src/plugins/package/penal/listeners/UserTaskListeners.vue
new file mode 100644
index 0000000..c113af9
--- /dev/null
+++ b/src/plugins/package/penal/listeners/UserTaskListeners.vue
@@ -0,0 +1,319 @@
+<template>
+  <div class="panel-tab__content">
+    <el-table :data="elementListenersList" size="mini" border>
+      <el-table-column label="序号" width="50px" type="index" />
+      <el-table-column label="事件类型" min-width="80px" show-overflow-tooltip :formatter="row => listenerEventTypeObject[row.event]" />
+<!--      <el-table-column label="事件id" min-width="80px" prop="id" show-overflow-tooltip />-->
+      <el-table-column label="监听器类型" min-width="80px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" />
+      <el-table-column label="操作" width="90px">
+        <template slot-scope="{ row, $index }">
+          <el-button size="mini" type="text" @click="openListenerForm(row, $index)">编辑</el-button>
+          <el-divider direction="vertical" />
+          <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="element-drawer__button">
+      <el-button size="mini" type="primary" icon="el-icon-plus" @click="openListenerForm(null)">添加监听器</el-button>
+    </div>
+
+    <!-- 监听器 编辑/创建 部分 -->
+    <el-drawer :visible.sync="listenerFormModelVisible" title="任务监听器" :size="`${width}px`" append-to-body destroy-on-close>
+      <el-form size="mini" :model="listenerForm" label-width="96px" ref="listenerFormRef" @submit.native.prevent>
+        <el-form-item label="事件类型" prop="event" :rules="{ required: true, trigger: ['blur', 'change'] }">
+          <el-select v-model="listenerForm.event">
+            <el-option v-for="i in Object.keys(listenerEventTypeObject)" :key="i" :label="listenerEventTypeObject[i]" :value="i" />
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item label="监听器ID" prop="id" :rules="{ required: true, trigger: ['blur', 'change'] }">-->
+<!--          <el-input v-model="listenerForm.id" clearable />-->
+<!--        </el-form-item>-->
+        <el-form-item label="监听器类型" prop="listenerType" :rules="{ required: true, trigger: ['blur', 'change'] }">
+          <el-select v-model="listenerForm.listenerType">
+            <el-option v-for="i in Object.keys(listenerTypeObject)" :key="i" :label="listenerTypeObject[i]" :value="i" />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'classListener'"
+          label="Java类"
+          prop="class"
+          key="listener-class"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.class" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'expressionListener'"
+          label="表达式"
+          prop="expression"
+          key="listener-expression"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.expression" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'delegateExpressionListener'"
+          label="代理表达式"
+          prop="delegateExpression"
+          key="listener-delegate"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.delegateExpression" clearable />
+        </el-form-item>
+        <template v-if="listenerForm.listenerType === 'scriptListener'">
+          <el-form-item
+            label="脚本格式"
+            prop="scriptFormat"
+            key="listener-script-format"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写脚本格式' }"
+          >
+            <el-input v-model="listenerForm.scriptFormat" clearable />
+          </el-form-item>
+          <el-form-item
+            label="脚本类型"
+            prop="scriptType"
+            key="listener-script-type"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请选择脚本类型' }"
+          >
+            <el-select v-model="listenerForm.scriptType">
+              <el-option label="内联脚本" value="inlineScript" />
+              <el-option label="外部脚本" value="externalScript" />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-if="listenerForm.scriptType === 'inlineScript'"
+            label="脚本内容"
+            prop="value"
+            key="listener-script"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写脚本内容' }"
+          >
+            <el-input v-model="listenerForm.value" clearable />
+          </el-form-item>
+          <el-form-item
+            v-if="listenerForm.scriptType === 'externalScript'"
+            label="资源地址"
+            prop="resource"
+            key="listener-resource"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写资源地址' }"
+          >
+            <el-input v-model="listenerForm.resource" clearable />
+          </el-form-item>
+        </template>
+
+        <template v-if="listenerForm.event === 'timeout'">
+          <el-form-item label="定时器类型" prop="eventDefinitionType" key="eventDefinitionType">
+            <el-select v-model="listenerForm.eventDefinitionType">
+              <el-option label="日期" value="date" />
+              <el-option label="持续时长" value="duration" />
+              <el-option label="循环" value="cycle" />
+              <el-option label="无" value="null" />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-if="!!listenerForm.eventDefinitionType && listenerForm.eventDefinitionType !== 'null'"
+            label="定时器"
+            prop="eventTimeDefinitions"
+            key="eventTimeDefinitions"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写定时器配置' }"
+          >
+            <el-input v-model="listenerForm.eventTimeDefinitions" clearable />
+          </el-form-item>
+        </template>
+      </el-form>
+
+      <el-divider />
+      <p class="listener-filed__title">
+        <span><i class="el-icon-menu"></i>注入字段：</span>
+        <el-button size="mini" type="primary" @click="openListenerFieldForm(null)">添加字段</el-button>
+      </p>
+      <el-table :data="fieldsListOfListener" size="mini" max-height="240" border fit style="flex: none">
+        <el-table-column label="序号" width="50px" type="index" />
+        <el-table-column label="字段名称" min-width="100px" prop="name" />
+        <el-table-column label="字段类型" min-width="80px" show-overflow-tooltip :formatter="row => fieldTypeObject[row.fieldType]" />
+        <el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" />
+        <el-table-column label="操作" width="100px">
+          <template slot-scope="{ row, $index }">
+            <el-button size="mini" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button>
+            <el-divider direction="vertical" />
+            <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="element-drawer__button">
+        <el-button size="mini" @click="listenerFormModelVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="saveListenerConfig">保 存</el-button>
+      </div>
+    </el-drawer>
+
+    <!-- 注入西段 编辑/创建 部分 -->
+    <el-dialog title="字段配置" :visible.sync="listenerFieldFormModelVisible" width="600px" append-to-body destroy-on-close>
+      <el-form :model="listenerFieldForm" size="mini" label-width="96px" ref="listenerFieldFormRef" style="height: 136px" @submit.native.prevent>
+        <el-form-item label="字段名称：" prop="name" :rules="{ required: true, trigger: ['blur', 'change'] }">
+          <el-input v-model="listenerFieldForm.name" clearable />
+        </el-form-item>
+        <el-form-item label="字段类型：" prop="fieldType" :rules="{ required: true, trigger: ['blur', 'change'] }">
+          <el-select v-model="listenerFieldForm.fieldType">
+            <el-option v-for="i in Object.keys(fieldTypeObject)" :key="i" :label="fieldTypeObject[i]" :value="i" />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="listenerFieldForm.fieldType === 'string'"
+          label="字段值："
+          prop="string"
+          key="field-string"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerFieldForm.string" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerFieldForm.fieldType === 'expression'"
+          label="表达式："
+          prop="expression"
+          key="field-expression"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerFieldForm.expression" clearable />
+        </el-form-item>
+      </el-form>
+      <template slot="footer">
+        <el-button size="mini" @click="listenerFieldFormModelVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="saveListenerFiled">确 定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { createListenerObject, updateElementExtensions } from "../../utils";
+import { initListenerForm, initListenerType, eventType, listenerType, fieldType } from "./utilSelf";
+
+export default {
+  name: "UserTaskListeners",
+  props: {
+    id: String,
+    type: String
+  },
+  inject: {
+    prefix: "prefix",
+    width: "width"
+  },
+  data() {
+    return {
+      elementListenersList: [],
+      listenerEventTypeObject: eventType,
+      listenerTypeObject: listenerType,
+      listenerFormModelVisible: false,
+      listenerForm: {},
+      fieldTypeObject: fieldType,
+      fieldsListOfListener: [],
+      listenerFieldFormModelVisible: false, // 监听器 注入字段表单弹窗 显示状态
+      editingListenerIndex: -1, // 监听器所在下标，-1 为新增
+      editingListenerFieldIndex: -1, // 字段所在下标，-1 为新增
+      listenerFieldForm: {} // 监听器 注入字段 详情表单
+    };
+  },
+  watch: {
+    id: {
+      immediate: true,
+      handler(val) {
+        val && val.length && this.$nextTick(() => this.resetListenersList());
+      }
+    }
+  },
+  methods: {
+    resetListenersList() {
+      this.bpmnElement = window.bpmnInstances.bpmnElement;
+      this.otherExtensionList = [];
+      this.bpmnElementListeners = this.bpmnElement.businessObject?.extensionElements?.values?.filter(ex => ex.$type === `${this.prefix}:TaskListener`) ?? [];
+      this.elementListenersList = this.bpmnElementListeners.map(listener => initListenerType(listener));
+    },
+    openListenerForm(listener, index) {
+      if (listener) {
+        this.listenerForm = initListenerForm(listener);
+        this.editingListenerIndex = index;
+      } else {
+        this.listenerForm = {};
+        this.editingListenerIndex = -1; // 标记为新增
+      }
+      if (listener && listener.fields) {
+        this.fieldsListOfListener = listener.fields.map(field => ({ ...field, fieldType: field.string ? "string" : "expression" }));
+      } else {
+        this.fieldsListOfListener = [];
+        this.$set(this.listenerForm, "fields", []);
+      }
+      // 打开侧边栏并清楚验证状态
+      this.listenerFormModelVisible = true;
+      this.$nextTick(() => {
+        if (this.$refs["listenerFormRef"]) this.$refs["listenerFormRef"].clearValidate();
+      });
+    },
+    // 移除监听器
+    removeListener(listener, index) {
+      this.$confirm("确认移除该监听器吗？", "提示", {
+        confirmButtonText: "确 认",
+        cancelButtonText: "取 消"
+      })
+        .then(() => {
+          this.bpmnElementListeners.splice(index, 1);
+          this.elementListenersList.splice(index, 1);
+          updateElementExtensions(this.bpmnElement, this.otherExtensionList.concat(this.bpmnElementListeners));
+        })
+        .catch(() => console.info("操作取消"));
+    },
+    // 保存监听器
+    async saveListenerConfig() {
+      let validateStatus = await this.$refs["listenerFormRef"].validate();
+      if (!validateStatus) return; // 验证不通过直接返回
+      const listenerObject = createListenerObject(this.listenerForm, true, this.prefix);
+      if (this.editingListenerIndex === -1) {
+        this.bpmnElementListeners.push(listenerObject);
+        this.elementListenersList.push(this.listenerForm);
+      } else {
+        this.bpmnElementListeners.splice(this.editingListenerIndex, 1, listenerObject);
+        this.elementListenersList.splice(this.editingListenerIndex, 1, this.listenerForm);
+      }
+      // 保存其他配置
+      this.otherExtensionList = this.bpmnElement.businessObject?.extensionElements?.values?.filter(ex => ex.$type !== `${this.prefix}:TaskListener`) ?? [];
+      updateElementExtensions(this.bpmnElement, this.otherExtensionList.concat(this.bpmnElementListeners));
+      // 4. 隐藏侧边栏
+      this.listenerFormModelVisible = false;
+      this.listenerForm = {};
+    },
+    // 打开监听器字段编辑弹窗
+    openListenerFieldForm(field, index) {
+      this.listenerFieldForm = field ? JSON.parse(JSON.stringify(field)) : {};
+      this.editingListenerFieldIndex = field ? index : -1;
+      this.listenerFieldFormModelVisible = true;
+      this.$nextTick(() => {
+        if (this.$refs["listenerFieldFormRef"]) this.$refs["listenerFieldFormRef"].clearValidate();
+      });
+    },
+    // 保存监听器注入字段
+    async saveListenerFiled() {
+      let validateStatus = await this.$refs["listenerFieldFormRef"].validate();
+      if (!validateStatus) return; // 验证不通过直接返回
+      if (this.editingListenerFieldIndex === -1) {
+        this.fieldsListOfListener.push(this.listenerFieldForm);
+        this.listenerForm.fields.push(this.listenerFieldForm);
+      } else {
+        this.fieldsListOfListener.splice(this.editingListenerFieldIndex, 1, this.listenerFieldForm);
+        this.listenerForm.fields.splice(this.editingListenerFieldIndex, 1, this.listenerFieldForm);
+      }
+      this.listenerFieldFormModelVisible = false;
+      this.$nextTick(() => (this.listenerFieldForm = {}));
+    },
+    // 移除监听器字段
+    removeListenerField(field, index) {
+      this.$confirm("确认移除该字段吗？", "提示", {
+        confirmButtonText: "确 认",
+        cancelButtonText: "取 消"
+      })
+        .then(() => {
+          this.fieldsListOfListener.splice(index, 1);
+          this.listenerForm.fields.splice(index, 1);
+        })
+        .catch(() => console.info("操作取消"));
+    }
+  }
+};
+</script>
diff --git a/src/plugins/package/penal/listeners/template.js b/src/plugins/package/penal/listeners/template.js
new file mode 100644
index 0000000..455b70d
--- /dev/null
+++ b/src/plugins/package/penal/listeners/template.js
@@ -0,0 +1,178 @@
+export const template = isTaskListener => {
+  return `
+  <div class="panel-tab__content">
+    <el-table :data="elementListenersList" size="mini" border>
+      <el-table-column label="序号" width="50px" type="index" />
+      <el-table-column label="事件类型" min-width="100px" prop="event" />
+      <el-table-column label="监听器类型" min-width="100px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" />
+      <el-table-column label="操作" width="90px">
+        <template slot-scope="{ row, $index }">
+          <el-button size="mini" type="text" @click="openListenerForm(row, $index)">编辑</el-button>
+          <el-divider direction="vertical" />
+          <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListener(row, $index)">移除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="element-drawer__button">
+      <el-button size="mini" type="primary" icon="el-icon-plus" @click="openListenerForm(null)">添加监听器</el-button>
+    </div>
+
+    <!-- 监听器 编辑/创建 部分 -->
+    <el-drawer :visible.sync="listenerFormModelVisible" title="执行监听器" :size="width + 'px'" append-to-body destroy-on-close>
+      <el-form size="mini" :model="listenerForm" label-width="96px" ref="listenerFormRef" @submit.native.prevent>
+        <el-form-item label="事件类型" prop="event" :rules="{ required: true, trigger: ['blur', 'change'] }">
+          <el-select v-model="listenerForm.event">
+            <el-option label="start" value="start" />
+            <el-option label="end" value="end" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="监听器类型" prop="listenerType" :rules="{ required: true, trigger: ['blur', 'change'] }">
+          <el-select v-model="listenerForm.listenerType">
+            <el-option v-for="i in Object.keys(listenerTypeObject)" :key="i" :label="listenerTypeObject[i]" :value="i" />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'classListener'"
+          label="Java类"
+          prop="class"
+          key="listener-class"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.class" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'expressionListener'"
+          label="表达式"
+          prop="expression"
+          key="listener-expression"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.expression" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'delegateExpressionListener'"
+          label="代理表达式"
+          prop="delegateExpression"
+          key="listener-delegate"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.delegateExpression" clearable />
+        </el-form-item>
+        <template v-if="listenerForm.listenerType === 'scriptListener'">
+          <el-form-item
+            label="脚本格式"
+            prop="scriptFormat"
+            key="listener-script-format"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写脚本格式' }"
+          >
+            <el-input v-model="listenerForm.scriptFormat" clearable />
+          </el-form-item>
+          <el-form-item
+            label="脚本类型"
+            prop="scriptType"
+            key="listener-script-type"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请选择脚本类型' }"
+          >
+            <el-select v-model="listenerForm.scriptType">
+              <el-option label="内联脚本" value="inlineScript" />
+              <el-option label="外部脚本" value="externalScript" />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-if="listenerForm.scriptType === 'inlineScript'"
+            label="脚本内容"
+            prop="value"
+            key="listener-script"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写脚本内容' }"
+          >
+            <el-input v-model="listenerForm.value" clearable />
+          </el-form-item>
+          <el-form-item
+            v-if="listenerForm.scriptType === 'externalScript'"
+            label="资源地址"
+            prop="resource"
+            key="listener-resource"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写资源地址' }"
+          >
+            <el-input v-model="listenerForm.resource" clearable />
+          </el-form-item>
+        </template>
+        ${
+          isTaskListener
+            ? "<el-form-item label='定时器类型' prop='eventDefinitionType' key='eventDefinitionType'>" +
+              "<el-select v-model='listenerForm.eventDefinitionType'>" +
+              "<el-option label='日期' value='date' />" +
+              "<el-option label='持续时长' value='duration' />" +
+              "<el-option label='循环' value='cycle' />" +
+              "<el-option label='无' value='' />" +
+              "</el-select>" +
+              "</el-form-item>" +
+              "<el-form-item v-if='!!listenerForm.eventDefinitionType' label='定时器' prop='eventDefinitions' key='eventDefinitions'>" +
+              "<el-input v-model='listenerForm.eventDefinitions' clearable />" +
+              "</el-form-item>"
+            : ""
+        }
+      </el-form>
+      <el-divider />
+      <p class="listener-filed__title">
+        <span><i class="el-icon-menu"></i>注入字段：</span>
+        <el-button size="mini" type="primary" @click="openListenerFieldForm(null)">添加字段</el-button>
+      </p>
+      <el-table :data="fieldsListOfListener" size="mini" max-height="240" border fit style="flex: none">
+        <el-table-column label="序号" width="50px" type="index" />
+        <el-table-column label="字段名称" min-width="100px" prop="name" />
+        <el-table-column label="字段类型" min-width="80px" show-overflow-tooltip :formatter="row => fieldTypeObject[row.fieldType]" />
+        <el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" />
+        <el-table-column label="操作" width="100px">
+          <template slot-scope="{ row, $index }">
+            <el-button size="mini" type="text" @click="openListenerFieldForm(row, $index)">编辑</el-button>
+            <el-divider direction="vertical" />
+            <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeListenerField(row, $index)">移除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="element-drawer__button">
+        <el-button size="mini" @click="listenerFormModelVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="saveListenerConfig">保 存</el-button>
+      </div>
+    </el-drawer>
+
+    <!-- 注入西段 编辑/创建 部分 -->
+    <el-dialog title="字段配置" :visible.sync="listenerFieldFormModelVisible" width="600px" append-to-body destroy-on-close>
+      <el-form :model="listenerFieldForm" size="mini" label-width="96px" ref="listenerFieldFormRef" style="height: 136px" @submit.native.prevent>
+        <el-form-item label="字段名称：" prop="name" :rules="{ required: true, trigger: ['blur', 'change'] }">
+          <el-input v-model="listenerFieldForm.name" clearable />
+        </el-form-item>
+        <el-form-item label="字段类型：" prop="fieldType" :rules="{ required: true, trigger: ['blur', 'change'] }">
+          <el-select v-model="listenerFieldForm.fieldType">
+            <el-option v-for="i in Object.keys(fieldTypeObject)" :key="i" :label="fieldTypeObject[i]" :value="i" />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="listenerFieldForm.fieldType === 'string'"
+          label="字段值："
+          prop="string"
+          key="field-string"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerFieldForm.string" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerFieldForm.fieldType === 'expression'"
+          label="表达式："
+          prop="expression"
+          key="field-expression"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerFieldForm.expression" clearable />
+        </el-form-item>
+      </el-form>
+      <template slot="footer">
+        <el-button size="mini" @click="listenerFieldFormModelVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="saveListenerFiled">确 定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+  `;
+};
diff --git a/src/plugins/package/penal/listeners/utilSelf.js b/src/plugins/package/penal/listeners/utilSelf.js
new file mode 100644
index 0000000..efd13ec
--- /dev/null
+++ b/src/plugins/package/penal/listeners/utilSelf.js
@@ -0,0 +1,62 @@
+// 初始化表单数据
+export function initListenerForm(listener) {
+  let self = {
+    ...listener
+  };
+  if (listener.script) {
+    self = {
+      ...listener,
+      ...listener.script,
+      scriptType: listener.script.resource ? "externalScript" : "inlineScript"
+    };
+  }
+  if (listener.event === "timeout" && listener.eventDefinitions) {
+    if (listener.eventDefinitions.length) {
+      let k = "";
+      for (let key in listener.eventDefinitions[0]) {
+        console.log(listener.eventDefinitions, key);
+        if (key.indexOf("time") !== -1) {
+          k = key;
+          self.eventDefinitionType = key.replace("time", "").toLowerCase();
+        }
+      }
+      console.log(k);
+      self.eventTimeDefinitions = listener.eventDefinitions[0][k].body;
+    }
+  }
+  return self;
+}
+
+export function initListenerType(listener) {
+  let listenerType;
+  if (listener.class) listenerType = "classListener";
+  if (listener.expression) listenerType = "expressionListener";
+  if (listener.delegateExpression) listenerType = "delegateExpressionListener";
+  if (listener.script) listenerType = "scriptListener";
+  return {
+    ...JSON.parse(JSON.stringify(listener)),
+    ...(listener.script ?? {}),
+    listenerType: listenerType
+  };
+}
+
+export const listenerType = {
+  classListener: "Java 类",
+  expressionListener: "表达式",
+  delegateExpressionListener: "代理表达式",
+  scriptListener: "脚本"
+};
+
+export const eventType = {
+  create: "创建",
+  assignment: "指派",
+  complete: "完成",
+  delete: "删除",
+  update: "更新",
+  timeout: "超时"
+};
+
+export const fieldType = {
+  string: "字符串",
+  expression: "表达式"
+};
diff --git a/src/plugins/package/penal/multi-instance/ElementMultiInstance.vue b/src/plugins/package/penal/multi-instance/ElementMultiInstance.vue
new file mode 100644
index 0000000..7d57f50
--- /dev/null
+++ b/src/plugins/package/penal/multi-instance/ElementMultiInstance.vue
@@ -0,0 +1,192 @@
+<template>
+  <div class="panel-tab__content">
+    <el-form size="mini" label-width="90px" @submit.native.prevent>
+      <el-form-item label="回路特性">
+        <el-select v-model="loopCharacteristics" @change="changeLoopCharacteristicsType">
+          <!--bpmn:MultiInstanceLoopCharacteristics-->
+          <el-option label="并行多重事件" value="ParallelMultiInstance" />
+          <el-option label="时序多重事件" value="SequentialMultiInstance" />
+          <!--bpmn:StandardLoopCharacteristics-->
+          <el-option label="循环事件" value="StandardLoop" />
+          <el-option label="无" value="Null" />
+        </el-select>
+      </el-form-item>
+      <template v-if="loopCharacteristics === 'ParallelMultiInstance' || loopCharacteristics === 'SequentialMultiInstance'">
+        <el-form-item label="循环基数" key="loopCardinality">
+          <el-input v-model="loopInstanceForm.loopCardinality" clearable @change="updateLoopCardinality" />
+        </el-form-item>
+        <el-form-item label="集合" key="collection">
+          <el-input v-model="loopInstanceForm.collection" clearable @change="updateLoopBase" />
+        </el-form-item>
+        <el-form-item label="元素变量" key="elementVariable">
+          <el-input v-model="loopInstanceForm.elementVariable" clearable @change="updateLoopBase" />
+        </el-form-item>
+        <el-form-item label="完成条件" key="completionCondition">
+          <el-input v-model="loopInstanceForm.completionCondition" clearable @change="updateLoopCondition" />
+        </el-form-item>
+        <el-form-item label="异步状态" key="async">
+          <el-checkbox v-model="loopInstanceForm.asyncBefore" label="异步前" @change="updateLoopAsync('asyncBefore')" />
+          <el-checkbox v-model="loopInstanceForm.asyncAfter" label="异步后" @change="updateLoopAsync('asyncAfter')" />
+          <el-checkbox
+            v-model="loopInstanceForm.exclusive"
+            v-if="loopInstanceForm.asyncAfter || loopInstanceForm.asyncBefore"
+            label="排除"
+            @change="updateLoopAsync('exclusive')"
+          />
+        </el-form-item>
+        <el-form-item label="重试周期" prop="timeCycle" v-if="loopInstanceForm.asyncAfter || loopInstanceForm.asyncBefore" key="timeCycle">
+          <el-input v-model="loopInstanceForm.timeCycle" clearable @change="updateLoopTimeCycle" />
+        </el-form-item>
+      </template>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "ElementMultiInstance",
+  props: {
+    businessObject: Object,
+    type: String
+  },
+  inject: {
+    prefix: "prefix"
+  },
+  data() {
+    return {
+      loopCharacteristics: "",
+      //默认配置，用来覆盖原始不存在的选项，避免报错
+      defaultLoopInstanceForm: {
+        completionCondition: "",
+        loopCardinality: "",
+        extensionElements: [],
+        asyncAfter: false,
+        asyncBefore: false,
+        exclusive: false
+      },
+      loopInstanceForm: {}
+    };
+  },
+  watch: {
+    businessObject: {
+      immediate: true,
+      handler(val) {
+        this.bpmnElement = window.bpmnInstances.bpmnElement;
+        this.getElementLoop(val);
+      }
+    }
+  },
+  methods: {
+    getElementLoop(businessObject) {
+      if (!businessObject.loopCharacteristics) {
+        this.loopCharacteristics = "Null";
+        this.loopInstanceForm = {};
+        return;
+      }
+      if (businessObject.loopCharacteristics.$type === "bpmn:StandardLoopCharacteristics") {
+        this.loopCharacteristics = "StandardLoop";
+        this.loopInstanceForm = {};
+        return;
+      }
+      if (businessObject.loopCharacteristics.isSequential) {
+        this.loopCharacteristics = "SequentialMultiInstance";
+      } else {
+        this.loopCharacteristics = "ParallelMultiInstance";
+      }
+      // 合并配置
+      this.loopInstanceForm = {
+        ...this.defaultLoopInstanceForm,
+        ...businessObject.loopCharacteristics,
+        completionCondition: businessObject.loopCharacteristics?.completionCondition?.body ?? "",
+        loopCardinality: businessObject.loopCharacteristics?.loopCardinality?.body ?? ""
+      };
+      // 保留当前元素 businessObject 上的 loopCharacteristics 实例
+      this.multiLoopInstance = window.bpmnInstances.bpmnElement.businessObject.loopCharacteristics;
+      // 更新表单
+      if (
+        businessObject.loopCharacteristics.extensionElements &&
+        businessObject.loopCharacteristics.extensionElements.values &&
+        businessObject.loopCharacteristics.extensionElements.values.length
+      ) {
+        this.$set(this.loopInstanceForm, "timeCycle", businessObject.loopCharacteristics.extensionElements.values[0].body);
+      }
+    },
+    changeLoopCharacteristicsType(type) {
+      // this.loopInstanceForm = { ...this.defaultLoopInstanceForm }; // 切换类型取消原表单配置
+      // 取消多实例配置
+      if (type === "Null") {
+        window.bpmnInstances.modeling.updateProperties(this.bpmnElement, { loopCharacteristics: null });
+        return;
+      }
+      // 配置循环
+      if (type === "StandardLoop") {
+        const loopCharacteristicsObject = window.bpmnInstances.moddle.create("bpmn:StandardLoopCharacteristics");
+        window.bpmnInstances.modeling.updateProperties(this.bpmnElement, {
+          loopCharacteristics: loopCharacteristicsObject
+        });
+        this.multiLoopInstance = null;
+        return;
+      }
+      // 时序
+      if (type === "SequentialMultiInstance") {
+        this.multiLoopInstance = window.bpmnInstances.moddle.create("bpmn:MultiInstanceLoopCharacteristics", { isSequential: true });
+      } else {
+        this.multiLoopInstance = window.bpmnInstances.moddle.create("bpmn:MultiInstanceLoopCharacteristics");
+      }
+      window.bpmnInstances.modeling.updateProperties(this.bpmnElement, {
+        loopCharacteristics: this.multiLoopInstance
+      });
+    },
+    // 循环基数
+    updateLoopCardinality(cardinality) {
+      let loopCardinality = null;
+      if (cardinality && cardinality.length) {
+        loopCardinality = window.bpmnInstances.moddle.create("bpmn:FormalExpression", { body: cardinality });
+      }
+      window.bpmnInstances.modeling.updateModdleProperties(this.bpmnElement, this.multiLoopInstance, { loopCardinality });
+    },
+    // 完成条件
+    updateLoopCondition(condition) {
+      let completionCondition = null;
+      if (condition && condition.length) {
+        completionCondition = window.bpmnInstances.moddle.create("bpmn:FormalExpression", { body: condition });
+      }
+      window.bpmnInstances.modeling.updateModdleProperties(this.bpmnElement, this.multiLoopInstance, { completionCondition });
+    },
+    // 重试周期
+    updateLoopTimeCycle(timeCycle) {
+      const extensionElements = window.bpmnInstances.moddle.create("bpmn:ExtensionElements", {
+        values: [
+          window.bpmnInstances.moddle.create(`${this.prefix}:FailedJobRetryTimeCycle`, {
+            body: timeCycle
+          })
+        ]
+      });
+      window.bpmnInstances.modeling.updateModdleProperties(this.bpmnElement, this.multiLoopInstance, { extensionElements });
+    },
+    // 直接更新的基础信息
+    updateLoopBase() {
+      window.bpmnInstances.modeling.updateModdleProperties(this.bpmnElement, this.multiLoopInstance, {
+        collection: this.loopInstanceForm.collection || null,
+        elementVariable: this.loopInstanceForm.elementVariable || null
+      });
+    },
+    // 各异步状态
+    updateLoopAsync(key) {
+      const { asyncBefore, asyncAfter } = this.loopInstanceForm;
+      let asyncAttr = Object.create(null);
+      if (!asyncBefore && !asyncAfter) {
+        this.$set(this.loopInstanceForm, "exclusive", false);
+        asyncAttr = { asyncBefore: false, asyncAfter: false, exclusive: false, extensionElements: null };
+      } else {
+        asyncAttr[key] = this.loopInstanceForm[key];
+      }
+      window.bpmnInstances.modeling.updateModdleProperties(this.bpmnElement, this.multiLoopInstance, asyncAttr);
+    }
+  },
+  beforeDestroy() {
+    this.multiLoopInstance = null;
+    this.bpmnElement = null;
+  }
+};
+</script>
diff --git a/src/plugins/package/penal/other/ElementOtherConfig.vue b/src/plugins/package/penal/other/ElementOtherConfig.vue
new file mode 100644
index 0000000..a4427b2
--- /dev/null
+++ b/src/plugins/package/penal/other/ElementOtherConfig.vue
@@ -0,0 +1,59 @@
+<template>
+  <div class="panel-tab__content">
+    <div class="element-property input-property">
+      <div class="element-property__label">元素文档：</div>
+      <div class="element-property__value">
+        <el-input
+          type="textarea"
+          v-model="documentation"
+          size="mini"
+          resize="vertical"
+          :autosize="{ minRows: 2, maxRows: 4 }"
+          @input="updateDocumentation"
+          @blur="updateDocumentation"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "ElementOtherConfig",
+  props: {
+    id: String
+  },
+  data() {
+    return {
+      documentation: ""
+    };
+  },
+  watch: {
+    id: {
+      immediate: true,
+      handler: function(id) {
+        if (id && id.length) {
+          this.$nextTick(() => {
+            const documentations = window.bpmnInstances.bpmnElement.businessObject?.documentation;
+            this.documentation = documentations && documentations.length ? documentations[0].text : "";
+          });
+        } else {
+          this.documentation = "";
+        }
+      }
+    }
+  },
+  methods: {
+    updateDocumentation() {
+      (this.bpmnElement && this.bpmnElement.id === this.id) || (this.bpmnElement = window.bpmnInstances.elementRegistry.get(this.id));
+      const documentation = window.bpmnInstances.bpmnFactory.create("bpmn:Documentation", { text: this.documentation });
+      window.bpmnInstances.modeling.updateProperties(this.bpmnElement, {
+        documentation: [documentation]
+      });
+    }
+  },
+  beforeDestroy() {
+    this.bpmnElement = null;
+  }
+};
+</script>
diff --git a/src/plugins/package/penal/properties/ElementProperties.vue b/src/plugins/package/penal/properties/ElementProperties.vue
new file mode 100644
index 0000000..edd9a36
--- /dev/null
+++ b/src/plugins/package/penal/properties/ElementProperties.vue
@@ -0,0 +1,134 @@
+<template>
+  <div class="panel-tab__content">
+    <el-table :data="elementPropertyList" size="mini" max-height="240" border fit>
+      <el-table-column label="序号" width="50px" type="index" />
+      <el-table-column label="属性名" prop="name" min-width="100px" show-overflow-tooltip />
+      <el-table-column label="属性值" prop="value" min-width="100px" show-overflow-tooltip />
+      <el-table-column label="操作" width="90px">
+        <template slot-scope="{ row, $index }">
+          <el-button size="mini" type="text" @click="openAttributesForm(row, $index)">编辑</el-button>
+          <el-divider direction="vertical" />
+          <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeAttributes(row, $index)">移除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="element-drawer__button">
+      <el-button size="mini" type="primary" icon="el-icon-plus" @click="openAttributesForm(null, -1)">添加属性</el-button>
+    </div>
+
+    <el-dialog :visible.sync="propertyFormModelVisible" title="属性配置" width="600px" append-to-body destroy-on-close>
+      <el-form :model="propertyForm" label-width="80px" size="mini" ref="attributeFormRef" @submit.native.prevent>
+        <el-form-item label="属性名：" prop="name">
+          <el-input v-model="propertyForm.name" clearable />
+        </el-form-item>
+        <el-form-item label="属性值：" prop="value">
+          <el-input v-model="propertyForm.value" clearable />
+        </el-form-item>
+      </el-form>
+      <template slot="footer">
+        <el-button size="mini" @click="propertyFormModelVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="saveAttribute">确 定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "ElementProperties",
+  props: {
+    id: String,
+    type: String
+  },
+  inject: {
+    prefix: "prefix",
+    width: "width"
+  },
+  data() {
+    return {
+      elementPropertyList: [],
+      propertyForm: {},
+      editingPropertyIndex: -1,
+      propertyFormModelVisible: false
+    };
+  },
+  watch: {
+    id: {
+      immediate: true,
+      handler(val) {
+        val && val.length && this.resetAttributesList();
+      }
+    }
+  },
+  methods: {
+    resetAttributesList() {
+      this.bpmnElement = window.bpmnInstances.bpmnElement;
+      this.otherExtensionList = []; // 其他扩展配置
+      this.bpmnElementProperties =
+        this.bpmnElement.businessObject?.extensionElements?.values?.filter(ex => {
+          if (ex.$type !== `${this.prefix}:Properties`) {
+            this.otherExtensionList.push(ex);
+          }
+          return ex.$type === `${this.prefix}:Properties`;
+        }) ?? [];
+
+      // 保存所有的 扩展属性字段
+      this.bpmnElementPropertyList = this.bpmnElementProperties.reduce((pre, current) => pre.concat(current.values), []);
+      // 复制 显示
+      this.elementPropertyList = JSON.parse(JSON.stringify(this.bpmnElementPropertyList ?? []));
+    },
+    openAttributesForm(attr, index) {
+      this.editingPropertyIndex = index;
+      this.propertyForm = index === -1 ? {} : JSON.parse(JSON.stringify(attr));
+      this.propertyFormModelVisible = true;
+      this.$nextTick(() => {
+        if (this.$refs["attributeFormRef"]) this.$refs["attributeFormRef"].clearValidate();
+      });
+    },
+    removeAttributes(attr, index) {
+      this.$confirm("确认移除该属性吗？", "提示", {
+        confirmButtonText: "确 认",
+        cancelButtonText: "取 消"
+      })
+        .then(() => {
+          this.elementPropertyList.splice(index, 1);
+          this.bpmnElementPropertyList.splice(index, 1);
+          // 新建一个属性字段的保存列表
+          const propertiesObject = window.bpmnInstances.moddle.create(`${this.prefix}:Properties`, {
+            values: this.bpmnElementPropertyList
+          });
+          this.updateElementExtensions(propertiesObject);
+          this.resetAttributesList();
+        })
+        .catch(() => console.info("操作取消"));
+    },
+    saveAttribute() {
+      const { name, value } = this.propertyForm;
+      if (this.editingPropertyIndex !== -1) {
+        window.bpmnInstances.modeling.updateModdleProperties(this.bpmnElement, this.bpmnElementPropertyList[this.editingPropertyIndex], {
+          name,
+          value
+        });
+      } else {
+        // 新建属性字段
+        const newPropertyObject = window.bpmnInstances.moddle.create(`${this.prefix}:Property`, { name, value });
+        // 新建一个属性字段的保存列表
+        const propertiesObject = window.bpmnInstances.moddle.create(`${this.prefix}:Properties`, {
+          values: this.bpmnElementPropertyList.concat([newPropertyObject])
+        });
+        this.updateElementExtensions(propertiesObject);
+      }
+      this.propertyFormModelVisible = false;
+      this.resetAttributesList();
+    },
+    updateElementExtensions(properties) {
+      const extensions = window.bpmnInstances.moddle.create("bpmn:ExtensionElements", {
+        values: this.otherExtensionList.concat([properties])
+      });
+      window.bpmnInstances.modeling.updateProperties(this.bpmnElement, {
+        extensionElements: extensions
+      });
+    }
+  }
+};
+</script>
diff --git a/src/plugins/package/penal/signal-message/SignalAndMessage.vue b/src/plugins/package/penal/signal-message/SignalAndMessage.vue
new file mode 100644
index 0000000..7ea59f6
--- /dev/null
+++ b/src/plugins/package/penal/signal-message/SignalAndMessage.vue
@@ -0,0 +1,104 @@
+<template>
+  <div class="panel-tab__content">
+    <div class="panel-tab__content--title">
+      <span><i class="el-icon-menu" style="margin-right: 8px; color: #555555"></i>消息列表</span>
+      <el-button size="mini" type="primary" icon="el-icon-plus" @click="openModel('message')">创建新消息</el-button>
+    </div>
+    <el-table :data="messageList" size="mini" border>
+      <el-table-column type="index" label="序号" width="60px" />
+      <el-table-column label="消息ID" prop="id" max-width="300px" show-overflow-tooltip />
+      <el-table-column label="消息名称" prop="name" max-width="300px" show-overflow-tooltip />
+    </el-table>
+    <div class="panel-tab__content--title" style="padding-top: 8px; margin-top: 8px; border-top: 1px solid #eeeeee">
+      <span><i class="el-icon-menu" style="margin-right: 8px; color: #555555"></i>信号列表</span>
+      <el-button size="mini" type="primary" icon="el-icon-plus" @click="openModel('signal')">创建新信号</el-button>
+    </div>
+    <el-table :data="signalList" size="mini" border>
+      <el-table-column type="index" label="序号" width="60px" />
+      <el-table-column label="信号ID" prop="id" max-width="300px" show-overflow-tooltip />
+      <el-table-column label="信号名称" prop="name" max-width="300px" show-overflow-tooltip />
+    </el-table>
+
+    <el-dialog :visible.sync="modelVisible" :title="modelConfig.title" :close-on-click-modal="false" width="400px" append-to-body destroy-on-close>
+      <el-form :model="modelObjectForm" size="mini" label-width="90px" @submit.native.prevent>
+        <el-form-item :label="modelConfig.idLabel">
+          <el-input v-model="modelObjectForm.id" clearable />
+        </el-form-item>
+        <el-form-item :label="modelConfig.nameLabel">
+          <el-input v-model="modelObjectForm.name" clearable />
+        </el-form-item>
+      </el-form>
+      <template slot="footer">
+        <el-button size="mini" @click="modelVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="addNewObject">保 存</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  name: "SignalAndMassage",
+  data() {
+    return {
+      signalList: [],
+      messageList: [],
+      modelVisible: false,
+      modelType: "",
+      modelObjectForm: {}
+    };
+  },
+  computed: {
+    modelConfig() {
+      if (this.modelType === "message") {
+        return { title: "创建消息", idLabel: "消息ID", nameLabel: "消息名称" };
+      } else {
+        return { title: "创建信号", idLabel: "信号ID", nameLabel: "信号名称" };
+      }
+    }
+  },
+  mounted() {
+    this.initDataList();
+  },
+  methods: {
+    initDataList() {
+      this.rootElements = window.bpmnInstances.modeler.getDefinitions().rootElements;
+      this.messageIdMap = {};
+      this.signalIdMap = {};
+      this.messageList = [];
+      this.signalList = [];
+      this.rootElements.forEach(el => {
+        if (el.$type === "bpmn:Message") {
+          this.messageIdMap[el.id] = true;
+          this.messageList.push({ ...el });
+        }
+        if (el.$type === "bpmn:Signal") {
+          this.signalIdMap[el.id] = true;
+          this.signalList.push({ ...el });
+        }
+      });
+    },
+    openModel(type) {
+      this.modelType = type;
+      this.modelObjectForm = {};
+      this.modelVisible = true;
+    },
+    addNewObject() {
+      if (this.modelType === "message") {
+        if (this.messageIdMap[this.modelObjectForm.id]) {
+          return this.$message.error("该消息已存在，请修改id后重新保存");
+        }
+        const messageRef = window.bpmnInstances.moddle.create("bpmn:Message", this.modelObjectForm);
+        this.rootElements.push(messageRef);
+      } else {
+        if (this.signalIdMap[this.modelObjectForm.id]) {
+          return this.$message.error("该信号已存在，请修改id后重新保存");
+        }
+        const signalRef = window.bpmnInstances.moddle.create("bpmn:Signal", this.modelObjectForm);
+        this.rootElements.push(signalRef);
+      }
+      this.modelVisible = false;
+      this.initDataList();
+    }
+  }
+};
+</script>
diff --git a/src/plugins/package/theme/flow-element-variables.scss b/src/plugins/package/theme/flow-element-variables.scss
new file mode 100644
index 0000000..a54b6e0
--- /dev/null
+++ b/src/plugins/package/theme/flow-element-variables.scss
@@ -0,0 +1,63 @@
+/* 改变主题色变量 */
+// $--color-primary: #1890ff;
+// $--color-danger: #ff4d4f;
+
+/* 改变 icon 字体路径变量，必需 */
+
+.process-drawer .el-drawer__header {
+  padding: 16px 16px 8px 16px;
+  margin: 0;
+  line-height: 24px;
+  font-size: 18px;
+  color: #303133;
+  box-sizing: border-box;
+  border-bottom: 1px solid #e8e8e8;
+}
+
+div[class^="el-drawer"]:focus,
+span:focus {
+  outline: none;
+}
+
+.process-drawer .el-drawer__body {
+  box-sizing: border-box;
+  padding: 16px;
+  width: 100%;
+  overflow-y: auto;
+}
+
+.process-design {
+  .el-table td,
+  .el-table th {
+    color: #333;
+  }
+
+  .el-dialog__header {
+    padding: 16px 16px 8px 16px;
+    box-sizing: border-box;
+    border-bottom: 1px solid #e8e8e8;
+  }
+  .el-dialog__body {
+    padding: 16px;
+    max-height: 80vh;
+    box-sizing: border-box;
+    overflow-y: auto;
+  }
+  .el-dialog__footer {
+    padding: 16px;
+    box-sizing: border-box;
+    border-top: 1px solid #e8e8e8;
+  }
+  .el-dialog__close {
+    font-weight: 600;
+  }
+  .el-select {
+    width: 100%;
+  }
+  .el-divider:not(.el-divider--horizontal) {
+    margin: 0 8px ;
+  }
+  .el-divider.el-divider--horizontal {
+    margin: 16px 0;
+  }
+}
diff --git a/src/plugins/package/theme/index.scss b/src/plugins/package/theme/index.scss
new file mode 100644
index 0000000..abbfc91
--- /dev/null
+++ b/src/plugins/package/theme/index.scss
@@ -0,0 +1,171 @@
+@import "./flow-element-variables.scss";
+@import "~bpmn-js-token-simulation/assets/css/bpmn-js-token-simulation.css";
+@import "~bpmn-js-token-simulation/assets/css/font-awesome.min.css";
+@import "~bpmn-js-token-simulation/assets/css/normalize.css";
+@import "~bpmn-js/dist/assets/diagram-js.css";
+@import "~bpmn-js/dist/assets/bpmn-font/css/bpmn.css";
+@import "~bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css";
+@import "./process-designer.scss";
+@import "./process-panel.scss";
+
+$success-color: #4eb819;
+$primary-color: #409EFF;
+$warning-color: #E6A23C;
+$danger-color: #F56C6C;
+$cancel-color: #909399;
+
+.process-viewer {
+  position: relative;
+  border: 1px solid #EFEFEF;
+  background: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHBhdHRlcm4gaWQ9ImEiIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgcGF0dGVyblVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTTAgMTBoNDBNMTAgMHY0ME0wIDIwaDQwTTIwIDB2NDBNMCAzMGg0ME0zMCAwdjQwIiBmaWxsPSJub25lIiBzdHJva2U9IiNlMGUwZTAiIG9wYWNpdHk9Ii4yIi8+PHBhdGggZD0iTTQwIDBIMHY0MCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZTBlMGUwIi8+PC9wYXR0ZXJuPjwvZGVmcz48cmVjdCB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2EpIi8+PC9zdmc+') repeat!important;
+
+  .success-arrow {
+    fill: $success-color;
+    stroke: $success-color;
+  }
+
+  .success-conditional {
+    fill: white;
+    stroke: $success-color;
+  }
+
+  .fail-arrow {
+    fill: $warning-color;
+    stroke: $warning-color;
+  }
+
+  .fail-conditional {
+    fill: white;
+    stroke: $warning-color;
+  }
+
+  .success.djs-connection {
+    .djs-visual path {
+      stroke: $success-color!important;
+      marker-end: url(#sequenceflow-end-white-success)!important;
+    }
+  }
+
+  .success.djs-connection.condition-expression {
+    .djs-visual path {
+      marker-start: url(#conditional-flow-marker-white-success)!important;
+    }
+  }
+
+  .success.djs-shape {
+    .djs-visual rect {
+      stroke: $success-color!important;
+      fill: $success-color!important;
+      fill-opacity: 0.15!important;
+    }
+
+    .djs-visual polygon {
+      stroke: $success-color!important;
+    }
+
+    .djs-visual path:nth-child(2) {
+      stroke: $success-color!important;
+      fill: $success-color!important;
+    }
+
+    .djs-visual circle {
+      stroke: $success-color!important;
+      fill: $success-color!important;
+      fill-opacity: 0.15!important;
+    }
+  }
+
+  .primary.djs-shape {
+    .djs-visual rect {
+      stroke: $primary-color!important;
+      fill: $primary-color!important;
+      fill-opacity: 0.15!important;
+    }
+
+    .djs-visual polygon {
+      stroke: $primary-color!important;
+    }
+
+    .djs-visual circle {
+      stroke: $primary-color!important;
+      fill: $primary-color!important;
+      fill-opacity: 0.15!important;
+    }
+  }
+
+  .warning.djs-connection {
+    .djs-visual path {
+      stroke: $warning-color!important;
+      marker-end: url(#sequenceflow-end-white-fail)!important;
+    }
+  }
+
+  .warning.djs-connection.condition-expression {
+    .djs-visual path {
+      marker-start: url(#conditional-flow-marker-white-fail)!important;
+    }
+  }
+
+  .warning.djs-shape {
+    .djs-visual rect {
+      stroke: $warning-color!important;
+      fill: $warning-color!important;
+      fill-opacity: 0.15!important;
+    }
+
+    .djs-visual polygon {
+      stroke: $warning-color!important;
+    }
+
+    .djs-visual path:nth-child(2) {
+      stroke: $warning-color!important;
+      fill: $warning-color!important;
+    }
+
+    .djs-visual circle {
+      stroke: $warning-color!important;
+      fill: $warning-color!important;
+      fill-opacity: 0.15!important;
+    }
+  }
+
+  .danger.djs-shape {
+    .djs-visual rect {
+      stroke: $danger-color!important;
+      fill: $danger-color!important;
+      fill-opacity: 0.15!important;
+    }
+
+    .djs-visual polygon {
+      stroke: $danger-color!important;
+    }
+
+    .djs-visual circle {
+      stroke: $danger-color!important;
+      fill: $danger-color!important;
+      fill-opacity: 0.15!important;
+    }
+  }
+
+  .cancel.djs-shape {
+    .djs-visual rect {
+      stroke: $cancel-color!important;
+      fill: $cancel-color!important;
+      fill-opacity: 0.15!important;
+    }
+
+    .djs-visual polygon {
+      stroke: $cancel-color!important;
+    }
+
+    .djs-visual circle {
+      stroke: $cancel-color!important;
+      fill: $cancel-color!important;
+      fill-opacity: 0.15!important;
+    }
+  }
+}
+
+.process-viewer .djs-tooltip-container, .process-viewer .djs-overlay-container, .process-viewer .djs-palette {
+  display: none;
+}
diff --git a/src/plugins/package/theme/process-designer.scss b/src/plugins/package/theme/process-designer.scss
new file mode 100644
index 0000000..f25e98d
--- /dev/null
+++ b/src/plugins/package/theme/process-designer.scss
@@ -0,0 +1,153 @@
+// 边框被 token-simulation 样式覆盖了
+.djs-palette {
+  background: var(--palette-background-color);
+  border: solid 1px var(--palette-border-color) !important;
+  border-radius: 2px;
+}
+
+.my-process-designer {
+  padding: 5px 0 10px 10px;
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  .my-process-designer__header {
+    width: 100%;
+    min-height: 36px;
+    .el-button {
+      text-align: center;
+    }
+    .el-button-group {
+      margin: 4px;
+    }
+    .el-tooltip__popper {
+      .el-button {
+        width: 100%;
+        text-align: left;
+        padding-left: 8px;
+        padding-right: 8px;
+      }
+      .el-button:hover {
+        background: rgba(64, 158, 255, 0.8);
+        color: #ffffff;
+      }
+    }
+    .align {
+      position: relative;
+      i {
+        &:after {
+          content: "|";
+          position: absolute;
+          transform: rotate(90deg) translate(200%, 60%);
+        }
+      }
+    }
+    .align.align-left i {
+      transform: rotate(90deg);
+    }
+    .align.align-right i {
+      transform: rotate(-90deg);
+    }
+    .align.align-top i {
+      transform: rotate(180deg);
+    }
+    .align.align-bottom i {
+      transform: rotate(0deg);
+    }
+    .align.align-center i {
+      transform: rotate(90deg);
+      &:after {
+        transform: rotate(90deg) translate(0, 60%);
+      }
+    }
+    .align.align-middle i {
+      transform: rotate(0deg);
+      &:after {
+        transform: rotate(90deg) translate(0, 60%);
+      }
+    }
+  }
+  .my-process-designer__container {
+    display: inline-flex;
+    width: 100%;
+    flex: 1;
+    .my-process-designer__canvas {
+      flex: 1;
+      height: 100%;
+      position: relative;
+      background: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHBhdHRlcm4gaWQ9ImEiIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgcGF0dGVyblVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTTAgMTBoNDBNMTAgMHY0ME0wIDIwaDQwTTIwIDB2NDBNMCAzMGg0ME0zMCAwdjQwIiBmaWxsPSJub25lIiBzdHJva2U9IiNlMGUwZTAiIG9wYWNpdHk9Ii4yIi8+PHBhdGggZD0iTTQwIDBIMHY0MCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZTBlMGUwIi8+PC9wYXR0ZXJuPjwvZGVmcz48cmVjdCB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2EpIi8+PC9zdmc+")
+      repeat !important;
+      div.toggle-mode {
+        display: none;
+      }
+    }
+    .my-process-designer__property-panel {
+      height: 100%;
+      overflow: scroll;
+      overflow-y: auto;
+      z-index: 10;
+      * {
+        box-sizing: border-box;
+      }
+    }
+    svg {
+      width: 100%;
+      height: 100%;
+      min-height: 100%;
+      overflow: hidden;
+    }
+  }
+}
+
+//侧边栏配置
+.djs-palette.open {
+  .djs-palette-entries {
+    div[class^="bpmn-icon-"]:before,
+    div[class*="bpmn-icon-"]:before {
+      line-height: unset;
+    }
+    div.entry {
+      position: relative;
+    }
+    div.entry:hover {
+      &::after {
+        width: max-content;
+        content: attr(title);
+        vertical-align: text-bottom;
+        position: absolute;
+        right: -10px;
+        top: 0;
+        bottom: 0;
+        overflow: hidden;
+        transform: translateX(100%);
+        font-size: 0.5em;
+        display: inline-block;
+        text-decoration: inherit;
+        font-variant: normal;
+        text-transform: none;
+        background: #fafafa;
+        box-shadow: 0 0 6px #eeeeee;
+        border: 1px solid #cccccc;
+        box-sizing: border-box;
+        padding: 0 16px;
+        border-radius: 4px;
+        z-index: 100;
+      }
+    }
+  }
+}
+pre {
+  margin: 0;
+  height: 100%;
+  overflow: hidden;
+  max-height: calc(80vh - 32px);
+  overflow-y: auto;
+}
+.hljs {
+  word-break: break-word;
+  white-space: pre-wrap;
+}
+.hljs * {
+  font-family: Consolas, Monaco, monospace;
+}
diff --git a/src/plugins/package/theme/process-panel.scss b/src/plugins/package/theme/process-panel.scss
new file mode 100644
index 0000000..5c7c3df
--- /dev/null
+++ b/src/plugins/package/theme/process-panel.scss
@@ -0,0 +1,110 @@
+.process-design {
+  .process-panel__container {
+    box-sizing: border-box;
+    padding: 0 8px;
+    border-left: 1px solid #eeeeee;
+    box-shadow: 0 0 8px #cccccc;
+    max-height: 100%;
+    overflow-y: scroll;
+  }
+  .panel-tab__title {
+    font-weight: 600;
+    padding: 0 8px;
+    font-size: 1.1em;
+    line-height: 1.2em;
+    i {
+      margin-right: 8px;
+      font-size: 1.2em;
+    }
+  }
+  .panel-tab__content {
+    width: 100%;
+    box-sizing: border-box;
+    border-top: 1px solid #eeeeee;
+    padding: 8px 16px;
+    .panel-tab__content--title {
+      display: flex;
+      justify-content: space-between;
+      padding-bottom: 8px;
+      span {
+        flex: 1;
+        text-align: left;
+      }
+    }
+  }
+  .element-property {
+    width: 100%;
+    display: flex;
+    align-items: flex-start;
+    margin: 8px 0;
+    .element-property__label {
+      display: block;
+      width: 90px;
+      text-align: right;
+      overflow: hidden;
+      padding-right: 12px;
+      line-height: 32px;
+      font-size: 14px;
+      box-sizing: border-box;
+    }
+    .element-property__value {
+      flex: 1;
+      line-height: 32px;
+    }
+    .el-form-item {
+      width: 100%;
+      margin-bottom: 0;
+      padding-bottom: 18px;
+    }
+  }
+  .list-property {
+    flex-direction: column;
+    .element-listener-item {
+      width: 100%;
+      display: inline-grid;
+      grid-template-columns: 16px auto 32px 32px;
+      grid-column-gap: 8px;
+    }
+    .element-listener-item + .element-listener-item {
+      margin-top: 8px;
+    }
+  }
+  .listener-filed__title {
+    display: inline-flex;
+    width: 100%;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 0;
+    span {
+      width: 200px;
+      text-align: left;
+      font-size: 14px;
+    }
+    i {
+      margin-right: 8px;
+    }
+  }
+  .element-drawer__button {
+    margin-top: 8px;
+    width: 100%;
+    display: inline-flex;
+    justify-content: space-around;
+  }
+  .element-drawer__button > .el-button {
+    width: 100%;
+  }
+  
+  .el-collapse-item__content {
+    padding-bottom: 0;
+  }
+  .el-input.is-disabled .el-input__inner {
+    color: #999999;
+  }
+  .el-form-item.el-form-item--mini {
+    margin-bottom: 0;
+    & + .el-form-item {
+      margin-top: 16px;
+    }
+  }
+}
+
diff --git a/src/plugins/package/utils.js b/src/plugins/package/utils.js
new file mode 100644
index 0000000..1f1926d
--- /dev/null
+++ b/src/plugins/package/utils.js
@@ -0,0 +1,69 @@
+// 创建监听器实例
+export function createListenerObject(options, isTask, prefix) {
+  const listenerObj = Object.create(null);
+  listenerObj.event = options.event;
+  // isTask && (listenerObj.id = options.id); // 任务监听器特有的 id 字段
+  switch (options.listenerType) {
+    case "scriptListener":
+      listenerObj.script = createScriptObject(options, prefix);
+      break;
+    case "expressionListener":
+      listenerObj.expression = options.expression;
+      break;
+    case "delegateExpressionListener":
+      listenerObj.delegateExpression = options.delegateExpression;
+      break;
+    default:
+      listenerObj.class = options.class;
+  }
+  // 注入字段
+  if (options.fields) {
+    listenerObj.fields = options.fields.map(field => {
+      return createFieldObject(field, prefix);
+    });
+  }
+  // 任务监听器的 定时器 设置
+  if (isTask && options.event === "timeout" && !!options.eventDefinitionType) {
+    const timeDefinition = window.bpmnInstances.moddle.create("bpmn:FormalExpression", { body: options.eventTimeDefinitions });
+    const TimerEventDefinition = window.bpmnInstances.moddle.create("bpmn:TimerEventDefinition", {
+      id: `TimerEventDefinition_${uuid(8)}`,
+      [`time${options.eventDefinitionType.replace(/^\S/, s => s.toUpperCase())}`]: timeDefinition
+    });
+    listenerObj.eventDefinitions = [TimerEventDefinition];
+  }
+  return window.bpmnInstances.moddle.create(`${prefix}:${isTask ? "TaskListener" : "ExecutionListener"}`, listenerObj);
+}
+
+// 创建 监听器的注入字段 实例
+export function createFieldObject(option, prefix) {
+  const { name, fieldType, string, expression } = option;
+  const fieldConfig = fieldType === "string" ? { name, string } : { name, expression };
+  return window.bpmnInstances.moddle.create(`${prefix}:Field`, fieldConfig);
+}
+
+// 创建脚本实例
+export function createScriptObject(options, prefix) {
+  const { scriptType, scriptFormat, value, resource } = options;
+  const scriptConfig = scriptType === "inlineScript" ? { scriptFormat, value } : { scriptFormat, resource };
+  return window.bpmnInstances.moddle.create(`${prefix}:Script`, scriptConfig);
+}
+
+// 更新元素扩展属性
+export function updateElementExtensions(element, extensionList) {
+  const extensions = window.bpmnInstances.moddle.create("bpmn:ExtensionElements", {
+    values: extensionList
+  });
+  window.bpmnInstances.modeling.updateProperties(element, {
+    extensionElements: extensions
+  });
+}
+
+// 创建一个id
+export function uuid(length = 8, chars) {
+  let result = "";
+  let charsString = chars || "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+  for (let i = length; i > 0; --i) {
+    result += charsString[Math.floor(Math.random() * charsString.length)];
+  }
+  return result;
+}
diff --git a/src/router/index.js b/src/router/index.js
index b112ea8..a8bb327 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,6 +46,11 @@ export const constantRoutes = [
     component: () => import("@/views/login"),
     hidden: true,
   },
+  {
+    path: "/entLogin",
+    component: () => import("@/views/entLogin"),
+    hidden: true,
+  },
   {
     path: "/register",
     component: () => import("@/views/register"),
@@ -101,27 +106,27 @@ export const constantRoutes = [
         meta: { title: '个人中心', icon: 'user' }
       },
       {
-        path: 'declareAddContent',
+        path: 'onlineDeclareAdd',
         component: () => import('@/views/onlineDeclaration/declareAddContent/index'),
-        name: 'declareAddContent',
+        name: 'onlineDeclareAdd',
         meta: { title: '新增申报', icon: 'user' }
       },
       {
-        path: 'declareDetailContent',
+        path: 'onlineDeclareInfo',
         component: () => import('@/views/onlineDeclaration/declareDetailContent/index'),
-        name: 'declareDetailContent',
+        name: 'onlineDeclareInfo',
         meta: { title: '申报详情', icon: 'user' }
       },
       {
-        path: 'templateDetail',
+        path: 'onlineDeclareDetail',
         component: () => import('@/views/onlineDeclaration/templateDetail/index'),
-        name: 'templateDetail',
+        name: 'onlineDeclareDetail',
         meta: { title: '模版详情', icon: 'user' }
       },
       {
-        path: 'supplementaryNew',
+        path: 'onlineDeclareTInfo',
         component: () => import('@/views/onlineDeclaration/supplementary/index'),
-        name: 'supplementaryNew',
+        name: 'onlineDeclareTInfo',
         meta: { title: '模版详情', icon: 'user' }
       },
       {
@@ -131,11 +136,17 @@ export const constantRoutes = [
         meta: { title: '项目详情', icon: 'user' }
       },
       {
-        path: 'enterInfo',
+        path: 'enterpriselibraryInfo',
         component: () => import('@/views/enterpriselibrary/enterInfo/index'),
-        name: 'enterInfo',
+        name: 'enterpriselibraryInfo',
         meta: { title: '企业详情', icon: 'user' }
       },
+      {
+        path: 'onlineDeclarebBuild',
+        component: () => import('@/views/tool/build/index'),
+        name: 'onlineDeclarebBuild',
+        meta: { title: '表单构建', icon: 'user' }
+      },
     ]
   }
 ];
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 36a8fb5..023c099 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -170,7 +170,14 @@ const user = {
 
     // 退出系统
     LogOut({ commit, state }) {
-      if(state.userType == "01") {
+      if(!state.token && state.clientToken) {
+        enterpriseLogout({clienttoken: state.clientToken}).then(()=>{
+          commit('SET_CLIENTTOKEN', '')
+          removeClientToken()
+        }).catch(error => {
+          reject(error)
+        })
+      } else if(state.userType == "01") {
         return new Promise((resolve, reject) => {
           enterpriseLogout({clienttoken: state.clientToken}).then(()=>{
             commit('SET_CLIENTTOKEN', '')
diff --git a/src/utils/echart.js b/src/utils/echart.js
new file mode 100644
index 0000000..32208f7
--- /dev/null
+++ b/src/utils/echart.js
@@ -0,0 +1,44 @@
+//echarts专用求最大公约数 不含小数
+export function chartlcm (a, b) {
+  var result = 1;
+  for (var i = 1; i <= a && i <= b; i++) {
+
+      if (a % i == 0 && b % i == 0) {
+          result = i;
+      }
+      if (result > 1 && i >= 10)//公约数大于10的时候 直接跳出 避免y轴刻度太多  (如果不介意刻度太多可以把这一段去掉）
+          break;
+  }
+  return result;
+}
+
+
+//获取echarts  多Y轴的最大值和间隔值 lcmval 最大公约数   divisor 间隔数量
+export function YmaxvalAndinterval (m, n, lcmval, divisor) {
+
+  var interval1 = Math.ceil(m / lcmval);
+  var interval2 = Math.ceil(n / lcmval);
+
+  if (lcmval != 1 && lcmval != 0 && lcmval <= 10)
+  {
+      return { max1: m, max2: n, interval1: interval1, interval2: interval2 }
+  }
+
+  if (divisor == undefined || divisor == null)
+      divisor = 5;
+
+  //var mval = m % divisor;
+  //if (mval > 0) {
+  //    m = ((m - mval) / divisor + 1) * divisor
+  //}
+  m = Math.ceil(m / divisor) * divisor
+
+  n = Math.ceil(n / divisor) * divisor
+
+  interval1 = Math.ceil(m / divisor );
+
+  interval2 = Math.ceil(n / divisor);
+
+  return { max1: m, max2: n, interval1: interval1, interval2: interval2 }
+
+}
\ No newline at end of file
diff --git a/src/utils/index.js b/src/utils/index.js
index b582bf1..b5f0669 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -285,6 +285,43 @@ export function deepClone(source) {
   return targetObj
 }
 
+// 深拷贝对象
+export function deepCloneTwo(obj) {
+  const _toString = Object.prototype.toString
+
+  // null, undefined, non-object, function
+  if (!obj || typeof obj !== 'object') {
+    return obj
+  }
+
+  // DOM Node
+  if (obj.nodeType && 'cloneNode' in obj) {
+    return obj.cloneNode(true)
+  }
+
+  // Date
+  if (_toString.call(obj) === '[object Date]') {
+    return new Date(obj.getTime())
+  }
+
+  // RegExp
+  if (_toString.call(obj) === '[object RegExp]') {
+    const flags = []
+    if (obj.global) { flags.push('g') }
+    if (obj.multiline) { flags.push('m') }
+    if (obj.ignoreCase) { flags.push('i') }
+
+    return new RegExp(obj.source, flags.join(''))
+  }
+
+  const result = Array.isArray(obj) ? [] : obj.constructor ? new obj.constructor() : {}
+
+  for (const key in obj) {
+    result[key] = deepCloneTwo(obj[key])
+  }
+
+  return result
+}
 /**
  * @param {Array} arr
  * @returns {Array}
diff --git a/src/views/components/myDialog/index.vue b/src/views/components/myDialog/index.vue
index 20a76fd..90736eb 100644
--- a/src/views/components/myDialog/index.vue
+++ b/src/views/components/myDialog/index.vue
@@ -6,6 +6,7 @@
    :close-on-press-escape="false"
    :custom-class="myclass ? 'custom-my-class':''"
    @close="resetCancel"
+   :width="width"
    append-to-body
   >
     <slot></slot>
@@ -38,7 +39,11 @@ export default {
     closeText:{
       type:String,
       default:'取消'
-    }
+    },
+    width: {
+      type:String,
+      default:"50%"
+    },
   },
   methods:{
     open(){
@@ -65,7 +70,7 @@ export default {
   .el-dialog__header {
     border-bottom: 1px solid #DDDDDD;
     span {
-      font-family: PingFang-SC, PingFang-SC;
+      // font-family: PingFang-SC, PingFang-SC;
       font-weight: 800;
       font-size: 16px;
       color: #000000;
diff --git a/src/views/components/myEditor/index.vue b/src/views/components/myEditor/index.vue
new file mode 100644
index 0000000..ffc9677
--- /dev/null
+++ b/src/views/components/myEditor/index.vue
@@ -0,0 +1,113 @@
+<template>
+  <div style="border: 1px solid #ccc;">
+    <Toolbar
+      ref="editor"
+      style="border-bottom: 1px solid #ccc"
+      :editor="editor"
+      :defaultConfig="toolbarConfig"
+      :mode="mode"
+    />
+    <Editor
+      style="height: 500px; overflow-y: hidden;"
+      v-loading="Loading"
+      v-model="html"
+      :defaultConfig="editorConfig"
+      :mode="mode"
+      @onCreated="onCreated"
+      @onChange="onChange"
+    />
+  </div>
+</template>
+<script>
+import "@wangeditor/editor/dist/css/style.css"
+import { DomEditor } from '@wangeditor/editor'
+import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
+import { getToken } from "@/utils/auth";
+export default {
+  components: { Editor, Toolbar },
+  data() {
+    return {
+      editor: null,
+      html: '',
+      Loading: false,
+      toolbarConfig: {
+        excludeKeys: [
+          'group-video',
+          'insertImage',
+          'emotion',
+        ],
+      },
+      editorConfig: { 
+        placeholder: '请输入内容...',
+        MENU_CONF: {
+          uploadImage:{
+            // 上传图片配置
+            server: process.env.VUE_APP_BASE_API + '/common/upload',
+            fieldName: "file",
+            headers: {
+              Authorization: "Bearer " + getToken()
+            },
+            customInsert(res,insertFn){
+              // console.log(res);
+              // console.log(insertFn);
+              insertFn(res.url,res.originalFilename,res.url)
+              // console.log("=======customInsert=======");
+            },
+            onBeforeUpload(file){
+              console.log(this.Loading);
+              // console.log("=======onBeforeUpload=======");
+            },
+            // onSuccess(file,res){
+            //   console.log('onSuccessFile',file);
+            //   console.log('onSuccessRes',res);
+            //   console.log("=======onSuccess=======");
+            // },
+          }
+        }, 
+      },
+      mode: 'default', // or 'simple'
+    }
+  },
+  props: {
+    /* 编辑器的内容 */
+    value: {
+      type: String,
+      default: "",
+    },
+  },
+  watch: {
+    value: {
+      handler(val) {
+        this.html = val
+      },
+      immediate: true,
+    },
+  },
+  methods:{
+    onCreated(editor) {
+      this.editor = Object.seal(editor) // 一定要用 Object.seal() ，否则会报错
+      this.$nextTick(()=>{
+        const toolbar = DomEditor.getToolbar(editor)
+        const curToolbarConfig = toolbar.getConfig()
+        // console.log( curToolbarConfig.toolbarKeys ) // 当前菜单排序和分组
+      })
+    },
+    onChange(editor){
+      let html = editor.getHtml();
+      // console.log("html", html);
+      this.$emit('input',html);
+      // console.log('content', editor.children)
+    },
+    destroy() {
+      const editor = this.editor
+      if (editor == null) return
+      editor.destroy() // 组件销毁时，及时销毁编辑器
+    },
+  },
+  mounted() {
+  },
+}
+</script>
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/dataCloudMap/components/collectDialog.vue b/src/views/dataCloudMap/components/collectDialog.vue
new file mode 100644
index 0000000..b3ee4f6
--- /dev/null
+++ b/src/views/dataCloudMap/components/collectDialog.vue
@@ -0,0 +1,83 @@
+<template>
+  <el-dialog
+    title="服务业分行业汇总" 
+    :visible.sync="infoVisible"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    @close="infoClose"
+    custom-class="collectDialog-dialog"
+    append-to-body
+    width="60%"
+  >
+    <div class="collectDialog-box">
+      <section>
+        <el-table 
+          v-loading="loading" 
+          row-key="id"
+          class="dataMap-two-table" 
+          :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+          :data="tableData" 
+          :row-class-name="tableRowClassName" 
+          :header-cell-style="{background:'#D1D9E6'}"
+          height="550px"
+        >  <!-- :max-height="tabHeader" -->
+          <el-table-column label="行业" prop="nameType" width="300"/>
+          <el-table-column label="全年营收(亿元)" prop="yearRevenue" align="center"/>
+          <el-table-column label="增加值(亿元)" prop="addValue" align="center" />
+          <el-table-column label="增加值增速(按不变价)" prop="growth" align="center" />
+          <el-table-column label="增加值占GDP比重" prop="gdpProportion" align="center" />
+        </el-table>
+      </section>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { getAllIndustry } from "@/api/jin_ji_hu/dataCloudMap"
+export default {
+  name: "honorDialog",
+  data() {
+    return {
+      infoVisible: false,
+      loading: false,
+      tableData:[],
+    }
+  },
+  methods:{
+    open(){
+      this.infoVisible = true;
+      this.loading = true;
+      getAllIndustry().then(res=>{
+        let arr = [ ...res.data ]
+        arr.map((item,index)=>{
+          item.id = index + 1
+          item.children.map((itemTwo,indexTwo)=>{
+            itemTwo.id = index + "+" + indexTwo
+            if(!itemTwo.children){
+              delete itemTwo.children
+            }
+          })
+        })
+        this.tableData = arr
+        this.loading = false;
+      })
+    },
+    infoClose(){
+      this.infoVisible = false;
+    },
+    // 修改table背景色
+    tableRowClassName({row, rowIndex}){
+      if (!row.children) {
+        return 'evenNumber-row-childred';
+      } else if(row.children && row.id % 2 == 0){
+        return 'evenNumber-row';
+      }
+      return '';
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep .collectDialog-dialog {
+  margin-top: 14vh !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/dataCloudMap/components/echartData.vue b/src/views/dataCloudMap/components/echartData.vue
new file mode 100644
index 0000000..76f8ca7
--- /dev/null
+++ b/src/views/dataCloudMap/components/echartData.vue
@@ -0,0 +1,268 @@
+<template>
+  <div class="components-box">
+    <div class="echarts-data-box">
+      <div class="E-box-item">
+        <div class="img-box-one img-box"></div>
+        <div class="data-box">
+          <div class="box-number">
+            <span class="number-yuan">{{ serviceData.valueAdded }}</span>
+            <span class="yuan-unit">亿元</span>
+          </div>
+          <div class="box-bottom">【{{ serviceData.developYear }}】服务业增加值</div>
+        </div>
+      </div>
+      <div class="E-box-item">
+        <div class="img-box-two img-box"></div>
+        <div class="data-box">
+          <div class="box-number">
+            <span class="number-yuan">{{ serviceData.increaseSpeed }}</span>
+            <span class="yuan-unit">%</span>
+          </div>
+          <div class="box-bottom">【{{ serviceData.developYear }}】服务业增速</div>
+        </div>
+      </div>
+      <div class="E-box-item">
+        <div class="img-box-three img-box"></div>
+        <div class="data-box">
+          <div class="box-number">
+            <span class="number-yuan">{{ serviceData.gdpProportion }}</span>
+            <span class="yuan-unit">%</span>
+          </div>
+          <div class="box-bottom">【{{ serviceData.developYear }}】服务业增加值占GDP比重</div>
+        </div>
+      </div>
+    </div>
+    <div id="echarts" ref="myChart"></div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import { servicesDevelop } from "@/api/jin_ji_hu/dataCloudMap"
+import { chartlcm, YmaxvalAndinterval } from "@/utils/echart.js"
+export default {
+  name:"echartData",
+  data() {
+    return {
+      myChart: false,
+      echartXdata:[],
+      echartYOnedata:[],
+      echartYTwodata:[],
+      serviceData:{
+        gdpProportion: 0,
+        increaseSpeed: 0,
+        quarterly: 0,
+        developYear: 0,
+      },
+      option: {
+        grid: {
+          top: "10%",
+          left: "5%",
+          right: "5%",
+          bottom: "8%", //也可设置left和right设置距离来控制图表的大小
+        },
+        xAxis: {
+          type: "category",
+          data: [],
+          axisLine: {
+            show: true, //隐藏X轴轴线
+            lineStyle: {
+              color: "#ccc",
+              opacity: 0.6,
+            },
+          },
+          axisTick: {
+            show: false, //隐藏X轴刻度
+          },
+          axisLabel: {
+            show: true,
+            color: "#666666", //X轴文字颜色
+            fontSize: 14,
+          },
+        },
+        yAxis: [
+          {
+            type: "value",
+            name:"增加值亿元",
+            nameTextStyle:{
+              padding: [0, 0, 0, -15],
+            },
+            min: 0,
+            max: 0,
+            interval: 0,
+            splitLine: {
+              show: true,
+              lineStyle :{
+                type: "dashed",
+              }
+            },
+            axisTick: {
+              show: false, //隐藏X轴刻度
+            },
+            minorTick: {
+              show: false, //隐藏X轴刻度
+            },
+            axisLabel: {
+              show: true,
+              color: "#666666",
+              fontSize: 12,
+            },
+          },
+          {
+            type: "value",
+            name:"增速%",
+            nameTextStyle:{
+              align:'center',
+              padding: [0, -15, 0, 0],
+            },
+            min: 0,
+            max: 0,
+            interval: 0,
+            splitLine: {
+              show: false,
+              lineStyle :{
+                type: "dashed",
+              }
+            },
+            axisTick: {
+              show: false, //隐藏X轴刻度
+            },
+            minorTick: {
+              show: false, //隐藏X轴刻度
+            },
+            axisLabel: {
+              show: true,
+              color: "#666666",
+              fontSize: 12,
+            },
+          },
+        ],
+        series: [
+          {
+            name: "销售水量",
+            type: "line",
+            yAxisIndex: 1, //使用的 y 轴的 index，在单个图表实例中存在多个 y轴的时候有用
+            // smooth: true, //平滑曲线显示  会让lineStyle的type设置的solid无效
+            showAllSymbol: true, //显示所有图形。
+            symbol: "circle", //标记的图形为实心圆
+            symbolSize: 10, //标记的大小
+            itemStyle: {
+              //折线拐点标志的样式
+              color: "#FFBB00",
+              borderColor: "#fff",
+              borderWidth: 2,
+              shadowColor: 'rgba(255, 187, 0, 0.7)',
+              shadowBlur: 10
+            },
+            lineStyle: {
+              type: "solid",
+              color: "#FFBB00",
+              shadowColor: 'rgba(255, 187, 0, 0.5)',
+              shadowBlur: 4
+            },
+            data:[]
+          },
+          {
+            name: "主营业务",
+            type: "bar",
+            barWidth: 25,
+            itemStyle: {
+              color: "#0086FF",
+            },
+            data:[]
+          },
+        ],
+      }
+    }
+  },
+  props:{
+    activeIndex:{
+      type:Number,
+      default:1
+    }
+  },
+  mounted(){
+    this.$nextTick(()=>{
+      this.initEchart();
+    })
+    setTimeout(()=>{
+      this.getService(1);
+    },200)
+    window.addEventListener('resize', this.cancalDebounce);
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
+  methods:{
+    cancalDebounce(){
+      window.onresize = this.myChart.resize();
+    },
+    initEchart(){
+      var chartDom = document.getElementById("echarts");
+      this.myChart = echarts.init(chartDom);
+      this.myChart.setOption(this.option)
+    },
+    // 获取服务业发展总览
+    getService(activeIndex){
+      servicesDevelop({type:activeIndex}).then(res=>{
+        if(activeIndex == 1) {
+          this.option.xAxis.data = []
+          this.option.series[0].data = []
+          this.option.series[1].data = []
+          res.data.map(item=>{
+            this.option.xAxis.data.push(item.developYear)
+            this.option.series[1].data.push(item.valueAdded)
+            this.option.series[0].data.push(item.increaseSpeed)
+          })
+          const maxY1 = Math.max.apply(null, this.option.series[0].data);
+          const maxY2 = Math.max.apply(null, this.option.series[1].data);
+          let divisor = 5;
+          let lcmVal = chartlcm(maxY1, maxY2)
+          let Ymaxval_interval = YmaxvalAndinterval(maxY1, maxY2, lcmVal, divisor);
+          this.option.yAxis[0].max = Ymaxval_interval.max2;
+          this.option.yAxis[0].interval = Ymaxval_interval.interval2;
+          this.option.yAxis[1].max = Ymaxval_interval.max1;
+          this.option.yAxis[1].interval = Ymaxval_interval.interval1;
+          this.serviceData = {
+            valueAdded: res.data[res.data.length - 1].valueAdded,
+            increaseSpeed: res.data[res.data.length - 1].increaseSpeed,
+            gdpProportion: res.data[res.data.length - 1].gdpProportion,
+            developYear: res.data[res.data.length - 1].developYear,
+          }
+        } else {
+          this.option.xAxis.data = []
+          this.option.series[0].data = []
+          this.option.series[1].data = []
+          this.option.xAxis.data = ["第一季度","第二季度","第三季度","第四季度"]
+          let arr = [0,0,0,0]
+          let arrTwo = [0,0,0,0]
+          res.data.map((item,index)=>{
+            arr[index] = item.valueAdded
+            arrTwo[index] = item.increaseSpeed
+            this.option.series[1].data = arr
+            this.option.series[0].data = arrTwo
+          })
+          const maxY1 = Math.max.apply(null, this.option.series[0].data);
+          const maxY2 = Math.max.apply(null, this.option.series[1].data);
+          let divisor = 5;
+          let lcmVal = chartlcm(maxY1, maxY2)
+          let Ymaxval_interval = YmaxvalAndinterval(maxY1, maxY2, lcmVal, divisor);
+          this.option.yAxis[0].max = Ymaxval_interval.max2;
+          this.option.yAxis[0].interval = Ymaxval_interval.interval2;
+          this.option.yAxis[1].max = Ymaxval_interval.max1;
+          this.option.yAxis[1].interval = Ymaxval_interval.interval1;
+          this.serviceData = {
+            valueAdded: res.data[res.data.length - 1].valueAdded,
+            increaseSpeed: res.data[res.data.length - 1].increaseSpeed,
+            gdpProportion: res.data[res.data.length - 1].gdpProportion,
+            developYear: res.data[res.data.length - 1].developYear,
+          }
+        }
+        this.myChart.setOption(this.option);     
+      })
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/dataCloudMap/components/headquarterEnterprise.vue b/src/views/dataCloudMap/components/headquarterEnterprise.vue
new file mode 100644
index 0000000..b9f260c
--- /dev/null
+++ b/src/views/dataCloudMap/components/headquarterEnterprise.vue
@@ -0,0 +1,176 @@
+<template>
+  <el-dialog
+    title="总部企业" 
+    :visible.sync="infoVisible"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    @close="infoClose"
+    custom-class="headquarterEnterprise-dialog"
+    append-to-body
+    width="75%"
+  >
+    <div class="headquarterEnterprise-box">
+      <el-form :inline="true" :model="formInline" size="small" class="headquarterEnterprise-form" ref="queryFrom">
+        <el-col :span="21">
+          <el-form-item label="企业名称：">
+            <el-input v-model.trim="formInline.enterpriseName" placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <el-form-item label="统一社会信用代码："> <!-- 申报单位 -->
+            <el-input v-model.trim="formInline.creditCode" placeholder="请输入统一社会信用代码"></el-input>
+          </el-form-item>
+          <el-form-item label="总部类型：">
+            <el-select class="ignoreElement" v-model="formInline.status" placeholder="请选择总部类型">
+              <!-- <el-option
+                v-for="dict in dict.type.bms_approval_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value">
+              </el-option> -->
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item>
+            <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
+            <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
+          </el-form-item>
+        </el-col>
+      </el-form>
+      <!-- <el-row class="radio_btn"> -->
+      <el-col class="radio_btn">
+        <el-radio-group v-model="formInline.statusChange" @change="toggleOptionsEnter" fill="#134EE6">
+          <el-radio-button label="0">全部(343)</el-radio-button>
+          <el-radio-button label="1">省级总部(67)</el-radio-button>
+          <el-radio-button label="2">市级总部(149)</el-radio-button>
+          <el-radio-button label="3">区级总部(127)</el-radio-button>
+        </el-radio-group>
+      </el-col>
+      <!-- </el-row> -->
+      <section>
+        <el-table 
+          v-loading="loading" 
+          class="dataMap-two-table" 
+          :data="tableData" 
+          :row-class-name="tableRowClassName" 
+          :header-cell-style="{background:'#D1D9E6'}"
+          height="500px"
+        >  <!-- :max-height="tabHeader" -->
+          <el-table-column label="序号" type="index" align="center" width="50"/>
+          <el-table-column label="企业名称" prop="enterpriseName" align="center"/>
+          <el-table-column label="统一信用代码" prop="creditCode" align="center" />
+          <el-table-column label="总部类型" prop="type" align="center" width="100">
+            <template slot-scope="scope">
+              <div>{{ scope.row.type }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="税收(亿元)" prop="taxRevenue" align="center" width="100"/>
+          <el-table-column label="产值(亿元)" prop="productionValue" align="center" width="100"/>
+          <el-table-column label="营收(亿元)" prop="revenue" align="center" width="100" />
+          <el-table-column label="销售额(亿元)" prop="sale" align="center" width="100" />
+          <el-table-column label="操作" align="center" width="100">
+            <template slot-scope="scope">
+              <div class="project-trace-table-number" @click="enterpriseInfo(scope.row)">企业详情</div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <my-pagination 
+          :total="total"
+          :page="pagination.current"
+          :limit="pagination.size"
+          @pagination="getPagination"
+          :current-page.sync="pagination.current" 
+        ></my-pagination>
+      </section>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import myPagination from "@/views/components/Pagination/index.vue"
+export default {
+  components:{myPagination},
+  name: "honorDialog",
+  data() {
+    return {
+      infoVisible: false,
+      loading: false,
+      tableData:[
+        {
+          enterpriseName:"XX信息技术服务有限公司",
+          creditCode:"91310311118959380R",
+          type:"制造业总部",
+          taxRevenue:"506.63",
+          productionValue:"201",
+          revenue:"188",
+          sale:"199",
+        },{
+          enterpriseName:"XX信息技术服务有限公司",
+          creditCode:"91310311118959380R",
+          type:"制造业总部",
+          taxRevenue:"506.63",
+          productionValue:"201",
+          revenue:"188",
+          sale:"199",
+        },{
+          enterpriseName:"XX信息技术服务有限公司",
+          creditCode:"91310311118959380R",
+          type:"制造业总部",
+          taxRevenue:"506.63",
+          productionValue:"201",
+          revenue:"188",
+          sale:"199",
+        },
+      ],
+      formInline:{
+        enterpriseName:"",
+        creditCode:"",
+        statusChange:"0"
+      },
+      pagination: {
+        current:1,
+        size:10,
+      },
+      total:40,
+    }
+  },
+  methods:{
+    open(){
+      this.infoVisible = true;
+    },
+    infoClose(){
+      this.infoVisible = false;
+    },
+    // 获取页码
+    getPagination(pages) {
+      this.pagination.current = pages.page;
+      this.pagination.size = pages.limit;
+    },
+    // 重置
+    resetQuery(){},
+    // 查询
+    handleQuery(){},
+    // 大类数量点击
+    enterpriseInfo(row){
+      // this.$router.push({
+      //   name: 'enterpriselibraryInfo',
+      //   query: { userId: row.id, creditCode: row.tyshxydm }
+      // })
+    },
+    // tab切换
+    toggleOptionsEnter(val){
+      // this.handleQuery();
+    },
+    // 修改table背景色
+    tableRowClassName({row, rowIndex}){
+      if (rowIndex % 2 !== 0) {
+        return 'evenNumber-row';
+      }
+      return '';
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep .headquarterEnterprise-dialog {
+  margin-top: 10vh !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/dataCloudMap/components/honorDialog.vue b/src/views/dataCloudMap/components/honorDialog.vue
new file mode 100644
index 0000000..752f798
--- /dev/null
+++ b/src/views/dataCloudMap/components/honorDialog.vue
@@ -0,0 +1,192 @@
+<template>
+  <el-dialog
+    title="荣誉情况" 
+    :visible.sync="infoVisible"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    @close="infoClose"
+    custom-class="honor-dialog"
+    append-to-body
+    width="60%"
+  >
+    <div>
+      <section>
+        <el-table 
+          v-loading="loading" 
+          border
+          class="dataMap-two-table" 
+          :data="tableData" 
+          :cell-class-name="tableRowClassName" 
+          :cell-style="tableCellStyle"
+          :header-cell-style="{background:'#D1D9E6'}"
+          :span-method="objectSpanMethod"
+          height="550px"
+        >  <!-- :max-height="tabHeader" -->
+          <el-table-column label="项目大类" prop="projectBigName" align="center"/>
+          <el-table-column label="数量" prop="count1" align="center" width="100">
+            <template slot-scope="scope">
+              <div class="project-trace-table-number" :class="scope.row.count1 == 0 ? 'grey-number' : ''" @click="bigNumber(scope.row)">{{ scope.row.count1 }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="项目中类" prop="projectMiddleName" align="center"/>
+          <el-table-column label="数量" prop="count2" align="center" width="100">
+            <template slot-scope="scope">
+              <div class="project-trace-table-number" :class="scope.row.count2 == 0 ? 'grey-number' : ''" @click="middleNumber(scope.row)">{{ scope.row.count2 }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="项目小类" prop="projectSmallName" align="center"/>
+          <el-table-column label="数量" prop="count3" align="center" width="100">
+            <template slot-scope="scope">
+              <div class="project-trace-table-number" :class="scope.row.count3 == 0 ? 'grey-number' : ''" @click="smallNumber(scope.row)">{{ scope.row.count3 }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="2024年新增" prop="currentYearAdd" align="center" width="100">
+            <template slot-scope="scope">
+              <div class="project-trace-table-number" :class="scope.row.currentYearAdd == 0 ? 'grey-number' : ''" @click="YrarNumber(scope.row)">{{ scope.row.currentYearAdd }}</div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </section>
+    </div>
+  </el-dialog>
+</template>
+<script>
+export default {
+  name: "honorDialog",
+  data() {
+    return {
+      infoVisible: false,
+      loading: false,
+      tableData:[],
+    }
+  },
+  methods:{
+    open(data){
+      this.infoVisible = true;
+      this.tableData = data
+      const effectMerge = {
+        projectBigName: ['projectMiddleName'], //一月和地理区域值都相同的时候，  大类和小类值都相同的时候
+        //可以合并一月这一列，其余情况不合并
+        projectSmallName: [], //三月值相同的时候合并这一列，不受其他的影响，可以跨地理区域进行合并
+        projectBigName: [] //三月值相同的时候合并这一列，不受其他的影响，可以跨地理区域进行合并     大类值相同的时候合并这一列 
+      };
+      this.setTabelRowSpan(this.tableData, ['projectBigName', 'count1', 'projectMiddleName', 'count2', 'projectSmallName', 'count3', 'currentYearAdd'], effectMerge);
+    },
+    infoClose(){
+      this.infoVisible = false;
+    },
+    // 大类数量点击
+    bigNumber(row){
+      if(row.count1 == 0) {
+        return;
+      } else {
+        this.$router.push({
+          name: 'Project',
+          params: { projectBigType: row.projectBigType }
+        })
+      }
+    },
+    // 中类数量点击
+    middleNumber(row){
+      if(row.count2 == 0) {
+        return;
+      } else {
+        this.$router.push({
+          name: 'Project',
+          params: { projectBigType: row.projectBigType, projectMiddleType: row.projectMiddleType }
+        })
+      }
+    },
+    // 小类数量点击
+    smallNumber(row){
+      if(row.count3 == 0) {
+        return;
+      } else {
+        this.$router.push({
+          name: 'Project',
+          params: {projectBigType: row.projectBigType, projectMiddleType: row.projectMiddleType, projectSmallType: row.projectSmallType }
+        })
+      }
+    },
+    // 2024年新增数量点击
+    YrarNumber(row){
+      if(row.currentYearAdd == 0) {
+        return;
+      } else {
+        this.$router.push({
+          name: 'Project',
+          params: { projectYear: 2024, projectBigType: row.projectBigType, projectMiddleType: row.projectMiddleType, projectSmallType: row.projectSmallType }
+        })
+      }
+    },
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (row.mergeCell.includes(column.property)) {
+        const rowspan = row[`rowspan_${column.property}`];
+        if (rowspan) {
+          return { rowspan: rowspan, colspan: 1 };
+        } else {
+          return { rowspan: 0, colspan: 0 };
+        }
+      }
+    },
+    setTabelRowSpan(tableData, fieldArr, effectMerge = {}, isFieldAll = false) {
+      let lastItem = {};
+      fieldArr.forEach((field, index) => {
+        let judgeArr = fieldArr.slice(0, index + 1);
+        if (isFieldAll) {
+          judgeArr = [...fieldArr];
+        } else if (effectMerge[field]) {
+          judgeArr = [...effectMerge[field], field];
+        }
+        tableData.forEach(item => {
+          item.mergeCell = fieldArr;
+          const rowSpan = `rowspan_${field}`;
+          // 判断是否合并到上个单元格。
+          if (judgeArr.every(e => lastItem[e] === item[e] && item[e] !== '')) {
+            // 判断是否所在行的列对应的值全部相同，并且此列的值不为空
+            // 是：合并行
+            item[rowSpan] = 0;
+            lastItem[rowSpan] += 1;
+          } else {
+            // 否：完成一次同类合并。lastItem重新赋值，进入下一次合并计算。
+            item[rowSpan] = 1;
+            lastItem = item;
+          }
+        });
+      });
+    },
+    // 修改table背景色
+    tableRowClassName({row, column, rowIndex, columnIndex}){
+      if(columnIndex == 4 || columnIndex == 5 || columnIndex == 6 ) {
+        if(rowIndex == 0 || rowIndex == 1 || rowIndex == 5 || rowIndex == 10 || rowIndex == 11 || rowIndex == 14 || rowIndex == 15 || rowIndex == 16 || rowIndex == 18 || rowIndex == 19 || rowIndex == 21 ) {
+          return 'evenNumber-row-border';
+        }
+      }
+      if(columnIndex == 0 || columnIndex == 1 ) {
+        if(rowIndex == 3 || rowIndex == 5 || rowIndex == 8 || rowIndex == 10) {
+          return 'evenNumber-row';
+        }
+      }
+      if(columnIndex == 2 || columnIndex == 3 ) {
+        if(rowIndex == 3 || rowIndex == 5 || rowIndex == 8 || rowIndex == 10 || rowIndex == 14 || rowIndex == 21) {
+          return 'evenNumber-row';
+        }
+      }
+      return '';
+    },
+    // 修改table背景色
+    tableCellStyle({row, column, rowIndex, columnIndex}){
+      if(columnIndex == 4 || columnIndex == 5 || columnIndex == 6 ) {
+        if (rowIndex == 3 || rowIndex == 5 || rowIndex == 6 || rowIndex == 8 || rowIndex == 10 || rowIndex == 11 || rowIndex == 12 || rowIndex == 14 || rowIndex == 15 || rowIndex == 16 || rowIndex == 17 || rowIndex == 21 || rowIndex == 22) {
+          return " background-color: #F6F9FD;"
+        }
+      }
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep .honor-dialog {
+  margin-top: 12vh !important;
+}
+</style>
diff --git a/src/views/dataCloudMap/components/serviceIndustry.vue b/src/views/dataCloudMap/components/serviceIndustry.vue
new file mode 100644
index 0000000..803852b
--- /dev/null
+++ b/src/views/dataCloudMap/components/serviceIndustry.vue
@@ -0,0 +1,136 @@
+<template>
+  <el-dialog
+    :title="title" 
+    :visible.sync="infoVisible"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    @close="infoClose"
+    custom-class="serviceIndustry-dialog"
+    append-to-body
+  >
+    <div class="serviceIndustry-box">
+      <el-form :inline="true" :model="formInline" size="small" class="serviceIndustry-form" ref="queryFrom">
+        <el-col :span="20">
+          <el-form-item label="企业名称：">
+            <el-input v-model.trim="formInline.enterpriseName" placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <el-form-item label="统一社会信用代码："> <!-- 申报单位 -->
+            <el-input v-model.trim="formInline.creditCode" placeholder="请输入统一社会信用代码"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item>
+            <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
+            <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
+          </el-form-item>
+        </el-col>
+      </el-form>
+      <section>
+        <el-table 
+          v-loading="loading" 
+          class="dataMap-two-table" 
+          :data="tableData" 
+          :row-class-name="tableRowClassName" 
+          :header-cell-style="{background:'#D1D9E6'}"
+          height="550px"
+        >  <!-- :max-height="tabHeader" -->
+          <el-table-column label="序号" type="index" align="center" width="50"/>
+          <el-table-column label="企业名称" prop="enterpriseName" align="center"/>
+          <el-table-column label="统一信用代码" prop="creditCode" align="center" />
+          <el-table-column label="全年营收(亿元)" prop="revenue" align="center" width="150" />
+          <el-table-column label="操作" align="center" width="150">
+            <template slot-scope="scope">
+              <div class="project-trace-table-number" @click="enterpriseInfo(scope.row)">企业详情</div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <my-pagination 
+          :total="total"
+          :page="pagination.current"
+          :limit="pagination.size"
+          @pagination="getPagination"
+          :current-page.sync="pagination.current" 
+        ></my-pagination>
+      </section>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import myPagination from "@/views/components/Pagination/index.vue"
+export default {
+  components:{myPagination},
+  name: "honorDialog",
+  data() {
+    return {
+      infoVisible: false,
+      loading: false,
+      tableData:[
+        {
+          enterpriseName:"XX信息技术服务有限公司",
+          creditCode:"91310311118959380R",
+          revenue:"188",
+        },{
+          enterpriseName:"XX信息技术服务有限公司",
+          creditCode:"91310311118959380R",
+          revenue:"188",
+        },{
+          enterpriseName:"XX信息技术服务有限公司",
+          creditCode:"91310311118959380R",
+          revenue:"188",
+        },
+      ],
+      formInline:{
+        enterpriseName:"",
+        creditCode:"",
+      },
+      pagination: {
+        current:1,
+        size:10,
+      },
+      total:40,
+    }
+  },
+  props:{
+    title:{
+      typeof:String,
+      default:"企业列表",
+    }
+  },
+  methods:{
+    open(){
+      this.infoVisible = true;
+    },
+    infoClose(){
+      this.infoVisible = false;
+    },
+    // 获取页码
+    getPagination(pages) {
+      this.pagination.current = pages.page;
+      this.pagination.size = pages.limit;
+    },
+    // 重置
+    resetQuery(){},
+    // 查询
+    handleQuery(){},
+    // 大类数量点击
+    enterpriseInfo(row){
+      // this.$router.push({
+      //   name: 'enterpriselibraryInfo',
+      //   query: { userId: row.id, creditCode: row.tyshxydm }
+      // })
+    },
+    // 修改table背景色
+    tableRowClassName({row, rowIndex}){
+      if (rowIndex % 2 !== 0) {
+        return 'evenNumber-row';
+      }
+      return '';
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep .serviceIndustry-dialog {
+  margin-top: 10vh !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/dataCloudMap/index.vue b/src/views/dataCloudMap/index.vue
index b598eb8..1789fa3 100644
--- a/src/views/dataCloudMap/index.vue
+++ b/src/views/dataCloudMap/index.vue
@@ -1,13 +1,544 @@
 <template>
-  <div>
-    <!-- <el-button type="primary" icon="icon-jc-xihuan">搜索</el-button>
-    <el-button type="primary" icon="el-icon-search">搜索</el-button>
-    <el-button type="yellow" icon="el-icon-search">搜索</el-button> -->
+  <div class="dataCloudMap">
+    <el-row class="dataCloudMap-main">
+      <el-col :span="11" class="dataCloudMap-main-left">
+        <!-- 服务业发展总览 -->
+        <div class="dataCloudMap-left-top">
+          <div class="echart-title">
+            <div class="echart-left-title">
+              <div class="L-title-left">
+                <span class="dataCloudMap-birght"></span>
+                <span class="dataCloudMap-title">服务业发展总览</span>
+              </div>
+              <span class="dataCloudMap-data">【统计数据截至：{{ time }}】</span>
+            </div>
+            <div class="rightBigNav">
+              <div class="right-nav">
+                <div
+                  class="tabStyle"
+                  v-for="(item, index) in options1"
+                  :key="index"
+                  @click="active(index + 1)"
+                  :class="activeIndex == index + 1 ? 'change-blue' : ''"
+                >
+                  <div class="change-grey-birght" :class="activeIndex == index + 1 ? 'change-blue-birght' : ''"></div>
+                  <span class="change-grey-text" :class="activeIndex == index + 1 ? 'change-blue-text' : ''">{{ item.name }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <echartData :activeIndex="activeIndex" ref="echartData"/>
+        </div>
+
+        <!-- 行业纵深情况 -->
+        <div class="dataCloudMap-left-bottom">
+          <div class="industry-title">
+            <div class="bottom-left-title">
+              <div class="L-title-left">
+                <span class="dataCloudMap-birght"></span>
+                <span class="dataCloudMap-title">行业纵深情况</span>
+              </div>
+              <span class="dataCloudMap-data">【统计数据截至：{{ time }}】</span>
+            </div>
+            <div class="rightBtn" @click="industryBtn">查看更多数据>></div>
+          </div>
+          <section>
+            <el-table v-loading="loadingOne" class="dataMap-two-table" :data="tableOneData" :row-class-name="tableRowClassName" :header-cell-style="{background:'#E8F3FC'}">  <!-- :max-height="tabHeader" -->
+              <el-table-column label="行业大类" prop="industryCategories" align="center"/>
+              <el-table-column label="全年营收" prop="yearRevenue" align="center">
+                <template slot="header" slot-scope="scope">
+                  <div class="Table-header">全年营收</div>
+                  <span class="Table-unit">(亿元)</span>
+                </template>
+                <template slot-scope="scope">
+                  <div class="project-trace-table-number">{{ scope.row.yearRevenue }}</div>
+                </template>
+              </el-table-column>
+              <el-table-column label="增加值(亿元)" prop="addValue" align="center">
+                <template slot="header" slot-scope="scope">
+                  <div class="Table-header">增加值</div>
+                  <span class="Table-unit">(亿元)</span>
+                </template>
+                <template slot-scope="scope">
+                  <div class="project-trace-table-number">{{ scope.row.addValue }}</div>
+                </template>
+              </el-table-column>
+              <el-table-column label="增加值增速(按不变价)" prop="growth" align="center">
+                <template slot="header" slot-scope="scope">
+                  <div class="Table-header">增加值增速</div>
+                  <span class="Table-unit">(按不变价)</span>
+                </template>
+                <template slot-scope="scope">
+                  <div class="project-trace-table-number">{{ scope.row.growth }} <span>%</span></div>
+                </template>
+              </el-table-column>
+              <el-table-column label="增加值占GDP比重" prop="gdpProportion" align="center" width="100">
+                <template slot-scope="scope">
+                  <div class="project-trace-table-number">{{ scope.row.gdpProportion }} <span>%</span></div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </section>
+        </div>
+      </el-col>
+      <el-col :span="13" class="dataCloudMap-main-right">
+        <!-- 企业情况 -->
+        <div class="dataCloudMap-right-top">
+          <!-- <div class="dataCloudMap-right-top-box">
+          </div> -->
+          <div class="right-top-title">
+            <div class="L-title-left">
+              <span class="dataCloudMap-birght"></span>
+              <span class="dataCloudMap-title">企业情况</span>
+            </div>
+            <span class="dataCloudMap-data">【统计数据截至：{{ time }}】</span>
+          </div>
+          <div class="dataCloudMap-enterprise-bottom">
+            <div class="dataCloudMap-enterprise">
+              <!-- 第一个卡片 -->
+              <el-card shadow="always">
+                <div slot="header" class="clearfix">
+                  <span>生产性服务业</span>
+                </div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img"></div>
+                    <div class="card-type">规上企业数量:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number" @click="enterInfo('生产性服务业企业')">768</div>
+                    <div class="card-unit">家</div>
+                  </div>
+                </div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img card-img-two"></div>
+                    <div class="card-type">规上企业营收:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number number-two">1913</div>
+                    <div class="card-unit unit-two">亿</div>
+                  </div>
+                </div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img card-img-three"></div>
+                    <div class="card-type">全口径增加值:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number number-three">132</div>
+                    <div class="card-unit unit-two">亿</div>
+                  </div>
+                </div>
+              </el-card>
+              <!-- 第二个卡片 -->
+              <el-card shadow="always">
+                <div slot="header" class="clearfix">
+                  <span>生活性服务业</span>
+                </div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img"></div>
+                    <div class="card-type">规上企业数量:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number" @click="enterInfo('生活性服务业企业')">768</div>
+                    <div class="card-unit">家</div>
+                  </div>
+                </div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img card-img-two"></div>
+                    <div class="card-type">规上企业营收:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number number-two">1913</div>
+                    <div class="card-unit unit-two">亿</div>
+                  </div>
+                </div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img card-img-three"></div>
+                    <div class="card-type">全口径增加值:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number number-three">132</div>
+                    <div class="card-unit unit-two">亿</div>
+                  </div>
+                </div>
+              </el-card>
+              <!-- 第三个卡片 -->
+              <el-card shadow="always">
+                <div slot="header" class="clearfix">
+                  <span>新兴服务业</span>
+                </div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img"></div>
+                    <div class="card-type">规上企业数量:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number" @click="enterInfo('新兴服务业企业')">768</div>
+                    <div class="card-unit">家</div>
+                  </div>
+                </div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img card-img-two"></div>
+                    <div class="card-type">规上企业营收:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number number-two">1913</div>
+                    <div class="card-unit unit-two">亿</div>
+                  </div>
+                </div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img card-img-three"></div>
+                    <div class="card-type">全口径增加值:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number number-three">132</div>
+                    <div class="card-unit unit-two">亿</div>
+                  </div>
+                </div>
+              </el-card>
+              <!-- 第四个卡片 -->
+              <el-card shadow="always">
+                <div slot="header" class="clearfix">
+                  <span>限上批零住餐</span>
+                </div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img"></div>
+                    <div class="card-type">规上企业数量:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number" @click="enterInfo('限上批零住餐企业')">768</div>
+                    <div class="card-unit">家</div>
+                  </div>
+                </div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img card-img-two"></div>
+                    <div class="card-type">规上企业营收:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number number-two">1913</div>
+                    <div class="card-unit unit-two">亿</div>
+                  </div>
+                </div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img card-img-three"></div>
+                    <div class="card-type">全口径增加值:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number number-three">132</div>
+                    <div class="card-unit unit-two">亿</div>
+                  </div>
+                </div>
+              </el-card>
+            </div>
+            <div class="dataCloudMap-statistics">
+              <div class="statistics-title">
+                总部企业
+              </div>
+              <div class="statistics-items">
+                <div class="statistics-item">
+                  <div class="statistics-item-img"></div>
+                  <div class="statistics-item-type">企业数量:</div>
+                  <div class="statistics-item-right">
+                    <div class="statistics-item-number" @click="headqEnterpriseBtn">365</div>
+                    <div class="statistics-item-unit">
+                      <span>家</span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div class="statistics-items">
+                <div class="statistics-item">
+                  <div class="statistics-item-img item-img-two"></div>
+                  <div class="statistics-item-type">税收贡献:</div>
+                  <div class="statistics-item-right">
+                    <div class="statistics-item-number number-two">1913</div>
+                    <div class="statistics-item-unit unit-two">
+                      <span>亿</span>
+                      <el-popover
+                        placement="top"
+                        width="207"
+                        trigger="click"
+                      >
+                        <div class="popover-Tooltip">增值税+企业所得税-免抵调库</div>
+                        <img slot="reference" src="@/assets/images/Mapi.png" alt="">
+                      </el-popover>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div class="statistics-items statistics-items-none">
+                <div class="statistics-item">
+                  <div class="statistics-item-img item-img-three"></div>
+                  <div class="statistics-item-type">经营数据:</div>
+                  <div class="statistics-item-right">
+                    <div class="statistics-item-number number-three">132</div>
+                    <div class="statistics-item-unit unit-two">
+                      <span>亿</span>
+                      <el-popover
+                        placement="top"
+                        width="170"
+                        trigger="click"
+                      >
+                      <div class="popover-Tooltip">
+                        <div>制造业总部提供产值</div>
+                        <div>服务业总部提供营收</div>
+                        <div>建筑业总部提供产值</div>
+                        <div>贸易类总部提供销售额</div>
+                      </div>
+                        <img slot="reference" src="@/assets/images/Mapi.png" alt="">
+                      </el-popover>
+                    </div>
+                  </div>
+                </div>
+              </div>
+          </div>
+          </div>
+        </div>
+
+        <!-- 荣誉情况 -->
+        <div class="dataCloudMap-right-middle">
+          <div class="honor-title">
+            <div class="right-middle-title">
+              <div class="L-title-left">
+                <span class="dataCloudMap-birght"></span>
+                <span class="dataCloudMap-title">荣誉情况</span>
+              </div>
+              <span class="dataCloudMap-data">【统计数据截至：{{ time }}】</span>
+            </div>
+            <div class="rightBtn" @click="honorBtn">查看更多数据>></div>
+          </div>
+          <div class="honor-data">
+            <div class="honor-item">
+              <span class="honor-item-left">领军企业</span>
+              <div class="honor-item-right">
+                <span class="honor-item-number">{{ honorData.count1 }}</span>
+                <span class="honor-item-home">家</span>
+              </div>
+            </div>
+            <div class="honor-item">
+              <span class="honor-item-left">两业融合试点</span>
+              <div class="honor-item-right">
+                <span class="honor-item-number">{{ honorData.count2 }}</span>
+                <span class="honor-item-home">家</span>
+              </div>
+            </div>
+            <div class="honor-item">
+              <span class="honor-item-left">工业设计</span>
+              <div class="honor-item-right">
+                <span class="honor-item-number">{{ honorData.count3 }}</span>
+                <span class="honor-item-home">家</span>
+              </div>
+            </div>
+            <div class="honor-item">
+              <span class="honor-item-left">服务型制造示范</span>
+              <div class="honor-item-right">
+                <span class="honor-item-number">{{ honorData.count4 }}</span>
+                <span class="honor-item-home">家</span>
+              </div>
+            </div>
+            <div class="honor-item">
+              <span class="honor-item-left">现代服务业集聚区</span>
+              <div class="honor-item-right">
+                <span class="honor-item-number">{{ honorData.count5 }}</span>
+                <span class="honor-item-home">家</span>
+              </div>
+            </div>
+            <div class="honor-item">
+              <span class="honor-item-left">楼宇经济</span>
+              <div class="honor-item-right">
+                <span class="honor-item-number">{{ honorData.count6 }}</span>
+                <span class="honor-item-home">家</span>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 项目追踪情况 -->
+        <div class="dataCloudMap-right-bottom" id="dataCloudMap-right-box">
+          <div class="project-trace-title" id="project-trace-title-id">
+            <div class="right-bottom-title">
+              <div class="L-title-left">
+                <span class="dataCloudMap-birght"></span>
+                <span class="dataCloudMap-title">项目追踪情况</span>
+              </div>
+              <span class="dataCloudMap-data">【统计数据截至：{{ time }}】</span>
+            </div>
+            <div class="rightBtn" @click="projectBtn">查看更多数据>></div>
+          </div>
+          <section>
+            <el-table v-loading="loadingTwo" class="dataMap-two-table" :data="tableTwoData" :row-class-name="tableRowClassName"  :height="tabHeader" :header-cell-style="{background:'#E8F3FC'}">  <!-- :max-height="tabHeader" -->
+              <el-table-column label="申报任务名称" prop="enterpriseDirectory" width="500" align="center"/>
+              <el-table-column label="填报时间" prop="time" align="center">
+                <template slot-scope="scope">
+                  <div v-if="scope.row.startTime && scope.row.endTime">{{ scope.row.startTime }}~{{ scope.row.endTime }}</div>
+                  <div v-else>长期有效</div>
+                </template>
+              </el-table-column>
+              <el-table-column label="已填报企业数" prop="count" align="center">
+                <template slot-scope="scope">
+                  <div class="project-trace-table-number">{{ scope.row.count }}</div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </section>
+        </div>
+      </el-col>
+    </el-row>
+    <honorDialogVue ref="honorDialog" />
+    <headqEnterprise ref="headqEnterprise" />
+    <serviceIndustry :title="titleDialog" ref="serviceIndustry" />
+    <collectDialog ref="collectDialog" />
   </div>
 </template>
-
 <script>
-export default {};
+import honorDialogVue from './components/honorDialog.vue';
+import headqEnterprise from './components/headquarterEnterprise.vue'
+import serviceIndustry from './components/serviceIndustry.vue'
+import collectDialog from './components/collectDialog.vue'
+import echartData from './components/echartData.vue'
+import { honor, projectTracking, getIndustryDepth } from "@/api/jin_ji_hu/dataCloudMap"
+export default {
+  components:{honorDialogVue,headqEnterprise,serviceIndustry,collectDialog,echartData},
+  data() {
+    return {
+      activeIndex:1,
+      options1: [
+        {
+          name: "按年",
+        },
+        {
+          name: "按季度",
+        },
+      ],
+      loadingOne: false,
+      tableOneData: [],
+      loadingTwo: false,
+      tableTwoData: [],
+      honorData: {
+        count1:0,
+        count2:0,
+        count3:0,
+        count4:0,
+        count5:0,
+        count6:0,
+      },
+      honorTableData:[],
+      titleDialog:"",
+      tabHeader: undefined,
+      time:"",
+    }
+  },
+  mounted(){
+    this.getProjectList();
+    this.getHonorList();
+    this.getIndustryDepthList();
+    // this.init()
+    this.time = this.getNowFormatDate();
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
+  methods:{
+    getNowFormatDate() {
+      let date = new Date(),
+      year = date.getFullYear(), //获取完整的年份(4位)
+      month = date.getMonth() + 1, //获取当前月份(0-11,0代表1月)
+      strDate = date.getDate() // 获取当前日(1-31)
+      if (month < 10) month = `0${month}` // 如果月份是个位数，在前面补0
+      if (strDate < 10) strDate = `0${strDate}` // 如果日是个位数，在前面补0
+      return `${year}-${month}-${strDate}`
+    },
+    // 获取荣誉情况
+    getHonorList(){
+      honor().then(res=>{
+        this.honorTableData = res.data;
+        res.data.map(item=>{
+          if(item.projectBigName == "省市服务业领军企业") {
+            this.honorData.count1 = item.count1
+          } else if(item.projectBigName == "两业融合试点单位") {
+            this.honorData.count2 = item.count1
+          } else if(item.projectBigName == "工业设计中心") {
+            this.honorData.count3 = item.count1
+          } else if(item.projectBigName == "服务型制造示范") {
+            this.honorData.count4 = item.count1
+          } else if(item.projectBigName == "省级现代服务业集聚区") {
+            this.honorData.count5 = item.count1
+          } else if(item.projectBigName == "楼宇经济") {
+            this.honorData.count6 = item.count1
+          }
+        })
+      })
+    },
+    // 获取行业纵深情况
+    getIndustryDepthList(){
+      this.loadingOne = true;
+      getIndustryDepth().then(res=>{
+        this.loadingOne = false;
+        this.tableOneData = res.data
+      })
+    },
+    // 获取项目追踪情况列表
+    getProjectList(){
+      this.loadingTwo = true;
+      projectTracking().then(res=>{
+        this.loadingTwo = false;
+        this.tableTwoData = res.data;
+      })
+    },
+    
+    // 荣誉情况查看更多数据按钮
+    honorBtn(){
+      this.$refs.honorDialog.open(this.honorTableData);
+    },
+    // 总部企业企业数量按钮
+    headqEnterpriseBtn(){
+      this.$refs.headqEnterprise.open();
+    },
+    // 企业情况上方四个卡片数量按钮
+    enterInfo(title) {
+      this.titleDialog = title;
+      this.$refs.serviceIndustry.open()
+    },
+    // 行业纵深情况查看详情按钮
+    industryBtn(){
+      this.$refs.collectDialog.open();
+    },
+    projectBtn(){
+      this.$router.push({
+        name: 'EnterpriseDirectory',
+      })
+    },
+    active(e) {
+      this.activeIndex = e;
+      this.$refs.echartData.getService(e);
+    },
+    // 修改table背景色
+    tableRowClassName({row, rowIndex}){
+      if (rowIndex % 2 !== 0) {
+        return 'evenNumber-row';
+      }
+      return '';
+    },
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('dataCloudMap-right-box'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('project-trace-title-id'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      this.tabHeader = elementHeight - headerHeight - 40;
+    }
+  },
+}
 </script>
-
-<style></style>
diff --git a/src/views/entLogin.vue b/src/views/entLogin.vue
new file mode 100644
index 0000000..0dd908b
--- /dev/null
+++ b/src/views/entLogin.vue
@@ -0,0 +1,317 @@
+<template>
+  <div class="login">
+    <el-form
+      ref="loginForm"
+      :model="loginForm"
+      :rules="loginRules"
+      class="login-form"
+    >
+      <!-- <h3 class="title">若依后台管理系统</h3> -->
+      <el-tabs v-model="userType" @tab-click="handleClick">
+        <el-tab-pane label="企业用户登录" name="01"></el-tab-pane>
+        <el-tab-pane label="政务用户登录" name="02"></el-tab-pane>
+      </el-tabs>
+      <el-form-item prop="username" v-show="userType == '02'">
+        <el-input
+          v-model="loginForm.username"
+          type="text"
+          auto-complete="off"
+          placeholder="账号"
+        >
+          <svg-icon
+            slot="prefix"
+            icon-class="user"
+            class="el-input__icon input-icon"
+          />
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="password" v-show="userType == '02'">
+        <el-input
+          v-model="loginForm.password"
+          type="password"
+          auto-complete="off"
+          placeholder="密码"
+          @keyup.enter.native="handleLogin"
+        >
+          <svg-icon
+            slot="prefix"
+            icon-class="password"
+            class="el-input__icon input-icon"
+          />
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="code" v-if="captchaEnabled && userType == '02'">
+        <el-input
+          v-model="loginForm.code"
+          auto-complete="off"
+          placeholder="验证码"
+          style="width: 63%"
+          @keyup.enter.native="handleLogin"
+        >
+          <svg-icon
+            slot="prefix"
+            icon-class="validCode"
+            class="el-input__icon input-icon"
+          />
+        </el-input>
+        <div class="login-code">
+          <img :src="codeUrl" @click="getCode" class="login-code-img" />
+        </div>
+      </el-form-item>
+      <el-checkbox
+        v-model="loginForm.rememberMe"
+        v-show="userType == '02'"
+        style="margin: 0px 0px 25px 0px"
+        >记住密码</el-checkbox
+      >
+      <el-form-item style="width: 100%" v-if="userType == '02'">
+        <el-button
+          :loading="loading"
+          size="medium"
+          type="primary"
+          style="width: 100%"
+          @click.native.prevent="handleLogin"
+        >
+          <span v-if="!loading">登 录</span>
+          <span v-else>登 录 中...</span>
+        </el-button>
+        <el-button
+          size="medium"
+          type="primary"
+          style="width: 100%;margin-left: 0;margin-top: 20px;"
+          @click.native.prevent="changeHttp"
+        >
+          <span>政务通统一身份认证登录</span>
+          <!-- <span v-else>登 录 中...</span> -->
+        </el-button>
+        <div style="float: right" v-if="register">
+          <router-link class="link-type" :to="'/register'"
+            >立即注册</router-link
+          >
+        </div>
+      </el-form-item>
+      <el-form-item style="width: 100%" v-else class="enterBtnLogin">
+        <div class="wai-box">
+          <el-button
+            :loading="loading"
+            size="medium"
+            type="primary"
+            style="width: 100%"
+            @click.native.prevent="handleLogin"
+          >
+            <span v-if="!loading">企业登录</span>
+            <span v-else>登 录 中...</span>
+          </el-button>
+        </div>
+      </el-form-item>
+    </el-form>
+    <!--  底部  -->
+    <!-- <div class="el-login-footer">
+      <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>
+    </div> -->
+
+
+    <!-- 正式环境部署命令 ： unzip /var/www/html/dist.zip -d /var/www/html/bms -->
+    <!-- process.env.VUE_APP_BASE_API 替换 location.origin + '/api'  publicPath： 由/dome/JinJiHu 更换为./ -->
+  </div>
+</template>
+
+<script>
+import { getCodeImg } from "@/api/login";
+import Cookies from "js-cookie";
+import { encrypt, decrypt } from "@/utils/jsencrypt";
+
+export default {
+  name: "Login",
+  data() {
+    return {
+      codeUrl: "",
+      loginForm: {
+        username: "",  // admin
+        password: "",  // admin123
+        rememberMe: false,
+        code: "",
+        uuid: "",
+      },
+      loginRules: {
+        username: [
+          { required: true, trigger: "blur", message: "请输入您的账号" },
+        ],
+        password: [
+          { required: true, trigger: "blur", message: "请输入您的密码" },
+        ],
+        code: [{ required: true, trigger: "change", message: "请输入验证码" }],
+      },
+      loading: false,
+      // 验证码开关
+      captchaEnabled: true,
+      // 注册开关
+      register: false,
+      redirect: undefined,
+      userType:"01",
+    };
+  },
+  watch: {
+    $route: {
+      handler: function (route) {
+        this.redirect = route.query && route.query.redirect;
+      },
+      immediate: true,
+    },
+  },
+  created() {
+    // this.getCode();
+    // this.getCookie();
+    location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login"
+  },
+  methods: {
+    handleClick(tab){
+     if(tab.index == "1") {
+      this.getCode();
+     }
+    },
+    getCode() {
+      getCodeImg().then((res) => {
+        this.captchaEnabled =
+          res.captchaEnabled === undefined ? true : res.captchaEnabled;
+        if (this.captchaEnabled) {
+          this.codeUrl = "data:image/gif;base64," + res.img;
+          this.loginForm.uuid = res.uuid;
+        }
+      });
+    },
+    getCookie() {
+      const username = Cookies.get("username");
+      const password = Cookies.get("password");
+      const rememberMe = Cookies.get("rememberMe");
+      this.loginForm = {
+        username: username === undefined ? this.loginForm.username : username,
+        password:
+          password === undefined ? this.loginForm.password : decrypt(password),
+        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
+      };
+    },
+    handleLogin() {
+      if(this.userType == '01') {
+        location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login"
+      } else {
+        this.$refs.loginForm.validate((valid) => {
+          if (valid) {
+            this.loading = true;
+            if (this.loginForm.rememberMe) {
+              Cookies.set("username", this.loginForm.username, { expires: 30 });
+              Cookies.set("password", encrypt(this.loginForm.password), {
+                expires: 30,
+              });
+              Cookies.set("rememberMe", this.loginForm.rememberMe, {
+                expires: 30,
+              });
+            } else {
+              Cookies.remove("username");
+              Cookies.remove("password");
+              Cookies.remove("rememberMe");
+            }
+            this.$store
+              .dispatch("Login", {...this.loginForm,userType:this.userType})
+              .then(() => {
+                this.$router.push({ path: this.redirect || "/" }).catch(() => {});
+              })
+              .catch(() => {
+                this.loading = false;
+                if (this.captchaEnabled) {
+                  if(this.userType == "02") {
+                    this.getCode();
+                  }
+                }
+              });
+          }
+        });
+      }
+    },
+    changeHttp(){
+      location.href = "https://qyt.sipac.gov.cn/sipsg-enterprise-mobile-manage/#/login"
+    },
+  },
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.login {
+  position: relative;
+  height: 100%;
+  background: url("../assets/images/login-background.jpg") no-repeat;
+  background-size: 100% 100%;
+}
+.title {
+  margin: 0px auto 30px auto;
+  text-align: center;
+  color: #707070;
+}
+
+.enterBtnLogin {
+  height: 100%;
+  .wai-box {
+    height: 100%;
+    margin-top: 30%;
+  }
+}
+
+.login-form {
+  position: absolute;
+  top: 45%;
+  left: 68%;
+  transform: translate(-50%, -50%);
+  border-radius: 6px;
+  background: #ffffff;
+  width: 400px;
+  height: 420px;
+  padding: 25px 25px 5px 25px;
+  box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.15);
+  .el-input {
+    height: 38px;
+    input {
+      height: 38px;
+    }
+  }
+  .input-icon {
+    height: 39px;
+    width: 14px;
+    margin-left: 2px;
+  }
+  ::v-deep .el-tabs {
+    .el-tabs__nav .el-tabs__item {
+      width: 50%;
+      text-align: center;
+    }
+  }
+}
+.login-tip {
+  font-size: 13px;
+  text-align: center;
+  color: #bfbfbf;
+}
+.login-code {
+  width: 33%;
+  height: 38px;
+  float: right;
+  img {
+    cursor: pointer;
+    vertical-align: middle;
+  }
+}
+.el-login-footer {
+  height: 40px;
+  line-height: 40px;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+  color: #fff;
+  font-family: Arial;
+  font-size: 12px;
+  letter-spacing: 1px;
+}
+.login-code-img {
+  height: 38px;
+}
+</style>
diff --git a/src/views/enterpriselibrary/enterInfo/components/tabFour/index.vue b/src/views/enterpriselibrary/enterInfo/components/tabFour/index.vue
index bb79007..d50b990 100644
--- a/src/views/enterpriselibrary/enterInfo/components/tabFour/index.vue
+++ b/src/views/enterpriselibrary/enterInfo/components/tabFour/index.vue
@@ -40,7 +40,7 @@
       </el-row>
     </div>
     <div class="memo-bottom" v-loading="loading">
-      <el-card :body-style="{ padding: '0px' }" v-for="(item,index) in memoList" :key="index"> <!-- 去除阴影 shadow="never -->
+      <el-card :body-style="{ 'padding': '0px' }" v-for="(item,index) in memoList" :key="index"> <!-- 去除阴影 shadow="never -->
         <div slot="header" class="clearfix">
           <div class="clearfix-left">
             <span>{{ item.name }}</span>
@@ -279,7 +279,7 @@ export default {
         type: "warning",
       })
       .then(() => {
-        delJMemorandum({ id: row.id }).then((res) => {
+        delJMemorandum(row.id).then((res) => {
           this.getList();
           this.$message({
             type: "success",
diff --git a/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue b/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue
index 2f6b864..fdbf4d1 100644
--- a/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue
+++ b/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="project-info-box">
-    <div class="project-info-title">【企业基本信息】</div>
-    <el-descriptions class="margin-top" :column="3" size="medium" border v-loading="loading">
+  <div class="project-info-box L-unitInfo" id="L-One-main">
+    <div class="project-info-title" id="L-One-title">【企业基本信息】</div>
+    <el-descriptions class="enter-one-top" :style="style" :column="3" size="medium" border v-loading="loading">
       <!-- <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" 
         v-for="(item,index) in info" 
         :key="index" 
@@ -10,51 +10,122 @@
       >
         {{ item.value }}
       </el-descriptions-item> -->
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="企业名称">
+        {{ info.qymc }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="标识证号">
+        {{ info.bszh }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="统一社会信用代码">
+        {{ info.tyshxydm }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="企业注册号">
+        {{ info.qyzch }}
+      </el-descriptions-item>
       <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="组织机构代码">
-        {{ info.institutionCode }}
+        {{ info.zzjgdm }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="经济类型代码">
+        {{ info.jjlxdm }}
       </el-descriptions-item>
-      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="登记注册统计类别">
-        {{ info.statisticalCategories }}
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="经济类型名称">
+        {{ info.jjlxmc }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="企业类型代码">
+        {{ info.qylxdm }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="企业类型名称">
+        {{ info.qylxmc }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="注册资金">
+        {{ info.zczj }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="注册资本币种">
+        {{ info.zczbbz }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="注册类型">
+        {{ info.zclx }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="经营或营业起始日期">
+        {{ info.jyhyyqsrq }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="经营或营业截至日期">
+        {{ info.jyhyyjzrq }}
       </el-descriptions-item>
       <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="行业代码">
-        {{ info.industryCode }}
+        {{ info.hydm }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="行业名称">
+        {{ info.hymc }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="行业门类">
+        {{ info.hymc }}
       </el-descriptions-item>
-      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="注册资本">
-        {{ info.registeredCapital }}
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="产业类型">
+        {{ info.cylx }}
       </el-descriptions-item>
-      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="所属行业">
-        {{ info.industry }}
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="企业住所">
+        {{ info.qyzs }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="经营场所">
+        {{ info.jycs }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="经营场所行政区划">
+        {{ info.jycsxzqh }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="邮政编码">
+        {{ info.yzbm }}
       </el-descriptions-item>
       <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="成立日期">
-        {{ info.establishDate }}
+        {{ info.clrq }}
       </el-descriptions-item>
-      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="曾用名">
-        {{ info.formerName }}
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="信用等级">
+        {{ info.xydj }}
       </el-descriptions-item>
-      <!-- <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="组织机构代码">
-        {{ info.institutionCode }}
-      </el-descriptions-item> -->
-      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="注册地址">
-        {{ info.enrollAddress }}
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="企业规模">
+        <!-- {{ info.qygm }} -->
+        {{ info.type == 1 ? "规上服务业" : info.type == 2 ? "其他" : ""}}
       </el-descriptions-item>
-      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="注册类型">
-        {{ info.enrollType }}
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="法定代表人姓名">
+        {{ info.fddbrxm }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="法定代表人证件号码">
+        {{ info.fddbrzjhm }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="登记机关">
+        {{ info.djjg }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="核准日期">
+        {{ info.hzrq }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="经营状态">
+        {{ info.jyzt }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="状态日期">
+        {{ info.ztrq }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="注销日期">
+        {{ info.zxrq }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="吊销日期">
+        {{ info.dxrq }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="联系电话">
+        {{ info.lxdh }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="是否园区内">
+        {{ info.sfyqn }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="入库时间">
+        {{ info.dwTimestamp }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="来源机构">
+        {{ info.dwLyjg }}
       </el-descriptions-item>
       <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="经营范围">
-        {{ info.business }}
+        {{ info.jyfw }}
       </el-descriptions-item>
     </el-descriptions>
-    <!-- <el-descriptions class="margin-top-file" :column="3" size="medium" v-loading="loading">
-      <el-descriptions-item labelClassName="tabOneFileLabel" contentClassName="tabOneFileContent" 
-        v-for="(item,index) in fileInfo" 
-        :key="index" 
-        :label="item.key"
-      >
-        <a :href="item.url" target="_blank">
-          {{ item.value }}
-        </a>
-      </el-descriptions-item>
-    </el-descriptions> -->
   </div>
 </template>
 <script>
@@ -96,13 +167,11 @@ export default {
       info:[],
       fileInfo:[],
       loading:false,
-      VUE_APP_BASE_API:process.env.VUE_APP_BASE_API,
+      style:{
+        height: null
+      }
     }
   },
-  mounted() {
-    // console.log(this.info,"tabOne");
-    // this.loading = true;
-  },
   methods:{
   },
 }
diff --git a/src/views/enterpriselibrary/enterInfo/components/tabThree/index.vue b/src/views/enterpriselibrary/enterInfo/components/tabThree/index.vue
index e6c3ace..2dcb835 100644
--- a/src/views/enterpriselibrary/enterInfo/components/tabThree/index.vue
+++ b/src/views/enterpriselibrary/enterInfo/components/tabThree/index.vue
@@ -6,10 +6,20 @@
         <el-table v-loading="loading" border class="tabTwo-table" :data="tableData" :row-class-name="tableRowClassName" :max-height="tabHeader">
           <el-table-column type="index" width="55" label="序号"/>
           <el-table-column label="年份" prop="projectYear" />
-          <el-table-column label="项目名称" prop="projectName" />
-          <el-table-column label="项目分类" prop="projectClassify">
+          <!-- <el-table-column label="项目名称" prop="projectName" /> -->
+          <el-table-column label="项目大类" prop="projectClassify">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.jjh_project_type" :value="scope.row.projectClassify"/>
+              <dict-tag :options="dict.type.project_categories" :value="scope.row.projectBigType"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="项目中类" prop="projectMiddleType">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.project_middle_type" :value="scope.row.projectMiddleType"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="项目小类" prop="projectSmallType">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.project_small_type" :value="scope.row.projectSmallType"/>
             </template>
           </el-table-column>
           <el-table-column label="状态" prop="status" class-name="table-status">
@@ -80,7 +90,7 @@ import { jProject } from "@/api/jin_ji_hu/project/index"
 export default {
   components:{myPagination},
   name:"tabThree",
-  dicts: ['jjh_project_type', 'bms_approval_status'],
+  dicts: [ "project_middle_type", "project_small_type", "project_categories"],
   props:{
     creditCode:{
       type:String,
diff --git a/src/views/enterpriselibrary/enterInfo/components/tabTwo/index.vue b/src/views/enterpriselibrary/enterInfo/components/tabTwo/index.vue
index b32a183..3d4229d 100644
--- a/src/views/enterpriselibrary/enterInfo/components/tabTwo/index.vue
+++ b/src/views/enterpriselibrary/enterInfo/components/tabTwo/index.vue
@@ -1,72 +1,334 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: JC9527
- * @Date: 2024-05-29 14:05:08
- * @LastEditors: JC9527
- * @LastEditTime: 2024-06-03 09:47:49
--->
 <template>
-  <div class="L-unitInfo" id="L-contacts-main">
+  <div class="L-unitInfo enter-contacts-list" id="L-contacts-main">
     <div id="L-header-list" class="project-info-title">【联络人列表】</div>
     <section>
-      <el-table v-loading="loading" class="tabTwo-table" border :data="tableData" :row-class-name="tableRowClassName" :max-height="tabHeader">
-        <el-table-column label="联系人姓名" prop="contactName" />
-        <el-table-column label="公司职务" prop="firmOffice" />
-        <el-table-column label="手机号码" prop="phone" />
-        <el-table-column label="邮箱" prop="email" />
+      <el-table v-loading="loading" class="tabTwo-table" border :data="tableData" :row-class-name="tableRowClassName" >  <!-- :max-height="tabHeader" -->
+        <el-table-column label="联络人姓名" prop="llrxm" />
+        <el-table-column label="联络人职务" prop="llrzw" />
+        <el-table-column label="电子邮箱" prop="dzyx" />
+        <el-table-column label="移动电话" prop="yddh" />
+        <el-table-column label="固定电话" prop="gddh" />
+        <el-table-column label="联络人编号" prop="llrbh" />
+        <el-table-column label="入库时间" prop="dwTimestamp" />
+        <el-table-column label="来源机构" prop="dwLyjg" />
       </el-table>
     </section>
+    <el-row>
+      <el-form :inline="true" :model="formInline" size="small" ref="queryFrom">
+        <el-col :span="9" style="display: flex; align-items: center;">
+          <div id="L-header-list" class="project-info-title" style="margin-top: 20px;margin-right: 10px;">【常用联系人列表】</div>
+          <el-button type="primary" icon="el-icon-plus" size="mini" @click="importBtn" style="margin-bottom: 5px;">新增常用联系人</el-button>
+        </el-col>
+        <el-col :span="15" v-if="roles.includes('gov') || roles.includes('other-gov') ">
+          <el-form-item label="联络人姓名">
+            <el-input v-model.trim="formInline.contactName" placeholder="请输入联络人姓名"></el-input>
+          </el-form-item>
+          <el-form-item label="联络人职务">
+            <el-input v-model.trim="formInline.contactOffice" placeholder="请输入联络人职务"></el-input>
+          </el-form-item>
+          <el-form-item class="query-item">
+              <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
+              <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
+            </el-form-item>
+        </el-col>
+      </el-form>
+    </el-row>
+    
+    <section>
+      <el-table v-loading="loadingTwo" class="tabTwo-table" border :data="tableTwoData" :row-class-name="tableRowClassName" >  <!-- :max-height="tabHeader" -->
+        <el-table-column label="联络人姓名" prop="contactName" />
+        <el-table-column label="联络人职务" prop="contactOffice" />
+        <el-table-column label="手机号码" prop="contactPhone" />
+        <el-table-column label="邮箱" prop="contactEmail" />
+        <el-table-column label="操作" prop="userId" class-name="table-operation" width="180px">
+          <template slot-scope="scope">
+            <span class="look-info" @click="goInfo(scope.row)">查看详情</span>
+            <span class="edit-info" @click="editInfo(scope.row)">编辑</span>
+            <span class="del-info" @click="delInfo(scope.row)">删除</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </section>
+
+    <my-dialog :title="title" @close="importClose" @confirm="confirm" ref="importProject" closeText="关闭" :myclass="true">
+      <el-form :model="addFrom" size="small" ref="importFrom" label-width="180px" :rules="rules" class="newArticle" :disabled="title == '查看常用联系人' ? true : false">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="企业统一社会信用代码：" class="importFormItem">
+              <el-input v-model.trim="addFrom.enterpriseCode" placeholder="请输入内容" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="企业名称：" class="importFormItem">
+              <el-input v-model.trim="addFrom.enterpriseName" placeholder="请输入内容" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="常用联系人名称：" class="importFormItem" prop="contactName">
+              <el-input v-model.trim="addFrom.contactName" placeholder="请输入常用联系人名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="常用联系人公司职务：" class="importFormItem" prop="contactOffice">
+              <el-input v-model.trim="addFrom.contactOffice" placeholder="请输入常用联系人公司职务"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="常用联系人手机号码：" class="importFormItem" prop="contactPhone">
+              <el-input v-model.trim="addFrom.contactPhone" placeholder="请输入常用联系人手机号码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="常用联系人邮箱：" class="importFormItem" prop="contactEmail">
+              <el-input v-model.trim="addFrom.contactEmail" placeholder="请输入常用联系人邮箱"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </my-dialog>
   </div>
 </template>
 <script>
 import { getjContacts } from "@/api/jin_ji_hu/enterList"
+import myDialog from "@/views/components/myDialog/index.vue"
+import { getJEnterpriseContact, jEnterpriseContactNew, jEnterpriseContactChange, jEnterpriseContactId, jEnterpriseContactDel } from "@/api/jin_ji_hu/infoMaintain"
 export default {
+  components:{ myDialog},
   name:"tabTwo",
   data() {
+    //验证邮箱的规则
+    var checkEmail = (rule,value,cb) => {
+      //验证邮箱的正则表达式
+      const regEmail = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/;
+      if(regEmail.test(value)){
+        //合法的邮箱
+        return cb();
+      }
+      //邮箱不合法
+      cb(new Error('请输入合法的邮箱！'));
+    }
+    //验证手机号的规则
+    var checkMobile = (rule,value,cb) =>{
+      const regMobile = /^(0|86|17951)?(13[0-9]|15[0123456789]|17[678]|18[0-9]|14[57])[0-9]{8}$/;
+      if(regMobile.test(value)){
+        //合法的手机号
+        return cb();
+      }
+      //手机号不合法
+      cb(new Error('请输入合法的手机号！'));
+    }
     return {
       tableData:[],
+      tableTwoData:[],
       loading:false,
+      loadingTwo:false,
       tabHeader: null,
+      roles: this.$store.state.user.roles,
+      userType: this.$store.state.user.userType,
+      formInline:{
+        contactName:"",
+        contactOffice:""
+      },
+      addFrom: {
+        contactName:"",
+        contactOffice:"",
+        contactPhone:"",
+        contactEmail:"",
+        enterpriseCode:"",
+        enterpriseName:"",
+      },
+      rules:{
+        contactName:[
+          { required: true, message: '请填写常用联系人姓名', trigger: 'blur' }
+        ],
+        contactOffice:[
+          { required: true, message: '请填写常用联系人公司职务', trigger: 'blur' }
+        ],
+        contactPhone:[
+          { required: true, message: '请填写常用联系人手机号码', trigger: 'blur' },
+          {validator: checkMobile, trigger: 'blur'}
+        ],
+        contactEmail:[
+          { required: true, message: '请填写常用联系人邮箱', trigger: 'blur' },
+          {validator: checkEmail, trigger: 'blur'}
+        ],
+      },
+      title:"新增常用联系人",
+      infoVisible:false,
     }
   },
   props:{
     creditCode:{
       type:String,
       default:""
-    }
+    },
+    detailedInfo:{
+      type:Object,
+      default:()=>{
+        return {};
+      }
+    },
   },
   mounted() {
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
     this.getList()
+    this.getTwoList()
   },
   destroyed() {
     window.removeEventListener('resize', this.cancalDebounce);
   },
   methods:{
-    // 修改table背景色
-    tableRowClassName({row, rowIndex}){
-      if (rowIndex % 2 !== 0) {
-        return 'evenNumber-row';
-      }
-      return '';
-    },
     // 查询联络人列表
     getList(){
       this.loading = true;
-      getjContacts({creditCode: this.creditCode || this.$store.state.user.name}).then(res=>{
+      getjContacts({tyshxydm: this.creditCode || this.$store.state.user.name}).then(res=>{
         this.tableData = res.data
         this.loading = false;
       })
     },
+    // 查询常用联系人
+    getTwoList(){
+      this.loadingTwo = true;
+      getJEnterpriseContact({enterpriseCode: this.creditCode || this.$store.state.user.name, ...this.formInline}).then(res=>{
+        this.tableTwoData = res.data.records;
+        this.loadingTwo = false;
+      })
+    },
+    // 重置
+    resetQuery(){
+      this.formInline = {
+        contactName:"",
+        contactOffice:"",
+      }
+      this.getTwoList();
+    },
+    // 搜索
+    handleQuery(){
+      this.getTwoList();
+    },
+    // 新增联系人
+    importBtn(){
+      this.title = "新增常用联系人";
+      // if(this.userType == "01"){
+
+      // } else {
+      //   this.addFrom.enterpriseCode = this.creditCode;
+      //   this.addFrom.enterpriseName = this.info.qymc;
+      // }
+      this.addFrom.enterpriseCode = this.detailedInfo.tyshxydm;
+      this.addFrom.enterpriseName = this.detailedInfo.qymc;
+      console.log(this.detailedInfo);
+      this.$refs.importProject.open();
+    },
+    // 查看详情
+    goInfo(row){
+      this.title = "查看常用联系人"
+      jEnterpriseContactId(row.id).then((res=>{
+        if(res.code == 200) {
+          this.addFrom = res.data;
+          this.$refs.importProject.open();
+        }
+      }))
+    },
+    // 编辑
+    editInfo(row){
+      this.title = "修改常用联系人"
+      // this.addFrom.enterpriseCode = this.name;
+      // this.addFrom.enterpriseName = this.nickName;
+      jEnterpriseContactId(row.id).then((res)=>{
+        if(res.code == 200) {
+          this.addFrom = res.data;
+          this.$refs.importProject.open();
+        }
+      })
+    },
+    // 关闭事件触发
+    importClose(){
+      this.$nextTick(()=>{
+        this.$refs.importFrom.resetFields();
+        this.$refs.importProject.close();
+        this.addFrom = {
+          contactName:"",
+          contactOffice:"",
+          contactPhone:"",
+          contactEmail:"",
+          enterpriseCode:"",
+          enterpriseName:"",
+        }
+      })
+    },
+    // 提交按钮
+    confirm(){
+      this.$refs.importFrom.validate((valid) => {
+        if (valid) {
+          // console.log(this.addFrom);
+          let id = this.addFrom.id ? this.addFrom.id : null;
+          if(id) {
+            jEnterpriseContactChange(this.addFrom).then((res)=>{
+              if(res.code == 200) {
+                this.getTwoList();
+                this.importClose();
+                this.$message({
+                  type: "success",
+                  message: "修改成功!",
+                });
+              }
+            })
+          } else {
+            jEnterpriseContactNew(this.addFrom).then((res)=>{
+              if(res.code == 200) {
+                this.getTwoList();
+                this.importClose();
+                this.$message({
+                  type: "success",
+                  message: "新增成功!",
+                });
+              }
+            })
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    // 删除
+    delInfo(row){
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          jEnterpriseContactDel(row.id).then((res) => {
+            this.getTwoList();
+            this.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    // 修改table背景色
+    tableRowClassName({row, rowIndex}){
+      if (rowIndex % 2 !== 0) {
+        return 'evenNumber-row';
+      }
+      return '';
+    },
     // 屏幕尺寸变化
     cancalDebounce(){
       const element = document.getElementById('L-contacts-main'); // 通过元素的 ID 获取元素
       const header = document.getElementById('L-header-list'); // 通过元素的 ID 获取元素
       const elementHeight = element.offsetHeight;
       const headerHeight = header.offsetHeight;
-      this.tabHeader = elementHeight - headerHeight - 100;
+      this.tabHeader = elementHeight - headerHeight;
     }
   },
 }
diff --git a/src/views/enterpriselibrary/enterInfo/index.vue b/src/views/enterpriselibrary/enterInfo/index.vue
index 721b59c..22ec490 100644
--- a/src/views/enterpriselibrary/enterInfo/index.vue
+++ b/src/views/enterpriselibrary/enterInfo/index.vue
@@ -2,13 +2,13 @@
   <div class="L-public-main projectInfo" id="L-size-main">
     <el-row :gutter="10">
       <el-col :span="24">
-        <div class="left-info" id="L-header">
+        <div class="left-info enter-left-info" id="L-header">
           <div class="project-info-title">【企业信息】</div>
           <el-descriptions class="margin-top" :column="2" size="medium" border v-loading="loading">
-            <el-descriptions-item label="企业名称">{{ info.enterpriseName }}</el-descriptions-item>
-            <el-descriptions-item label="法定代表人" contentClassName="info-link">{{ info.legalEntity }}</el-descriptions-item>
-            <el-descriptions-item label="统一社会信用代码" contentClassName="info-link">{{ info.creditCode }}</el-descriptions-item>
-            <el-descriptions-item label="企业类型">{{ info.enterpriseType }}</el-descriptions-item>
+            <el-descriptions-item label="企业名称">{{ info.qymc }}</el-descriptions-item>
+            <el-descriptions-item label="法定代表人" contentClassName="info-link">{{ info.fddbrxm }}</el-descriptions-item>
+            <el-descriptions-item label="统一社会信用代码" contentClassName="info-link">{{ info.tyshxydm }}</el-descriptions-item>
+            <el-descriptions-item label="企业类型">{{ info.qylxmc }}</el-descriptions-item>
           </el-descriptions>
         </div>
         <div class="left-tabs enter-tabs">
@@ -17,7 +17,7 @@
           </div>
           <div class="tabs-bottom" :style="tabStyle">
             <tab-one v-if="active == 0" :detailedInfo="info"></tab-one>
-            <tab-two v-if="active == 1" :creditCode="$route.query.creditCode"></tab-two>
+            <tab-two v-if="active == 1" :creditCode="$route.query.creditCode" :detailedInfo="info"></tab-two>
             <tab-three v-if="active == 2" :creditCode="$route.query.creditCode"></tab-three>
             <tab-four v-if="active == 3" :id="$route.query.userId"></tab-four>
           </div>
@@ -26,10 +26,9 @@
           <el-button type="primary" @click="goBack">返回</el-button>
           <!-- <el-button type="primary">导出企业清单</el-button> -->
         </div>
-        <div class="enter-footTabs" v-else>
-          <!-- <el-button type="primary" @click="goBack">返回</el-button> -->
+        <!-- <div class="enter-footTabs" v-else>
           <el-button type="primary" @click="editEnterInfo">编辑</el-button>
-        </div>
+        </div> -->
       </el-col>
     </el-row>
 
@@ -279,7 +278,7 @@ export default {
       const elementHeight = element.offsetHeight;
       const headerHeight = header.offsetHeight;
       const paginationtHeight = pagination.offsetHeight;
-      this.tabStyle.height = (elementHeight - headerHeight - paginationtHeight - 20) + 'px';
+      this.tabStyle.height = (elementHeight - headerHeight - paginationtHeight - 74) + 'px';
     }
   },
 }
diff --git a/src/views/enterpriselibrary/index.vue b/src/views/enterpriselibrary/index.vue
index b2a5d96..86b25b6 100644
--- a/src/views/enterpriselibrary/index.vue
+++ b/src/views/enterpriselibrary/index.vue
@@ -4,8 +4,24 @@
       <header id="L-header">
         <el-form :inline="true" :model="formInline" size="small" class="demo-form-inline" ref="queryFrom">
           <el-col :span="20">
-            <el-form-item label="企业名称：" prop="enterpriseName">
-              <el-input v-model.trim="formInline.enterpriseName" placeholder="请输入内容"></el-input>
+            <el-form-item label="企业名称：" prop="qymc">
+              <el-input v-model.trim="formInline.qymc" placeholder="请输入内容"></el-input>
+            </el-form-item>
+            <el-form-item label="企业规模：" prop="type">
+              <el-select class="ignoreElement" v-model="formInline.type" placeholder="请选择">
+                <el-option
+                  label="全部"
+                  value="">
+                </el-option>
+                <el-option
+                  label="规上服务业"
+                  value="1">
+                </el-option>
+                <el-option
+                  label="其他"
+                  value="2">
+                </el-option>
+              </el-select>
             </el-form-item>
             <!-- <el-form-item label="统一社会信用代码：" prop="enterUnit">
               <el-input v-model.trim="formInline.enterUnit" placeholder="请输入内容"></el-input>
@@ -37,20 +53,24 @@
       </header>
       <section>
         <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" :height="tabHeader" :max-height="tabHeader">
-          <el-table-column label="企业名称" prop="enterpriseName" />
-          <el-table-column label="统一社会信用代码" prop="creditCode" />
+          <el-table-column label="企业名称" prop="qymc" />
+          <el-table-column label="统一社会信用代码" prop="tyshxydm" />
           <!-- <el-table-column label="法定代表人" prop="policyLevel" />
           <el-table-column label="经营状态" prop="enterTime" />
           <el-table-column label="成立日期" prop="createBy" />
           <el-table-column label="注册资本" prop="createTime" /> -->
-          <el-table-column label="组织机构代码" prop="institutionCode" />
-          <el-table-column label="登记注册统计类别" prop="statisticalCategories" />
-          <el-table-column label="行业代码" prop="industryCode" />
-          <el-table-column label="企业类型" prop="enterpriseType" />
-          <el-table-column label="所属行业" prop="industry" />
-          <el-table-column label="成立日期" prop="createTime">
+          <el-table-column label="经济类型" prop="jjlxmc" />
+          <!-- <el-table-column label="登记注册统计类别" prop="statisticalCategories" /> -->
+          <el-table-column label="企业类型" prop="qylxmc" />
+          <el-table-column label="行业名称" prop="hymc" />
+          <el-table-column label="企业规模" prop="cylx">
+            <template slot-scope="scope">
+              <span>{{ scope.row.type == 1 ? "规上服务业" : scope.row.type == 2 ? "其他" : ""}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="成立日期" prop="clrq" width="200">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d}") }}</span>
+              <span>{{ parseTime(scope.row.clrq,"{y}-{m}-{d}") }}</span>
             </template>
           </el-table-column>
           <!-- <el-table-column label="组织机构代码" prop="createTime" />
@@ -59,7 +79,7 @@
           <el-table-column label="注册地址" prop="createTime" />
           <el-table-column label="注册类型" prop="createTime" />
           <el-table-column label="经营范围" prop="createTime" /> -->
-          <el-table-column label="操作" prop="userId" class-name="table-operation">
+          <el-table-column label="操作" prop="userId" class-name="table-operation" width="120">
             <template slot-scope="scope">
               <span class="look-info" @click="goInfo(scope.row)">查看详情</span>
               <!-- <span class="edit-info" @click="editInfo(scope.row)">编辑</span>
@@ -70,10 +90,10 @@
         <my-pagination 
           id="L-pagination"
           :total="total"
-          :page="pagination.pageNum"
-          :limit="pagination.pageSize"
+          :page="pagination.current"
+          :limit="pagination.size"
           @pagination="getPagination"
-          :current-page.sync="pagination.pageNum" 
+          :current-page.sync="pagination.current" 
         ></my-pagination>
       </section>
     </div>
@@ -139,12 +159,13 @@ export default {
       deptId: this.$store.state.user.deptId,
       total:0,
       pagination: {
-        pageNum:1,
-        pageSize:10,
+        current:1,
+        size:10,
       },
       loading:false,
       formInline: {
-        enterpriseName: '',
+        qymc: '',
+        type: null,
       },
       tableData:[],
       tabHeader: undefined,
@@ -211,21 +232,21 @@ export default {
       this.loading = true;
       getEnterList(this.pagination).then(res=>{
         this.loading = false;
-        this.total = res.total;
-        this.tableData = res.rows;
+        this.total = res.data.total;
+        this.tableData = res.data.records;
       })
     },
     // 获取页码
     getPagination(pages) {
-      this.pagination.pageNum = pages.page;
-      this.pagination.pageSize = pages.limit;
+      this.pagination.current = pages.page;
+      this.pagination.size = pages.limit;
       this.getList();
     },
     // 查询
     handleQuery() {
       this.pagination = {
-        pageNum: 1,
-        pageSize: 10
+        current: 1,
+        size: 10
       }
       this.pagination = { ...this.pagination,...this.formInline };
       // console.log(this.pagination);
@@ -236,8 +257,8 @@ export default {
     resetQuery(formName){
       this.$refs[formName].resetFields();
       this.pagination = {
-        pageNum: 1,
-        pageSize: 10
+        current: 1,
+        size: 10
       }
       this.getList();
     },
@@ -251,8 +272,8 @@ export default {
     // 查看详情
     goInfo(row){
       this.$router.push({
-        name: 'enterInfo',
-        query: { userId: row.id, creditCode: row.creditCode }
+        name: 'enterpriselibraryInfo',
+        query: { userId: row.id, creditCode: row.tyshxydm }
       })
     },
     // 编辑
@@ -315,7 +336,7 @@ export default {
     //下载模版
     frontDownload() {
       var a = document.createElement("a"); //创建一个<a></a>标签
-      a.href = "/demo/JinJiHu/static/企业库数据.xlsx";
+      a.href = "/demo/JinJiHu/static/企业库数据模板.xlsx";
         //给a标签的href属性值加上地址，注意，这里是绝对路径，不用加 点.
         a.download ="企业库模板.xlsx";
         //设置下载文件文件名，这里加上.xlsx指定文件类型，pdf文件就指定.fpd即可
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
new file mode 100644
index 0000000..72935d0
--- /dev/null
+++ b/src/views/home/index.vue
@@ -0,0 +1,193 @@
+<template>
+  <div class="workbench-box">
+    <main class="home-main home-index-main">
+      <el-row class="main-row">
+        <el-col :span="8" class="work-main-left">
+          <div class="main-left">
+            <div class="left-header">
+              <div class="left-header-title">【服务业数据概览】</div>
+            </div>
+          </div>
+        </el-col>
+        <el-col :span="8" class="work-main-left">
+          <div class="main-left">
+            <div class="left-header">
+              <div class="left-header-title">【智能提醒】</div>
+            </div>
+            <div class="left-main" v-if="remindList.length > 0">
+              <el-card shadow="never" v-for="(item,index) in remindList" :key="index" :class="item.isRead == 1 ? 'el-card-border' : ''">
+                <div class="warn-main">
+                  <div class="warn-main-left" v-if="item.alertManner == 2">
+                    <div class="warn-main-img"><img src="@/assets/images/warn-green.png" alt=""></div>
+                    <div class="warn-main-content">
+                      <div class="content-title">【{{ item.declarationName }}】【预计{{ item.daysAdvance }}天后填报结束】</div>
+                      <div class="content-middle">{{ item.alertContent }}</div>
+                      <div class="content-time">{{ item.alertTime }}</div>
+                    </div>
+                  </div>
+                  <div class="warn-main-left" v-else-if="item.alertManner == 1 && item.qymc && item.alertRecipients == 2">
+                    <div class="warn-main-img"><img src="@/assets/images/warn-orange.png" alt=""></div>
+                    <div class="warn-main-content">
+                      <div class="content-title" style="display: flex;">【{{ item.qymc }}】<dict-tag :options="dict.type.project_small_type" :value="item.declarationName"/></div>
+                      <div class="content-middle">{{ item.alertContent }}</div>
+                      <div class="content-time">{{ item.alertTime }}</div>
+                    </div>
+                  </div>
+                  <div class="warn-main-left" v-else-if="item.alertManner == 1 && item.projectId">
+                    <div class="warn-main-img"><img src="@/assets/images/warn-orange.png" alt=""></div>
+                    <div class="warn-main-content">
+                      <div class="content-title">【{{ item.declarationName }}】</div>
+                      <div class="content-middle">{{ item.alertContent }}</div>
+                      <div class="content-time">{{ item.alertTime }}</div>
+                    </div>
+                  </div>
+                  <div class="warn-main-left different-left" v-else-if="item.alertManner == 1 && !item.projectId">
+                    <div class="warn-main-img"><img src="@/assets/images/warn-blue.png" alt=""></div>
+                    <div class="warn-main-content">
+                      <div class="content-title">{{ item.alertContent }}</div>
+                      <div class="content-time">{{ item.alertTime }}</div>
+                    </div>
+                  </div>
+                  <div class="warn-main-right">
+                    <div class="warn-main-right-chakan" @click="putMemo(item)">
+                      查看
+                    </div>
+                    <div class="warn-main-right-status" :class="item.isRead == 1 ? 'status-unread' : ''">
+                      {{ item.isRead == 1 ? '未读' : '已读' }}
+                    </div>
+                  </div>
+                </div>
+              </el-card>
+            </div>
+            <div class="right-main" v-else>
+              <el-divider content-position="center">暂无</el-divider>
+            </div>
+          </div>
+        </el-col>
+        <el-col :span="8" class="work-main-right">
+          <div class="main-right">
+            <div class="right-header">
+              <div class="right-header-title">【待办提醒】</div>
+              <el-button @click="MoreRecords('all')" type="text" v-if="backlogArray.length > 0">>> 更多记录</el-button>
+            </div>
+            <div class="right-main" v-if="backlogArray.length > 0" v-loading="loading">
+              <div class="main-items" v-for="(item,index) in backlogArray" :key="index" :class="index % 2 == 0 ? '':'main-item'">
+                <div>{{ item.enterpriseDirectory}}</div>
+                <!-- <div>{{ item.enterpriseName }}</div> -->
+                <div>{{ (item.status == 0 ? "待填报" : item.status == 8 ? "初审不通过" : item.status == 10 ? "初审退回修改" : item.status == 7 ? "复审不通过" : item.status == 9 ? "终审不通过" : item.status == 5 ? "终审通过" : "") }}</div>
+                <!-- <div>审批【知识产权】材料</div> -->
+                <div @click="MoreRecords('id',item.status)" class="last_child_item" :class="item.status == 0 ? 'tab-red' : item.status == 10 ? 'tab-red' : 'last_child_item'">{{ item.status == 0 ? "去填报" : item.status == 10 ? "去修改" : "去查看"}}</div>
+              </div>
+            </div>
+            <div class="right-main" v-else>
+              <el-divider content-position="center">暂无</el-divider>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+    </main>
+    <el-dialog title="详情" :visible.sync="open" width="400px" append-to-body :close-on-click-modal="false">
+      <div class="team-main">
+        <div>提醒时间:</div>
+        <div>{{ info.alertTime }}</div>
+      </div>
+      <div class="team-main">
+        <div>提醒内容:</div>
+        <div>{{ info.alertContent  }}</div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { listRecords } from "@/api/onlineDeclartion/records"
+import { chiefAll, enterpriseAll, changeIsRead } from "@/api/jin_ji_hu/intelligentReminder"
+export default {
+  dicts: ["project_small_type"],
+  data() {
+    return {
+      // 判断登陆用户是何身份⌈ 01 ： 企业  02 ： 政务 ⌋
+      // userType: this.$store.state.user.userType,
+      backlogArray:[],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        creditCode: this.$store.state.user.name,
+        statusStr: [0, 5, 7, 8, 9, 10],
+      },
+      // 是否显示弹出层
+      open: false,
+      fileList: [],
+      uploadList: [],
+      loading:false,
+      remindList: [],
+      info:{},
+    }
+  },
+  mounted(){
+    this.getListTwo();
+    this.entRemind();
+  },
+  methods:{
+    // 待填报
+    getListTwo(){
+      this.loading = true;
+      listRecords(this.queryParams).then(response => {
+        this.backlogArray = response.rows
+        this.loading = false;
+      });
+    },
+    // 企业端智能提醒
+    entRemind(){
+      enterpriseAll().then(res=>{
+        this.remindList = res.data;
+      })
+    },
+    // 智能提醒去查看并修改状态
+    putMemo(item){
+      if(item.isRead == 1) {
+        changeIsRead({id:item.id}).then(res=>{
+          this.entRemind();
+        })
+      }
+      if(item.projectId) {
+        this.$router.push({
+          name: 'projectInfo',
+          query: { userId: Number(item.projectId) }
+        })
+      } else if(item.alertRecipients == 1 && item.alertManner == 2) {
+        this.$router.push({
+          name: 'Records',
+          params: { statusChange: "0" }
+        })
+      } else if(item.alertManner == 1) {
+        this.open = true;
+        this.info = item;
+      }
+    },
+    // 更多记录
+    MoreRecords(type,status){
+      if(type == 'all') {
+        this.$router.push({
+          name: 'Records',
+          params: { statusChange: "" }
+        })
+      } else {
+        if(status == 0 || status == 10) {
+          this.$router.push({
+            name: 'Records',
+            params: { statusChange: "0" }
+          })
+        } else {
+          this.$router.push({
+            name: 'Records',
+            params: { statusChange: "1" }
+          })
+        }
+      }
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/index.vue b/src/views/index.vue
index 3efe4a8..36ec5cd 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -16,4 +16,4 @@ export default {
 };
 </script>
 
-<style></style>
+<style></style>
\ No newline at end of file
diff --git a/src/views/infoMaintain/index.vue b/src/views/infoMaintain/index.vue
index 6204893..510e0c0 100644
--- a/src/views/infoMaintain/index.vue
+++ b/src/views/infoMaintain/index.vue
@@ -23,13 +23,14 @@
               </el-select>
             </el-form-item> -->
             <el-form-item>
-              <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
-              <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
+              <el-button size="mini" @click="resetQuery('queryFrom')" :disabled="userType == '01' ? true : false">重置</el-button>
+              <el-button size="mini" type="primary" @click="handleQuery('queryFrom')" :disabled="userType == '01' ? true : false">查询</el-button>
             </el-form-item>
           </el-col>
           <el-col :span="2">
             <!-- <el-button type="primary" class="import-btn" icon="icon iconfont icon-jc-shangchuan" size="mini" @click="importBtn">新增发文</el-button> -->
-            <el-button v-if="roles.includes('ent') && tableData.length == 0" type="primary" class="import-btn" icon="el-icon-plus" size="mini" @click="importBtn">新增常用联系人</el-button>
+            <!--  v-if="roles.includes('ent') && tableData.length == 0" -->
+            <el-button type="primary" v-if="roles.includes('ent')" class="import-btn" icon="el-icon-plus" size="mini" @click="importBtn">新增常用联系人</el-button>
           </el-col>
         </el-form>
       </header>
@@ -214,11 +215,11 @@ export default {
     // 重置
     resetQuery(formName){
       this.$nextTick(() => {
-        this.$refs[formName].resetFields();
         if(this.userType == "01") {
           this.pagination.current = 1;
           this.pagination.size = 10;
         } else {
+          this.$refs[formName].resetFields();
           this.pagination = {
             current: 1,
             size: 10
@@ -319,7 +320,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          jEnterpriseContactDel({ id: row.id }).then((res) => {
+          jEnterpriseContactDel(row.id).then((res) => {
             this.getList();
             this.$message({
               type: "success",
diff --git a/src/views/intelligentReminder/index.vue b/src/views/intelligentReminder/index.vue
new file mode 100644
index 0000000..8b5004b
--- /dev/null
+++ b/src/views/intelligentReminder/index.vue
@@ -0,0 +1,432 @@
+<template>
+  <div class="L-public-main" id="L-size-main">
+    <div class="L-main">
+      <header id="L-header">
+        <el-form :inline="true" :model="formInline" size="small" class="demo-form-inline" ref="queryFrom">
+          <el-col :span="22">
+            <el-form-item label="规则名称：" prop="rulesName">
+              <el-input v-model.trim="formInline.rulesName" placeholder="请输入内容"></el-input>
+            </el-form-item>
+            <el-form-item label="提醒类型：" prop="alertType">
+              <el-select class="ignoreElement" v-model="formInline.alertType" placeholder="请选择">
+                <!-- <el-option
+                  label="全局自定义通知"
+                  value="0">
+                </el-option>
+                <el-option
+                  label="申报任务即将结束"
+                  value="1">
+                </el-option>
+                <el-option
+                  label="项目即将建设完成"
+                  value="2">
+                </el-option>
+                <el-option
+                  label="项目自定义通知"
+                  value="3">
+                </el-option> -->
+                <el-option
+                  v-for="dict in dict.type.alert_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
+              <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="2">
+            <!-- <el-button type="primary" class="import-btn" icon="icon iconfont icon-jc-shangchuan" size="mini" @click="importBtn">新增发文</el-button> -->
+            <el-button  type="primary" class="import-btn" icon="el-icon-plus" size="mini" @click="importBtn">新增智能提醒规则</el-button>
+          </el-col>
+        </el-form>
+      </header>
+      <section>
+        <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" :height="tabHeader" :max-height="tabHeader">
+          <el-table-column label="规则名称" prop="rulesName" />
+          <el-table-column label="提醒类型" prop="alertType">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.alert_type" :value="scope.row.alertType"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="提醒对象" prop="alertRecipients">
+            <template slot-scope="scope">
+              <span>{{ scope.row.alertRecipients == 1 ? "企业用户" : scope.row.alertRecipients == 2 ? "政务用户" : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="提醒方式" prop="alertManner">
+            <template slot-scope="scope">
+              <span>{{ scope.row.alertManner == 1 ? "定期提醒" : scope.row.alertManner == 2 ? "不定期提醒" : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="提醒时间" prop="alertTime">
+            <template slot-scope="scope">
+              <span>{{ scope.row.alertManner == 1 ? scope.row.alertTime : scope.row.alertManner == 2 ? scope.row.daysAdvance + '天' : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="修改时间" prop="updateTime" />
+          <!-- <el-table-column label="常用联系人邮箱" prop="contactEmail" /> -->
+          <el-table-column label="操作" prop="userId" class-name="table-operation" width="180px">
+            <template slot-scope="scope">
+              <span class="look-info" @click="goInfo(scope.row)">查看详情</span>
+              <span class="edit-info" @click="editInfo(scope.row)">修改</span>
+              <span class="del-info" @click="delInfo(scope.row)" v-if="scope.row.alertManner == 1">删除</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <my-pagination 
+          id="L-pagination"
+          :total="total"
+          :page="pagination.current"
+          :limit="pagination.size"
+          @pagination="getPagination"
+          :current-page.sync="pagination.current" 
+        ></my-pagination>
+      </section>
+    </div>
+    <my-dialog :title="title" @close="importClose" @confirm="confirm" ref="importProject" closeText="关闭" width="40%" :myclass="true">
+      <el-form :model="addFrom" size="small" ref="importFrom" label-width="180px" :rules="rules" class="newArticle intelligentReminder-form" :disabled="title == '查看智能提醒规则' ? true : false">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="提醒规则标题" class="importFormItem" prop="rulesName">
+              <el-input v-model.trim="addFrom.rulesName" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="提醒对象：" class="importFormItem" prop="alertRecipients">
+              <el-radio-group v-model="addFrom.alertRecipients" :disabled="title == '修改智能提醒规则' ? true : false">
+                <el-radio :label="2">政务用户</el-radio>
+                <el-radio :label="1">企业用户</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="提醒方式：" class="importFormItem" prop="alertManner">
+              <el-radio-group v-model="addFrom.alertManner" disabled>
+                <el-radio :label="1">定期提醒</el-radio>
+                <el-radio :label="2">不定期提醒</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="addFrom.alertManner == 1">
+            <!-- :rules="form.isTime == 0 ? rules.reportTime : [
+					      {required: false, message: '请选择填报时间', trigger: 'change' }]" -->
+            <el-form-item label="提醒时间：" prop="alertTime" class="importFormItem"
+              :rules="addFrom.alertManner == 1 ? rules.alertTime : [
+					      {required: false, message: '请选择填报时间', trigger: 'change' }]"
+            >
+              <!-- range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期" -->
+              <el-date-picker
+                v-model="addFrom.alertTime"
+                type="datetime"
+                placeholder="选择日期"
+                style="width:  100%;"
+                value-format="yyyy-MM-dd HH:mm:ss"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="addFrom.alertManner == 2">
+            <el-form-item label="提醒内容：" prop="daysAdvance" class="importFormItem"
+              :rules="addFrom.alertManner == 2 ? rules.daysAdvance : [
+					      {required: false, message: '请选择填报时间', trigger: 'change' }]"
+            >
+              <div class="intelligentReminder_radio">
+                <el-radio-group v-model="addFrom.alertType" disabled>
+                  <el-radio :label="1">申报任务即将结束（企业）</el-radio>
+                  <el-radio :label="2">项目即将建设完成（政府）</el-radio>
+                </el-radio-group>
+                <div class="intelligentReminder_text"><span>*</span>提前<el-input-number v-model="addFrom.daysAdvance" :min="1" :controls="false"></el-input-number>天提醒</div>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="addFrom.projectId">
+            <!-- <el-form-item label="所属项目：" class="importFormItem" prop="projectId">
+              <el-input
+                disabled
+                placeholder="请输入提醒内容"
+                v-model="addFrom.projectId">
+              </el-input>
+            </el-form-item> -->
+            <div class="reminder-project">
+              <div class="new-label">所属项目：</div>
+              <div class="new-value">
+                <div class="value-enterName">{{ addFrom.qymc }}-</div>
+                <dict-tag :options="dict.type.project_small_type" :value="addFrom.projectSmallType"/>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="提醒内容：" class="importFormItem" prop="alertContent">
+              <el-input
+                type="textarea"
+                resize="none"
+                :rows="3"
+                placeholder="请输入提醒内容"
+                v-model="addFrom.alertContent">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="24">
+            <el-form-item label="常用联系人邮箱：" class="importFormItem" prop="contactEmail">
+              <el-input v-model.trim="addFrom.contactEmail" placeholder="请输入常用联系人邮箱"></el-input>
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+      </el-form>
+    </my-dialog>
+  </div>
+</template>
+<script>
+import myPagination from "@/views/components/Pagination/index.vue"
+import myDialog from "@/views/components/myDialog/index.vue"
+import { getjSmartReminders, jSmartRemindersNew, updateNdqChange, updateDqChange, jSmartRemindersId, jSmartRemindersDel } from "@/api/jin_ji_hu/intelligentReminder"
+export default {
+  components:{myPagination, myDialog},
+  dicts: ['alert_type', "project_small_type"],
+  data() {
+    let validateTime = (rule, value, callback) => {
+      if (new Date(value) < new Date()) {
+        callback(new Error('选择时间需大于当前时间'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      total:0,
+      pagination: {
+        current:1,
+        size:10,
+      },
+      loading:false,
+      formInline: {
+        rulesName: '',
+        alertType: "",
+      },
+      tableData:[],
+      tabHeader: undefined,
+      addFrom: {
+        rulesName:"",
+        alertRecipients: 2,
+        alertManner: 1,
+        alertTime:"",
+        alertContent:"",
+        daysAdvance: null,
+        alertType: 1,
+      },
+      rules:{
+        rulesName:[
+          { required: true, message: '请填写提醒规则标题', trigger: 'blur' }
+        ],
+        alertRecipients:[
+          { required: true, message: '请选择提醒对象', trigger: 'change' }
+        ],
+        alertManner:[
+          { required: true, message: '请选择提醒方式', trigger: 'change' },
+        ],
+        alertTime:[
+          { required: true, message: '请选择日期', trigger: 'change' },
+          {validator: validateTime, trigger: 'blur'},
+        ],
+        alertContent:[
+          { required: true, message: '请填写提醒内容', trigger: 'blur' },
+        ],
+        daysAdvance:[
+          { required: true, message: '请填写期限', trigger: 'blur' },
+        ]
+      },
+      title:"新增智能提醒规则",
+      infoVisible:false,
+    }
+  },
+  mounted() {
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+    this.getList()
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
+  methods:{
+    // 列表获取
+    getList(){
+      this.loading = true;
+      getjSmartReminders(this.pagination).then(res=>{
+        this.loading = false;
+        this.total = res.data.total;
+        this.tableData = res.data.records;
+      })
+    },
+    // 获取页码
+    getPagination(pages) {
+      this.pagination.current = pages.page;
+      this.pagination.size = pages.limit;
+      this.getList();
+    },
+    // 查询
+    handleQuery() {
+      this.pagination.current = 1;
+      this.pagination.size = 10;
+      this.pagination = { ...this.pagination,...this.formInline };
+      // console.log(this.pagination);
+      // console.log(this.formInline);
+      this.getList();
+    },
+    // 重置
+    resetQuery(formName){
+      this.$nextTick(() => {
+        this.$refs[formName].resetFields();
+        this.pagination = {
+          current: 1,
+          size: 10
+        }
+        this.getList();
+      });
+    },
+    // 修改table背景色
+    tableRowClassName({row, rowIndex}){
+      if (rowIndex % 2 !== 0) {
+        return 'evenNumber-row';
+      }
+      return '';
+    },
+    // 新增联系人
+    importBtn(){
+      this.title = "新增智能提醒规则";
+      this.$refs.importProject.open();
+    },
+    // 关闭事件触发
+    importClose(){
+      this.$nextTick(()=>{
+        this.$refs.importFrom.resetFields();
+        this.$refs.importProject.close();
+        this.addFrom = {
+          // ruleTitle:"",
+          // content:"",
+          // contactPhone:"",
+          // contactEmail:"",
+          ruleTitle:"",
+          alertRecipients: 2,
+          alertManner: 1,
+          alertTime:"",
+          alertContent:"",
+          daysAdvance: null,
+          alertType: 1,
+        }
+      })
+    },
+    // 查看详情
+    goInfo(row){
+      this.title = "查看智能提醒规则"
+      jSmartRemindersId(row.id).then((res=>{
+        if(res.code == 200) {
+          this.addFrom = res.data;
+          this.$refs.importProject.open();
+        }
+      }))
+    },
+    // 编辑
+    editInfo(row){
+      this.title = "修改智能提醒规则"
+      // this.addFrom.enterpriseCode = this.name;
+      // this.addFrom.enterpriseName = this.nickName;
+      jSmartRemindersId(row.id).then((res)=>{
+        if(res.code == 200) {
+          this.addFrom = res.data;
+          this.$refs.importProject.open();
+        }
+      })
+    },
+    // 提交按钮
+    confirm(){
+      this.$refs.importFrom.validate((valid) => {
+        if (valid) {
+          if(this.title == "查看智能提醒规则") {
+            this.getList();
+            this.importClose();
+          } else {
+            let id = this.addFrom.id ? this.addFrom.id : null;
+            if(id) {
+              if(this.addFrom.alertManner == 2) {
+                updateNdqChange(this.addFrom).then((res)=>{
+                  if(res.code == 200) {
+                    this.getList();
+                    this.importClose();
+                    this.$message({
+                      type: "success",
+                      message: "修改成功!",
+                    });
+                  }
+                })
+              } else {
+                // 修改定期
+                updateDqChange(this.addFrom).then((res)=>{
+                  if(res.code == 200) {
+                    this.getList();
+                    this.importClose();
+                    this.$message({
+                      type: "success",
+                      message: "修改成功!",
+                    });
+                  }
+                })
+              }
+            } else {
+              jSmartRemindersNew(this.addFrom).then((res)=>{
+                if(res.code == 200) {
+                  this.getList();
+                  this.importClose();
+                  this.$message({
+                    type: "success",
+                    message: "新增成功!",
+                  });
+                }
+              })
+            }
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    // 删除
+    delInfo(row){
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          jSmartRemindersDel(row.id).then((res) => {
+            this.getList();
+            this.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('L-size-main'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('L-header'); // 通过元素的 ID 获取元素
+      const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      const paginationtHeight = pagination.offsetHeight;
+      this.tabHeader = elementHeight - headerHeight - paginationtHeight - 140;
+    }
+  },
+}
+</script>
diff --git a/src/views/login.vue b/src/views/login.vue
index 69b9706..2b43296 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -109,6 +109,10 @@
     <!-- <div class="el-login-footer">
       <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>
     </div> -->
+
+
+    <!-- 正式环境部署命令 ： unzip /var/www/html/dist.zip -o /var/www/html/bms -->
+    <!-- process.env.VUE_APP_BASE_API 替换 location.origin + '/api'  publicPath： 由/dome/JinJiHu 更换为./ -->
   </div>
 </template>
 
diff --git a/src/views/onlineDeclaration/declarationManagement/index.vue b/src/views/onlineDeclaration/declarationManagement/index.vue
index 78897fb..365b437 100644
--- a/src/views/onlineDeclaration/declarationManagement/index.vue
+++ b/src/views/onlineDeclaration/declarationManagement/index.vue
@@ -65,7 +65,7 @@
     >
       <el-table-column label="序号" align="center" width="50" fixed>
         <template slot-scope="scope">
-          <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+          <span>{{(queryParams.current - 1) * queryParams.size + scope.$index + 1}}</span>
         </template>
       </el-table-column>
       <el-table-column prop="templateName" label="模版名称" min-width="160" :show-overflow-tooltip="true"></el-table-column>
@@ -114,8 +114,8 @@
       id="L-pagination"
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.current"
+      :limit.sync="queryParams.size"
       @pagination="getList"
     />
     <!-- 添加或修改菜单对话框 -->
@@ -188,8 +188,8 @@ export default {
       queryParams: {
         menuName: undefined,
         visible: undefined,
-        ageNum: 1,
-        pageSize: 20,
+        current: 1,
+        size: 10,
       },
       enterpriseId: '',
       templateDataList: [],
@@ -234,8 +234,8 @@ export default {
     getList() {
       this.loading = true;
       listInfo(this.queryParams).then(response => {
-        this.InfoList = response.rows;
-        this.total = response.total
+        this.InfoList = response.data.records;
+        this.total = response.data.total
         this.loading = false;
       });
     },
@@ -329,7 +329,7 @@ export default {
     },
     /** 查看表单模版 */
     handleTemplate (row) {
-      this.$router.push({name: 'templateDetail',query: {
+      this.$router.push({name: 'onlineDeclareDetail',query: {
         templateId: row.id,
         pageType: "template",
       }})
diff --git a/src/views/onlineDeclaration/declareAddContent/index.vue b/src/views/onlineDeclaration/declareAddContent/index.vue
index 70a0539..5f6d22c 100644
--- a/src/views/onlineDeclaration/declareAddContent/index.vue
+++ b/src/views/onlineDeclaration/declareAddContent/index.vue
@@ -13,7 +13,7 @@
             <el-col :span="8" style="height: 50px">
               <div class="templateInfo">
                 <div class="templateInfo_left">申报单位：</div>
-                <div>{{ baseInfo.enterpriseName }}</div>
+                <div>{{ baseInfo.qymc }}</div>
               </div>
             </el-col>
             <el-col :span="8" style="height: 50px">
@@ -25,8 +25,20 @@
             </el-col>
             <el-col :span="8" style="height: 50px">
               <div class="templateInfo">
-                <div class="templateInfo_left">项目分类：</div>
-                <dict-tag :options="dict.type.jjh_project_type" :value="templateInfo.projectClassify"/>
+                <div class="templateInfo_left">项目大类：</div>
+                <dict-tag :options="dict.type.project_categories" :value="templateInfo.projectBigType"/>
+              </div>
+            </el-col>
+            <el-col :span="8" style="height: 50px">
+              <div class="templateInfo">
+                <div class="templateInfo_left">项目中类：</div>
+                <dict-tag :options="dict.type.project_middle_type" :value="templateInfo.projectMiddleType"/>
+              </div>
+            </el-col>
+            <el-col :span="8" style="height: 50px">
+              <div class="templateInfo">
+                <div class="templateInfo_left">项目小类：</div>
+                <dict-tag :options="dict.type.project_small_type" :value="templateInfo.projectSmallType"/>
               </div>
             </el-col>
             <el-col :span="8" style="height: 50px">
@@ -47,31 +59,31 @@
               <template slot="label">
                 申报企业名称
               </template>
-              {{ baseInfo.enterpriseName }}
+              {{ baseInfo.qymc }}    <!-- enterpriseName -->
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
                 统一社会信用代码
               </template>
-              {{ baseInfo.creditCode }}
+              {{ baseInfo.tyshxydm }}       <!-- creditCode -->
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
                 联络人
               </template>
-              {{ baseInfo.contacts }}
+              {{ baseInfo.fddbrxm }}     <!-- contacts -->
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
                 联络电话
               </template>
-              {{ baseInfo.contactsNumber }}
+              {{ baseInfo.fddbrzjhm }}     <!-- contactsNumber -->
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
                 企业地址
               </template>
-              {{ baseInfo.address }}
+              {{ baseInfo.jycs }}      <!-- address -->
             </el-descriptions-item>
           </el-descriptions>
           <!-- 项目落户奖补模版 -->
@@ -1323,7 +1335,7 @@ export default {
   name: "declareAddContent",
   // 'sys_show_hide', 'sys_normal_disable', 'bms_product_area', 'bms_declaration_type','bms_template_type', 'bms_declaration_channels',
   
-  dicts: ['bms_responsibility_unit', 'bms_level',  'bms_affiliation_type', 'sys_declaration_type', 'jjh_project_type', 'template_industry', 'new_template_type'],
+  dicts: ['bms_responsibility_unit', 'bms_level',  'bms_affiliation_type', 'sys_declaration_type', 'jjh_project_type', 'template_industry', 'new_template_type',"project_middle_type", "project_small_type", "project_categories"],
   data() {
     //验证手机号的规则
     var checkMobile = (rule,value,cb) =>{
@@ -1522,10 +1534,11 @@ export default {
     // console.log('this.templateInfo: ', this.templateInfo);
     getBasicInfo({enterpriseId: this.$store.state.user.enterpriseId}).then((response) => {
       this.baseInfo = response.data
+      console.log(this.baseInfo);
+    })
+    getOpenInterface({templateRecordId: templateRecordId}).then((response) => {
+      this.openInterfaceInfo = response.data
     })
-    // getOpenInterface({templateRecordId: templateRecordId}).then((response) => {
-    //   this.openInterfaceInfo = response.data
-    // })
     // templateList({
     //   responsibilityUnit: this.templateInfo.responsibilityUnit,
     //   enterpriseId: this.$store.state.user.enterpriseId,
@@ -1554,16 +1567,16 @@ export default {
       }
     },
     submitForm(type) {
-      console.log(this.form);
+      // console.log(this.form);
       this.$refs["form"].validate(valid => {
         if (valid) {
           let params = {
             declarationId: this.declarationId,
-            address: this.baseInfo.address,
-            contacts: this.baseInfo.contacts,
-            contactsNumber: this.baseInfo.contactsNumber,
-            creditCode: this.baseInfo.creditCode,
-            enterpriseName: this.baseInfo.enterpriseName,
+            // address: this.baseInfo.address,
+            // contacts: this.baseInfo.contacts,
+            // contactsNumber: this.baseInfo.contactsNumber,
+            tyshxydm: this.baseInfo.tyshxydm,
+            // enterpriseName: this.baseInfo.enterpriseName,
             // declarationTemplateType: this.openInterfaceInfo.declarationTemplateType,
             projectName: this.templateInfo.templateName,
             year: this.templateInfo.createTime,
@@ -1636,10 +1649,14 @@ export default {
               }
             })
             let detailList = []
-            detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: this.openInterfaceInfo.year})
-            detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: this.openInterfaceInfo.year})
-            detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: Number(this.openInterfaceInfo.year)+1})
-            detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrate: '预计税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: Number(this.openInterfaceInfo.year)+1})
+            // detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: this.openInterfaceInfo.year})
+            // detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: this.openInterfaceInfo.year})
+            // detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: Number(this.openInterfaceInfo.year)+1})
+            // detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrate: '预计税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: Number(this.openInterfaceInfo.year)+1})
+            detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: 2021})
+            detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: 2021})
+            detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: 2022})
+            detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrate: '预计税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: 2022})
             params.fundingDetailList = detailList
             // console.log('11', params);
             addProjectSettlementAward(params).then((response) => {
@@ -1663,14 +1680,22 @@ export default {
               }
             })
             let detailList = []
-            detailList.push({amount: this.form.revenueNowYear3,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear3',year: this.openInterfaceInfo.year})
-            detailList.push({amount: this.form.taxationNowYear3,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear3',year: this.openInterfaceInfo.year})
-            detailList.push({amount: this.form.revenueNowYear2,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear2',year: Number(this.openInterfaceInfo.year)+1})
-            detailList.push({amount: this.form.taxationNowYear2,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear2',year: Number(this.openInterfaceInfo.year)+1})
-            detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: Number(this.openInterfaceInfo.year)+2})
-            detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: Number(this.openInterfaceInfo.year)+2})
-            detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: Number(this.openInterfaceInfo.year)+3})
-            detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: Number(this.openInterfaceInfo.year)+3})
+            // detailList.push({amount: this.form.revenueNowYear3,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear3',year: this.openInterfaceInfo.year})
+            // detailList.push({amount: this.form.taxationNowYear3,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear3',year: this.openInterfaceInfo.year})
+            // detailList.push({amount: this.form.revenueNowYear2,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear2',year: Number(this.openInterfaceInfo.year)+1})
+            // detailList.push({amount: this.form.taxationNowYear2,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear2',year: Number(this.openInterfaceInfo.year)+1})
+            // detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: Number(this.openInterfaceInfo.year)+2})
+            // detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: Number(this.openInterfaceInfo.year)+2})
+            // detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: Number(this.openInterfaceInfo.year)+3})
+            // detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: Number(this.openInterfaceInfo.year)+3})
+            detailList.push({amount: this.form.revenueNowYear3,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear3',year: 2021})
+            detailList.push({amount: this.form.taxationNowYear3,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear3',year: 2021})
+            detailList.push({amount: this.form.revenueNowYear2,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear2',year: 2022})
+            detailList.push({amount: this.form.taxationNowYear2,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear2',year: 2022})
+            detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: 2023})
+            detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: 2023})
+            detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: 2024})
+            detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: 2024})
             params.fundingDetailList = detailList
             // console.log('11', params);
             addBigStrongAward(params).then((response) => {
@@ -2328,6 +2353,7 @@ list-style: none; /* 清除列表项前的标记 */
 }
 .templateInfo {
   display: flex;
+  align-items: center;
   justify-content: flex-start;
   font-size: 14px;
   .templateInfo_left {
diff --git a/src/views/onlineDeclaration/declareDetailContent/index.vue b/src/views/onlineDeclaration/declareDetailContent/index.vue
index e017b17..bbfa308 100644
--- a/src/views/onlineDeclaration/declareDetailContent/index.vue
+++ b/src/views/onlineDeclaration/declareDetailContent/index.vue
@@ -20,7 +20,7 @@
             <el-col :span="8" style="height: 50px">
               <div class="templateInfo">
                 <div class="templateInfo_left">申报单位：</div>
-                <div>{{ baseInfo.enterpriseName }}</div>
+                <div>{{ baseInfo.qymc }}</div>
               </div>
             </el-col>
             <el-col :span="8" style="height: 50px">
@@ -32,10 +32,28 @@
             </el-col>
             <el-col :span="8" style="height: 50px">
               <div class="templateInfo">
-                <div class="templateInfo_left">项目分类：</div>
+                <div class="templateInfo_left">项目大类：</div>
                 <dict-tag
-                  :options="dict.type.jjh_project_type"
-                  :value="templateInfo.projectClassify"
+                  :options="dict.type.project_categories"
+                  :value="templateInfo.projectBigType"
+                />
+              </div>
+            </el-col>
+            <el-col :span="8" style="height: 50px">
+              <div class="templateInfo">
+                <div class="templateInfo_left">项目中类：</div>
+                <dict-tag
+                  :options="dict.type.project_middle_type"
+                  :value="templateInfo.projectMiddleType"
+                />
+              </div>
+            </el-col>
+            <el-col :span="8" style="height: 50px">
+              <div class="templateInfo">
+                <div class="templateInfo_left">项目小类：</div>
+                <dict-tag
+                  :options="dict.type.project_small_type"
+                  :value="templateInfo.projectSmallType"
                 />
               </div>
             </el-col>
@@ -75,23 +93,23 @@
           >
             <el-descriptions-item>
               <template slot="label"> 申报企业名称 </template>
-              {{ baseInfo.enterpriseName }}
+              {{ baseInfo.qymc }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label"> 统一社会信用代码 </template>
-              {{ baseInfo.creditCode }}
+              {{ baseInfo.tyshxydm }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label"> 联络人 </template>
-              {{ baseInfo.contacts }}
+              {{ baseInfo.fddbrxm }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label"> 联络电话 </template>
-              {{ baseInfo.contactsNumber }}
+              {{ baseInfo.fddbrzjhm }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label"> 企业地址 </template>
-              {{ baseInfo.address }}
+              {{ baseInfo.jycs }}
             </el-descriptions-item>
           </el-descriptions>
           <!-- 项目落户奖补模版 -->
@@ -3276,10 +3294,13 @@
                     >
                     </span>
                     <div class="contain_main">
-                      <div>{{ item.approvalByName }}</div>
+                      <div v-if="item.approvalByName && item.approvalStatus == 1">{{ item.approvalByName }}</div>
                       <div v-show="item.approvalOpinions">
                         审核意见：{{ item.approvalOpinions }}
                       </div>
+                      <div>
+                        企业名称：{{ item.enterpriseName }}
+                      </div>
                       <div class="attach">
                         <div v-if="!item.approvalAttachment">附件</div>
                         <div class="attach_left" v-if="item.approvalAttachment">
@@ -3428,7 +3449,9 @@ export default {
     "bms_level",
     "bms_affiliation_type",
     "sys_declaration_type",
-    "jjh_project_type",
+    "project_middle_type", 
+    "project_small_type", 
+    "project_categories",
     "template_industry",
     "new_template_type",
   ],
@@ -3978,11 +4001,11 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           let params = {
-            address: this.baseInfo.address,
-            contacts: this.baseInfo.contacts,
-            contactsNumber: this.baseInfo.contactsNumber,
-            creditCode: this.baseInfo.creditCode,
-            enterpriseName: this.baseInfo.enterpriseName,
+            // address: this.baseInfo.address,
+            // contacts: this.baseInfo.contacts,
+            // contactsNumber: this.baseInfo.contactsNumber,
+            tyshxydm: this.baseInfo.tyshxydm,
+            // enterpriseName: this.baseInfo.enterpriseName,
             // declarationTemplateType: this.openInterfaceInfo.declarationTemplateType,
             // projectName: this.openInterfaceInfo.projectName,
             // year: this.openInterfaceInfo.year,
@@ -4749,27 +4772,47 @@ export default {
 
     /* 打印 */
     printOutpdf() {
-      let name = `${this.templateInfo.templateName}_${this.baseInfo.enterpriseName}`;
-      let domName = this.$refs.pdf;
-      let _this = this;
-
-      let targetDom = domName; //原本需要截图的div
-      let clonedNode = targetDom.cloneNode(true); //复制一个
-      clonedNode.setAttribute(
-        "style",
-        `width: ${targetDom.clientHeight};height: ${targetDom.clientWidth};`
-      );
-      document.body.appendChild(clonedNode); //放到body后面
-
-      html2canvas(clonedNode, {
-        allowTaint: true,
-        taintTest: false,
-      }).then((canvas) => {
-        let canvasImg = canvas.toDataURL("image/png");
-        _this.downLoadFile(name, canvasImg);
-        document.body.removeChild(clonedNode);
-      });
-    },
+      let name = ''
+      name = `${this.templateInfo.templateName}_${this.baseInfo.enterpriseName}`
+      let modalDiv = this.$refs.pdf
+      let newDiv = modalDiv.cloneNode(true)
+      newDiv.classList.remove('detail_content');
+      newDiv.id = 'reportId'
+      let newTwoDiv = document.createElement('div');
+      newTwoDiv.id = 'detail_content_two'
+      document.body.appendChild(newTwoDiv)
+      newTwoDiv.appendChild(newDiv)
+      let obj = document.getElementById('reportId')
+      setTimeout(()=>{
+        html2canvas(obj).then(function(canvas) {
+          let contentWidth = canvas.width
+          let contentHeight = canvas.height
+          let pageHeight = contentWidth / 592.28 * 841.89
+          let leftHeight = contentHeight
+          let position = 0
+          let imgWidth = 595.28
+          let imgHeight = 592.28 / contentWidth * contentHeight
+          let pageData = canvas.toDataURL('image/jpeg', 1.0)
+          let PDF = new JsPDF('p', 'pt', 'a4') // [592.28 * 841.89]
+          console.log(pageData);
+          if (leftHeight < pageHeight) {
+            PDF.addImage(pageData, 'JPEG', 0, 0, imgWidth, imgHeight)
+          } else {
+            // 5 为误差值
+            while (leftHeight > 5) {
+              PDF.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight)
+              leftHeight -= pageHeight
+              position -= 841.89
+              if (leftHeight > 5) {
+                PDF.addPage()
+              }
+            }
+          }
+            PDF.save(name + '.pdf')
+            newTwoDiv.remove()
+        })
+      },200)
+    }
   },
 };
 </script>
@@ -4869,6 +4912,7 @@ li {
 }
 .templateInfo {
   display: flex;
+  align-items: center;
   justify-content: flex-start;
   font-size: 14px;
   .templateInfo_left {
@@ -5067,7 +5111,7 @@ li {
   }
 
   .form {
-    height: calc(100% - 150px);
+    // height: calc(100% - 150px);
     background-color: #fff;
     padding: 15px;
     .table-content {
diff --git a/src/views/onlineDeclaration/enterpriseDirectory/index.vue b/src/views/onlineDeclaration/enterpriseDirectory/index.vue
index 3637132..474ef9c 100644
--- a/src/views/onlineDeclaration/enterpriseDirectory/index.vue
+++ b/src/views/onlineDeclaration/enterpriseDirectory/index.vue
@@ -57,11 +57,16 @@
         </template>
       </el-table-column>
       <el-table-column prop="enterpriseDirectory" label="申报任务标题" :show-overflow-tooltip="true" min-width="190"></el-table-column>
+      <el-table-column label="项目小类" :show-overflow-tooltip="true" min-width="150">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.project_small_type" :value="scope.row.projectClassify"/>
+        </template>
+      </el-table-column>
       <!-- <el-table-column prop="enterpriseDirectory" label="企业名录分类" :show-overflow-tooltip="true" min-width="190"></el-table-column> -->
       <el-table-column prop="templateName" label="模版名称" min-width="180" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column label="状态" min-width="50" >
         <template slot-scope="scope">
-          <span :class="scope.row.status == 2 ? 'tab-green' : scope.row.status == 1 ? 'tab-red' : scope.row.status == 0 ? 'tab-blue' : ''">{{ scope.row.status == 2 ? '有效' : scope.row.status == 1 ? '过期' : scope.row.status == 0 ? '未开始' : '' }}</span>
+          <span :class="scope.row.status == 2 ? 'tab-green' : scope.row.status == 1 ? 'tab-red' : scope.row.status == 0 ? 'tab-blue' : scope.row.status == 3 ? 'tab-green' : ''">{{ scope.row.status == 2 ? '有效' : scope.row.status == 1 ? '过期' : scope.row.status == 0 ? '未开始' : scope.row.status == 3 ? '长期有效' : '' }}</span>
         </template>
       </el-table-column>
       <!-- <el-table-column label="级别" min-width="60">
@@ -77,7 +82,8 @@
       <!-- <el-table-column align="center" label="开放时间" :show-overflow-tooltip="true" min-width="180" > -->
       <el-table-column align="center" label="任务填报时间" :show-overflow-tooltip="true" min-width="180" >
         <template slot-scope="scope">
-          <span>{{ scope.row.startTime }}~{{ scope.row.endTime }}</span>
+          <span v-if="scope.row.startTime && scope.row.endTime">{{ scope.row.startTime }}~{{ scope.row.endTime }}</span>
+          <span v-else>长期有效</span>
         </template>
       </el-table-column>
       <el-table-column prop="status" label="责任单位" min-width="80">
@@ -98,14 +104,14 @@
             size="mini"
             type="text"
             style="color: red;"
-            v-if="scope.row.status == 1"
+            v-if="scope.row.status == 1 || scope.row.status == 3"
             @click="handleReplace(scope.row)"
           >补录</el-button>
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             @click="handleUpdate(scope.row)"
-          >编辑</el-button>
+          >编辑</el-button> -->
           <el-button
             size="mini"
             type="text"
@@ -128,8 +134,8 @@
       @pagination="getList"
     />
     <!-- 添加或修改申报企业名录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" v-loading="diaLoading">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-loading="diaLoading">
         <el-row>
           <el-col :span="24">
             <el-form-item label="责任单位" prop="responsibilityUnit">
@@ -145,14 +151,23 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="项目分类" prop="projectClassify">
-              <el-select v-model="form.projectClassify" placeholder="请选择项目分类" style="width: 100%;" @change="changeProjectClassify" :disabled="isReplace">
+              <!-- <el-select v-model="form.projectClassify" placeholder="请选择项目分类" style="width: 100%;" @change="changeProjectClassify" :disabled="!form.responsibilityUnit || isReplace">
                 <el-option
                   v-for="dict in dict.type.jjh_project_type"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value"
                 ></el-option>
-              </el-select>
+              </el-select> -->
+              <el-cascader
+                style="width: 100%;"
+                :disabled="isReplace"
+                v-model="form.projectClassify"
+                :options="optionsTwo"
+                :props="propsTwo"
+                @change="changeProjectClassify"
+              >
+              </el-cascader>
             </el-form-item>
           </el-col>
           <!-- <el-col :span="24">
@@ -169,7 +184,7 @@
           </el-col> -->
           <el-col :span="24">
             <el-form-item label="申报表单模版" prop="templateId">
-              <el-select v-model="form.templateId" placeholder="请选择申报表单模版" style="width: 100%;" @change="changeTemplate" :disabled="isReplace">
+              <el-select v-model="form.templateId" placeholder="请选择申报表单模版" style="width: 100%;" @change="changeTemplate" :disabled="isForm">
                 <el-option
                   v-for="dict in templateList"
                   :key="dict.id"
@@ -190,8 +205,27 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
+            <el-form-item label="是否限时" prop="isTime">
+              <el-radio-group v-model="form.isTime" :disabled="isReplace">
+                <el-radio :label="0">限时</el-radio>
+                <el-radio :label="1">不限时</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="是否审批" prop="isApproval">
+              <el-radio-group v-model="form.isApproval" :disabled="isApprovalDisabled">
+                <el-radio :label="0">不需要审批</el-radio>
+                <el-radio :label="1">需要审批</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-show="form.isTime == 0">
             <!-- <el-form-item label="申报时间" prop="reportTime"> -->
-            <el-form-item label="任务填报时间" prop="reportTime">
+            <el-form-item label="任务填报时间" prop="reportTime"
+              :rules="form.isTime == 0 ? rules.reportTime : [
+					      {required: false, message: '请选择填报时间', trigger: 'change' }]"
+            >
               <el-date-picker
                 v-model="form.reportTime"
                 type="daterange"
@@ -302,11 +336,11 @@
 <script>
 import { listTemplate, listBusiness, exportData, addTemplateRecord, putTemplateRecord, listTemplateInfo, getTemplateRecord, uploadFile, allList, supplementation } from "@/api/onlineDeclartion/enterpriseDirectory"
 import * as XLSX from 'xlsx'
-
+import { getAllList } from "@/api/system/dict/data";
 export default {
   name: "EnterpriseDirectory",
   // 'sys_show_hide', 'sys_normal_disable', 'bms_template_type', 
-  dicts: ['bms_responsibility_unit', 'bms_declaration_channels', 'bms_level', 'jjh_project_type'],
+  dicts: ['bms_responsibility_unit', 'bms_declaration_channels', 'bms_level', 'jjh_project_type', "project_small_type"],
   data() {
     let validateTime = (rule, value, callback) => {
       if (new Date(value[1]) < new Date()) {
@@ -329,6 +363,10 @@ export default {
       open: false,
       // 是否是补录按钮点击
       isReplace: false,
+      // 申报表单模板是否可用
+      isForm: false,
+      // 是否审批是否禁用
+      isApprovalDisabled: false,
       // 重新渲染表格状态
       refreshTable: true,
       total: 10,
@@ -371,8 +409,14 @@ export default {
         isFrame: [
           { required: true, message: "名录维护方式不能为空", trigger: "blur" }
         ],
+        isTime: [
+          { required: true, message: "是否限时", trigger: "blur" }
+        ],
         fileList: [
           { required: true, message: "请上传企业名录", trigger: "blur" }
+        ],
+        isApproval: [
+          { required: true, message: "是否审批", trigger: "blur" }
         ]
       },
       businessLoading: false,
@@ -387,13 +431,36 @@ export default {
       excelData: [],
       tabHeader: undefined,
       unitId: undefined,
-      projectId: undefined,
+      projectBigType: undefined,
+      projectMiddleType: undefined,
+      projectSmallType: undefined,
       diaLoading:false,
+      optionsTwo: [],
+      propsTwo:{
+        lazy:true,
+        lazyLoad (node, resolve) {
+          const { level, data, children } = node;
+          if(children?.length == 0 ) {
+            getAllList({dictType:  data.dict}).then(res=>{
+              const nodes = Array.from(res.data).map((item)=>{
+                return {
+                  value:item.dictValue,
+                  label:item.dictLabel,
+                  dict:item.remark,
+                  leaf: level >= 2
+                }
+              })
+              resolve(nodes)
+            })
+          }
+        }
+      },
     };
   },
   mounted() {
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
+    this.getDataList();
   },
   destroyed() {
     window.removeEventListener('resize', this.cancalDebounce);
@@ -403,6 +470,17 @@ export default {
     this.getTemplateList();
   },
   methods: {
+    getDataList(){
+      getAllList({dictType:"project_categories"}).then(res=>{
+        res.data.map(item => {
+          let obj = {};
+          obj.value = item.dictValue;
+          obj.label = item.dictLabel;
+          obj.dict = item.remark;
+          this.optionsTwo.push(obj);
+        })
+      })
+    },
     // 屏幕尺寸变化
     cancalDebounce(){
       const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
@@ -440,6 +518,8 @@ export default {
     cancel() {
       this.open = false;
       this.isReplace = false;
+      this.isForm = false;
+      this.isApprovalDisabled = false;
       this.reset();
     },
     // 表单重置
@@ -452,6 +532,8 @@ export default {
         notes: undefined,
         orderNum: undefined,
         isFrame: 0,
+        isTime: 0,
+        isApproval: 0,
       };
       this.resetForm("form");
     },
@@ -469,10 +551,54 @@ export default {
       this.reset();
       this.open = true;
       this.isReplace = false;
+      this.isForm = true;
+      this.isApprovalDisabled = false;
       this.fileList = [];
       this.form.isFrame = 0;
+      this.form.isTime = 0;
+      this.form.isApproval = 0;
       this.title = "发布申报任务";
     },
+    /** 回显Cascader 级联选择器数据  */
+    echoCascader(arr){
+      getAllList({dictType:"project_categories"}).then(res=>{
+        let obj = {};
+        let objTwo = {};
+        let objThree = {};
+        res.data.map(item => {
+          if(arr[0] == item.dictValue) {
+            obj.value = item.dictValue;
+            obj.label = item.dictLabel;
+            obj.dict = item.remark;
+            obj.children = [];
+            getAllList({dictType:  item.remark}).then(resTwo=>{
+              resTwo.data.map((itemTwo)=>{
+                if(arr[1] == itemTwo.dictValue) {
+                  objTwo.value = itemTwo.dictValue;
+                  objTwo.label = itemTwo.dictLabel;
+                  objTwo.dict = itemTwo.remark;
+                  objTwo.children = [];
+                  obj.children.push(objTwo)
+                  getAllList({dictType:  itemTwo.remark}).then(resThree => {
+                    resThree.data.map((itemThree)=>{
+                      if(arr[2] == itemThree.dictValue) {
+                        objThree.value = itemThree.dictValue;
+                        objThree.label = itemThree.dictLabel;
+                        objThree.dict = itemThree.remark;
+                        objThree.leaf = 'leaf';
+                        objTwo.children.push(objThree)
+                        this.optionsTwo.push(obj);
+                      }
+                    })
+                  })
+                }
+              })
+            })
+            
+          }
+        })
+      })
+    },
     /** 补录按钮操作 */
     handleReplace(row){
       this.reset();
@@ -480,9 +606,19 @@ export default {
         this.form = response.data;
         this.open = true;
         this.isReplace = true;
+        this.isForm = true;
+        this.isApprovalDisabled = true;
         this.title = "申报补录";
         this.form.responsibilityUnit = this.form.responsibilityUnit + ''
-        this.form.projectClassify = this.form.projectClassify + ''
+        let arr = [];
+        if(response.data.projectBigType && response.data.projectMiddleType && response.data.projectSmallType) {
+          arr.push(response.data.projectBigType + '')
+          arr.push(response.data.projectMiddleType + '')
+          arr.push(response.data.projectSmallType + '')
+        }
+        this.echoCascader(arr)
+        // this.form.projectClassify = this.form.projectClassify + ''
+        this.form.projectClassify = arr
         this.form.road = this.form.road + ''
         
         if(this.form.fileName) {
@@ -494,11 +630,19 @@ export default {
         } else {
           this.$set(this.form, 'isFrame', 0)
         }
+        if(this.form.startTime && this.form.endTime) {
+          let arr = []
+          arr.push(this.form.startTime, this.form.endTime)
+          this.$set(this.form, 'reportTime', arr)
+          this.$set(this.form, 'isTime', 0)
+        } else {
+          this.$set(this.form, 'isTime', 1)
+        }
         this.form.fileList = this.form.fileName || []
         this.fileList = this.form.fileName || []
-        let arr = []
-        arr.push(this.form.startTime, this.form.endTime)
-        this.$set(this.form, 'reportTime', arr)
+        // let arr = []
+        // arr.push(this.form.startTime, this.form.endTime)
+        // this.$set(this.form, 'reportTime', arr)
         this.templateList = this.templateListLock.filter((item) => {
           return item.responsibilityUnit == this.form.responsibilityUnit
         })
@@ -512,6 +656,8 @@ export default {
         this.form = response.data;
         this.open = true;
         this.isReplace = false;
+        this.isForm = false;
+        this.isApprovalDisabled = false;
         this.title = "修改申报任务";
         this.form.responsibilityUnit = this.form.responsibilityUnit + ''
         this.form.projectClassify = this.form.projectClassify + ''
@@ -524,11 +670,17 @@ export default {
         } else {
           this.$set(this.form, 'isFrame', 0)
         }
+        if(this.form.startTime && this.form.endTime) {
+          let arr = []
+          arr.push(this.form.startTime, this.form.endTime)
+          this.$set(this.form, 'reportTime', arr)
+          this.$set(this.form, 'isTime', 0)
+        } else {
+          this.$set(this.form, 'isTime', 1)
+        }
         this.form.fileList = this.form.fileName || []
         this.fileList = this.form.fileName || []
-        let arr = []
-        arr.push(this.form.startTime, this.form.endTime)
-        this.$set(this.form, 'reportTime', arr)
+        
         
         // console.log(this.form,"form");
         this.templateList = this.templateListLock.filter((item) => {
@@ -553,6 +705,8 @@ export default {
               this.$modal.msgSuccess("补录成功");
               this.open = false;
               this.isReplace = false;
+              this.isForm = false;
+              this.isApprovalDisabled = false;
               this.getList();
             })
           } else if (this.form.id != undefined) {
@@ -561,6 +715,8 @@ export default {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.isReplace = false;
+              this.isForm = false;
+              this.isApprovalDisabled = false;
               this.getList();
             });
           } else {
@@ -569,6 +725,8 @@ export default {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.isReplace = false;
+              this.isForm = false;
+              this.isApprovalDisabled = false;
               this.getList();
             });
           }
@@ -623,14 +781,14 @@ export default {
     // 责任单位选择
     changeResponsibilityUnit(valid) {
       this.unitId = valid;
-      
-      if(this.projectId) {
+      if(this.projectBigType && this.projectMiddleType && this.projectSmallType) {
+        this.isForm = false;
         // this.templateList = this.templateListLock.filter((item) => {
         //   return item.responsibilityUnit == valid
         // })
         this.templateList = []
         this.form.templateId = ""
-        allList({responsibilityUnit:Number(valid),projectClassify:Number(this.projectId)}).then(res=>{
+        allList({responsibilityUnit:Number(valid),projectBigType:this.projectBigType,projectMiddleType:this.projectMiddleType,projectSmallType:this.projectSmallType}).then(res=>{
           // console.log(res);
           this.templateList = res.data || []
         })
@@ -640,17 +798,28 @@ export default {
     },
     // 项目分类选择
     changeProjectClassify(valId){
-      this.projectId = valId
-      if(this.unitId) {
-        // this.templateList = this.templateListLock.filter((item) => {
-        //   return item.responsibilityUnit == valId
-        // })
-        this.templateList = []
-        this.form.templateId = ""
-        allList({responsibilityUnit:Number(this.unitId),projectClassify:Number(valId)}).then(res=>{
-          // console.log(res);
-          this.templateList = res.data || []
-        })
+      if(valId) {
+        this.projectBigType = valId[0]
+        this.projectMiddleType = valId[1]
+        this.projectSmallType = valId[2]
+        if(this.projectBigType == 11) {
+          this.isApprovalDisabled = true;
+          this.form.isApproval = 0;
+        } else {
+          this.isApprovalDisabled = false;
+        }
+        if(this.unitId) {
+          this.isForm = false;
+          // this.templateList = this.templateListLock.filter((item) => {
+          //   return item.responsibilityUnit == valId
+          // })
+          this.templateList = []
+          this.form.templateId = ""
+          allList({responsibilityUnit:Number(this.unitId),projectBigType:this.projectBigType,projectMiddleType:this.projectMiddleType,projectSmallType:this.projectSmallType}).then(res=>{
+            // console.log(res);
+            this.templateList = res.data || []
+          })
+        }
       }
     },
     changeTemplate(){
diff --git a/src/views/onlineDeclaration/pendingReview/index.vue b/src/views/onlineDeclaration/pendingReview/index.vue
index f1a87a9..544727b 100644
--- a/src/views/onlineDeclaration/pendingReview/index.vue
+++ b/src/views/onlineDeclaration/pendingReview/index.vue
@@ -164,7 +164,7 @@
               <div>
                 <el-radio-group v-model="form.approvalStatus">
                   <el-radio label="1">审批通过</el-radio>
-                  <el-radio label="2">审批驳回</el-radio>
+                  <el-radio label="2">审批不通过</el-radio>
                   <el-radio label="3" v-if="deptId == '105'">退回修改</el-radio>
                 </el-radio-group>
               </div>
@@ -308,7 +308,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleView(row) {
-      this.$router.push({name: 'declareDetailContent',query: {
+      this.$router.push({name: 'onlineDeclareInfo',query: {
         templateId: row.templateId,
         templateRecordId: row.templateRecordId,
         pageType: "detail",
diff --git a/src/views/onlineDeclaration/records/index.vue b/src/views/onlineDeclaration/records/index.vue
index bca43e6..0a79021 100644
--- a/src/views/onlineDeclaration/records/index.vue
+++ b/src/views/onlineDeclaration/records/index.vue
@@ -82,12 +82,16 @@
       <el-col :span="22">
         <el-radio-group v-model="radio" @change="toggleOptions">
           <el-radio-button label="">全部</el-radio-button>
-          <el-radio-button label="1,8">初审</el-radio-button>
-          <el-radio-button label="2,7">复审</el-radio-button>
-          <!-- <el-radio-button label="3,6">专家评审</el-radio-button> -->
-          <el-radio-button label="3,6">终审</el-radio-button>
-          <!-- <el-radio-button label="4">市级评审</el-radio-button> -->
-          <el-radio-button label="5">终审通过</el-radio-button>
+          <el-radio-button label="0">待填报</el-radio-button>
+          <el-radio-button label="6">已填报</el-radio-button>
+          <el-radio-button label="1">初审中</el-radio-button>
+          <el-radio-button label="10">初审驳回</el-radio-button>
+          <el-radio-button label="8">初审不通过</el-radio-button>
+          <el-radio-button label="2">复审中</el-radio-button>
+          <el-radio-button label="7">复审不通过</el-radio-button>
+          <el-radio-button label="3">终审中</el-radio-button>
+          <el-radio-button label="9">终审不通过</el-radio-button>
+          <el-radio-button label="5">评审通过</el-radio-button>
         </el-radio-group>
       </el-col>
       <el-col :span="2" class="zipImport">
@@ -174,6 +178,11 @@
       </el-table-column>
       <!-- <el-table-column prop="projectName" label="项目名称" :show-overflow-tooltip="true" min-width="160"></el-table-column> -->
       <el-table-column prop="enterpriseDirectory" label="申报任务标题" :show-overflow-tooltip="true" min-width="160"></el-table-column>
+      <el-table-column label="项目小类" :show-overflow-tooltip="true" min-width="150">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.project_small_type" :value="scope.row.projectSmallType"/>
+        </template>
+      </el-table-column>
       <el-table-column prop="enterpriseName" label="申报单位" :show-overflow-tooltip="true" min-width="120"></el-table-column>
       <!--  width="60" -->
       <el-table-column label="级别">
@@ -218,6 +227,7 @@
           <span v-if="scope.row.status == 8" class="approval_status8">初审不通过</span>
           <span v-if="scope.row.status == 7" class="approval_status9">复审不通过</span>
           <!-- <span v-if="scope.row.status == 6" class="approval_status9">专家评审-拒绝</span> -->
+          <span v-if="scope.row.status == 6" class="approval_status5">已填报</span>
           <span v-if="scope.row.status == 9" class="approval_status9">终审不通过</span>
           <span v-if="scope.row.status == 10" class="approval_status9">初审驳回</span>
         </template>
@@ -366,7 +376,7 @@ import * as XLSX from 'xlsx'
 import { Message, Loading } from 'element-ui'
 export default {
   name: "Records",
-  dicts: ['sys_show_hide', 'sys_normal_disable', 'bms_declaration_type', 'bms_responsibility_unit', 'bms_level', 'bms_template_type', 'bms_declaration_channels'],
+  dicts: ['sys_show_hide', 'sys_normal_disable', 'bms_declaration_type', 'bms_responsibility_unit', 'bms_level', 'bms_template_type', 'bms_declaration_channels', "project_small_type"],
   data() {
     return {
       userType: this.$store.state.user.userType,
@@ -463,7 +473,7 @@ export default {
       this.multipleSelection = val;
     },
     routerGo() {
-      this.$router.push({ name: 'supplementaryNew' }).catch(()=>{});
+      this.$router.push({ name: 'onlineDeclareTInfo' }).catch(()=>{});
     },
     /** 查询菜单列表 */
     getList() {
@@ -570,7 +580,7 @@ export default {
     /** 开始填报按钮操作 */
     handleAdd(row){
       // console.log(row);
-      this.$router.push({name: 'declareAddContent',query: {
+      this.$router.push({name: 'onlineDeclareAdd',query: {
         templateId: row.templateId,
         templateRecordId: row.templateRecordId,
         declarationId: row.id,
@@ -579,7 +589,7 @@ export default {
     },
     /** 查看审核详情操作 */
     handleDetail(row){
-      this.$router.push({name: 'declareDetailContent',query: {
+      this.$router.push({name: 'onlineDeclareInfo',query: {
         templateId: row.templateId,
         // templateRecordId: row.templateRecordId,
         pageType: "detail",
@@ -621,7 +631,7 @@ export default {
     submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.$router.push({name: 'declareAddContent',query: {
+          this.$router.push({name: 'onlineDeclareAdd',query: {
             templateId: this.form.templateId,
             templateRecordId: this.form.templateRecordId,
             pageType: "add",
@@ -631,7 +641,7 @@ export default {
     },
     /** 编辑按钮 */
     handleEdit(row) {
-      this.$router.push({name: 'declareDetailContent',query: {
+      this.$router.push({name: 'onlineDeclareInfo',query: {
         templateId: row.templateId,
         templateRecordId: row.templateRecordId,
         pageType: "edit",
diff --git a/src/views/onlineDeclaration/template/index.vue b/src/views/onlineDeclaration/template/index.vue
index 4c9bce1..70ade6e 100644
--- a/src/views/onlineDeclaration/template/index.vue
+++ b/src/views/onlineDeclaration/template/index.vue
@@ -1,58 +1,42 @@
 <template>
   <div class="app-container" id="app-container">
     <el-form :model="queryParams" id="I-form" ref="queryForm" size="small" :inline="true">
-      <el-form-item label="模版名称" prop="templateName">
-        <el-input
-          v-model="queryParams.templateName"
-          placeholder="请输入模版名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目分类" prop="projectClassify">
-        <el-select v-model="queryParams.projectClassify" placeholder="请选择产业领域" clearable>
-          <el-option
-            v-for="dict in dict.type.jjh_project_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+      <el-col :span="22">
+        <el-form-item label="模版名称" prop="templateName">
+          <el-input
+            v-model="queryParams.templateName"
+            placeholder="请输入模版名称"
+            clearable
+            @keyup.enter.native="handleQuery"
           />
-        </el-select>
-      </el-form-item>
-      <!-- <el-form-item label="产业领域" prop="productArea">
-        <el-select v-model="queryParams.productArea" placeholder="请选择产业领域" clearable>
-          <el-option
-            v-for="dict in dict.type.bms_product_area"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="申报类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择申报类型" clearable>
-          <el-option
-            v-for="dict in dict.type.bms_declaration_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item> -->
-      <el-form-item label="责任单位" prop="responsibilityUnit">
-        <el-select v-model="queryParams.responsibilityUnit" placeholder="请选择责任单位" clearable>
-          <el-option
-            v-for="dict in dict.type.bms_responsibility_unit"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item class="search_btn">
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" class="btn">查询</el-button>
-      </el-form-item>
+        </el-form-item>
+        <el-form-item label="项目分类" prop="projectClassify">
+          <el-cascader
+            placeholder="请选择项目分类"
+            v-model="queryParams.projectClassify"
+            :options="optionsTwo"
+            :props="propsTwo"
+          >
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="责任单位" prop="responsibilityUnit">
+          <el-select v-model="queryParams.responsibilityUnit" placeholder="请选择责任单位" clearable>
+            <el-option
+              v-for="dict in dict.type.bms_responsibility_unit"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item class="search_btn">
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" class="btn">查询</el-button>
+        </el-form-item>
+      </el-col>
+      <el-col :span="2">
+        <el-button type="primary" class="import-btn" icon="icon iconfont icon-jc-daoru" size="mini" @click="importBtn(null)">创建新模板</el-button>
+      </el-col>
     </el-form>
 
     <el-table
@@ -64,7 +48,7 @@
     >
       <el-table-column label="序号" align="center" width="50" fixed>
         <template slot-scope="scope">
-          <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+          <span>{{(queryParams.current - 1) * queryParams.size + scope.$index + 1}}</span>
         </template>
       </el-table-column>
       <el-table-column label="年份" align="center" prop="createTime" min-width="80">
@@ -73,10 +57,15 @@
         </template>
       </el-table-column>
       <el-table-column prop="templateName" label="模版名称" min-width="150" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column label="项目分类" :show-overflow-tooltip="true" min-width="150">
+      <!-- <el-table-column label="项目分类" :show-overflow-tooltip="true" min-width="150">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.jjh_project_type" :value="scope.row.projectClassify"/>
         </template>
+      </el-table-column> -->
+      <el-table-column label="项目小类" :show-overflow-tooltip="true" min-width="150">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.project_small_type" :value="scope.row.projectSmallType"/>
+        </template>
       </el-table-column>
       <el-table-column label="级别" min-width="100">
         <template slot-scope="scope">
@@ -111,7 +100,7 @@
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="140" fixed="right">
+      <el-table-column label="操作" align="center" width="250" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -121,8 +110,21 @@
           <el-button
             size="mini"
             type="text"
+            style="margin-left: 5px;"
             @click="handleExport(scope.row)"
           >下载表单</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            style="margin-left: 5px;"
+            @click="handleProcessView(scope.row)"
+          >流程设计</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            style="margin-left: 5px;"
+            @click="importBtn(scope.row)"
+          >表单自定义</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -130,19 +132,41 @@
       id="L-pagination"
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.current"
+      :limit.sync="queryParams.size"
       @pagination="getList"
     />
+
+    <!-- 流程图   :xml="processView.xmlData" -->
+    <el-dialog :title="designerData.title" :visible.sync="designerOpen" width="90%" append-to-body custom-class="process-dialog">
+      <process-designer
+        :key="designerOpen"
+        style="border:1px solid rgba(0, 0, 0, 0.1);"
+        ref="modelDesigner"
+        v-loading="designerData.loading"
+        :bpmnXml="designerData.bpmnXml"
+        :designerForm="designerData.form"
+      />
+      <!-- @save="onSaveDesigner" -->
+    </el-dialog>
+    <el-dialog title="表单自定义" :visible.sync="FromOpen" width="90%" append-to-body custom-class="process-dialog">
+      <FromBuild :info="info" @successCode="successCode" ref="FromBuild"></FromBuild>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listInfo, exportData } from "@/api/onlineDeclartion/declarationManagement"
-
+import { getAllList } from "@/api/system/dict/data";
+import ProcessDesigner from '@/components/ProcessDesigner';
+import FromBuild from "@/views/tool/build"
 export default {
   name: "Template",
-  dicts: ['bms_product_area', 'bms_declaration_type', 'bms_responsibility_unit', 'bms_level', 'jjh_project_type'],
+  dicts: ['bms_product_area', 'bms_declaration_type', 'bms_responsibility_unit', 'bms_level', 'jjh_project_type', "project_small_type"],
+  components: {
+    ProcessDesigner,
+    FromBuild
+  },
   data() {
     return {
       // 遮罩层
@@ -155,26 +179,117 @@ export default {
       // 查询参数
       queryParams: {
         templateName: undefined,
-        projectClassify: undefined,
+        projectClassify: [],
         // type: undefined,
         responsibilityUnit: undefined,
-        pageNum: 1,
-        pageSize: 20,
+        current: 1,
+        size: 10,
       },
       tabHeader: undefined,
+      optionsTwo: [],
+      propsTwo:{
+        lazy:true,
+        lazyLoad (node, resolve) {
+          const { level, data, children } = node;
+          if(children?.length == 0 ) {
+            getAllList({dictType:  data.dict}).then(res=>{
+              const nodes = Array.from(res.data).map((item)=>{
+                return {
+                  value:item.dictValue,
+                  label:item.dictLabel,
+                  dict:item.remark,
+                  leaf: level >= 2
+                }
+              })
+              resolve(nodes)
+            })
+          }
+        }
+      },
+      designerOpen: false,
+      designerData: {
+        loading: false,
+        bpmnXml: '',
+        modelId: null,
+        form: {
+          processName: null,
+          processKey: null
+        }
+      },
+      FromOpen:false,
+      info:{},
     };
   },
   mounted() {
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
+    // if(this.$route.params.code == 200) {
+    //   this.$message({
+    //     type: "success",
+    //     message: "新增模板成功!",
+    //   });
+    // } else if(this.$route.params.code == 800) {
+    //   this.$message({
+    //     type: "success",
+    //     message: "修改模板成功!",
+    //   });
+    // }
   },
   destroyed() {
     window.removeEventListener('resize', this.cancalDebounce);
   },
   created() {
     this.getList();
+    this.getDataList();
   },
   methods: {
+    /** 查看流程图 */
+    handleProcessView(row) {
+      this.designerData.title = "流程设计 - " + row.templateName;
+      this.designerData.modelId = "";
+      this.designerOpen = true;
+      // this.designerData.form = {
+      //   processName: row.templateName,
+      //   processKey: row.id + ''
+      // }
+      // if (row.modelId) {
+      //   this.designerData.loading = true;
+      //   getBpmnXml(row.modelId).then(response => {
+      //     this.designerData.bpmnXml = response.data || '';
+      //     this.designerData.loading = false;
+      //     this.designerOpen = true;
+      //   })
+      // }
+    },
+    // onSaveDesigner(bpmnXml) {
+    //   this.bpmnXml = bpmnXml;
+    //   let dataBody = {
+    //     modelId: this.designerData.modelId,
+    //     bpmnXml: this.bpmnXml
+    //   }
+    //   this.$confirm("是否将此模型保存为新版本？", "提示", {
+    //     distinguishCancelAndClose: true,
+    //     confirmButtonText: '是',
+    //     cancelButtonText: '否'
+    //   }).then(() => {
+    //     this.confirmSave(dataBody, true)
+    //   }).catch(action => {
+    //     if (action === 'cancel') {
+    //       this.confirmSave(dataBody, false)
+    //     }
+    //   })
+    // },
+    getDataList(){
+      getAllList({dictType:"project_categories"}).then(res=>{
+        res.data.map(item => {
+          let obj = {};
+          obj.value = item.dictValue;
+          obj.label = item.dictLabel;
+          obj.dict = item.remark;
+          this.optionsTwo.push(obj);
+        })
+      })
+    },
     // 屏幕尺寸变化
     cancalDebounce(){
       const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
@@ -196,6 +311,11 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      if(this.queryParams.projectClassify) {
+        this.queryParams.projectBigType = this.queryParams.projectClassify[0]
+        this.queryParams.projectMiddleType = this.queryParams.projectClassify[1]
+        this.queryParams.projectSmallType = this.queryParams.projectClassify[2]
+      }
       this.getList();
     },
     /** 重置按钮操作 */
@@ -205,13 +325,13 @@ export default {
     },
      /** 查看详情操作 */
     handleDetail(row) {
-      this.$router.push({name: 'templateDetail',query: {
+      this.$router.push({name: 'onlineDeclareDetail',query: {
         templateId: row.id,
         pageType: "template",
       }})
     },
-     /** 导出按钮操作 */
-     handleExport(row) {
+    /** 导出按钮操作 */
+    handleExport(row) {
       exportData({id: row.id}).then(response => {
         let url = window.URL.createObjectURL(new Blob([response]))
         let link = document.createElement('a')
@@ -224,6 +344,39 @@ export default {
         window.URL.revokeObjectURL(url)
       })
     },
+    // 创建新模板按钮
+    importBtn(row){
+      this.FromOpen = true;
+      this.$nextTick(()=>{
+        this.$refs.FromBuild.open()
+      })
+      if(row) {
+        this.info = row
+        // this.$router.push({
+        //   name: 'onlineDeclarebBuild',
+        //   query: { info: JSON.stringify(row) }
+        // })
+      } else {
+        this.info = {}
+        // this.$router.push({
+        //   name: 'onlineDeclarebBuild',
+        // })
+      }
+    },
+    // 成功后的事件
+    successCode(code){
+      if(code == 200) {
+        this.$message({
+          type: "success",
+          message: "新增模板成功!",
+        });
+      } else if(code == 800) {
+        this.$message({
+          type: "success",
+          message: "修改模板成功!",
+        });
+      }
+    },
   }
 };
 </script>
diff --git a/src/views/onlineDeclaration/templateDetail/index.vue b/src/views/onlineDeclaration/templateDetail/index.vue
index ed41a84..abdba6d 100644
--- a/src/views/onlineDeclaration/templateDetail/index.vue
+++ b/src/views/onlineDeclaration/templateDetail/index.vue
@@ -5,7 +5,16 @@
         <el-form ref="form" :model="form"  label-width="120px" label-position="left" class="form">
           <el-row>
             <el-col :span="8" style="height: 50px;display: flex;">
-              项目分类：<dict-tag :options="dict.type.jjh_project_type" :value="info.projectClassify"/>
+              模板名称：{{ info.templateName }}
+            </el-col>
+            <el-col :span="8" style="height: 50px;display: flex;">
+              项目大类：<dict-tag :options="dict.type.project_categories" :value="info.projectBigType"/>
+            </el-col>
+            <el-col :span="8" style="height: 50px;display: flex;">
+              项目中类：<dict-tag :options="dict.type.project_middle_type" :value="info.projectMiddleType"/>
+            </el-col>
+            <el-col :span="8" style="height: 50px;display: flex;">
+              项目小类：<dict-tag :options="dict.type.project_small_type" :value="info.projectSmallType"/>
             </el-col>
             <el-col :span="8" style="height: 50px;display: flex;">
               <!-- {{ info.responsibilityUnit == 0 ? '经发委' : info.responsibilityUnit == 1 ? '规建委' : info.responsibilityUnit == 2 ? '行审局' : info.responsibilityUnit == 3 ? '市监局' : '' }} -->
@@ -72,16 +81,36 @@
                   截止目前员工人数
                 </template>
               </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+                  2023年营收
+                </template>
+              </el-descriptions-item>
+              <el-descriptions-item >
+                <template slot="label">
+                  2023年税收
+                </template>
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+                  2024年预计营收
+                </template>
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+                  2024年预计税收
+                </template>
+              </el-descriptions-item>
             </el-descriptions>
           </div>
           <!-- 做大做强奖补模版 -->
           <div class="table-content" v-if="templateId == 2">
             <el-descriptions class="margin-top" title="【项目投资计划】" :column="3" :size="size" border :label-style="LS">
-            <el-descriptions-item>
+            <!-- <el-descriptions-item>
               <template slot="label">
                 项目名称
               </template>
-            </el-descriptions-item>
+            </el-descriptions-item> -->
             <el-descriptions-item>
               <template slot="label">
                 申报单位成立时间
@@ -93,6 +122,51 @@
               </template>
               是
             </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                2021年营收
+              </template>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                2021年税收
+              </template>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                2022年营收
+              </template>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                2022年税收
+              </template>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                2023年营收
+              </template>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                2023年税收
+              </template>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                2024年预计营收
+              </template>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                2024年预计税收
+              </template>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                园区其他经营奖励
+              </template>
+            </el-descriptions-item>
           </el-descriptions>
           </div>
           <!-- 载体建设奖补模版 -->
@@ -242,6 +316,15 @@
             </el-descriptions-item>
           </el-descriptions>
           </div>
+          <div class="table-content" v-else>
+            <el-descriptions class="margin-top" title="【项目投资计划】" :column="2" :size="size" border  :label-style="LS">
+              <el-descriptions-item v-for="(item,index) in templateJson.fields" :key="index" v-if="!item.action">
+                <template slot="label">
+                  {{ item.label }}
+                </template>
+              </el-descriptions-item>
+            </el-descriptions>
+          </div>
           <!-- 上传文件列表 -->
           <div class="table-content last_upload">
             <p>【上传材料】</p>
@@ -358,6 +441,9 @@
               <div  v-if="templateId == 12 " class="upload_col">
                 <div class="upload_title">其他相关情况说明</div>
               </div>
+              <div v-for="(item,index) in templateJson.fields" :key="index" v-if="item.action" class="upload_col">
+                <div class="upload_title">{{ item.label }}</div>
+              </div>
             </div>
           </div>
           <!-- <div class="operate_btn">
@@ -406,7 +492,7 @@ import JsPDF from 'jspdf';
 import { getInfo } from "@/api/onlineDeclartion/declarationManagement"
 export default {
   name: "declareAddContent",
-  dicts: ['jjh_project_type', 'bms_responsibility_unit'],
+  dicts: ['bms_responsibility_unit', "project_middle_type", "project_small_type", "project_categories"],
   data() {
     return {
       size: '',
@@ -420,6 +506,7 @@ export default {
         'work-break': 'break-all'
       },
       info:{},
+      templateJson:{},
     };
   },
   async mounted(){
@@ -429,6 +516,8 @@ export default {
     getInfo(this.templateId).then(res=>{
       // console.log(res);
       this.info = res.data
+      this.templateJson = res.data.templateJson ? JSON.parse(res.data.templateJson) : {};
+      // console.log(this.templateJson);
     })
     switch (this.templateId){
         case 1:
diff --git a/src/views/policyDocument/index.vue b/src/views/policyDocument/index.vue
index aeb2130..5ef13ed 100644
--- a/src/views/policyDocument/index.vue
+++ b/src/views/policyDocument/index.vue
@@ -13,7 +13,7 @@
             <el-form-item label="政策等级：" prop="policyLevel">
               <el-select class="ignoreElement" v-model="formInline.policyLevel" placeholder="请选择">
                 <el-option
-                  v-for="dict in dict.type.bms_level"
+                  v-for="dict in dict.type.policy_grade"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value">
@@ -62,7 +62,7 @@
           <el-table-column label="发文单位" prop="enterUnit" />
           <el-table-column label="政策等级" prop="policyLevel">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.bms_level" :value="scope.row.policyLevel"/>
+              <dict-tag :options="dict.type.policy_grade" :value="scope.row.policyLevel"/>
             </template>
           </el-table-column>
           <el-table-column label="发文时间" prop="enterTime" />
@@ -99,7 +99,7 @@
               <!-- <el-input v-model.trim="addFrom.policyLevel" placeholder="请输入内容"></el-input> -->
               <el-select class="ignoreElement" v-model="addFrom.policyLevel" placeholder="请选择">
                 <el-option
-                  v-for="dict in dict.type.bms_level"
+                  v-for="dict in dict.type.policy_grade"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value">
@@ -143,7 +143,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="发文内容：" class="importFormItem" prop="enterContent">
-              <Editor :height="200" v-model="addFrom.enterContent"></Editor>
+              <myEditor v-if="openEditor" :height="200" v-model="addFrom.enterContent"></myEditor>
             </el-form-item>
           </el-col>
         </el-row>
@@ -163,6 +163,8 @@
         <div class="info-content-top">
           <div>发布人：{{ addFrom.createBy }}</div>
           <div>发布时间：{{ addFrom.enterTime }}</div>
+          <div>发文单位：{{ addFrom.enterUnit }}</div>
+          <div style="display: flex;align-items: center;">政策等级：<dict-tag :options="dict.type.policy_grade" :value="addFrom.policyLevel"/></div>
         </div>
         <div v-html="addFrom.enterContent" class="info-content-content"></div>
       </div>
@@ -179,14 +181,17 @@
 <script>
 import myPagination from "@/views/components/Pagination/index.vue"
 import myDialog from "@/views/components/myDialog/index.vue"
+import myEditor from "@/views/components/myEditor/index.vue"
 import { getJPolicyFile, jPolicyFileNew, jPolicyFileChange, jPolicyFileId, jPolicyFileDel } from "@/api/jin_ji_hu/policyDocument"
 export default {
-  components:{myPagination, myDialog},
-  dicts: ['jjh_project_type', 'bms_level'],
+  components:{myPagination, myDialog, myEditor},
+  dicts: ['jjh_project_type', 'policy_grade'],
   data() {
+    var now = new Date();
     return {
       userType: this.$store.state.user.userType,
       deptId: this.$store.state.user.deptId,
+      now:now,
       total:0,
       pagination: {
         current:1,
@@ -198,24 +203,14 @@ export default {
         enterUnit:"",
         policyLevel:"",
       },
-      tableData:[
-        {
-          projectName:"苏财建[2021]101号 关于下达2021年江苏省级现代服务业发展 专项资金（现代服务业项目）的通知",
-          project:"全方位生物大分子药定制研发生产（CDMO）服务平台",
-          unit:"苏财政",
-          grade:"市级",
-          issueTime:"2023-03-19",
-          user:"张珊",
-          uploadingTime:"2023-05-11 14:00",
-        }
-      ],
+      tableData:[],
       tabHeader: undefined,
       addFrom: {
         name:"",
         joinProject:"",
         enterUnit:"",
         policyLevel:"",
-        enterTime:"",
+        enterTime: now,
       },
       rules:{
         name:[
@@ -228,14 +223,15 @@ export default {
           { required: true, message: '请填写发文单位', trigger: 'blur' }
         ],
         policyLevel:[
-          { required: true, message: '请选择发文时间', trigger: 'change' }
+          { required: true, message: '请选择政策等级', trigger: 'change' }
         ],
         enterTime:[
-          { required: true, message: '请选择关联项目', trigger: 'change' }
+          { required: true, message: '请选择发文时间', trigger: 'change' }
         ],
       },
       title:"新增发文",
       infoVisible:false,
+      openEditor:false,
     }
   },
   mounted() {
@@ -290,14 +286,16 @@ export default {
       }
       return '';
     },
-    // 导入按钮
+    // 新增按钮
     importBtn(){
       this.title = "新增发文";
       this.$refs.importProject.open();
+      this.openEditor = true;
     },
     // 关闭事件触发
     importClose(){
       this.$nextTick(()=>{
+        this.openEditor = false;
         this.$refs.importFrom.resetFields();
         this.$refs.importProject.close();
         this.addFrom = {
@@ -305,7 +303,7 @@ export default {
           joinProject:"",
           enterUnit:"",
           policyLevel:"",
-          enterTime:"",
+          enterTime:this.now,
         }
       })
     },
@@ -328,6 +326,7 @@ export default {
       this.title = "修改发文"
       jPolicyFileId(row.id).then((res)=>{
         if(res.code == 200) {
+          this.openEditor = true;
           this.addFrom = res.data;
           this.addFrom.joinProject = this.addFrom.joinProject + ''
           this.$refs.importProject.open();
@@ -376,7 +375,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          jPolicyFileDel({ id: row.id }).then((res) => {
+          jPolicyFileDel(row.id).then((res) => {
             this.getList();
             this.$message({
               type: "success",
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index e02487b..b65c157 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -15,20 +15,27 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item label="项目分类：">
-              <el-select class="ignoreElement" v-model="formInline.projectClassify" placeholder="请选择">
+              <!-- <el-select class="ignoreElement" v-model="formInline.projectClassify" placeholder="请选择">
                 <el-option
                   v-for="dict in dict.type.jjh_project_type"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value">
                 </el-option>
-              </el-select>
+              </el-select> -->
+              <el-cascader
+                v-model="formInline.projectClassify"
+                class="ignoreElement project_big_type"
+                :options="options"
+                :props="props"
+                clearable>
+              </el-cascader>
             </el-form-item>
-            <el-form-item label="项目名称：">
+            <!-- <el-form-item label="项目名称：">
               <el-input v-model.trim="formInline.projectName" placeholder="请输入内容"></el-input>
-            </el-form-item>
-            <el-form-item label="申报单位：">
-              <el-input v-model.trim="formInline.declareUnit" placeholder="请输入内容"></el-input>
+            </el-form-item> -->
+            <el-form-item label="单位名称："> <!-- 申报单位 -->
+              <el-input v-model.trim="formInline.declareUnit" placeholder="请输入单位名称"></el-input>
             </el-form-item>
             
             <el-form-item label="状态：">
@@ -47,20 +54,37 @@
             </el-form-item>
           </el-col>
           <el-col :span="2">
-            <el-button type="primary" class="import-btn" icon="icon iconfont icon-jc-daoru" size="mini" @click="importBtn">导入新项目</el-button>
+            <el-button type="primary" class="import-btn" icon="icon iconfont icon-jc-daoru" size="mini" @click="importBtn" v-if="!roles.includes('ent')">导入新项目</el-button>
           </el-col>
         </el-form>
       </header>
       <section>
         <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" :height="tabHeader" :max-height="tabHeader">
           <el-table-column label="年份" key="projectYear" width="200px" prop="projectYear" />
-          <el-table-column label="项目名称" key="projectName" width="450px" prop="projectName" />
+          <!-- <el-table-column label="项目名称" key="projectName" width="450px" prop="projectName" />
           <el-table-column label="申报单位" key="declareUnit" width="550px" prop="declareUnit" />
           <el-table-column label="项目分类" key="projectClassify" width="250px" prop="projectClassify">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.jjh_project_type" :value="scope.row.projectClassify"/>
             </template>
+          </el-table-column> -->
+          <el-table-column label="项目大类" key="projectBigType" prop="projectBigType">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.project_categories" :value="scope.row.projectBigType"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="项目中类" key="projectMiddleType" prop="projectMiddleType">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.project_middle_type" :value="scope.row.projectMiddleType"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="项目小类" key="projectSmallType" prop="projectSmallType">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.project_small_type" :value="scope.row.projectSmallType"/>
+            </template>
           </el-table-column>
+          <el-table-column label="单位名称" key="declareUnit" prop="declareUnit" />
+          <el-table-column label="信用代码" key="creditCode" prop="creditCode" />
           <el-table-column label="状态" key="status" width="200px" prop="status" class-name="table-status">
             <template slot-scope="scope">
               <p class="statusisZero" v-if="scope.row.status === 0">
@@ -108,7 +132,7 @@
           <el-table-column label="操作" prop="userId" class-name="table-operation">
             <template slot-scope="scope">
               <span class="look-info" @click="goInfo(scope.row)">查看详情</span>
-              <span class="del-info" @click="delInfo(scope.row)">删除</span>
+              <span class="del-info" v-if="!roles.includes('ent')" @click="delInfo(scope.row)">删除</span>
             </template>
           </el-table-column>
         </el-table>
@@ -122,30 +146,29 @@
         ></my-pagination>
       </section>
     </div>
-    <my-dialog :title="title" @close="importClose" ref="importProject" class="project-import-dialog">
+    <my-dialog :title="title" @close="importClose" ref="importProject" class="project-import-dialog" width="55%">
       <el-row>
         <el-col :span="12">
           <el-form :model="importFrom" size="small" ref="importFrom" label-width="100px" :rules="rules">
-            <el-form-item label="项目分类：" class="importFormItem" prop="projectClassify">
+            <!-- <el-form-item label="项目大类：" class="importFormItem" prop="projectClassify">
               <el-select class="ignoreElement" v-model="importFrom.projectClassify" placeholder="请选择">
                 <el-option
-                  v-for="dict in dict.type.jjh_project_type"
+                  v-for="dict in dict.type.project_categories"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value">
                 </el-option>
               </el-select>
-            </el-form-item>
-            <!-- <el-form-item label="年份：" class="importFormItem" prop="projectYear">
-              <el-date-picker
-                class="ignoreElement"
-                v-model="importFrom.projectYear"
-                type="year"
-                format="yyyy"
-                value-format="yyyy"
-                placeholder="选择年">
-              </el-date-picker>
             </el-form-item> -->
+            <el-form-item label="项目分类：" class="importFormItem" prop="projectClassify">
+              <el-cascader
+                v-model="importFrom.projectClassify"
+                :options="optionsTwo"
+                :props="propsTwo"
+                @change="handleItemChange"
+              >
+              </el-cascader>
+            </el-form-item>
             <el-form-item class="importFormItem">
               <!-- <el-button type="primary" class="import-btn" icon="icon iconfont icon-jc-daoru" size="mini" @click="importBtn">导入新项目</el-button> -->
               <div class="btnsFlex">
@@ -155,7 +178,7 @@
                   :limit="1"
                   v-show="false"
                   accept=".xlsx, .xls"
-                  :data="importFrom"
+                  :data="importFromChange"
                   :headers="upload.headers"
                   :action="upload.url"
                   :disabled="upload.isUploading"
@@ -179,15 +202,17 @@
           <div class="importExplain">
             <div class="importExplain-title">导入模板说明</div>
             <div class="importExplain-content">
-              <span>"项目名称  申报单位  年份"</span>
+              <span>"企业名称  统一社会信用代码  年份"</span><br />
               <span>以上字段为excel公共字段，后面的字段可自定义，系统会自动识别并导入</span>
             </div>
             <div class="importExplain-table">
               <table>
                 <tr>
-                    <th>项目名称</th>
-                    <!-- <th>项目分类</th> -->
+                    <!-- <th>项目名称</th>
                     <th>申报单位</th>
+                    <th>年份</th> -->
+                    <th>企业名称</th>
+                    <th>统一社会信用代码</th>
                     <th>年份</th>
                     <th></th>
                 </tr>
@@ -220,14 +245,15 @@ import myDialog from "@/views/components/myDialog/index.vue"
 import { getToken } from "@/utils/auth";
 import { clearKey } from "@/utils/object.js"
 import { jProject, jProjectDel } from "@/api/jin_ji_hu/project/index"
-
+import { getAllList } from "@/api/system/dict/data";
 export default {
   components:{myPagination,myDialog},
-  dicts: ['jjh_project_type', 'bms_approval_status'],
+  dicts: ['jjh_project_type', 'bms_approval_status', "project_middle_type", "project_small_type", "project_categories"],
   data() {
     return {
       // 判断登陆用户是何身份⌈ 01 ： 企业  02 ： 政务 ⌋
       userType: this.$store.state.user.userType,
+      roles: this.$store.state.user.roles,
       total:0,
       pagination: {
         current:1,
@@ -235,29 +261,52 @@ export default {
       },
       formInline: {
         projectClassify: '',
-        projectName:"",
+        projectName:[],
         declareUnit:"",
         projectYear:"",
         status: ''
       },
-      options:[
-        {
-          value: '选项1',
-          label: '总部经济'
-        },{
-          value: '选项2',
-          label: '自主品牌先进技术研究院'
-        },{
-          value: '选项3',
-          label: '省现代服务业重点项目'
-        },{
-          value: '选项4',
-          label: '省市服务业领军企业'
-        },{
-          value: '选项5',
-          label: '两业融合试点单位'
-        },
-      ],
+      options: [],
+      optionsTwo: [],
+      props:{
+        checkStrictly:true,
+        lazy:true,
+        lazyLoad (node, resolve) {
+          const { level, data, children } = node;
+          if(children?.length == 0 ) {
+            getAllList({dictType:  data.dict}).then(res=>{
+              const nodes = Array.from(res.data).map((item)=>{
+                return {
+                  value:item.dictValue,
+                  label:item.dictLabel,
+                  dict:item.remark,
+                  leaf: level >= 2
+                }
+              })
+              resolve(nodes)
+            })
+          }
+        }
+      },
+      propsTwo:{
+        lazy:true,
+        lazyLoad (node, resolve) {
+          const { level, data, children } = node;
+          if(children?.length == 0 ) {
+            getAllList({dictType:  data.dict}).then(res=>{
+              const nodes = Array.from(res.data).map((item)=>{
+                return {
+                  value:item.dictValue,
+                  label:item.dictLabel,
+                  dict:item.remark,
+                  leaf: level >= 2
+                }
+              })
+              resolve(nodes)
+            })
+          }
+        }
+      },
       loading:false,
       tableData:[],
       title:"导入新项目",
@@ -265,6 +314,11 @@ export default {
         projectClassify:"",
         // projectYear:"",
       },
+      importFromChange:{
+        projectBigType:"",
+        projectMiddleType:"",
+        projectSmallType:"",
+      },
       rules: {
         projectClassify: [
           { required: true, message: '请选择项目分类', trigger: 'change' }
@@ -293,8 +347,27 @@ export default {
       this.formInline.projectClassify = this.$route.params.projectId + '';
       this.pagination = { ...this.pagination,...this.formInline };
     }
-    if(this.$route.params.projectName) {
-      this.formInline.projectName = this.$route.params.projectName;
+    if(this.$route.params.projectYear || (this.$route.params.projectBigType || this.$route.params.projectMiddleType || this.$route.params.projectSmallType)) {
+      let arr = [];
+      arr.push(this.$route.params.projectBigType + '')
+      this.$route.params.projectMiddleType ? arr.push(this.$route.params.projectMiddleType + '') : null;
+      this.$route.params.projectSmallType ? arr.push(this.$route.params.projectSmallType + '') : null;
+      this.echoCascader(arr)
+      this.formInline.projectYear = this.$route.params.projectYear ? this.$route.params.projectYear + '' : '';
+      this.formInline.projectBigType = arr[0];
+      this.formInline.projectMiddleType = arr[1] ? arr[1] : null;
+      this.formInline.projectSmallType = arr[2] ? arr[2] : null;
+      this.pagination = { ...this.pagination,...this.formInline };
+      this.formInline.projectClassify = arr;
+    } else {
+      this.getDataList();
+    }
+    // if(this.$route.params.projectName) {
+    //   this.formInline.projectName = this.$route.params.projectName;
+    //   this.pagination = { ...this.pagination,...this.formInline };
+    // }
+    if(this.$route.params.declareUnit) {
+      this.formInline.declareUnit = this.$route.params.declareUnit
       this.pagination = { ...this.pagination,...this.formInline };
     }
     if(this.userType == "01") {
@@ -309,6 +382,75 @@ export default {
     window.removeEventListener('resize', this.cancalDebounce);
   },
   methods:{
+    /** 回显Cascader 级联选择器数据  */
+    echoCascader(arr){
+      getAllList({dictType:"project_categories"}).then(res=>{
+        let obj = {};
+        let objTwo = {};
+        let objThree = {};
+        res.data.map(item => {
+          if(arr[0] == item.dictValue) {
+            obj.value = item.dictValue;
+            obj.label = item.dictLabel;
+            obj.dict = item.remark;
+            if(!arr[1]) {
+              this.options.push(obj);
+              return;
+            } else {
+              obj.children = [];
+            }
+            getAllList({dictType:  item.remark}).then(resTwo=>{
+              resTwo.data.map((itemTwo)=>{
+                if(arr[1] == itemTwo.dictValue) {
+                  objTwo.value = itemTwo.dictValue;
+                  objTwo.label = itemTwo.dictLabel;
+                  objTwo.dict = itemTwo.remark;
+                  if(!arr[2]) {
+                    obj.children.push(objTwo)
+                    this.options.push(obj);
+                    return;
+                  } else {
+                    objTwo.children = [];
+                    obj.children.push(objTwo)
+                  }
+                  getAllList({dictType:  itemTwo.remark}).then(resThree => {
+                    resThree.data.map((itemThree)=>{
+                      if(arr[2] == itemThree.dictValue) {
+                        objThree.value = itemThree.dictValue;
+                        objThree.label = itemThree.dictLabel;
+                        objThree.dict = itemThree.remark;
+                        objThree.leaf = 'leaf';
+                        objTwo.children.push(objThree)
+                        this.options.push(obj);
+                      }
+                    })
+                  })
+                }
+              })
+            })
+          }
+        })
+      })
+    },
+    handleItemChange(value){
+      this.importFromChange = {
+        projectBigType: value[0],
+        projectMiddleType: value[1],
+        projectSmallType: value[2],
+      }
+    },
+    getDataList(){
+      getAllList({dictType:"project_categories"}).then(res=>{
+        res.data.map(item => {
+          let obj = {};
+          obj.value = item.dictValue;
+          obj.label = item.dictLabel;
+          obj.dict = item.remark;
+          this.options.push(obj);
+          this.optionsTwo.push(obj);
+        })
+      })
+    },
     // 列表获取
     getList(){
       this.loading = true;
@@ -330,6 +472,11 @@ export default {
         current: 1,
         size: 10
       }
+      if(this.formInline.projectClassify.length > 0) {
+        this.formInline.projectBigType = this.formInline.projectClassify[0]
+        this.formInline.projectMiddleType = this.formInline.projectClassify[1]
+        this.formInline.projectSmallType = this.formInline.projectClassify[2]
+      }
       this.pagination = { ...this.pagination,...this.formInline };
       // console.log(this.pagination);
       // console.log(this.formInline);
@@ -343,6 +490,7 @@ export default {
       }
       clearKey(this.formInline)
       this.getList();
+      this.getDataList();
     },
     // 导入按钮
     importBtn(){
@@ -353,6 +501,11 @@ export default {
       this.$refs.importProject.close();
       this.$nextTick(()=>{
         this.$refs.importFrom.resetFields();
+        this.importFromChange = {
+          projectBigType:"",
+          projectMiddleType:"",
+          projectSmallType:"",
+        }
       })
     },
     // 导入事件触发
@@ -394,9 +547,13 @@ export default {
     },
     // 查看详情
     goInfo(row){
+      let type = 1;
+      if((row.projectBigType == 5 && row.projectMiddleType == 5 && row.projectSmallType == 8) || row.declareUnit == "江南嘉捷电梯股份有限公司" || row.declareUnit == "苏州工业园区文体旅游局") {
+        type = 2
+      }
       this.$router.push({
         name: 'projectInfo',
-        query: { userId: row.id }
+        query: { userId: row.id,type }
       })
     },
     // 删除
@@ -407,7 +564,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          jProjectDel({ id: row.id }).then((res) => {
+          jProjectDel(row.id).then((res) => {
             this.getList();
             this.$message({
               type: "success",
diff --git a/src/views/project/projectInfo/components/index.js b/src/views/project/projectInfo/components/index.js
index ed2ecdb..46fbef8 100644
--- a/src/views/project/projectInfo/components/index.js
+++ b/src/views/project/projectInfo/components/index.js
@@ -2,4 +2,5 @@ export { default as tabOne } from './tabOne'
 export { default as tabTwo } from './tabTwo'
 export { default as tabThree } from './tabThree'
 export { default as tabFour } from './tabFour'
+export { default as tabFive } from './tabFive'
 export { default as projectProgress } from './projectProgress'
\ No newline at end of file
diff --git a/src/views/project/projectInfo/components/projectProgress/index.vue b/src/views/project/projectInfo/components/projectProgress/index.vue
index 46fe7f8..20bdcb5 100644
--- a/src/views/project/projectInfo/components/projectProgress/index.vue
+++ b/src/views/project/projectInfo/components/projectProgress/index.vue
@@ -1,73 +1,88 @@
 <template>
   <div class="L-projectProgress" id="L-size-main-right">
     <div class="projectProgress-title" id="L-xiangmujinzhan">【项目进展】</div>
-    <div class="schedule-timeline" :style="Mystyle">
-      <el-timeline>
-        <el-timeline-item
-          v-for="(activity, index) in flow"
-          :key="index"
-          size="large"
-          :class="activity.approvalStatus == 1 || activity.approvalStatus == 0 ? 'timeline-item-green' : activity.approvalStatus == 2 ? 'timeline-item-red' : ''"
-        >
-          <div slot="dot" class="timeline-dot" :class="activity.approvalStatus == 2 ? 'timeline-dot-red' : ''">
-            <i class="icon iconfont" :class="activity.approvalStatus == 1 || activity.approvalStatus == 0 ? 'icon-jc-dian-green' : activity.approvalStatus == 2 ? 'icon-jc-dian' : ''"></i>
-          </div>
-          <el-card> <!-- 去除阴影  shadow="never -->
-            <div class="schedule-content">
-              <div class="card-content-left">
-                <div class="schedule-card-title">{{ activity.approvalByName }}</div>
-                <!-- <div class="schedule-card-title" v-if="false">提交项目材料</div> -->
-                <!-- <div class="schedule-card-title" v-if="activity.sort == 1 && activity.approvalStatus == 0">待初审</div>
-                <div class="schedule-card-title" v-if="activity.sort == 1 && activity.approvalStatus == 1">初审通过</div>
-                <div class="schedule-card-title" v-if="activity.sort == 1 && activity.approvalStatus == 2">初审拒绝</div>
-                <div class="schedule-card-title" v-if="activity.sort == 2 && activity.approvalStatus == 0">待复审</div>
-                <div class="schedule-card-title" v-if="activity.sort == 2 && activity.approvalStatus == 1">复审通过</div>
-                <div class="schedule-card-title" v-if="activity.sort == 2 && activity.approvalStatus == 2">复审拒绝</div>
-                <div class="schedule-card-title" v-if="activity.sort == 3 && activity.approvalStatus == 0">待专家评审</div>
-                <div class="schedule-card-title" v-if="activity.sort == 3 && activity.approvalStatus == 1">专家评审通过</div>
-                <div class="schedule-card-title" v-if="activity.sort == 3 && activity.approvalStatus == 2">专家评审拒绝</div>
-                <div class="schedule-card-title" v-if="activity.sort == 4 && activity.approvalStatus == 0">待市级评审</div>
-                <div class="schedule-card-title" v-if="activity.sort == 4 && activity.approvalStatus == 1">市级评审通过</div>
-                <div class="schedule-card-title" v-if="activity.sort == 4 && activity.approvalStatus == 2">市级评审拒绝</div> -->
-                <div class="card-content-one" v-show="activity.approvalStatus == 0 && activity.approvalAttachment">
-                  <span>提醒</span>
-                  <span>已提交xxx材料</span>
-                </div>
-                <!-- <div class="card-content-one" v-show="activity.approvalStatus == 2">
-                  <span>提醒</span>
-                  <span>请xxx专家审核</span>
-                </div> -->
-                <div class="card-content-one" v-show="activity.approvalStatus == 1">
-                  <span>审核结果</span>
-                  <span>{{ activity.approvalByName }}审核通过</span>
-                </div>
-                <div class="card-content-one" v-show="activity.approvalStatus == 2">
-                  <span>审核结果</span>
-                  <span>{{ activity.approvalByName }}审核不通过</span>
-                </div>
-                <div class="card-content-two" v-show="activity.approvalOpinions">
-                  <span>审核意见</span>
-                  <span>{{ activity.approvalOpinions }}</span>
-                </div>
-                <div class="card-content-two" v-if="activity.approvalAttachment">
-                  <span>附件</span>
-                  <a :href="VUE_APP_BASE_API + activity.approvalAttachment" target="_blank">{{ activity.approvalAttachment.split("/")[activity.approvalAttachment.split("/").length - 1] }}</a>
-                </div>
-                <div class="card-content-two" v-if="!activity.approvalAttachment">
-                  <span>附件</span>
-                  <a></a>
-                </div>
-                <div class="card-content-three">{{ activity.approvalTime }}</div>
-                <!-- <div class="card-content-three-red" v-show="activity.approvalStatus == 2">请于2023-06-20前审核</div> -->
-              </div>
-              <div class="card-content-right">
-                <i class="icon iconfont" :class="activity.approvalStatus == 2 ? 'icon-jc-yijujue' : activity.approvalStatus == 1 ? 'icon-jc-shenpitongguo-copy' : activity.approvalStatus == 0 ? 'icon-jc-daishenpi1-copy' : activity.approvalStatus == 3 ? 'icon-jc-yijujue' : ''"></i>
-              </div>
-            </div>
-          </el-card>
-        </el-timeline-item>
-      </el-timeline>
+    <div class="left_title">
+      <el-steps :active="active" finish-status="process" align-center>
+        <el-step title="初审"></el-step>
+        <el-step title="复审"></el-step>
+        <el-step title="终审"></el-step>
+      </el-steps>
     </div>
+    <el-tabs type="border-card" :style="Mystyle">
+      <el-tab-pane label="审批流程">
+        <div class="schedule-timeline" :style="newStyle">
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in flow"
+              :key="index"
+              size="large"
+              :class="activity.approvalStatus == 1 || activity.approvalStatus == 0 ? 'timeline-item-green' : activity.approvalStatus == 2? 'timeline-item-red' : ''"
+            >
+              <div slot="dot" class="timeline-dot" :class="activity.approvalStatus == 2  || activity.approvalStatus == 3 ? 'timeline-dot-red' : ''">
+                <i class="icon iconfont" :class="activity.approvalStatus == 1 || activity.approvalStatus == 0 ? 'icon-jc-dian-green' : activity.approvalStatus == 2 || activity.approvalStatus == 3 ? 'icon-jc-dian' : ''"></i>
+              </div>
+              <el-card> <!-- 去除阴影  shadow="never -->
+                <div class="schedule-content">
+                  <div class="card-content-left">
+                    <div class="schedule-card-title" v-if="activity.approvalByName && activity.approvalStatus == 1">{{ activity.approvalByName }}</div>
+                    <!-- <div class="schedule-card-title" v-if="false">提交项目材料</div> -->
+                    <!-- <div class="schedule-card-title" v-if="activity.sort == 1 && activity.approvalStatus == 0">待初审</div>
+                    <div class="schedule-card-title" v-if="activity.sort == 1 && activity.approvalStatus == 1">初审通过</div>
+                    <div class="schedule-card-title" v-if="activity.sort == 1 && activity.approvalStatus == 2">初审拒绝</div>
+                    <div class="schedule-card-title" v-if="activity.sort == 2 && activity.approvalStatus == 0">待复审</div>
+                    <div class="schedule-card-title" v-if="activity.sort == 2 && activity.approvalStatus == 1">复审通过</div>
+                    <div class="schedule-card-title" v-if="activity.sort == 2 && activity.approvalStatus == 2">复审拒绝</div>
+                    <div class="schedule-card-title" v-if="activity.sort == 3 && activity.approvalStatus == 0">待专家评审</div>
+                    <div class="schedule-card-title" v-if="activity.sort == 3 && activity.approvalStatus == 1">专家评审通过</div>
+                    <div class="schedule-card-title" v-if="activity.sort == 3 && activity.approvalStatus == 2">专家评审拒绝</div>
+                    <div class="schedule-card-title" v-if="activity.sort == 4 && activity.approvalStatus == 0">待市级评审</div>
+                    <div class="schedule-card-title" v-if="activity.sort == 4 && activity.approvalStatus == 1">市级评审通过</div>
+                    <div class="schedule-card-title" v-if="activity.sort == 4 && activity.approvalStatus == 2">市级评审拒绝</div> -->
+                    <div class="card-content-one" v-show="activity.approvalStatus == 0 && activity.approvalAttachment">
+                      <span>提醒</span>
+                      <span>已提交xxx材料</span>
+                    </div>
+                    <!-- <div class="card-content-one" v-show="activity.approvalStatus == 2">
+                      <span>提醒</span>
+                      <span>请xxx专家审核</span>
+                    </div> -->
+                    <div class="card-content-one" v-show="activity.approvalStatus == 1">
+                      <span>审核结果</span>
+                      <span>{{ activity.approvalByName }}审核通过</span>
+                    </div>
+                    <div class="card-content-one" v-show="activity.approvalStatus == 2">
+                      <span>审核结果</span>
+                      <span>{{ activity.approvalByName }}审核不通过</span>
+                    </div>
+                    <div class="card-content-two" v-show="activity.approvalOpinions">
+                      <span>审核意见</span>
+                      <span>{{ activity.approvalOpinions }}</span>
+                    </div>
+                    <div class="card-content-two">
+                      <span>企业名称</span>
+                      <span>{{ activity.enterpriseName }}</span>
+                    </div>
+                    <div class="card-content-two" v-if="activity.approvalAttachment">
+                      <span>附件</span>
+                      <a :href="VUE_APP_BASE_API + activity.approvalAttachment" target="_blank">{{ activity.approvalAttachment.split("/")[activity.approvalAttachment.split("/").length - 1] }}</a>
+                    </div>
+                    <div class="card-content-two" v-if="!activity.approvalAttachment">
+                      <span>附件</span>
+                      <span>无</span>
+                    </div>
+                    <div class="card-content-three">{{ activity.approvalTime }}</div>
+                    <!-- <div class="card-content-three-red" v-show="activity.approvalStatus == 2">请于2023-06-20前审核</div> -->
+                  </div>
+                  <div class="card-content-right">
+                    <i class="icon iconfont" :class="activity.approvalStatus == 2 ? 'icon-jc-yijujue' : activity.approvalStatus == 1 ? 'icon-jc-shenpitongguo-copy' : activity.approvalStatus == 0 ? 'icon-jc-daishenpi1-copy' : activity.approvalStatus == 3 ? 'icon-jc-yijujue' : ''"></i>
+                  </div>
+                </div>
+              </el-card>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 <script>
@@ -88,7 +103,11 @@ export default {
       Mystyle:{
         height:"",
       },
+      newStyle:{
+        height:"",
+      },
       VUE_APP_BASE_API:process.env.VUE_APP_BASE_API,
+      active: 3,
     }
   },
   mounted() {
@@ -112,7 +131,8 @@ export default {
       const header = document.getElementById('L-xiangmujinzhan'); // 通过元素的 ID 获取元素
       const elementHeight = element.offsetHeight;
       const headerHeight = header.offsetHeight;
-      this.Mystyle.height = elementHeight - headerHeight - 77 + 'px';
+      this.Mystyle.height = elementHeight - headerHeight - 120 + 'px';
+      this.newStyle.height = elementHeight - headerHeight - 170 + 'px';
     }
   },
 }
diff --git a/src/views/project/projectInfo/components/tabFive/index.vue b/src/views/project/projectInfo/components/tabFive/index.vue
new file mode 100644
index 0000000..655f56b
--- /dev/null
+++ b/src/views/project/projectInfo/components/tabFive/index.vue
@@ -0,0 +1,192 @@
+<template>
+  <div class="smart-remind">
+    <el-row>
+      <div class="remind-top">
+        <div class="remind-title">【智能提醒】</div>
+        <el-button type="primary" icon="icon iconfont icon-jc-xinjian" size="mini" @click="newRemind">新建提醒</el-button>
+      </div>
+      <div class="remind-timeline" v-loading="loading">
+        <el-card shadow="never" v-for="(item,index) in remindList" :key="index" :class="item.isRead == 1 ? 'el-card-border' : ''">
+          <div class="warn-main">
+            <div class="warn-main-left" v-if="item.alertManner == 2">
+              <div class="warn-main-img"><img src="@/assets/images/warn-green.png" alt=""></div>
+              <div class="warn-main-content">
+                <div class="content-title">【{{ item.declarationName }}】【预计{{ item.daysAdvance }}天后{{ item.alertRecipients == 1 ? "填报结束" : item.alertRecipients == 2 ? "建设完成" : "" }}】</div>
+                <div class="content-middle">{{ item.alertContent }}</div>
+                <div class="content-time">{{ item.alertTime }}</div>
+              </div>
+            </div>
+            <div class="warn-main-left" v-if="item.alertManner == 1 && item.projectId">
+              <div class="warn-main-img"><img src="@/assets/images/warn-orange.png" alt=""></div>
+              <div class="warn-main-content">
+                <div class="content-title">【{{ item.declarationName }}】</div>
+                <div class="content-middle">{{ item.alertContent }}</div>
+                <div class="content-time">{{ item.alertTime }}</div>
+              </div>
+            </div>
+            <div class="warn-main-left different-left" v-if="item.alertManner == 1 && !item.projectId">
+              <div class="warn-main-img"><img src="@/assets/images/warn-blue.png" alt=""></div>
+              <div class="warn-main-content">
+                <div class="content-title">{{ item.alertContent }}</div>
+                <div class="content-time">{{ item.alertTime }}</div>
+              </div>
+            </div>
+            <div class="warn-main-right">
+              <div class="warn-main-right-chakan" @click="putMemo(item)">
+                {{ item.isRead == 1 ? '标记已读' : '已读' }}
+              </div>
+              <div class="warn-main-right-status" :class="item.isRead == 1 ? 'status-unread' : ''">
+                {{ item.isRead == 1 ? '未读' : '已读' }}
+              </div>
+            </div>
+          </div>
+        </el-card>
+      </div>
+    </el-row>
+    <my-dialog title="新增智能提醒规则" @close="remindClose" @confirm="confirm" :myclass="true" ref="newRemindRef">
+      <div class="remindDialog">
+        <el-form :model="remindData" size="small" ref="remindFrom" label-width="160px" :rules="rules">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="提醒规则标题" class="importFormItem" prop="rulesName">
+                <el-input v-model.trim="remindData.rulesName" placeholder="请输入内容"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="提醒对象：" class="importFormItem" prop="alertRecipients">
+                <el-radio-group v-model="remindData.alertRecipients">
+                  <el-radio :label="2">政务用户</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="提醒方式：" class="importFormItem" prop="alertManner" disabled>
+                <el-radio-group v-model="remindData.alertManner">
+                  <el-radio :label="1">定期提醒</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="提醒时间：" prop="alertTime" class="importFormItem">
+                <el-date-picker
+                  v-model="remindData.alertTime"
+                  type="datetime"
+                  placeholder="选择日期"
+                  style="width:  100%;"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="提醒内容：" class="importFormItem" prop="alertContent">
+                <el-input
+                  type="textarea"
+                  resize="none"
+                  :rows="3"
+                  placeholder="请输入提醒内容"
+                  v-model="remindData.alertContent">
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </my-dialog>
+  </div>
+</template>
+<script>
+import { chiefAll, jSmartRemindersNew, changeIsRead } from "@/api/jin_ji_hu/intelligentReminder/index"
+import myDialog from "@/views/components/myDialog/index.vue"
+export default {
+  name:"tabFive",
+  components:{
+    myDialog
+  },
+  props:{
+    id:{
+      type:Number,
+      default:null,
+    }
+  },
+  data() {
+    return {
+      remindData:{
+        rulesName: "",
+        alertRecipients: 2,
+        alertManner: 1,
+        alertTime: "",
+        alertContent: "",
+      },
+      rules:{
+        rulesName:[
+          { required: true, message: '请填写提醒规则标题', trigger: 'blur' }
+        ],
+        alertRecipients:[
+          { required: true, message: '请选择提醒对象', trigger: 'change' }
+        ],
+        alertManner:[
+          { required: true, message: '请选择提醒方式', trigger: 'change' },
+        ],
+        alertTime:[
+          { required: true, message: '请选择日期', trigger: 'change' },
+        ],
+        alertContent:[
+          { required: true, message: '请填写提醒内容', trigger: 'blur' },
+        ],
+      },
+      loading: false,
+      remindList:[],
+      formInline:{},
+    }
+  },
+  mounted(){
+    this.getList();
+  },
+  methods:{
+    newRemind(){
+      this.$nextTick(()=>{
+        this.$refs.newRemindRef.open();
+        this.$refs.remindFrom.resetFields();
+      })
+    },
+    // 关闭新增智能提醒
+    remindClose(){
+      this.$nextTick(()=>{
+        this.$refs.remindFrom.resetFields();
+        this.$refs.newRemindRef.close();
+      })
+    },
+    // 新增智能提醒提交
+    confirm(){
+      this.remindData.projectId = this.id
+      jSmartRemindersNew(this.remindData).then(res=>{
+        if(res.code == 200) {
+          this.remindClose();
+          this.getList();
+          this.$message({
+            type: "success",
+            message: "新增成功!",
+          });
+        }
+      })
+    },
+    // 获取备忘录列表
+    getList() {
+      this.loading = true;
+      chiefAll({projectId:this.id}).then(res=>{
+        this.remindList = res.data;
+        this.loading = false;
+      })
+    },
+    // 修改已读
+    putMemo(item){
+      if(item.isRead == 1) {
+        changeIsRead({id:item.id}).then(res=>{
+          this.getList();
+        })
+      }
+    },
+  },
+}
+</script>
diff --git a/src/views/project/projectInfo/components/tabFour/index.vue b/src/views/project/projectInfo/components/tabFour/index.vue
index 158f214..2e4b381 100644
--- a/src/views/project/projectInfo/components/tabFour/index.vue
+++ b/src/views/project/projectInfo/components/tabFour/index.vue
@@ -279,7 +279,7 @@ export default {
         type: "warning",
       })
       .then(() => {
-        delJMemorandum({ id: row.id }).then((res) => {
+        delJMemorandum(row.id).then((res) => {
           this.getList();
           this.$message({
             type: "success",
diff --git a/src/views/project/projectInfo/components/tabOne/index.vue b/src/views/project/projectInfo/components/tabOne/index.vue
index 9b987de..4e307f1 100644
--- a/src/views/project/projectInfo/components/tabOne/index.vue
+++ b/src/views/project/projectInfo/components/tabOne/index.vue
@@ -51,6 +51,12 @@ export default {
       default:()=>{
         return {};
       }
+    },
+    enterInfo:{
+      type:Object,
+      default:()=>{
+        return {}
+      }
     }
   },
   watch: {
@@ -65,19 +71,20 @@ export default {
               
               let obj = {};
               obj["key"] = key;
-              if(key == "是否获得园区其他经营奖励") {
-                obj["value"] = newInfo[key] == 0 ? '是' : newInfo[key] == 1 ? '否':'';
-              } else if(key == "申报类型") {
-                obj["value"] = newInfo[key] == 1 ? '两业融合示范企业' : newInfo[key] == 2 ? '制造业企业设立财务独立核算的制造服务业职能部门' : newInfo[key] == 3 ? "制造业企业剥离服务业务成立独立的法人制造业企业剥离服务业务成立独立的法人" : "";
-              } else if(key == "所属类型"){
-                obj["value"] = newInfo[key] == 0 ? '市场服务类' : newInfo[key] == 1 ? '公共服务类' : "";
-              } else if(key == "所属行业"){
-                obj["value"] = newInfo[key] == 1 ? '轻工' : newInfo[key] == 2 ? '纺织' : newInfo[key] == 3 ? '冶金' : newInfo[key] == 4 ? '化工' : newInfo[key] == 5 ? '建材' : newInfo[key] == 6 ? '机械加工' : "";
-              } else if(key == "类别"){
-                obj["value"] = newInfo[key] == 1 ? '淘汰落后生产工艺装备' : newInfo[key] == 2 ? '退出低端低效生产工艺装备' : "";
-              } else {
-                obj["value"] = newInfo[key] ? newInfo[key] : '暂无'
-              }
+              // if(key == "是否获得园区其他经营奖励") {
+              //   obj["value"] = newInfo[key] == 0 ? '是' : newInfo[key] == 1 ? '否':'';
+              // } else if(key == "申报类型") {
+              //   obj["value"] = newInfo[key] == 1 ? '两业融合示范企业' : newInfo[key] == 2 ? '制造业企业设立财务独立核算的制造服务业职能部门' : newInfo[key] == 3 ? "制造业企业剥离服务业务成立独立的法人制造业企业剥离服务业务成立独立的法人" : "";
+              // } else if(key == "所属类型"){
+              //   obj["value"] = newInfo[key] == 0 ? '市场服务类' : newInfo[key] == 1 ? '公共服务类' : "";
+              // } else if(key == "所属行业"){
+              //   obj["value"] = newInfo[key] == 1 ? '轻工' : newInfo[key] == 2 ? '纺织' : newInfo[key] == 3 ? '冶金' : newInfo[key] == 4 ? '化工' : newInfo[key] == 5 ? '建材' : newInfo[key] == 6 ? '机械加工' : "";
+              // } else if(key == "类别"){
+              //   obj["value"] = newInfo[key] == 1 ? '淘汰落后生产工艺装备' : newInfo[key] == 2 ? '退出低端低效生产工艺装备' : "";
+              // } else {
+              //   obj["value"] = newInfo[key] ? newInfo[key] : '暂无'
+              // }
+              obj["value"] = newInfo[key] ? newInfo[key] : '暂无'
               obj["span"] = 1;
               arr.push(obj)
             }
@@ -121,7 +128,16 @@ export default {
           }
           
           this.$nextTick(()=>{
-            this.info = [...arr]
+            if(this.enterInfo.projectEndTime) {
+              let time = {
+                key:"预计完成时间",
+                value: this.enterInfo.projectEndTime
+              }
+              this.info = [...arr,time]
+            } else {
+              this.info = [...arr]
+            }
+            
           })
         }
         
diff --git a/src/views/project/projectInfo/components/tabTwo/index.vue b/src/views/project/projectInfo/components/tabTwo/index.vue
index cbb59bc..a55f573 100644
--- a/src/views/project/projectInfo/components/tabTwo/index.vue
+++ b/src/views/project/projectInfo/components/tabTwo/index.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="L-unitInfo">
     <div class="project-info-title">【申报单位信息】</div>
-    <el-descriptions class="margin-top" :column="3" size="medium" border>
+    <!-- <el-descriptions class="margin-top" :column="3" size="medium" border>
       <el-descriptions-item label="申报类型">投资补助</el-descriptions-item>
-      <el-descriptions-item label="申报企业名称"><a class="a-primary" v-show="info.declareUnit">{{ info.declareUnit }}</a></el-descriptions-item>
+      <el-descriptions-item label="申报企业名称"><a class="a-primary" @click="goEnterprice(info.creditCode)" v-show="info.declareUnit">{{ info.declareUnit }}</a></el-descriptions-item>
       <el-descriptions-item label="企业性质">内资民营</el-descriptions-item>
       <el-descriptions-item label="统一社会信用代码">{{ info.creditCode }}</el-descriptions-item>
       <el-descriptions-item label="邮编">215513</el-descriptions-item>
@@ -16,6 +16,123 @@
       <el-descriptions-item label="电话">18012345432</el-descriptions-item>
       <el-descriptions-item label="电话">18023494876</el-descriptions-item>
       <el-descriptions-item label="电话">18743870987</el-descriptions-item>
+    </el-descriptions> -->
+    <el-descriptions :column="3" size="medium" border>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="企业名称">
+        <a class="a-primary" @click="goEnterprice(info.tyshxydm)">{{ info.qymc }}</a>
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="标识证号">
+        {{ info.bszh }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="统一社会信用代码">
+        {{ info.tyshxydm }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="企业注册号">
+        {{ info.qyzch }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="组织机构代码">
+        {{ info.zzjgdm }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="经济类型代码">
+        {{ info.jjlxdm }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="经济类型名称">
+        {{ info.jjlxmc }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="企业类型代码">
+        {{ info.qylxdm }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="企业类型名称">
+        {{ info.qylxmc }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="注册资金">
+        {{ info.zczj }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="注册资本币种">
+        {{ info.zczbbz }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="注册类型">
+        {{ info.zclx }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="经营或营业起始日期">
+        {{ info.jyhyyqsrq }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="经营或营业截至日期">
+        {{ info.jyhyyjzrq }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="行业代码">
+        {{ info.hydm }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="行业名称">
+        {{ info.hymc }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="行业门类">
+        {{ info.hymc }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="产业类型">
+        {{ info.cylx }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="企业住所">
+        {{ info.qyzs }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="经营场所">
+        {{ info.jycs }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="经营场所行政区划">
+        {{ info.jycsxzqh }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="邮政编码">
+        {{ info.yzbm }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="成立日期">
+        {{ info.clrq }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="信用等级">
+        {{ info.xydj }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="企业规模">
+        <!-- {{ info.qygm }} -->
+        {{ info.type == 1 ? "规上服务业" : info.type == 2 ? "其他" : ""}}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="法定代表人姓名">
+        {{ info.fddbrxm }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="法定代表人证件号码">
+        {{ info.fddbrzjhm }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="登记机关">
+        {{ info.djjg }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="核准日期">
+        {{ info.hzrq }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="经营状态">
+        {{ info.jyzt }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="状态日期">
+        {{ info.ztrq }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="注销日期">
+        {{ info.zxrq }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="吊销日期">
+        {{ info.dxrq }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="联系电话">
+        {{ info.lxdh }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="是否园区内">
+        {{ info.sfyqn }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="入库时间">
+        {{ info.dwTimestamp }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="来源机构">
+        {{ info.dwLyjg }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="经营范围">
+        {{ info.jyfw }}
+      </el-descriptions-item>
     </el-descriptions>
   </div>
 </template>
@@ -24,6 +141,8 @@ export default {
   name:"tabTwo",
   data() {
     return {
+      // 判断登陆用户是何身份⌈ 01 ： 企业  02 ： 政务 ⌋
+      userType: this.$store.state.user.userType,
     }
   },
   props:{
@@ -35,6 +154,20 @@ export default {
     }
   },
   methods:{
+    goEnterprice(creditCode){
+      // console.log(creditCode);
+      if(this.userType == '01') {
+        this.$router.push({
+          name: 'EenterInfo',
+          query: { userId: this.info.id, creditCode: creditCode }
+        })
+      } else {
+        this.$router.push({
+          name: 'enterpriselibraryInfo',
+          query: { userId: this.info.id, creditCode: creditCode }
+        })
+      }
+    },
   },
 }
 </script>
diff --git a/src/views/project/projectInfo/index.vue b/src/views/project/projectInfo/index.vue
index bbb0713..417f98a 100644
--- a/src/views/project/projectInfo/index.vue
+++ b/src/views/project/projectInfo/index.vue
@@ -3,23 +3,34 @@
     <el-row :gutter="10" class="L_row">
       <el-col :span="18">
         <div class="left-info" id="L-header">
-          <div class="project-info-title">【{{ info.projectName }}】</div>
+          <div class="project-info-title">【{{ info.declareUnit }}】</div>
           <el-descriptions class="margin-top" :column="2" size="medium" border v-loading="loading">
-            <el-descriptions-item label="项目名称">{{ info.projectName }}</el-descriptions-item>
-            <el-descriptions-item label="项目分类" contentClassName="info-link"><a class="a-primary" @click="goback(info.projectClassify)"><dict-tag :options="dict.type.jjh_project_type" :value="info.projectClassify"/></a></el-descriptions-item>
-            <el-descriptions-item label="申报单位" contentClassName="info-link">{{ info.declareUnit }}<a v-show="info.declareUnit" @click="goEnterprice(info.creditCode)">查看详情</a></el-descriptions-item>
-            <el-descriptions-item label="年份">{{ info.projectYear }}</el-descriptions-item>
+            <el-descriptions-item label="企业名称" contentClassName="info-link">{{ info.declareUnit }}<a v-if="$route.query.type == 1" @click="goEnterprice(info.creditCode)">查看详情</a></el-descriptions-item>
+            <el-descriptions-item label="统一社会信用代码">{{ info.creditCode }}</el-descriptions-item>
+            <!-- <el-descriptions-item label="项目分类" contentClassName="info-link">
+              <div class="project_info_box" style="display: flex;">
+                <dict-tag class="dict_type" :options="dict.type.project_categories" :value="info.projectBigType" />/<dict-tag class="dict_type" :options="dict.type.project_middle_type" :value="info.projectMiddleType"/>/<dict-tag class="dict_type" :options="dict.type.project_small_type" :value="info.projectSmallType"/>
+              </div>
+            </el-descriptions-item> -->
+            <el-descriptions-item label="项目大类" contentClassName="info-link"><dict-tag :options="dict.type.project_categories" :value="info.projectBigType"/></el-descriptions-item>
+            <el-descriptions-item label="项目中类" contentClassName="info-link"><dict-tag :options="dict.type.project_middle_type" :value="info.projectMiddleType"/></el-descriptions-item>
+            <el-descriptions-item label="项目小类" contentClassName="info-link"><dict-tag :options="dict.type.project_small_type" :value="info.projectSmallType"/></el-descriptions-item>
+            <!-- <el-descriptions-item label="项目大类" contentClassName="info-link"><a class="a-primary" @click="goback(info.projectBigType)"><dict-tag :options="dict.type.project_categories" :value="info.projectBigType"/></a></el-descriptions-item>
+            <el-descriptions-item label="项目中类" contentClassName="info-link"><a class="a-primary" @click="goback(info.projectMiddleType)"><dict-tag :options="dict.type.project_middle_type" :value="info.projectMiddleType"/></a></el-descriptions-item>
+            <el-descriptions-item label="项目小类" contentClassName="info-link"><a class="a-primary" @click="goback(info.projectSmallType)"><dict-tag :options="dict.type.project_small_type" :value="info.projectSmallType"/></a></el-descriptions-item> -->
+            <el-descriptions-item label="申报年份">{{ info.projectYear }}</el-descriptions-item>
           </el-descriptions>
         </div>
         <div class="left-tabs">
           <div class="tabs-top" id="L-pagination">
-            <div v-for="(item,index) in tabs" :key="index" class="tabs-top-item" :class="active == index ? 'active-item' : ''" @click="active = index">{{ item.name }}</div>
+            <div v-for="(item,index) in tabs" :key="index" class="tabs-top-item" :class="active == item.id ? 'active-item' : ''" @click="active = item.id">{{ item.name }}</div>
           </div>
           <div class="tabs-bottom" :style="tabStyle">
-            <tab-one v-if="active == 0" :detailedInfo="detailedInfo" :fileJson="fileJson"></tab-one>
-            <tab-two v-if="active == 1" :info="info"></tab-two>
-            <tab-three v-if="active == 2"></tab-three>
-            <tab-four v-if="active == 3" :id="$route.query.userId"></tab-four>
+            <tab-one v-if="active == 1" :detailedInfo="detailedInfo" :fileJson="fileJson" :enterInfo="info"></tab-one>
+            <tab-two v-if="active == 2" :info="enterInfo"></tab-two>
+            <tab-three v-if="active == 3"></tab-three>
+            <tab-four v-if="active == 4" :id="$route.query.userId"></tab-four>
+            <tab-five v-if="active == 5" :id="Number($route.query.userId)"></tab-five>
           </div>
         </div>
       </el-col>
@@ -34,31 +45,78 @@
   </div>
 </template>
 <script>
-import { tabOne, tabTwo, tabThree, tabFour, projectProgress } from "./components"
+import { tabOne, tabTwo, tabThree, tabFour, tabFive, projectProgress } from "./components"
 import { jProjectId, getUserId } from "@/api/jin_ji_hu/project/index"
 export default {
-  dicts: ['jjh_project_type','jjh_status'],
+  dicts: ["project_middle_type", "project_small_type", "project_categories"],
   components:{
     tabOne,
     tabTwo,
     tabThree,
     tabFour,
+    tabFive,
     projectProgress
   },
   data() {
     return {
-      tabs:[
+      tabs:[],
+      enterpriseTabs:[
         {
           name: "项目详细信息",
+          id: 1,
         },{
           name: "申报单位信息",
+          id: 2,
         },{
           name: "资金拨付进度",
+          id: 3,
+        }
+      ],
+      enterpriseSpecialTabs:[
+        {
+          name: "项目详细信息",
+          id: 1,
+        },{
+          name: "资金拨付进度",
+          id: 3,
+        }
+      ],
+      govSpecialTabs:[
+        {
+          name: "项目详细信息",
+          id: 1,
+        },{
+          name: "资金拨付进度",
+          id: 3,
         },{
           name: "备忘录",
+          id: 4,
+        },{
+          name: "智能提醒",
+          id: 5,
         },
       ],
-      active: 0,
+      govTabs:[
+        {
+          name: "项目详细信息",
+          id: 1,
+        },{
+          name: "申报单位信息",
+          id: 2,
+        },{
+          name: "资金拨付进度",
+          id: 3,
+        },{
+          name: "备忘录",
+          id: 4,
+        },{
+          name: "智能提醒",
+          id: 5,
+        },
+      ],
+      // 判断登陆用户是何身份⌈ 01 ： 企业  02 ： 政务 ⌋
+      userType: this.$store.state.user.userType,
+      active: 1,
       info:{},
       detailedInfo:{},
       fileJson:{},
@@ -66,11 +124,25 @@ export default {
       tabStyle:{
         height:undefined,
         overflow: 'auto'
-      }
+      },
+      enterInfo:{},
     }
   },
   mounted(){
     this.getInfo(this.$route.query.userId)
+    if(this.userType == '01') {
+      if(this.$route.query.type == 2) {
+        this.tabs = this.enterpriseSpecialTabs
+      } else {
+        this.tabs = this.enterpriseTabs;
+      }
+    } else {
+      if(this.$route.query.type == 2) {
+        this.tabs = this.govSpecialTabs
+      } else {
+        this.tabs = this.govTabs;
+      }
+    }
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
   },
@@ -81,6 +153,18 @@ export default {
     goBack(){
       this.$router.back();
     },
+    getLabel(id,type){
+      if(type == 'big') {
+        let label = this.dict.type.project_categories.filter(item => item.value === id + "")
+        return label[0].label;
+      } else if(type == 'middle') {
+        let label = this.dict.type.project_middle_type.filter(item => item.value === id + "")
+        return label[0].label;
+      } else if(type == 'small') {
+        let label = this.dict.type.project_small_type.filter(item => item.value === id + "")
+        return label[0].label;
+      }
+    },
     getInfo(id){
       this.loading = true;
       jProjectId(id).then(res=>{
@@ -88,7 +172,9 @@ export default {
         this.loading = false;
         this.detailedInfo = JSON.parse(res.data.otherJson);
         this.fileJson = JSON.parse(res.data.fileJson);
-        return getUserId({getCreditCode : this.info.creditCode})
+        if(this.info.creditCode) {
+          return getUserId({getCreditCode : this.info.creditCode})
+        }
         // console.log(this.fileJson,"this.fileJson");
         // for (var key in obj) {
         //   if (obj.hasOwnProperty(key)) {
@@ -97,6 +183,7 @@ export default {
         //   }
         // }
       }).then(res=>{
+        this.enterInfo = res.data
         this.info.userId = res.data.id
       })
     },
@@ -113,10 +200,17 @@ export default {
     },
     goEnterprice(creditCode){
       // console.log(creditCode);
-      this.$router.push({
-        name: 'enterInfo',
-        query: { userId: this.info.userId, creditCode: creditCode }
-      })
+      if(this.userType == '01') {
+        this.$router.push({
+          name: 'EenterInfo',
+          query: { userId: this.info.userId, creditCode: creditCode }
+        })
+      } else {
+        this.$router.push({
+          name: 'enterpriselibraryInfo',
+          query: { userId: this.info.userId, creditCode: creditCode }
+        })
+      }
     },
     // 屏幕尺寸变化
     cancalDebounce(){
@@ -126,7 +220,7 @@ export default {
       const elementHeight = element.offsetHeight;
       const headerHeight = header.offsetHeight;
       const paginationtHeight = pagination.offsetHeight;
-      this.tabStyle.height = (elementHeight - headerHeight - paginationtHeight - 60) + 'px';
+      this.tabStyle.height = (elementHeight - headerHeight - paginationtHeight - 100) + 'px';
     }
   },
 }
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index fc75041..bebfd5b 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -204,8 +204,8 @@
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户昵称" prop="nickName">
@@ -295,6 +295,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="政务通账户名" prop="zwuser">
+              <el-input v-model="form.zwuser" placeholder="请输入政务通账户名" maxlength="30" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="用户类型" prop="userType">
diff --git a/src/views/tool/build/RightPanel.vue b/src/views/tool/build/RightPanel.vue
index c2760eb..9396aad 100644
--- a/src/views/tool/build/RightPanel.vue
+++ b/src/views/tool/build/RightPanel.vue
@@ -875,10 +875,11 @@ export default {
   position: absolute;
   right: 0;
   top: 0;
+  height: 100%;
   padding-top: 3px;
   .field-box {
     position: relative;
-    height: calc(100vh - 42px);
+    height: calc(100% - 42px);
     box-sizing: border-box;
     overflow: hidden;
   }
diff --git a/src/views/tool/build/index.vue b/src/views/tool/build/index.vue
index 2bd298b..a8f12c4 100644
--- a/src/views/tool/build/index.vue
+++ b/src/views/tool/build/index.vue
@@ -78,6 +78,9 @@
 
     <div class="center-board">
       <div class="action-bar">
+        <el-button icon="el-icon-view" type="text" @click="showJson">
+          上传json
+        </el-button>
         <el-button icon="el-icon-download" type="text" @click="download">
           导出vue文件
         </el-button>
@@ -132,6 +135,74 @@
       @confirm="generate"
     />
     <input id="copyNode" type="hidden">
+
+    <!-- 新增模板 -->
+    <el-dialog title="创建新模板" :visible.sync="createTemplate" width="680px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="dialogForm" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="模板名称" prop="templateName">
+              <el-input v-model="dialogForm.templateName" placeholder="请输入模板名称"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="项目分类" prop="projectClassify">
+              <el-cascader
+                style="width: 100%;"
+                v-model="dialogForm.projectClassify"
+                :options="options"
+                :props="props"
+                @change="changeProjectClassify"
+              >
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="级别" prop="level">
+              <el-select v-model="dialogForm.level" placeholder="请选择级别" style="width: 100%;">
+                <el-option
+                  v-for="dict in dict.type.bms_level"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="责任单位" prop="responsibilityUnit">
+              <el-select v-model="dialogForm.responsibilityUnit" placeholder="请选择责任单位" style="width: 100%;">
+                <el-option
+                  v-for="dict in dict.type.bms_responsibility_unit"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="模板使用有效期" prop="reportTime">
+              <el-date-picker
+                v-model="dialogForm.reportTime"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="模板使用有效期开始时间"
+                end-placeholder="模板使用有效期结束时间"
+                style="width:  100%;"
+                value-format="yyyy-MM-dd"
+                @change="changeDateRange"
+                >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm" class="btn">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -150,6 +221,8 @@ import drawingDefault from '@/utils/generator/drawingDefault'
 import logo from '@/assets/logo/logo.png'
 import CodeTypeDialog from './CodeTypeDialog'
 import DraggableItem from './DraggableItem'
+import { templateInfo, templateInfoChange } from "@/api/onlineDeclartion/declarationManagement"
+import { getAllList } from "@/api/system/dict/data";
 
 let oldActiveId
 let tempActiveData
@@ -162,7 +235,23 @@ export default {
     CodeTypeDialog,
     DraggableItem
   },
+  dicts: ['bms_responsibility_unit', 'bms_level'],
+  props:{
+    info:{
+      type:Object,
+      default:()=>{
+        return {}
+      }
+    }
+  },
   data() {
+    let validateTime = (rule, value, callback) => {
+      if (new Date(value[1]) < new Date()) {
+        callback(new Error('选择结束时间需大于当前时间'))
+      } else {
+        callback()
+      }
+    }
     return {
       logo,
       idGlobal: 100,
@@ -179,7 +268,55 @@ export default {
       dialogVisible: false,
       generateConf: null,
       showFileName: false,
-      activeData: drawingDefault[0]
+      activeData: drawingDefault[0],
+      options: [],
+      props:{
+        lazy:true,
+        lazyLoad (node, resolve) {
+          const { level, data, children } = node;
+          if(children?.length == 0 ) {
+            getAllList({dictType:  data.dict}).then(res=>{
+              const nodes = Array.from(res.data).map((item)=>{
+                return {
+                  value:item.dictValue,
+                  label:item.dictLabel,
+                  dict:item.remark,
+                  leaf: level >= 2
+                }
+              })
+              resolve(nodes)
+            })
+          }
+        }
+      },
+      // 表单参数
+      dialogForm: {},
+      // 表单校验
+      rules: {
+        // year: [
+        //   { required: true, message: "请选择年份", trigger: "blur" },
+        // ],
+        responsibilityUnit: [
+          { required: true, message: "请选择责任单位", trigger: "blur" }
+        ],
+        level: [
+          { required: true, message: "请选择级别", trigger: "blur" }
+        ],
+        projectClassify: [
+        { required: true, message: "请选择项目分类", trigger: "blur" }
+        ],
+        templateName: [
+          { required: true, message: "请输入模板名称", trigger: "blur" }
+        ],
+        reportTime: [
+          { required: true, message: "请选择模板使用有效期", trigger: "blur" },
+          {validator: validateTime, trigger: 'blur'},
+        ],
+      },
+      projectBigType: undefined,
+      projectMiddleType: undefined,
+      projectSmallType: undefined,
+      createTemplate: false,
     }
   },
   created() {
@@ -206,9 +343,35 @@ export default {
         oldActiveId = val
       },
       immediate: true
+    },
+    info:{
+      handler(val) {
+        if(val) {
+          // this.createTemplate = false;
+          // let obj = JSON.parse(this.$route.query.info)
+          let obj = val
+          if(obj.templateJson) {
+            let lists = JSON.parse(obj.templateJson)
+            this.drawingList = lists.fields
+          }
+        }
+        //  else {
+        //   this.createTemplate = true;
+        // }
+      },
+      deep:true,
+      immediate: true
     }
   },
   mounted() {
+    // if(this.$route.query.info) {
+    //   this.createTemplate = false;
+    //   let obj = JSON.parse(this.$route.query.info)
+    //   let lists = JSON.parse(obj.templateJson)
+    //   this.drawingList = lists.fields
+    // } else {
+    //   this.createTemplate = true;
+    // }
     const clipboard = new ClipboardJS('#copyNode', {
       text: trigger => {
         const codeStr = this.generateCode()
@@ -223,8 +386,64 @@ export default {
     clipboard.on('error', e => {
       this.$message.error('代码复制失败')
     })
+    this.getDataList();
   },
   methods: {
+    open(){
+      this.createTemplate = true;
+    },
+    getDataList(){
+      getAllList({dictType:"project_categories"}).then(res=>{
+        res.data.map(item => {
+          let obj = {};
+          obj.value = item.dictValue;
+          obj.label = item.dictLabel;
+          obj.dict = item.remark;
+          this.options.push(obj);
+        })
+      })
+    },
+    // 项目分类选择
+    changeProjectClassify(valId){
+      if(valId) {
+        this.projectBigType = valId[0]
+        this.projectMiddleType = valId[1]
+        this.projectSmallType = valId[2]
+      }
+    },
+    // 模板有效期选择
+    changeDateRange(val) {
+      // console.log('val: ', val);
+      this.dialogForm.useStart = val[0]
+      this.dialogForm.useEnd = val[1]
+    },
+    // 取消按钮
+    cancel() {
+      this.createTemplate = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.dialogForm = {
+        responsibilityUnit: undefined,
+        templateName: undefined,
+        level: undefined,
+        projectClassify:[],
+        reportTime: [],
+      };
+      this.projectBigType = undefined
+      this.projectMiddleType = undefined
+      this.projectSmallType = undefined
+      this.resetForm("form");
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.createTemplate = false;
+        }
+      });
+    },
     activeFormItem(element) {
       this.activeData = element
       this.activeId = element.formId
@@ -324,6 +543,35 @@ export default {
       const css = cssStyle(makeUpCss(this.formData))
       return beautifier.html(html + script + css, beautifierConf.html)
     },
+    showJson() {
+      this.AssembleFormData()
+      // 级别，责任单位，模板使用有效期开始时间，模板使用有效期结束时间，模板名称
+      const { level, responsibilityUnit, useStart, useEnd, templateName } = this.dialogForm;
+      if(level && responsibilityUnit && useStart && useEnd && templateName) {
+        templateInfo({level, responsibilityUnit, templateName, useStart, useEnd, projectBigType:this.projectBigType, projectMiddleType:this.projectMiddleType, projectSmallType:this.projectSmallType,templateJson: JSON.stringify(this.formData)}).then(res=>{
+          if(res.code == 200) {
+            // this.$router.push({
+            //   name: 'Template',
+            //   params: {code:200},
+            // })
+            this.$emit("successCode",200)
+          }
+        })
+        
+      } else if(this.$route.query.info){
+        templateInfoChange({...this.$route.params.info, templateJson: JSON.stringify(this.formData)}).then(res=>{
+          if(res.code == 200) {
+            // this.$router.push({
+            //   name: 'Template',
+            //   params: {code:800},
+            // })
+            this.$emit("successCode",800)
+          }
+        })
+      } else {
+        this.createTemplate = true;
+      }
+    },
     download() {
       this.dialogVisible = true
       this.showFileName = true
@@ -552,21 +800,21 @@ $lighterBlue: #409EFF;
   position: absolute;
   left: 0;
   top: 0;
-  height: 100vh;
+  height: 100%;
 }
 .left-scrollbar{
-  height: calc(100vh - 42px);
+  height: calc(100% - 42px);
   overflow: hidden;
 }
 .center-scrollbar {
-  height: calc(100vh - 42px);
+  height: calc(100% - 42px);
   overflow: hidden;
   border-left: 1px solid #f1e8e8;
   border-right: 1px solid #f1e8e8;
   box-sizing: border-box;
 }
 .center-board {
-  height: 100vh;
+  height: 100%;
   width: auto;
   margin: 0 350px 0 260px;
   box-sizing: border-box;
@@ -630,7 +878,7 @@ $lighterBlue: #409EFF;
   box-sizing: border-box;
   & > .el-form {
     // 69 = 12+15+42
-    height: calc(100vh - 69px);
+    height: calc(100% - 69px);
   }
 }
 .drawing-board {
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue
index c2a2893..fee35db 100644
--- a/src/views/workbench/index.vue
+++ b/src/views/workbench/index.vue
@@ -1,21 +1,15 @@
 <template>
-  <div class="workbench-box">
-    <header>
-      <div class="workbench-serch" v-if="userType == '02'">
+  <div class="workbench-box" v-if="userType == '02'">
+    <header> 
+      <div class="workbench-serch">
         <div class="workbench-title">
           <div class="title-item" :class="checked == index ? 'checked-item' : ''" v-for="(item,index) in tabs" :key="index" @click="changeTab(index)">
             {{ item.value }}
           </div>
-          <!-- <div class="title-item">
-            查项目
-          </div>
-          <div class="title-item">
-            查荣誉
-          </div> -->
         </div>
         <div class="workbench-btn">
           <el-autocomplete 
-            placeholder="请输入企业名称、项目名称、荣誉，查询" 
+            :placeholder="checked == 0 ? '请输入企业名称' : checked == 1 ? '请输入项目名称' : checked == 2 ? '请输入荣誉名称' : ''" 
             ref="autocomplete"
             v-model="search" 
             :fetch-suggestions="querySearch" 
@@ -28,88 +22,154 @@
         </div>
       </div>
     </header>
-    <main>
+    <main class="home-main">
       <el-row class="main-row">
-        <el-col :span="16" class="work-main-left">
-          <div class="main-left">
-            
-          </div>
-        </el-col>
-        <el-col :span="8" class="work-main-right">
-          <div class="main-right">
-            <div class="right-header">
-              <div class="title">【待办提醒】</div>
-              <el-button @click="MoreRecords" type="text" v-if="backlogArray.length > 0">>> 更多记录</el-button>
+        <el-col :span="14" class="work-main-left service-left">
+          <!-- <div class="main-left">
+            <div class="left-header">
+              <div class="left-header-title">【服务业数据概览】</div>
             </div>
-            <div class="right-main" v-if="backlogArray.length > 0" v-loading="loading">
-              <div class="main-items" v-for="(item,index) in backlogArray" :key="index" :class="index % 2 == 0 ? '':'main-item'">
-                <div>{{ item.matter || item.enterpriseDirectory}}</div>
-                <div>{{ item.enterpriseName }}</div>
-                <!-- <div>审批【知识产权】材料</div> -->
-                <div @click="MoreRecords">{{ userType == '02' ? '去审批' : userType == '01' ? '去填报' : '' }}</div>
+          </div> -->
+          <div class="echart-title">
+            <div class="echart-left-title">
+              <div class="L-title-left">
+                <span class="dataCloudMap-birght"></span>
+                <span class="dataCloudMap-title">服务业发展总览</span>
               </div>
+              <span class="dataCloudMap-data">【统计数据截至：2024-01】</span>
             </div>
-            <div class="right-main" v-else>
-              <el-divider content-position="center">暂未待审核</el-divider>
+            <div class="rightBigNav">
+              <div class="right-nav">
+                <div
+                  class="tabStyle"
+                  v-for="(item, index) in options1"
+                  :key="index"
+                  @click="active(index + 1)"
+                  :class="activeIndex == index + 1 ? 'change-blue' : ''"
+                >
+                  <div class="change-grey-birght" :class="activeIndex == index + 1 ? 'change-blue-birght' : ''"></div>
+                  <span class="change-grey-text" :class="activeIndex == index + 1 ? 'change-blue-text' : ''">{{ item.name }}</span>
+                </div>
+              </div>
             </div>
           </div>
+          <echartData :activeIndex="activeIndex" ref="echartData"/>
+        </el-col>
+        
+        <el-col :span="10">
+          <el-row type="flex" class="main-two-row">
+            <el-col :span="24" class="work-main-left" style="height: 63%;">
+              <div class="main-left">
+                <div class="left-header">
+                  <div class="left-header-titleS">
+                    <span class="dataCloudMap-birght"></span>
+                    <div class="left-header-title">智能提醒</div>
+                  </div>
+                  <el-button @click="MoreRecords('all')" type="text" v-if="remindList.length > 0">>> 更多记录</el-button>
+                </div>
+                <div class="left-main">
+                  <el-card shadow="never" v-for="(item,index) in remindList" :key="index" :class="item.isRead == 1 ? 'el-card-border' : ''">
+                    <div class="warn-main">
+                      <div class="warn-main-left" v-if="item.alertManner == 2">
+                        <div class="warn-main-img"><img src="@/assets/images/warn-green.png" alt=""></div>
+                        <div class="warn-main-content">
+                          <div class="content-title">【{{ item.declarationName }}】【预计{{ item.daysAdvance }}天后建设完成】</div>
+                          <div class="content-middle">{{ item.alertContent }}</div>
+                          <div class="content-time">{{ item.alertTime }}</div>
+                        </div>
+                      </div>
+                      <div class="warn-main-left" v-else-if="item.alertManner == 1 && item.qymc && item.alertRecipients == 2">
+                        <div class="warn-main-img"><img src="@/assets/images/warn-orange.png" alt=""></div>
+                        <div class="warn-main-content">
+                          <div class="content-title" style="display: flex;">【{{ item.qymc }}】<dict-tag :options="dict.type.project_small_type" :value="item.declarationName"/></div>
+                          <div class="content-middle">{{ item.alertContent }}</div>
+                          <div class="content-time">{{ item.alertTime }}</div>
+                        </div>
+                      </div>
+                      <div class="warn-main-left" v-else-if="item.alertManner == 1 && item.projectId">
+                        <div class="warn-main-img"><img src="@/assets/images/warn-orange.png" alt=""></div>
+                        <div class="warn-main-content">
+                          <div class="content-title">【{{ item.declarationName }}】</div>
+                          <div class="content-middle">{{ item.alertContent }}</div>
+                          <div class="content-time">{{ item.alertTime }}</div>
+                        </div>
+                      </div>
+                      <div class="warn-main-left different-left" v-else-if="item.alertManner == 1 && !item.projectId">
+                        <div class="warn-main-img"><img src="@/assets/images/warn-blue.png" alt=""></div>
+                        <div class="warn-main-content">
+                          <div class="content-title">{{ item.alertContent }}</div>
+                          <div class="content-time">{{ item.alertTime }}</div>
+                        </div>
+                      </div>
+                      <div class="warn-main-right">
+                        <div class="warn-main-right-chakan" @click="putMemo(item)">
+                          查看
+                        </div>
+                        <div class="warn-main-right-status" :class="item.isRead == 1 ? 'status-unread' : ''">
+                          {{ item.isRead == 1 ? '未读' : '已读' }}
+                        </div>
+                      </div>
+                    </div>
+                  </el-card>
+                </div>
+              </div>
+            </el-col>
+            <el-col :span="24" style="height: 34%;">
+              <div class="work-main-right">
+                <div class="main-right">
+                  <div class="right-header">
+                    <div class="right-header-box">
+                      <span class="dataCloudMap-birght"></span>
+                      <div class="right-header-title">待办提醒</div>
+                    </div>
+                    <el-button @click="MoreRecords('all')" type="text" v-if="backlogArray.length > 0">>> 更多记录</el-button>
+                  </div>
+                  <div class="right-main" v-if="backlogArray.length > 0" v-loading="loading">
+                    <div class="main-items" v-for="(item,index) in backlogArray" :key="index" :class="index % 2 == 0 ? '':'main-item'">
+                      <div>【{{ item.matter }}】 </div>
+                      <div>{{ (item.status == 1 ? "待初审" : item.status == 2 ? "待复审" : item.status == 3 ? "待终审" : "") }}</div>
+                      <!-- <div>审批【知识产权】材料</div> -->
+                      <div @click="MoreRecords('id',item.status)" class="last_child_item">去审批</div>
+                    </div>
+                  </div>
+                  <div class="right-main" v-else>
+                    <el-divider content-position="center">暂无</el-divider>
+                  </div>
+                </div>
+              </div>
+            </el-col>
+          </el-row>
         </el-col>
       </el-row>
-    </main>
-    <!-- 申报审核对话框 -->
-    <!-- <el-dialog title="申报审核" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px" label-position="left">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="审批状态" prop="approvalStatus">
-              <el-radio-group v-model="form.approvalStatus">
-                <el-radio label="1">审批通过</el-radio>
-                <el-radio label="2">审批驳回</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="审批意见" prop="approvalOpinions">
-              <el-input v-model="form.approvalOpinions" type="textarea" placeholder="请输入审批意见" maxlength="200"></el-input>
-            </el-form-item>
-          </el-col>
+      <el-row class="main-row-two">
 
-          <el-col :span="24">
-            <el-form-item label="审批附件" prop="fileList">
-              <el-upload
-                class="upload-demo"
-                :show-file-list="false"
-                action=""
-                accept=".xlsx,.XLSX,.XSL,.doc,.xls,.ppt,.pdf,.png,.jpg,.jpeg,.rar,.zip,.docx"
-                :http-request="handleFileUpload"
-                :file-list="fileList"
-                >
-                <el-button slot="trigger" size="small" type="success">上传文件</el-button>
-                <div slot="tip" class="el-upload__tip">请上传格式为<span style="color: red;">doc/xls/ppt/pdf/png/jpg/jpeg/rar/zip/docx/xlsx</span>的文件</div>
-              </el-upload>
-              <ul v-if="fileList.length >0" class="upload_ul">
-                <li v-for="item in uploadList" :key="item.url" class="upload_li">
-                  <img src="@/assets/images/uploadBgc.jpg" class="li_img" alt="">
-                  <span class="icon_name">{{ item.name }}</span>
-                  <el-button type="text" style="color: red;" @click="deleteUpload(item)">删除</el-button>
-                </li>
-              </ul>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+      </el-row>
+    </main>
+    <el-dialog title="详情" :visible.sync="open" width="400px" append-to-body :close-on-click-modal="false">
+      <div class="team-main">
+        <div>提醒时间:</div>
+        <div>{{ info.alertTime }}</div>
       </div>
-    </el-dialog> -->
+      <div class="team-main">
+        <div>提醒内容:</div>
+        <div>{{ info.alertContent  }}</div>
+      </div>
+    </el-dialog>
   </div>
+  <homeIndex v-else-if="userType == '01'" />
 </template>
 <script>
-import { approvalList, approvalEdit, uploadFile } from "@/api/onlineDeclartion/pendingReview"
-import { listRecords } from "@/api/onlineDeclartion/records"
+import { approvalList, uploadFile } from "@/api/onlineDeclartion/pendingReview"
 import { selectAll, workSearch } from "@/api/jin_ji_hu/home"
+import { chiefAll, changeIsRead } from "@/api/jin_ji_hu/intelligentReminder"
+import homeIndex from "@/views/home/index.vue"
+import echartData from '@/views/dataCloudMap/components/echartData.vue'
 export default {
+  dicts: ["project_small_type"],
+  components:{
+    homeIndex,
+    echartData
+  },
   data() {
     return {
       // 判断登陆用户是何身份⌈ 01 ： 企业  02 ： 政务 ⌋
@@ -121,29 +181,8 @@ export default {
         pageSize:10,
         approvalStatusStr: 0,
       },
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        creditCode: this.$store.state.user.name,
-        statusStr: [0, 10],
-      },
       // 是否显示弹出层
       open: false,
-      // 表单参数
-      form: {
-        approvalOpinions: ''
-      },
-      // 表单校验
-      rules: {
-        approvalStatus: [
-          { required: true, message: "请选择审批状态", trigger: "blur" }
-        ],
-        approvalOpinions: [
-          { required: true, message: "名录维护方式不能为空", trigger: "blur" }
-        ],
-      },
-      fileList: [],
-      uploadList: [],
       tabs: [
         {
           value:"查企业"
@@ -155,17 +194,30 @@ export default {
       ],
       checked: 0,
       loading:false,
+      remindList: [],
+      info:{},
+      activeIndex:1,
+      options1: [
+        {
+          name: "按年",
+        },
+        {
+          name: "按季度",
+        },
+      ],
     }
   },
   mounted(){
-    if(this.userType == "02") {
+    if(this.userType == '02') {
       this.getList();
-    } else if(this.userType == "01") {
-      this.getListTwo();
+      this.govRemind();
     }
-    
   },
   methods:{
+    active(e) {
+      this.activeIndex = e;
+      this.$refs.echartData.getService(e);
+    },
     // 待审批
     getList(){
       this.loading = true;
@@ -175,25 +227,40 @@ export default {
         this.loading = false;
       })
     },
-    // 待填报
-    getListTwo(){
-      this.loading = true;
-      listRecords(this.queryParams).then(response => {
-        this.backlogArray = response.rows
-        this.loading = false;
-      });
+    // 政务端智能提醒
+    govRemind(){
+      chiefAll().then(res=>{
+        this.remindList = res.data;
+      })
+    },
+    // 智能提醒去查看并修改状态
+    putMemo(item){
+      if(item.isRead == 1) {
+        changeIsRead({id:item.id}).then(res=>{
+          this.govRemind();
+        })
+      }
+      if(item.projectId) {
+        this.$router.push({
+          name: 'projectInfo',
+          query: { userId: Number(item.projectId) }
+        })
+      } else if(item.alertManner == 1) {
+        this.open = true;
+        this.info = item;
+      }
     },
     // 更多记录
-    MoreRecords(){
-      if(this.userType == "02") {
+    MoreRecords(type,status){
+      if(type == 'all') {
         this.$router.push({
           name: 'PendingReview',
-          params: { approvalStatusStr: "0" }
+          params: { approvalStatusStr: "" }
         })
-      } else if(this.userType == "01") {
+      } else {
         this.$router.push({
-          name: 'Records',
-          params: { statusChange: "0" }
+          name: 'PendingReview',
+          params: { approvalStatusStr: "0" }
         })
       }
     },
@@ -205,35 +272,15 @@ export default {
       this.$refs.autocomplete.suggestions = [];
       this.$refs.autocomplete.highlightedIndex = -1;
     },
-    // 审批弹框
-    handleApproval(row) {
-      this.reset();
-      this.form.declarationRecordsId = row.declarationRecordsId
-      this.open = true;
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        approvalOpinions: '',
-        approvalStatus: '1',
-        approvalAttachment: '',
-      };
-      this.resetForm("form");
-      this.uploadList = []
-    },
     querySearch(queryString, cb) {
       let results = []
       if(this.checked == 0) {
         workSearch({enterpriseInfo: queryString}).then(res => {
           res.data.forEach(item => {
             results.push({
-              value: item.enterpriseName,
-              id: item.id
+              value: item.qymc,
+              id: item.id,
+              tyshxydm: item.tyshxydm
             })
           })
         })
@@ -241,13 +288,20 @@ export default {
         selectAll({ name: queryString }).then(res => {
           res.data.forEach(item => {
             results.push({
-              value: item.projectName,
+              value: item.declareUnit,
               id: item.id
             })
           })
         })
       } else if(this.checked == 2) {
-        
+        selectAll({ name: queryString, status: 5}).then(res => {
+          res.data.forEach(item => {
+            results.push({
+              value: item.declareUnit,
+              id: item.id
+            })
+          })
+        })
       }
       // queryString 拿到搜索到的数据
       /**
@@ -260,19 +314,21 @@ export default {
     },
     // 点击搜索到的数据
     handleSelect(item) {
-      // console.log(item);
       if(this.checked == 0) {
         this.$router.push({
-          name: 'enterInfo',
-          query: { userId: item.id, creditCode: item.creditCode }
+          name: 'enterpriselibraryInfo',
+          query: { userId: item.id, creditCode: item.tyshxydm }
         })
       } else if(this.checked == 1) {
         this.$router.push({
           name: 'projectInfo',
-          query: { userId: item.id }
+          query: { userId: Number(item.id) }
         })
       } else if(this.checked == 2) {
-
+        this.$router.push({
+          name: 'projectInfo',
+          query: { userId: Number(item.id) }
+        })
       }
     },
     searchBtn(){
@@ -283,53 +339,18 @@ export default {
           params: { enterpriseName: this.search }
         })
       } else if(this.checked == 1) {
+        // this.$router.push({
+        //   name: 'Project',
+        //   params: { projectName: this.search }
+        // })
         this.$router.push({
           name: 'Project',
-          params: { projectName: this.search }
+          params: { declareUnit: this.search }
         })
       } else if(this.checked == 2) {
 
       }
     },
-    handleFileUpload(params) {
-      const file = params.file
-      let form = new FormData()
-      form.append('file', file)
-      uploadFile(form).then(response => {
-        this.fileList = []
-        this.fileList.push(file)
-        this.form.fileList = this.fileList
-        let data = {}
-        data.name = response.originalFilename;
-        data.url = response.fileName;
-        this.uploadList.push(data)
-        // console.log('this.fileList: ', this.fileList);
-      })
-    },
-    deleteUpload(value) {
-      this.uploadList =  this.uploadList.filter(item => {
-        return item.url != value.url
-      })
-    },
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.uploadList.forEach((item,index) => {
-            if(this.uploadList.length-1 == index){
-              this.form.approvalAttachment+=`${item.url}`
-            } else {
-              this.form.approvalAttachment+=`${item.url},`
-            }
-          })
-          // console.log("sdas", this.form);
-          approvalEdit(this.form).then(response => {
-            this.$modal.msgSuccess("审核完成");
-            this.open = false;
-            this.getList();
-          });
-        }
-      });
-    },
   },
 }
 </script>
diff --git a/vue.config.js b/vue.config.js
index a7a80de..405310d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -19,7 +19,7 @@ module.exports = {
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
   // demo/JinJiHu
-  publicPath: process.env.NODE_ENV === "production" ? "/demo/JinJiHu" : "/",
+  publicPath: process.env.NODE_ENV === "production" ? "./" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: "dist",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）