Merge branch 'develop' of http://dev.hsfuel.com:3000/adminTk/Web into features/errorpage

admin.ui.plus-master/.env.development

@@ -3,8 +3,8 @@ ENV = 'development'
 
 # 本地环境接口地址
 # VITE_API_URL = 'http://ipos.biz:8070'
-#VITE_API_URL = 'http://localhost:8000'
+VITE_API_URL = 'http://localhost:8000'
 # VITE_API_URL = 'http://dev.hsfuel.com:8070'
-VITE_API_URL = 'http://47.101.220.106:8070'
+#VITE_API_URL = 'http://47.101.220.106:8070'
 # VITE_API_URL = 'http://ipos.biz:8070'
 

admin.ui.plus-master/.env.production

@@ -9,7 +9,7 @@ VITE_PUBLIC_PATH = '/'
 
 # 线上环境接口地址
 # VITE_API_URL = 'http://ipos.biz:8070'
-#VITE_API_URL = 'http://localhost:8000'
+VITE_API_URL = 'http://localhost:8000'
 # VITE_API_URL = 'http://dev.hsfuel.com:8070'
-VITE_API_URL = 'http://47.101.220.106:8070'
+#VITE_API_URL = 'http://47.101.220.106:8070'
 # VITE_API_URL = 'http://ipos.biz:8070'

admin.ui.plus-master/package-lock.json

@@ -11,11 +11,8 @@
       "dependencies": {
         "@element-plus/icons": "^0.0.11",
         "@element-plus/icons-vue": "^2.1.0",
-<<<<<<< HEAD
         "@jiaminghi/data-view": "^2.10.0",
         "@kjgl77/datav-vue3": "^1.7.3",
-=======
->>>>>>> origin/develop
         "@types/date-fns": "^2.6.0",
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^5.1.12",
@@ -24,11 +21,7 @@
         "countup.js": "^2.6.2",
         "cropperjs": "^1.5.13",
         "date-fns": "^3.6.0",
-<<<<<<< HEAD
         "echarts": "^5.5.0",
-=======
-        "echarts": "^5.4.2",
->>>>>>> origin/develop
         "echarts-gl": "^2.0.9",
         "echarts-wordcloud": "^2.1.0",
         "element-plus": "^2.4.3",
@@ -221,11 +214,7 @@
     },
     "node_modules/@element-plus/icons": {
       "version": "0.0.11",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@element-plus/icons/-/icons-0.0.11.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@element-plus/icons/-/icons-0.0.11.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-iKQXSxXu131Ai+I9Ymtcof9WId7kaXvB1+WRfAfpQCW7UiAMYgdNDqb/u0hgTo2Yq3MwC4MWJnNuTBEpG8r7+A==",
       "deprecated": "Please use @element-plus/icons-vue instead."
     },
