弹窗反应慢问题优化

Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into zzq
表单使用正则bug修正
2024-05-14 15:27:00 +08:00 · 2024-05-14 15:22:29 +08:00 · 2024-04-18 17:21:16 +08:00 · 2024-04-18 10:39:39 +08:00 · 2024-04-18 10:39:03 +08:00 · 2024-04-17 17:08:02 +08:00
431 changed files with 53272 additions and 1171 deletions
--- a/.env.development
+++ b/.env.development
@ -6,7 +6,7 @@ VITE_PUBLIC_PATH = /
 # Basic interface address SPA
 #VITE_GLOB_API_URL=/basic-api
-VITE_GLOB_API_URL=http://192.168.10.124:9400
+VITE_GLOB_API_URL=http://192.168.10.104:9400
 # File upload address， optional
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@ -9,6 +9,7 @@
    "antfu.iconify",
    "antfu.unocss",
    "mikestead.dotenv",
-    "vue.vscode-typescript-vue-plugin"
+    "vue.vscode-typescript-vue-plugin",
    "ms-ceintl.vscode-language-pack-zh-hans"
  ]
 }
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -7,29 +7,27 @@
  "editor.defaultFormatter": "esbenp.prettier-vscode",
  "files.eol": "\n",
  "search.exclude": {
-    "**/node_modules": true,
+    "**/.DS_Store": true,
    "**/.git": true,
    "**/.gitignore": true,
    "**/.idea": true,
    "**/.svn": true,
    "**/.vscode": false,
    "**/.yarn": true,
    "**/*.log": true,
    "**/*.log*": true,
    "**/bower_components": true,
    "**/dist": true,
    "**/elehukouben": true,
-    "**/.git": true,
+    "**/node_modules": true,
    "**/.gitignore": true,
    "**/.svn": true,
    "**/.DS_Store": true,
    "**/.idea": true,
    "**/.vscode": false,
    "**/yarn.lock": true,
    "**/tmp": true,
-    "out": true,
+    "**/yarn.lock": true,
    "dist": true,
    "node_modules": true,
    "CHANGELOG.md": true,
    "dist": true,
    "examples": true,
    "out": true,
    "res": true,
    "screenshots": true,
-    "yarn-error.log": true,
+    "yarn-error.log": true
    "**/.yarn": true
  },
  "files.exclude": {
    "**/.cache": true,
@ -76,7 +74,7 @@
    "editor.defaultFormatter": "esbenp.prettier-vscode"
  },
  "[html]": {
-    "editor.defaultFormatter": "vscode.html-language-features"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
  },
  "[css]": {
    "editor.defaultFormatter": "esbenp.prettier-vscode"
@ -184,5 +182,8 @@
    ".eslintrc.cjs": ".eslintignore,.prettierignore,.stylelintignore,.commitlintrc.*,.prettierrc.*,.stylelintrc.*"
  },
  "terminal.integrated.scrollback": 10000,
-  "nuxt.isNuxtApp": false
+  "nuxt.isNuxtApp": false,
  "[javascript]": {
    "editor.defaultFormatter": "vscode.typescript-language-features"
  }
 }
--- a/index.html
+++ b/index.html
@ -10,6 +10,8 @@
    />
    <title><%= VITE_GLOB_APP_TITLE %></title>
    <link rel="icon" href="/favicon.ico" />
    <link rel="stylesheet" href="learunui/learunui.css">
  </head>
  <body>
    <div id="app">
@ -154,5 +156,7 @@
      </div>
    </div>
    <script type="module" src="/src/main.ts"></script>
  </body>
 </html>
