Ver Fonte

我的填报详情

Hwf há 2 meses atrás
pai
commit
a70f5cdf11
4 ficheiros alterados com 28 adições e 48 exclusões
  1. 16 32
      package-lock.json
  2. 2 1
      package.json
  3. 0 8
      src/types/components.d.ts
  4. 10 7
      src/views/dataFilling/formDetail.vue

+ 16 - 32
package-lock.json

@@ -11,7 +11,7 @@
       "dependencies": {
         "@amap/amap-jsapi-loader": "^1.0.1",
         "@element-plus/icons-vue": "2.3.1",
-        "@handsontable/vue3": "^15.0.1",
+        "@handsontable/vue3": "^15.1.0",
         "@highlightjs/vue-plugin": "2.1.0",
         "@turf/turf": "^7.2.0",
         "@univerjs/core": "^0.4.1",
@@ -43,6 +43,7 @@
         "file-saver": "^2.0.5",
         "fuse.js": "7.0.0",
         "gcoord": "^1.0.7",
+        "handsontable": "^15.1.0",
         "highlight.js": "11.9.0",
         "html2canvas": "^1.4.1",
         "image-conversion": "^2.1.1",
@@ -1236,14 +1237,12 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/@handsontable/pikaday/-/pikaday-1.0.0.tgz",
       "integrity": "sha512-1VN6N38t5/DcjJ7y7XUYrDx1LuzvvzlrFdBdMG90Qo1xc8+LXHqbWbsTEm5Ec5gXTEbDEO53vUT35R+2COmOyg==",
-      "license": "(0BSD OR MIT)",
-      "peer": true
+      "license": "(0BSD OR MIT)"
     },
     "node_modules/@handsontable/vue3": {
-      "version": "15.0.1",
-      "resolved": "https://registry.npmmirror.com/@handsontable/vue3/-/vue3-15.0.1.tgz",
-      "integrity": "sha512-a138HtC4tjGW8VenDQZYXjv3AoCpS4CeLAPFOBIQR6MB4Fb0xEn/uXBSy4SA/sfSGxhpyNhx3R1BPpxVJ0SXoA==",
-      "license": "SEE LICENSE IN LICENSE.txt",
+      "version": "15.1.0",
+      "resolved": "https://registry.npmmirror.com/@handsontable/vue3/-/vue3-15.1.0.tgz",
+      "integrity": "sha512-47bbi9h/L2ArM0rAwsx7TGgIO6OxNus60EUIng6GSd8wmTZHwZ6kD+NvuxKC5Xjh16Fyqp6QqA0ayCXqU1wE6Q==",
       "peerDependencies": {
         "handsontable": ">=15.0.0",
         "vue": "^3.2.22"
@@ -4718,8 +4717,7 @@
       "resolved": "https://registry.npmmirror.com/@types/trusted-types/-/trusted-types-2.0.7.tgz",
       "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
       "license": "MIT",
-      "optional": true,
-      "peer": true
+      "optional": true
     },
     "node_modules/@types/uuid": {
       "version": "10.0.0",
@@ -7252,9 +7250,7 @@
       "version": "6.5.0",
       "resolved": "https://registry.npmmirror.com/chevrotain/-/chevrotain-6.5.0.tgz",
       "integrity": "sha512-BwqQ/AgmKJ8jcMEjaSnfMybnKMgGTrtDKowfTP3pX4jwVy0kNjRsT/AP6h+wC3+3NC+X8X15VWBnTCQlX+wQFg==",
-      "license": "Apache-2.0",
       "optional": true,
-      "peer": true,
       "dependencies": {
         "regexp-to-ast": "0.4.0"
       }
@@ -7536,7 +7532,6 @@
       "integrity": "sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==",
       "hasInstallScript": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/core-js"
@@ -8118,7 +8113,6 @@
       "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-3.2.4.tgz",
       "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==",
       "license": "(MPL-2.0 OR Apache-2.0)",
-      "peer": true,
       "optionalDependencies": {
         "@types/trusted-types": "^2.0.7"
       }
@@ -9745,11 +9739,9 @@
       }
     },
     "node_modules/handsontable": {
-      "version": "15.0.1",
-      "resolved": "https://registry.npmmirror.com/handsontable/-/handsontable-15.0.1.tgz",
-      "integrity": "sha512-pG5klHXpcWXiaDgtImkEZQ28CrM3j9dHSXx7Y4MJ7A/v07rbWdGMl/kDJsg1jvH1joWgevE5ZqH9rjaFt0+WIg==",
-      "license": "SEE LICENSE IN LICENSE.txt",
-      "peer": true,
+      "version": "15.1.0",
+      "resolved": "https://registry.npmmirror.com/handsontable/-/handsontable-15.1.0.tgz",
+      "integrity": "sha512-tRCdIap3qSydy1bwM5UwMbsgAlcvnUjA3m+6nCblVXHCGBE0a5eHiYoGMX6iCF/JIKGZbMO5aAtzE6u3G18jfQ==",
       "dependencies": {
         "@handsontable/pikaday": "^1.0.0",
         "core-js": "^3.37.0",
@@ -9758,7 +9750,7 @@
         "numbro": "2.5.0"
       },
       "optionalDependencies": {
-        "hyperformula": "^2.6.2"
+        "hyperformula": "^3.0.0"
       }
     },
     "node_modules/has-ansi": {
@@ -9994,12 +9986,10 @@
       }
     },
     "node_modules/hyperformula": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmmirror.com/hyperformula/-/hyperformula-2.7.1.tgz",