@@ -239,11 +228,7 @@
     },
     "node_modules/@esbuild/android-arm": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==",
       "cpu": [
         "arm"
@@ -259,11 +244,7 @@
     },
     "node_modules/@esbuild/android-arm64": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==",
       "cpu": [
         "arm64"
@@ -279,11 +260,7 @@
     },
     "node_modules/@esbuild/android-x64": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/android-x64/-/android-x64-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==",
       "cpu": [
         "x64"
@@ -299,11 +276,7 @@
     },
     "node_modules/@esbuild/darwin-arm64": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==",
       "cpu": [
         "arm64"
@@ -319,11 +292,7 @@
     },
     "node_modules/@esbuild/darwin-x64": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
       "cpu": [
         "x64"
@@ -339,11 +308,7 @@
     },
     "node_modules/@esbuild/freebsd-arm64": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
       "cpu": [
         "arm64"
@@ -359,11 +324,7 @@
     },
     "node_modules/@esbuild/freebsd-x64": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
       "cpu": [
         "x64"
@@ -379,11 +340,7 @@
     },
     "node_modules/@esbuild/linux-arm": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
       "cpu": [
         "arm"
@@ -399,11 +356,7 @@
     },
     "node_modules/@esbuild/linux-arm64": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
       "cpu": [
         "arm64"
@@ -419,11 +372,7 @@
     },
     "node_modules/@esbuild/linux-ia32": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
       "cpu": [
         "ia32"
@@ -439,11 +388,7 @@
     },
     "node_modules/@esbuild/linux-loong64": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
       "cpu": [
         "loong64"
@@ -459,11 +404,7 @@
     },
     "node_modules/@esbuild/linux-mips64el": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
       "cpu": [
         "mips64el"
@@ -479,11 +420,7 @@
     },
     "node_modules/@esbuild/linux-ppc64": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
       "cpu": [
         "ppc64"
@@ -499,11 +436,7 @@
     },
     "node_modules/@esbuild/linux-riscv64": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
       "cpu": [
         "riscv64"
@@ -519,11 +452,7 @@
     },
     "node_modules/@esbuild/linux-s390x": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
       "cpu": [
         "s390x"
@@ -539,11 +468,7 @@
     },
     "node_modules/@esbuild/linux-x64": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==",
       "cpu": [
         "x64"
@@ -559,11 +484,7 @@
     },
     "node_modules/@esbuild/netbsd-x64": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
       "cpu": [
         "x64"
@@ -579,11 +500,7 @@
     },
     "node_modules/@esbuild/openbsd-x64": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
       "cpu": [
         "x64"
@@ -599,11 +516,7 @@
     },
     "node_modules/@esbuild/sunos-x64": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
       "cpu": [
         "x64"
@@ -619,11 +532,7 @@
     },
     "node_modules/@esbuild/win32-arm64": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
       "cpu": [
         "arm64"
@@ -639,11 +548,7 @@
     },
     "node_modules/@esbuild/win32-ia32": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
       "cpu": [
         "ia32"
@@ -659,11 +564,7 @@
     },
     "node_modules/@esbuild/win32-x64": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
       "cpu": [
         "x64"
@@ -1221,11 +1122,7 @@
     },
     "node_modules/@types/date-fns": {
       "version": "2.6.0",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@types/date-fns/-/date-fns-2.6.0.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/@types/date-fns/-/date-fns-2.6.0.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-9DSw2ZRzV0Tmpa6PHHJbMcZn79HHus+BBBohcOaDzkK/G3zMjDUDYjJIWBFLbkh+1+/IOS0A59BpQfdr37hASg==",
       "deprecated": "This is a stub types definition for date-fns (https://github.com/date-fns/date-fns). date-fns provides its own type definitions, so you don't need @types/date-fns installed!",
       "dependencies": {
@@ -2383,11 +2280,7 @@
     },
     "node_modules/date-fns": {
       "version": "3.6.0",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/date-fns/-/date-fns-3.6.0.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==",
       "funding": {
         "type": "github",
@@ -2644,11 +2537,7 @@
     },
     "node_modules/esbuild": {
       "version": "0.18.20",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/esbuild/-/esbuild-0.18.20.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==",
       "dev": true,
       "hasInstallScript": true,
@@ -3165,11 +3054,7 @@
     },
     "node_modules/fs": {
       "version": "0.0.1-security",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/fs/-/fs-0.0.1-security.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w==",
       "dev": true
     },
@@ -3180,11 +3065,7 @@
     },
     "node_modules/fs-extra": {
       "version": "11.2.0",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-11.2.0.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -3202,11 +3083,7 @@
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "hasInstallScript": true,
@@ -4011,11 +3888,7 @@
     },
     "node_modules/nanoid": {
       "version": "3.3.7",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.7.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
       "funding": [
         {
@@ -4273,11 +4146,7 @@
     },
     "node_modules/path": {
       "version": "0.12.7",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/path/-/path-0.12.7.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==",
       "dependencies": {
         "process": "^0.11.1",
@@ -4357,11 +4226,7 @@
     },
     "node_modules/postcss": {
       "version": "8.4.38",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.38.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
       "funding": [
         {
@@ -4440,11 +4305,7 @@
     },
     "node_modules/process": {
       "version": "0.11.10",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/process/-/process-0.11.10.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
       "engines": {
         "node": ">= 0.6.0"
@@ -4600,11 +4461,7 @@
     },
     "node_modules/rollup": {
       "version": "3.29.4",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/rollup/-/rollup-3.29.4.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
       "dev": true,
       "bin": {
@@ -4850,11 +4707,7 @@
     },
     "node_modules/source-map-js": {
       "version": "1.2.0",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.0.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
       "engines": {
         "node": ">=0.10.0"
@@ -5234,11 +5087,7 @@
     },
     "node_modules/util": {
       "version": "0.10.4",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/util/-/util-0.10.4.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
       "dependencies": {
         "inherits": "2.0.3"
@@ -5251,11 +5100,7 @@
     },
     "node_modules/util/node_modules/inherits": {
       "version": "2.0.3",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.3.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
     },
     "node_modules/uuid": {
@@ -5268,11 +5113,7 @@
     },
     "node_modules/vite": {
       "version": "4.5.3",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/vite/-/vite-4.5.3.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==",
       "dev": true,
       "dependencies": {
@@ -5341,11 +5182,7 @@
     },
     "node_modules/vite-plugin-compression/node_modules/fs-extra": {
       "version": "10.1.0",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-10.1.0.tgz",
->>>>>>> origin/develop
       "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
       "dev": true,
       "dependencies": {

admin.ui.plus-master/src/api/admin/data-contracts.ts

@@ -4631,6 +4631,7 @@ export interface OauthRole{
   description?:string|null
   /** 排序 */
   sort?: string|null
+  appid: number
 }
 /** 应用角色信息输出 */
 export interface ResultOutputListOauthRole{

admin.ui.plus-master/src/api/admin/deviceAuthorization/fuelingftpApi.ts

@@ -22,6 +22,27 @@ export class FuelingFtpAPI<SecurityDataType = unknown> extends HttpClient<Securi
         ...params
       }
     )
+
+  /**
+   * No description
+   *
+   * @tags
+   * @name getFtpPwdofDate
+   * @summary 获取非当天FTP密码
+   * @request POST:/api/app/fuel-ftp/get-fuel-ftp-key-of-date
+   * @secure
+   */
+
+    getFtpPwdofDate = (data: any, params: RequestParams = {}) =>
+      this.request<AxiosResponse, any>({
+        path: `/api/app/fuel-ftp/get-fuel-ftp-key-of-date`,
+        method: 'POST',
+        query: data,
+        secure: true,
+        type: ContentType.Json,
+        ...params,
+      })
+    
     /**
    * No description
    *

admin.ui.plus-master/src/views/admin/api/index.vue

@@ -103,7 +103,8 @@ const onQuery = async () => {
         return item.label?.toLocaleLowerCase().indexOf(keyword) > -1 || item.path?.toLocaleLowerCase().indexOf(keyword) > -1
       },
     })
-    state.formApiTreeData = listToTree(res.data.filter((a) => a.parentId === 0))
+    //state.formApiTreeData = listToTree(res.data.filter((a) => a.parentId === 0))
+    state.formApiTreeData = listToTree(res.data)
   } else {
     state.apiTreeData = []
     state.formApiTreeData = []

admin.ui.plus-master/src/views/admin/authorize/fuelingFTPofDate/index.vue

@@ -0,0 +1,264 @@
+<template>
+    <div class="layout-pd" >
+      <el-row>
+        <!--操作-->
+        <el-col :xs="24" >
+          <el-card class="mt8" shadow="never" :body-style="{ paddingBottom: '0' }">
+            <div style="width: 100%;display: flex;justify-content: center;align-items: center;">
+              <h1 style="margin-bottom: 10px;font-size: 30px;">油机非当天动态密钥生成</h1>
+            </div>
+            <div v-if="state.msgDisplay" style="width: 100%;display: flex;justify-content: center;align-items: center;">
+              <h1 style="margin-bottom: 10px;color: #81B337;font-size: 20px;">密码申请成功</h1>
+            </div>
+            <div style="width: 100%;display: flex;justify-content: center;align-items: center;">
+              <el-form :inline="true" @submit.stop.prevent style="width: 60%;">
+                <el-form-item label="密钥使用日期" style="width: 100%;">
+                  <el-input  type="date" v-model="state.filter.useDate" style="width: 30%;"  @keyup.enter="onQuery" />
+                </el-form-item>
+              </el-form>
+            </div>            
+            <div style="width: 100%;display: flex;justify-content: center;align-items: center;">
+              <el-form :inline="true" @submit.stop.prevent style="width: 60%;">
+                <el-form-item label="申请备注" style="width: 100%;">
+                  <el-input v-model="state.filter.info" style="width: 100%;" placeholder="请输入申请备注" @keyup.enter="onQuery" />
+                </el-form-item>
+              </el-form>
+            </div>
+            <div v-if="state.pwdDisplay" style="width: 100%;display: flex;justify-content: center;align-items: center;">
+              <el-form :inline="true" @submit.stop.prevent style="width: 60%;">
+                <el-form-item label="FTP密码" style="width: 82%;">
+                  <el-input disabled v-model="state.pwd" style="width: 100%;" placeholder="FTP密码" @keyup.enter="onQuery" />
+                </el-form-item>
+                <el-form-item>
+                  <el-button id="copyBtn" :data-clipboard-text="state.pwd" type="primary" @click="onCopy()">复制</el-button>
+                </el-form-item>
+              </el-form>
+            </div>
+            <div v-if="state.timeDisplay" style="width: 100%;display: flex;justify-content: center;align-items: center;">
+              <el-form :inline="true" @submit.stop.prevent style="width: 60%;">
+                <el-form-item label="过期时间" style="width: 100%;">
+                  {{ state.filter.expirationTime }}
+                </el-form-item>
+              </el-form>
+            </div>
+            <div v-if="state.btnDisplay" style="display: flex;justify-content: center;align-items: center;">
+              <el-button style="margin-top: 10px;margin-bottom: 10px;width: 264px;height: 42px;" type="primary" @click="onQuery">申请油机FTP密码</el-button>
+            </div>
+          </el-card>
+        </el-col>
+        <!--表格-->
+        <el-col  :xs="24" >
+          <el-card style="height: 65vh" class="my-fill mt8" shadow="hover">
+            <el-table ref="multipleTableRef"
+              v-loading="state.loading"
+              stripe :data="state.tableModel"
+              row-key="id"
+              style="width: 100%" >
+              <el-table-column type="index" label="记录" width="60"/>
+              <el-table-column v-for="column in state.dynamicColumns" :key="column.prop" :prop="column.prop" :label="column.label" />
+            </el-table>
+            <div class="my-flex my-flex-end" style="margin-top: 20px">
+              <el-pagination
+                v-model:currentPage="state.pageInput.CurrentPage"
+                v-model:page-size="state.pageInput.PageSize"
+                :total="state.total"
+                :page-sizes="[10, 20, 50, 100]"
+                small
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                layout="total, sizes, prev, pager, next, jumper"
+              />
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </div>
+  
+  </template>
+  
+  <script setup lang="ts" name="authorize/fuelingsdk">
+  import { onMounted, reactive, ref, watch, onBeforeMount } from "vue";
+  import eventBus from "/@/utils/mitt";
+  import { ElMessage, ElTable } from 'element-plus'
+  import { FuelingFtpAPI } from '/@/api/admin/deviceAuthorization/fuelingFTPApi'
+  import { FuelFtpPswRecordDto } from '/@/api/admin/deviceAuthorization/fuelingFTPDto'
+  import Clipboard from 'clipboard'
+  import type {pageInput} from "/@/api/admin/shareDto/shareDto";
+  import { AuthApi } from '/@/api/admin/Auth'
+  
+  const multipleTableRef=ref<InstanceType<typeof ElTable>>()
+  /**FTP申请页面对象 */
+  const state = reactive({
+    time:'',
+    /**加载显示 */
+    loading: false,
+    /**条件查询模块 */
+    filter: {
+      /**申请备注 */
+      info: "",
+      /**过期时间 */
+      expirationTime: '',
+      /**使用日期*/
+      useDate: '',      
+      /**申请日期*/
+      applyDate: '',
+      /**申请人*/
+      name: ''
+    },
+     /**分页标识 */
+     pageInput:{
+      CurrentPage: 1,
+      PageSize: 10,
+    } as pageInput,
+    /**分页总数 */
+    total: 0,
+    /**表格信息 */
+    tableModel: [] as FuelFtpPswRecordDto,
+    /**动态表头 */
+    dynamicColumns: [
+      { prop: 'applyDate', label: '申请日期' },
+      { prop: 'name', label: '申请人' },
+      { prop: 'info', label: '备注' },
+      { prop: 'useDate', label: '密钥使用日期' },
+      { prop: 'expirationTime', label: '密钥过期时间' }
+    ],
+    /**FTP密码 */
+    pwd: "",
+    pwdDisplay:false,
+    timeDisplay:false,
+    btnDisplay:true,
+    msgDisplay:false
+  })
+  
+  /**初始化 */
+  const init = async () => {
+    state.filter.info=''
+    state.filter.name=''
+    state.filter.applyDate=''
+    state.filter.expirationTime=''
+    state.filter.useDate=''
+    state.pwd=''
+    state.btnDisplay=true
+    state.msgDisplay=false
+    state.pwdDisplay=false
+    state.timeDisplay=false
+    const res:any = await new FuelingFtpAPI().getFtpDate({...state.pageInput, filter:state.filter}).catch(() => {
+      state.loading = false
+    })
+    //console.log(res.data.list)
+    state.total=res.data.total
+    state.tableModel=res.data.list
+  }
+  
+  onMounted(() => {
+    init()
+    eventBus.off('refreshView')
+    eventBus.on('refreshView', async () => {
+      init()
+    })
+  })
+  
+  onBeforeMount(() => {
+    eventBus.off('refreshView')
+  })
+  
+  /**
+   * 监听时间变换
+   */
+  watch(() => state.time, (newVal ) => {
+    if(newVal.length === 0){
+      return
+    }
+    state.filter.expirationTime = newVal?.[0].toString()
+  })
+  /**复制FTP密码 */
+  const onCopy=()=>{
+    const clipboard=new Clipboard('#copyBtn')
+    clipboard.on('success',()=>{
+      ElMessage.success('复制成功')
+      clipboard.destroy()
+    })
+    clipboard.on('error',()=>{
+      ElMessage.error('复制失败')
+      clipboard.destroy()
+    })
+  }
+  /**申请FTP密码 */
+  const onQuery =async () => {
+    if(state.filter.useDate==='')
+    {
+        ElMessage.error('请选择密钥使用日期')  
+    }
+    else if(state.filter.info==='')
+    {
+      ElMessage.error('请输入申请备注')
+    }
+    else{
+      const res=await new FuelingFtpAPI().getFtpPwdofDate({dt:state.filter.useDate}).catch()
+      state.pwd=res.data
+      state.msgDisplay=true
+      state.pwdDisplay=true
+      state.timeDisplay=true
+      state.btnDisplay=false
+      const date=new Date()
+      let month=padZero(date.getMonth()+1)
+      let day=padZero(date.getDate())
+      let hour=padZero(date.getHours())
+      let minute=padZero(date.getMinutes())
+      let second=padZero(date.getSeconds())
+      state.filter.applyDate=date.getFullYear()+'-'+month+'-'+day+' '+hour+':'+minute+':'+second
+      state.filter.expirationTime=state.filter.useDate+' 23:59:59'
+      const name:any=await new AuthApi().getUserProfile()
+      state.filter.name=name.data.name
+      await new FuelingFtpAPI().insertFtpDate(state.filter)
+      const data:any = await new FuelingFtpAPI().getFtpDate({...state.pageInput, filter:state.filter}).catch(() => {
+        state.loading = false
+      })
+      state.total=data.data.total
+      state.tableModel=data.data.list
+    }
+  }
+  /**将Filter对象成.的连接方式*/
+  const flattenObject = (obj, parentKey = '') => {
+    const result = {};
+    for (const key in obj) {
+      if (obj.hasOwnProperty(key)) {
+        const newKey = parentKey ? `${parentKey}.${key}` : key;
+        if (typeof obj[key] === 'object' && !Array.isArray(obj[key])) {
+          const flattened = flattenObject(obj[key], newKey);
+          Object.assign(result, flattened);
+        } else {
+          result[newKey] = obj[key];
+        }
+      }
+    }
+  
+    return result;
+  }
+  /**页条数变化*/
+  const onSizeChange = () => {
+    init()
+  }
+  
+  /**页数变化*/
+  const onCurrentChange = () =>{
+    init()
+  }
+  const padZero=(num:any)=>{
+    return num<10?'0'+num:num
+  }
+  </script>
+  
+  <style scoped lang="scss">
+  .my-el-link {
+    font-size: 12px;
+  }
+  .el-form .el-col.mb20 {
+    margin: 0 !important;
+  }
+  .el-input, .el-select {
+    width: 240px;
+  }
+  </style>
+  

admin.ui.plus-master/src/views/example/application/roleManage/components/role-form.vue

@@ -112,7 +112,7 @@ const onCancel = () => {
 const onSure = () => {
   formRef.value.validate(async (valid: boolean) => {
     if (!valid) return
-
+    debugger
     state.sureLoading = true
     let res = {} as any
     state.form.parentId = state.form.parentId && Number(state.form.parentId) > 0 ? state.form.parentId : undefined

admin.ui.plus-master/src/views/example/application/roleManage/index.vue

@@ -165,6 +165,7 @@ const state = reactive({
   userListData: [] as UserDto[],
   roleId: undefined as number | undefined,
   roleName: '' as string | null | undefined,
+  appid:undefined as number | undefined
 })
 
 onMounted(() => {
@@ -184,6 +185,8 @@ const onQuery = async () => {
   const name = router.currentRoute.value.params.id
   const appData=await new PermissionApi().getApplyInfo({Name:name})
   state.filter.app=appData.data[0].name
+  debugger
+  state.appid = appData.data[0].id
   const res = await new PermissionApi().getRoleInfo({name:state.filter.roleName,AppID:appData.data[0].id}).catch(() => {
     state.loading = false
   })
@@ -222,12 +225,13 @@ const onQuery = async () => {
 const onAdd = (type: RoleType, row: OauthRole | undefined = undefined) => {
   switch (type) {
     case 1:
+      debugger
       state.roleFormTitle = '新增分组'
-      roleFormRef.value.open({ type: 1 })
+      roleFormRef.value.open({ type: 1 ,appid:state.appid})
       break
     case 2:
       state.roleFormTitle = '新增角色'
-      roleFormRef.value.open({ type: 2, parentId: row?.id, dataScope: 1 })
+      roleFormRef.value.open({ type: 2, parentId: row?.id, dataScope: 1,appid:state.appid })
       break
   }
 }