--- a/lib/vform/designer.style.css
+++ b/lib/vform/designer.style.css
--- a/lib/vform/designer.umd.js
+++ b/lib/vform/designer.umd.js
--- a/package.json
+++ b/package.json
@ -18,7 +18,7 @@
  "type": "module",
  "scripts": {
    "bootstrap": "pnpm install",
-    "build": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=8192 pnpm vite build",
+    "build": "vite build",
    "build:analyze": "cross-env NODE_OPTIONS=--max-old-space-size=8192 pnpm vite build --mode analyze",
    "build:docker": "vite build --mode docker",
    "build:no-cache": "pnpm store prune && npm run build",
@ -79,17 +79,27 @@
    "@zxcvbn-ts/core": "^3.0.4",
    "ant-design-vue": "^4.0.8",
    "axios": "^1.6.4",
    "bpmn-js": "^17.0.2",
    "bpmn-js-properties-panel": "^5.13.0",
    "bpmn-js-token-simulation": "^0.33.1",
    "codemirror": "^5.65.16",
    "cropperjs": "^1.6.1",
    "crypto-js": "^4.2.0",
    "dayjs": "^1.11.10",
    "diagram-js": "^14.1.0",
    "driver.js": "^1.3.1",
    "echarts": "^5.4.3",
    "element-plus": "^2.6.0",
    "exceljs": "^4.4.0",
    "highlight.js": "^11.9.0",
    "kml-geojson": "^1.2.2",
    "localforage": "^1.10.0",
    "js-md5": "^0.8.3",
    "lodash": "^4.17.21",
    "lodash-es": "^4.17.21",
    "mars3d": "^3.7.0",
    "mars3d-cesium": "^1.113.0",
    "min-dash": "^4.2.1",
    "mockjs": "^1.1.0",
    "nprogress": "^0.2.0",
    "path-to-regexp": "^6.2.1",
@ -116,7 +126,8 @@
    "vxe-table": "^4.5.17",
    "vxe-table-plugin-export-xlsx": "^3.1.0",
    "xe-utils": "^3.5.14",
-    "xlsx": "^0.18.5"
+    "xlsx": "^0.18.5",
    "xml-js": "^1.6.11"
  },
  "devDependencies": {
    "@commitlint/cli": "^18.4.4",
--- a/public/config/config.json
+++ b/public/config/config.json
@ -1,7 +1,7 @@
 {
  "map3d": {
    "scene": {
-      "center": { "lat": 31.686288, "lng": 117.229619, "alt": 11333.9, "heading": 359.2, "pitch": -39.5 },
+      "center": {"lat":35.408009,"lng":118.08707,"alt":4006.9,"heading":3.4,"pitch":-78.8},
      "scene3DOnly": false,
      "shadows": false,
      "removeDblClick": true,
@ -70,15 +70,14 @@
        "id": 2021,
        "pid": 10,
        "name": "谷歌影像",
-        "icon": "/img/basemaps/google_img.png",
+        "icon": "/mars/img/basemaps/google_img.png",
        "type": "google",
-        "layer": "img_d",
+        "layer": "img_d"
        "show": true
      },
      {
        "pid": 10,
        "name": "天地图影像",
-        "icon": "img/basemaps/tdt_img.png",
+        "icon": "mars/img/basemaps/tdt_img.png",
        "type": "group",
        "layers": [
          { "name": "底图", "type": "tdt", "layer": "img_d" },
@ -89,7 +88,7 @@
      {
        "pid": 10,
        "name": "天地图电子",
-        "icon": "img/basemaps/tdt_vec.png",
+        "icon": "mars/img/basemaps/tdt_vec.png",
        "type": "group",
        "layers": [
          { "name": "底图", "type": "tdt", "layer": "vec_d" },
@ -100,7 +99,7 @@
        "pid": 10,
        "name": "高德影像",
        "type": "group",
-        "icon": "img/basemaps/gaode_img.png",
+        "icon": "mars/img/basemaps/gaode_img.png",
        "layers": [
          { "name": "底图", "type": "gaode", "layer": "img_d" },
          { "name": "注记", "type": "gaode", "layer": "img_z" }
@ -110,14 +109,15 @@
        "pid": 10,
        "name": "高德电子",
        "type": "gaode",
-        "icon": "img/basemaps/gaode_vec.png",
+        "icon": "mars/img/basemaps/gaode_vec.png",
-        "layer": "vec"
+        "layer": "vec",
 				"show": true
      },
      {
        "pid": 10,
        "name": "百度影像",
        "type": "group",
-        "icon": "img/basemaps/bd-img.png",
+        "icon": "mars/img/basemaps/bd-img.png",
        "layers": [
          { "name": "底图", "type": "baidu", "layer": "img_d" },
          { "name": "注记", "type": "baidu", "layer": "img_z" }
@ -126,14 +126,14 @@
      {
        "pid": 10,
        "name": "百度电子",
-        "icon": "img/basemaps/bd-vec.png",
+        "icon": "mars/img/basemaps/bd-vec.png",
        "type": "baidu",
        "layer": "vec"
      },
      {
        "pid": 10,
        "name": "腾讯影像",
-        "icon": "img/basemaps/tencent_img.png",
+        "icon": "mars/img/basemaps/tencent_img.png",
        "type": "group",
        "layers": [
          { "name": "底图", "type": "tencent", "layer": "img_d" },
@ -143,14 +143,14 @@
      {
        "pid": 10,
        "name": "腾讯电子",
-        "icon": "img/basemaps/tencent_vec.png",
+        "icon": "mars/img/basemaps/tencent_vec.png",
        "type": "tencent",
        "layer": "vec"
      },
      {
        "pid": 10,
        "name": "ArcGIS影像",
-        "icon": "img/basemaps/esriWorldImagery.png",
+        "icon": "mars/img/basemaps/esriWorldImagery.png",
        "type": "xyz",
        "url": "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
        "enablePickFeatures": false
@ -158,7 +158,7 @@
      {
        "pid": 10,
        "name": "微软影像",
-        "icon": "img/basemaps/bingAerial.png",
+        "icon": "mars/img/basemaps/bingAerial.png",
        "type": "bing",
        "layer": "Aerial"
      },
@ -167,7 +167,7 @@
        "pid": 10,
        "name": "暗色底图",
        "type": "gaode",
-        "icon": "img/basemaps/blackMarble.png",
+        "icon": "mars/img/basemaps/blackMarble.png",
        "layer": "vec",
        "invertColor": true,
        "filterColor": "#4e70a6",
@ -180,7 +180,7 @@
      {
        "pid": 10,
        "name": "蓝色底图",
-        "icon": "img/basemaps/bd-c-midnight.png",
+        "icon": "mars/img/basemaps/bd-c-midnight.png",
        "type": "xyz",
        "url": "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}",
        "chinaCRS": "GCJ02",
@ -189,7 +189,7 @@
      {
        "pid": 10,
        "name": "黑色底图",
-        "icon": "img/basemaps/bd-c-dark.png",
+        "icon": "mars/img/basemaps/bd-c-dark.png",
        "type": "tencent",
        "layer": "custom",
        "style": "4"
@ -198,7 +198,7 @@
        "pid": 10,
        "name": "离线地图 (供参考)",
        "type": "group",
-        "icon": "img/basemaps/google_img.png",
+        "icon": "mars/img/basemaps/google_img.png",
        "layers": [
          {
            "name": "全球",
@ -230,7 +230,7 @@
      {
        "pid": 10,
        "name": "单张图片 (本地离线)",
-        "icon": "img/basemaps/offline.png",
+        "icon": "mars/img/basemaps/offline.png",
        "type": "image",
        "url": "//data.mars3d.cn/file/img/world/world.jpg"
      },
@ -238,7 +238,7 @@
        "id": 2023,
        "pid": 10,
        "name": "无底图",
-        "icon": "/img/basemaps/null.png",
+        "icon": "/mars/img/basemaps/null.png",
        "type": "grid",
        "color": "#ffffff",
        "alpha": 0.03,
--- a/public/learunui/learunui.css
+++ b/public/learunui/learunui.css
--- a/public/learunui/learunui.umd.min.js
+++ b/public/learunui/learunui.umd.min.js
--- a/public/mars/img/basemaps/TerrainEllipsoid.png
+++ b/public/mars/img/basemaps/TerrainEllipsoid.png
--- a/public/mars/img/basemaps/TerrainSTK.png
+++ b/public/mars/img/basemaps/TerrainSTK.png
--- a/public/mars/img/basemaps/arcgis.png
+++ b/public/mars/img/basemaps/arcgis.png
--- a/public/mars/img/basemaps/bd-c-bluish.png
+++ b/public/mars/img/basemaps/bd-c-bluish.png
--- a/public/mars/img/basemaps/bd-c-dark.png
+++ b/public/mars/img/basemaps/bd-c-dark.png
--- a/public/mars/img/basemaps/bd-c-darkgreen.png
+++ b/public/mars/img/basemaps/bd-c-darkgreen.png
--- a/public/mars/img/basemaps/bd-c-googlelite.png
+++ b/public/mars/img/basemaps/bd-c-googlelite.png
--- a/public/mars/img/basemaps/bd-c-grassgreen.png
+++ b/public/mars/img/basemaps/bd-c-grassgreen.png
--- a/public/mars/img/basemaps/bd-c-grayscale.png
+++ b/public/mars/img/basemaps/bd-c-grayscale.png
--- a/public/mars/img/basemaps/bd-c-hardedge.png
+++ b/public/mars/img/basemaps/bd-c-hardedge.png
--- a/public/mars/img/basemaps/bd-c-light.png
+++ b/public/mars/img/basemaps/bd-c-light.png
--- a/public/mars/img/basemaps/bd-c-midnight.png
+++ b/public/mars/img/basemaps/bd-c-midnight.png
--- a/public/mars/img/basemaps/bd-c-pink.png
+++ b/public/mars/img/basemaps/bd-c-pink.png
--- a/public/mars/img/basemaps/bd-c-redalert.png
+++ b/public/mars/img/basemaps/bd-c-redalert.png
--- a/public/mars/img/basemaps/bd-img.png
+++ b/public/mars/img/basemaps/bd-img.png
--- a/public/mars/img/basemaps/bd-vec.png
+++ b/public/mars/img/basemaps/bd-vec.png
--- a/public/mars/img/basemaps/bingAerial.png
+++ b/public/mars/img/basemaps/bingAerial.png
--- a/public/mars/img/basemaps/bingAerialLabels.png
+++ b/public/mars/img/basemaps/bingAerialLabels.png
--- a/public/mars/img/basemaps/bingRoads.png
+++ b/public/mars/img/basemaps/bingRoads.png
--- a/public/mars/img/basemaps/bingimage.png
+++ b/public/mars/img/basemaps/bingimage.png
--- a/public/mars/img/basemaps/bingmap.png
+++ b/public/mars/img/basemaps/bingmap.png
--- a/public/mars/img/basemaps/blackMarble.png
+++ b/public/mars/img/basemaps/blackMarble.png
--- a/public/mars/img/basemaps/esriNationalGeographic.png
+++ b/public/mars/img/basemaps/esriNationalGeographic.png
--- a/public/mars/img/basemaps/esriWorldImagery.png
+++ b/public/mars/img/basemaps/esriWorldImagery.png
--- a/public/mars/img/basemaps/esriWorldStreetMap.png
+++ b/public/mars/img/basemaps/esriWorldStreetMap.png
--- a/public/mars/img/basemaps/gaode_img.png
+++ b/public/mars/img/basemaps/gaode_img.png
--- a/public/mars/img/basemaps/gaode_vec.png
+++ b/public/mars/img/basemaps/gaode_vec.png
--- a/public/mars/img/basemaps/google_img.png
+++ b/public/mars/img/basemaps/google_img.png
--- a/public/mars/img/basemaps/google_ter.png
+++ b/public/mars/img/basemaps/google_ter.png
--- a/public/mars/img/basemaps/google_vec.png
+++ b/public/mars/img/basemaps/google_vec.png
--- a/public/mars/img/basemaps/mapQuestOpenStreetMap.png
+++ b/public/mars/img/basemaps/mapQuestOpenStreetMap.png
--- a/public/mars/img/basemaps/mapboxSatellite.png
+++ b/public/mars/img/basemaps/mapboxSatellite.png
--- a/public/mars/img/basemaps/mapboxStreets.png
+++ b/public/mars/img/basemaps/mapboxStreets.png
--- a/public/mars/img/basemaps/mapboxTerrain.png
+++ b/public/mars/img/basemaps/mapboxTerrain.png
--- a/public/mars/img/basemaps/naturalEarthII.png
+++ b/public/mars/img/basemaps/naturalEarthII.png
--- a/public/mars/img/basemaps/null.png
+++ b/public/mars/img/basemaps/null.png
--- a/public/mars/img/basemaps/offline.png
+++ b/public/mars/img/basemaps/offline.png
--- a/public/mars/img/basemaps/osm.png
+++ b/public/mars/img/basemaps/osm.png
--- a/public/mars/img/basemaps/sea.png
+++ b/public/mars/img/basemaps/sea.png
--- a/public/mars/img/basemaps/stamenToner.png
+++ b/public/mars/img/basemaps/stamenToner.png
--- a/public/mars/img/basemaps/stamenWatercolor.png
+++ b/public/mars/img/basemaps/stamenWatercolor.png
--- a/public/mars/img/basemaps/tdt_img.png
+++ b/public/mars/img/basemaps/tdt_img.png
--- a/public/mars/img/basemaps/tdt_ter.png
+++ b/public/mars/img/basemaps/tdt_ter.png
--- a/public/mars/img/basemaps/tdt_vec.png
+++ b/public/mars/img/basemaps/tdt_vec.png
--- a/public/mars/img/basemaps/tencent_img.png
+++ b/public/mars/img/basemaps/tencent_img.png
--- a/public/mars/img/basemaps/tencent_vec.png
+++ b/public/mars/img/basemaps/tencent_vec.png
--- a/public/mars/img/icon/div1.png
+++ b/public/mars/img/icon/div1.png
--- a/public/mars/img/icon/popupLbl.png
+++ b/public/mars/img/icon/popupLbl.png
--- a/public/mars/img/icon/typhoon.gif
+++ b/public/mars/img/icon/typhoon.gif
--- a/public/mars/img/marker/lace-blue.png
+++ b/public/mars/img/marker/lace-blue.png
--- a/public/mars/img/marker/lace-red.png
+++ b/public/mars/img/marker/lace-red.png
--- a/public/mars/img/marker/lace-yellow.png
+++ b/public/mars/img/marker/lace-yellow.png
--- a/public/mars/img/marker/mark-blue.png
+++ b/public/mars/img/marker/mark-blue.png
--- a/public/mars/img/marker/mark-green.png
+++ b/public/mars/img/marker/mark-green.png
--- a/public/mars/img/marker/mark-red.png
+++ b/public/mars/img/marker/mark-red.png
--- a/public/mars/img/marker/point-orange.png
+++ b/public/mars/img/marker/point-orange.png
--- a/public/mars/img/marker/point-red.png
+++ b/public/mars/img/marker/point-red.png
--- a/public/mars/img/marker/point-yellow.png
+++ b/public/mars/img/marker/point-yellow.png
--- a/public/mars/img/marker/route-end.png
+++ b/public/mars/img/marker/route-end.png
--- a/public/mars/img/marker/route-start.png
+++ b/public/mars/img/marker/route-start.png
--- a/public/mars/img/onlineform/layout-left.png
+++ b/public/mars/img/onlineform/layout-left.png
--- a/public/mars/img/onlineform/layout.png
+++ b/public/mars/img/onlineform/layout.png
--- a/public/mars/img/onlineform/query1.jpg
+++ b/public/mars/img/onlineform/query1.jpg
--- a/public/mars/img/onlineform/query2.jpg
+++ b/public/mars/img/onlineform/query2.jpg
--- a/public/mars/img/poi/indexMark.png
+++ b/public/mars/img/poi/indexMark.png
--- a/public/mars/img/textures/arrow-2left.png
+++ b/public/mars/img/textures/arrow-2left.png
--- a/public/mars/img/textures/arrow-6left.png
+++ b/public/mars/img/textures/arrow-6left.png
--- a/public/mars/img/textures/arrow-h.png
+++ b/public/mars/img/textures/arrow-h.png
--- a/public/mars/img/textures/arrow.png
+++ b/public/mars/img/textures/arrow.png
--- a/public/mars/img/textures/buildings.png
+++ b/public/mars/img/textures/buildings.png
--- a/public/mars/img/textures/circle-scan.png
+++ b/public/mars/img/textures/circle-scan.png
--- a/public/mars/img/textures/circle-two.png
+++ b/public/mars/img/textures/circle-two.png
--- a/public/mars/img/textures/colors.png
+++ b/public/mars/img/textures/colors.png
--- a/public/mars/img/textures/fence-line.png
+++ b/public/mars/img/textures/fence-line.png
--- a/public/mars/img/textures/fence-top.png
+++ b/public/mars/img/textures/fence-top.png
--- a/public/mars/img/textures/fence.png
+++ b/public/mars/img/textures/fence.png
--- a/public/mars/img/textures/line-arrow-blue.png
+++ b/public/mars/img/textures/line-arrow-blue.png
--- a/public/mars/img/textures/line-arrow-dovetail.png
+++ b/public/mars/img/textures/line-arrow-dovetail.png
--- a/public/mars/img/textures/line-arrow-right.png
+++ b/public/mars/img/textures/line-arrow-right.png
--- a/public/mars/img/textures/line-arrow-trans.png
+++ b/public/mars/img/textures/line-arrow-trans.png
--- a/public/mars/img/textures/line-color-aqua.png
+++ b/public/mars/img/textures/line-color-aqua.png
--- a/public/mars/img/textures/line-color-azure.png
+++ b/public/mars/img/textures/line-color-azure.png
--- a/public/mars/img/textures/line-color-red.png
+++ b/public/mars/img/textures/line-color-red.png
--- a/public/mars/img/textures/line-color-yellow.png
+++ b/public/mars/img/textures/line-color-yellow.png
--- a/public/mars/img/textures/line-colour.png
+++ b/public/mars/img/textures/line-colour.png
--- a/public/mars/img/textures/line-gradual.png
+++ b/public/mars/img/textures/line-gradual.png
--- a/public/mars/img/textures/line-pulse.png
+++ b/public/mars/img/textures/line-pulse.png
--- a/public/mars/img/textures/line-sprite.png
+++ b/public/mars/img/textures/line-sprite.png
--- a/public/mars/img/textures/line-sprite2.png
+++ b/public/mars/img/textures/line-sprite2.png
--- a/public/mars/img/textures/line-tarans.png
+++ b/public/mars/img/textures/line-tarans.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
zzq	99fb13892f	弹窗反应慢问题优化	2024-05-14 15:27:00 +08:00
zzq	3cb37be509	Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into zzq	2024-05-14 15:22:29 +08:00
滕嵩	215143e5be	表单使用正则bug修正	2024-04-18 17:21:16 +08:00
刘妍	33248eec56	Merge branch 'ly' into dev	2024-04-18 10:39:39 +08:00
刘妍	510134cfe5	组件树，复选框样式优化	2024-04-18 10:39:03 +08:00
zzq	747bb693ea	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-04-17 17:08:02 +08:00
zzq	ee447b0fcd	代码规范化	2024-04-17 17:07:21 +08:00
刘妍	ee130acd05	Merge branch 'ly' into dev	2024-04-17 14:44:19 +08:00
刘妍	62879b0d81	优化流程设计涉及数据库的内容	2024-04-17 14:43:47 +08:00
滕嵩	fe6bf59431	数据源补充	2024-04-16 17:02:38 +08:00
刘妍	ebd537e45a	Merge branch 'ly' into dev	2024-04-15 17:04:15 +08:00
刘妍	4b61ab791a	树组件优化，代码规范	2024-04-15 17:03:03 +08:00
滕嵩	b11b6aac61	表单图片优化	2024-04-13 17:03:45 +08:00
zzq	955fe43a64	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-04-13 16:54:58 +08:00
zzq	0c2c362a83	表单设计完善	2024-04-13 16:54:26 +08:00
刘妍	2a097b4e04	Merge branch 'ly' into dev	2024-04-12 16:10:06 +08:00
刘妍	d9e3a1df75	流程H5页面	2024-04-12 16:09:30 +08:00
滕嵩	3c32596b07	表单设计-暂存、表单其他bug修正	2024-04-12 14:21:37 +08:00
zzq	52a4a5650e	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-04-11 17:07:27 +08:00
zzq	e74c822062	表单调用完善	2024-04-11 17:06:53 +08:00
刘妍	52c353b0ad	Merge branch 'ly' into dev	2024-04-11 16:59:39 +08:00
刘妍	4365aca920	问题优化	2024-04-11 16:59:10 +08:00
刘妍	03dd7b67b7	Merge branch 'ly' into dev	2024-04-11 10:56:19 +08:00
刘妍	1c6f96adba	流程审核、流程详情增加流转记录。草稿发起流程。流程表单内容优化。	2024-04-11 10:55:43 +08:00
石超	30f0e72b0c	删除登录多余按钮	2024-04-11 08:37:36 +08:00
滕嵩	01b15a2b9f	表单设计、发布的优化	2024-04-10 17:57:56 +08:00
刘妍	3c954a4412	Merge branch 'ly' into dev	2024-04-10 17:44:20 +08:00
刘妍	41cc452d17	流程优化	2024-04-10 17:43:41 +08:00
zzq	fc4d5636c2	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-04-10 16:54:15 +08:00
zzq	fbdb0819a9	表单调用接口对接完善，H5页面完善接口对接	2024-04-10 16:53:41 +08:00
石超	1a3eb97292	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-04-10 14:54:00 +08:00
石超	7db5a9d716	修改测试服务地址	2024-04-10 14:53:55 +08:00
刘妍	a83e05d21c	Merge branch 'ly' into dev	2024-04-10 14:36:17 +08:00
刘妍	738b9a2f0e	流程优化	2024-04-10 14:35:37 +08:00
石超	56785997ec	空Vue文件添加内容	2024-04-10 10:48:23 +08:00
zzq	64acbbab12	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-04-09 17:35:41 +08:00
zzq	963b408560	表单调用新增编辑接口对接	2024-04-09 17:33:28 +08:00
滕嵩	7166f79bf7	表单设计、发布bug修改，数据源部分	2024-04-09 17:25:29 +08:00
刘妍	55078eabb4	Merge branch 'ly' into dev	2024-04-09 17:15:06 +08:00
刘妍	727e1ab892	表单接口调整后流程审核和详情逻辑相应调整	2024-04-09 17:14:30 +08:00
刘妍	b46850ed9f	Merge branch 'ly' into dev	2024-04-09 16:01:15 +08:00
刘妍	7793acbe6a	流程审核、流程详情表单内容赋值	2024-04-09 16:00:42 +08:00
刘妍	a851f035e3	Merge branch 'ly' into dev	2024-04-09 11:20:15 +08:00
刘妍	e08ce03a41	封装流程表单调用组件，优化mars导致流程相关页面样式冲突	2024-04-09 11:19:32 +08:00
zzq	93abc0afd7	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-04-09 10:33:48 +08:00
zzq	927ace2322	编辑器添加控件类型	2024-04-09 10:33:19 +08:00
滕嵩	16ab15b9b4	表单设计、发布修正	2024-04-09 10:27:55 +08:00
zzq	9c25ae1cfc	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-04-08 17:50:53 +08:00
zzq	e55951cf8d	表单接口对接	2024-04-08 17:50:14 +08:00
滕嵩	733c2a849f	表单设计bug修改，表单发布数据源添加	2024-04-08 14:18:56 +08:00
zzq	93111ca59d	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-04-07 17:32:22 +08:00
zzq	33265d0ee0	设计器报错修改，表单调用完善	2024-04-07 17:30:14 +08:00
刘妍	ec94df4980	Merge branch 'ly' into dev	2024-04-07 17:12:22 +08:00
刘妍	c47376c7f4	优化测试问题和页面	2024-04-07 17:04:23 +08:00
滕嵩	9c5d75eb5d	表单发布-树试引用数据源	2024-04-03 17:56:59 +08:00
滕嵩	3fca277eb2	表单设计、发布bug修改、数据源部分	2024-04-03 17:24:24 +08:00
zzq	49bbe8ab49	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-04-03 16:59:41 +08:00
zzq	bf385b87c4	代码规范，表单发布页面完善，表单编辑器控件添加默认值	2024-04-03 16:58:52 +08:00
刘妍	85c7be74cb	解决冲突	2024-04-03 13:56:59 +08:00
刘妍	7f3532c47a	流程设计开始节点增加表单内容，系统设置测试问题优化	2024-04-03 13:48:11 +08:00
滕嵩	56af7453d4	表单设计、发布-预览修正	2024-04-03 11:34:25 +08:00
zzq	6b8b1a6715	merge	2024-04-03 08:33:07 +08:00
zzq	82919311e7	设计器字段乱变修改，表单调用完善	2024-04-02 17:03:50 +08:00
滕嵩	e5410edc6c	表单发布修正部分bug	2024-04-02 15:13:04 +08:00
刘妍	3c6c4489fa	Merge branch 'ly' into dev	2024-04-02 13:53:02 +08:00
刘妍	bef6e7ee93	优化流程审核内容	2024-04-02 13:51:36 +08:00
滕嵩	379b88ce5e	表单发布-树	2024-04-01 17:14:19 +08:00
刘妍	38db715591	解决冲突	2024-04-01 17:09:08 +08:00
刘妍	e3ee56539d	流程节点名称双向赋值，更改内容测试。	2024-04-01 16:56:41 +08:00
滕嵩	a7678e9f31	表单发布-左树	2024-03-30 19:46:40 +08:00
刘妍	6ecc1a895e	Merge branch 'ly' into dev	2024-03-30 17:04:01 +08:00
刘妍	8e92dc1c9e	优化流程审核内容，完成流程撤销，催办限制。完成我的传阅-完成阅读功能。	2024-03-30 17:03:26 +08:00
zzq	6f646f3a4e	数据库连接模块开发接口对接，表单调用模块路径完善	2024-03-30 16:56:16 +08:00
滕嵩	4fb0af75da	表单发布样式修正、编辑等的bug修复	2024-03-29 18:08:40 +08:00
刘妍	a58b6e67b4	Merge branch 'ly' into dev	2024-03-29 17:06:18 +08:00
刘妍	75edf75ebf	优化流程设计代码。已办任务详情展示。	2024-03-29 17:05:42 +08:00
zzq	caf00a8e13	merge	2024-03-29 16:53:21 +08:00
zzq	6c4aa13cd4	表单设计优化	2024-03-29 16:50:23 +08:00
滕嵩	eb109d408e	表单发布-编辑	2024-03-28 18:33:47 +08:00
滕嵩	fb00c57f4b	表单发布因冲突未提交上的文件	2024-03-28 14:27:37 +08:00
滕嵩	7cd925605e	表单发布-新增可使用版	2024-03-28 14:07:00 +08:00
石超	9f0f021368	删除力软信息	2024-03-28 08:39:08 +08:00
zzq	84fe53cd75	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-03-27 17:00:36 +08:00
zzq	66022141f3	表单设计样式跟随主体，获取在线数据库列表，导入数据库表	2024-03-27 16:59:36 +08:00
刘妍	bb38116df8	Merge branch 'ly' into dev	2024-03-27 16:54:46 +08:00
刘妍	807ba06ef4	优化流程设计。待办任务审核页面封装，展示节点的流程时间轴。登录取消默认的错误提示。	2024-03-27 16:54:12 +08:00
刘妍	b2c621ffbb	Merge branch 'ly' into dev	2024-03-26 16:59:24 +08:00
刘妍	357b4d80e7	解决冲突	2024-03-26 16:58:58 +08:00
刘妍	fc052ce96e	安装js-md5	2024-03-26 16:54:36 +08:00
刘妍	4baab54509	职级组件更换树的形式，审核节点一些组件封装。节点数据换成pinia存储。登录密码加密。	2024-03-26 16:42:25 +08:00
滕嵩	bd3adf3fe4	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-03-26 09:11:35 +08:00
滕嵩	d93b70f1d7	暂存	2024-03-26 09:08:15 +08:00
滕嵩	aadceca875	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-03-25 18:38:09 +08:00
滕嵩	489b8f22ed	表单发布-样式	2024-03-25 18:37:45 +08:00
zzq	dc20d81a03	解决冲突	2024-03-25 17:41:52 +08:00
zzq	0bf6c77e5d	merge	2024-03-25 17:22:43 +08:00
zzq	26c2c2948d	Merge branch 'zzq' into dev	2024-03-25 17:17:29 +08:00
zzq	1bfde90d06	导入表弹窗开发接口对接，表单调用	2024-03-25 17:16:55 +08:00
刘妍	4beff39054	Merge branch 'ly' into dev	2024-03-22 16:46:48 +08:00
刘妍	8a9e5671e5	优化模板设计内容。增加任务流程详情页面。	2024-03-22 16:46:08 +08:00
滕嵩	05032e1169	表单设计-拼接	2024-03-22 08:36:18 +08:00
刘妍	406a6da8aa	Merge branch 'ly' into dev	2024-03-21 16:54:27 +08:00
刘妍	ad2e471f96	流程发起页面里的七个tab页接口对接	2024-03-21 16:53:51 +08:00
滕嵩	b11c65f2a5	表单设计和表单发布前端页面	2024-03-21 15:46:03 +08:00
zzq	db8b313c96	Merge branch 'zzq' into dev	2024-03-20 17:38:07 +08:00
zzq	07b6bb9a2f	基本配置模块完善	2024-03-20 17:27:32 +08:00
刘妍	456e3b0a4d	Merge branch 'ly' into dev	2024-03-20 16:58:44 +08:00
刘妍	1a975d5445	流程发起接口对接，流程任务页面布局	2024-03-20 16:58:08 +08:00
zzq	df07807df9	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-03-19 17:32:49 +08:00
zzq	68cd8c4bf4	数据表关联表新增编辑关联完善	2024-03-19 17:31:00 +08:00
刘妍	eaf2ce65f2	Merge branch 'ly' into dev	2024-03-19 17:03:47 +08:00
刘妍	52f1233354	增加线条、并行网关、包含网关节点及对应属性面板。流程发起列表页，流程发起页面	2024-03-19 17:03:11 +08:00
zzq	8681ad3c6c	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-03-15 17:02:59 +08:00
zzq	fa3a7546ad	编辑新增接口对接，表单设计器json渲染	2024-03-15 17:01:55 +08:00
刘妍	adafbc5985	Merge branch 'ly' into dev	2024-03-15 17:01:25 +08:00
刘妍	3a1aa488bb	流程模板详情页面补充。增加排他网关节点，完成关联。封装选择数据表组件	2024-03-15 17:00:44 +08:00
刘妍	1e6e01eb31	Merge branch 'ly' into dev	2024-03-14 17:09:01 +08:00
刘妍	c30684eb3d	版本预览页面展示，相关的属性面板页面完成逻辑交互	2024-03-14 17:08:16 +08:00
zzq	d52e7b1dc1	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-03-13 17:33:36 +08:00
zzq	0476c9dd91	表单设计模块部分接口对接	2024-03-13 17:29:23 +08:00
刘妍	743edcba2b	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-03-13 16:53:57 +08:00
刘妍	6cc00a29c5	Merge branch 'ly' into dev	2024-03-13 16:53:35 +08:00
刘妍	e03e530e99	简单的模板设计：编辑模板，节点面板流程图展示，属性面板数据绑定。编辑和删除接口对接	2024-03-13 16:53:01 +08:00
zzq	290c425b87	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-03-12 17:33:15 +08:00
zzq	97f3cf41bc	添加填单编辑器	2024-03-12 17:23:28 +08:00
刘妍	49039bd911	Merge branch 'ly' into dev	2024-03-12 16:41:59 +08:00
刘妍	72c07fbd80	流程模板设计：简单的流程新增数据处理，接口对接，编辑逻辑梳理。	2024-03-12 16:41:21 +08:00
刘妍	07c7810726	Merge branch 'ly' into dev	2024-03-11 16:56:37 +08:00
刘妍	b015db153d	流程模板：列表、改变模板状态、历史记录、切换模板版本接口对接。梳理新增流程模板的页面数据	2024-03-11 16:55:44 +08:00
刘妍	6faa60487c	Merge branch 'ly' into dev	2024-03-09 16:50:42 +08:00
刘妍	1f81dbe44b	封装流程属性面板：结束节点、子流程。流程分类相关接口对接	2024-03-09 16:45:47 +08:00
刘妍	71bcc85900	Merge branch 'ly' into dev	2024-03-08 11:38:49 +08:00
刘妍	fbf7daba37	去头	2024-03-08 11:38:29 +08:00
刘妍	5efd729366	去掉文件头	2024-03-08 11:31:55 +08:00
zzq	4d872e2d5a	修改力软服务器地址	2024-03-08 11:06:18 +08:00
zzq	9584bbd290	env修改	2024-03-08 10:56:42 +08:00
滕嵩	11a118c28a	表单设计和表单发布前端页面	2024-03-08 10:12:21 +08:00
徐景良	eff00e8c29	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-03-08 09:49:36 +08:00
徐景良	a1fab2bf8a	地图	2024-03-08 09:49:33 +08:00
刘妍	00a89b668a	vite.config	2024-03-08 09:46:28 +08:00
刘妍	5a59b18066	merge	2024-03-08 09:42:51 +08:00
徐景良	2aec5bc5ac	Merge branch 'dev' of http://123.132.248.154:10000/HC_YFZX/vue-vben-admin into dev	2024-03-08 09:42:31 +08:00
刘妍	52c238a3dc	解决冲突	2024-03-08 09:17:39 +08:00
刘妍	3f9f7281ec	流程	2024-03-08 09:08:19 +08:00
徐景良	7af9ac1457	数据维护	2024-03-08 08:59:24 +08:00
zzq	6431118316	表单设计模块更新	2024-03-08 08:48:07 +08:00
刘妍	ea04fee4a0	封装全局组件：职级（岗位）选择。流程组件：审核节点一部分。	2024-03-08 08:47:25 +08:00
刘妍	1a51ad1c7b	封装流程属性面板组件：流程属性、发起权限、开始节点。封装全局组件：选择角色和选择账号。	2024-03-07 14:51:01 +08:00
刘妍	7caecfbac7	删除力软的一些引用	2024-03-06 08:45:11 +08:00
刘妍	f7bcdd087b	封装流程节点组件，节点汉化，增加流程图功能	2024-03-05 17:10:53 +08:00
zzq	f8d0ea1966	表单设计页面	2024-03-05 15:18:55 +08:00
zzq	e54b264bd4	添加表单设计页面	2024-03-02 17:03:40 +08:00
刘妍	00becc4c21	增加力软的UI代码	2024-03-01 10:49:34 +08:00