-      "integrity": "sha512-mpVF5zOyNpksZzgTaCQyRAzdC/X43+taz5x1n7zNbs/PUUv0AuLmsy2yfihCr+vihUzN/pk+gXBbOfNpXKOpgA==",
-      "license": "GPL-3.0-only",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/hyperformula/-/hyperformula-3.0.0.tgz",
+      "integrity": "sha512-fAmwxQnbo405llUZiLcnrQTWA26kmbWZk+Cn58PJrANJ/xHBk7ls0ilcNJRIJdti5Z6AqPVi0hZSKvHLbTYtyQ==",
       "optional": true,
-      "peer": true,
       "dependencies": {
         "chevrotain": "^6.5.0",
         "tiny-emitter": "^2.1.0"
@@ -11162,7 +11152,6 @@
       "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
       "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "*"
       }
@@ -11379,7 +11368,6 @@
       "resolved": "https://registry.npmmirror.com/numbro/-/numbro-2.5.0.tgz",
       "integrity": "sha512-xDcctDimhzko/e+y+Q2/8i3qNC9Svw1QgOkSkQoO0kIPI473tR9QRbo2KP88Ty9p8WbPy+3OpTaAIzehtuHq+A==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "bignumber.js": "^8 || ^9"
       },
@@ -12849,9 +12837,7 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmmirror.com/regexp-to-ast/-/regexp-to-ast-0.4.0.tgz",
       "integrity": "sha512-4qf/7IsIKfSNHQXSwial1IFmfM1Cc/whNBQqRwe0V2stPe7KmN1U0tWQiIx6JiirgSrisjE0eECdNf7Tav1Ntw==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true
+      "optional": true
     },
     "node_modules/regexp-util": {
       "version": "2.0.0",
@@ -14175,9 +14161,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
       "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true
+      "optional": true
     },
     "node_modules/tiny-inflate": {
       "version": "1.0.3",

+ 2 - 1
package.json

@@ -20,7 +20,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@element-plus/icons-vue": "2.3.1",
-    "@handsontable/vue3": "^15.0.1",
+    "@handsontable/vue3": "^15.1.0",
     "@highlightjs/vue-plugin": "2.1.0",
     "@turf/turf": "^7.2.0",
     "@univerjs/core": "^0.4.1",
@@ -52,6 +52,7 @@
     "file-saver": "^2.0.5",
     "fuse.js": "7.0.0",
     "gcoord": "^1.0.7",
+    "handsontable": "^15.1.0",
     "highlight.js": "11.9.0",
     "html2canvas": "^1.4.1",
     "image-conversion": "^2.1.1",

+ 0 - 8
src/types/components.d.ts

@@ -41,16 +41,12 @@ declare module 'vue' {
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
-    ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
-    ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
@@ -60,8 +56,6 @@ declare module 'vue' {
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
-    ElTimeline: typeof import('element-plus/es')['ElTimeline']
-    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
@@ -76,8 +70,6 @@ declare module 'vue' {
     HikvisionPlayer: typeof import('./../components/HKVideo/hikvision-player.vue')['default']
     HKVideo: typeof import('./../components/HKVideo/index.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
-    IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
-    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']

+ 10 - 7
src/views/dataFilling/formDetail.vue

@@ -26,17 +26,21 @@
 <!--            </template>-->
 <!--          </el-table-column>-->
 <!--        </el-table>-->
-        <hot-table v-if="tableData.length > 0" ref="wrapper" :data="tableData" :settings="hotSettings" />
+        <div style="height: 400px">
+          <hot-table v-if="tableData.length > 0" ref="wrapper" :data="tableData" :settings="hotSettings" />
+        </div>
       </el-col>
     </el-row>
   </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted } from 'vue';
-import { ElTable, ElButton, ElCol, ElRow, ElTableColumn } from 'element-plus';
 import * as XLSX from 'xlsx';
 import { fillDetail } from '@/api/dataFilling/datafilling';
 import { HotTable } from '@handsontable/vue3';
+import 'handsontable/languages';
+import 'handsontable/dist/handsontable.full.css';
+import { registerAllModules } from 'handsontable/registry';
+registerAllModules();
 
 const emits = defineEmits(['close']);
 const props = defineProps<{
@@ -53,10 +57,6 @@ const detailData = ref({
   end: ''
 });
 
-onMounted(() => {
-  fetchFillDetail();
-});
-
 const exportToExcel = () => {
   const worksheet = XLSX.utils.json_to_sheet(tableData.value);
   const workbook = { Sheets: { data: worksheet }, SheetNames: ['data'] };
@@ -168,6 +168,9 @@ const hotSettings = reactive({
     }
   }
 });
+onMounted(() => {
+  fetchFillDetail();
+});
 </script>
 
 <style scoped>