From b256c87dced91d2df37b4f4190621ea412b351c4 Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期一, 05 八月 2024 11:26:22 +0800
Subject: [PATCH] fix: 提交代码
---
src/views/dmx/model/components/addModel.vue | 2
src/views/dmx/model/index.vue | 42 ++++---
package-lock.json | 179 +++++++++++++++--------------------
yarn.lock | 27 ++---
4 files changed, 112 insertions(+), 138 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index c23af3a..23b14b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,8 @@
"license": "MIT",
"dependencies": {
"@arco-design/web-vue": "^2.44.7",
+ "@vue-office/docx": "^1.6.2",
+ "@vue-office/excel": "^1.7.11",
"@vueuse/core": "^9.3.0",
"arco-design-pro-vue": "^2.7.3",
"axios": "^0.24.0",
@@ -2083,6 +2085,38 @@
"path-browserify": "^1.0.1"
}
},
+ "node_modules/@vue-office/docx": {
+ "version": "1.6.2",
+ "resolved": "https://registry.npmmirror.com/@vue-office/docx/-/docx-1.6.2.tgz",
+ "integrity": "sha512-OHAoUHeY8nHjhWvwDhlPx+/rmRkxmqLpvPgtfCEOZ4H1c1LCdJ6eDbdV3152ww8dcdZ7fgGQu3fmSSaI7JwdpQ==",
+ "hasInstallScript": true,
+ "peerDependencies": {
+ "@vue/composition-api": "^1.7.1",
+ "vue": "^2.0.0 || >=3.0.0",
+ "vue-demi": "^0.14.6"
+ },
+ "peerDependenciesMeta": {
+ "@vue/composition-api": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@vue-office/excel": {
+ "version": "1.7.11",
+ "resolved": "https://registry.npmmirror.com/@vue-office/excel/-/excel-1.7.11.tgz",
+ "integrity": "sha512-LF3R9IV573Sf4qTu6Ik5Ee8UMfkrsZQ6HEQE25/2m1c0CMcHX6KanIy6Cz0b0Q+FrLH3TjIsLTm6oPcqAbDGSA==",
+ "hasInstallScript": true,
+ "peerDependencies": {
+ "@vue/composition-api": "^1.7.1",
+ "vue": "^2.0.0 || >=3.0.0",
+ "vue-demi": "^0.14.6"
+ },
+ "peerDependenciesMeta": {
+ "@vue/composition-api": {
+ "optional": true
+ }
+ }
+ },
"node_modules/@vue/babel-helper-vue-transform-on": {
"version": "1.2.2",
"resolved": "https://registry.npmmirror.com/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.2.2.tgz",
@@ -2334,32 +2368,6 @@
"url": "https://github.com/sponsors/antfu"
}
},
- "node_modules/@vueuse/core/node_modules/vue-demi": {
- "version": "0.14.8",
- "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.8.tgz",
- "integrity": "sha512-Uuqnk9YE9SsWeReYqK2alDI5YzciATE0r2SkA6iMAtuXvNTMNACJLJEXNXaEy94ECuBe4Sk6RzRU80kjdbIo1Q==",
- "hasInstallScript": true,
- "license": "MIT",
- "bin": {
- "vue-demi-fix": "bin/vue-demi-fix.js",
- "vue-demi-switch": "bin/vue-demi-switch.js"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/antfu"
- },
- "peerDependencies": {
- "@vue/composition-api": "^1.0.0-rc.1",
- "vue": "^3.0.0-0 || ^2.6.0"
- },
- "peerDependenciesMeta": {
- "@vue/composition-api": {
- "optional": true
- }
- }
- },
"node_modules/@vueuse/metadata": {
"version": "9.13.0",
"resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-9.13.0.tgz",
@@ -2379,32 +2387,6 @@
},
"funding": {
"url": "https://github.com/sponsors/antfu"
- }
- },
- "node_modules/@vueuse/shared/node_modules/vue-demi": {
- "version": "0.14.8",
- "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.8.tgz",
- "integrity": "sha512-Uuqnk9YE9SsWeReYqK2alDI5YzciATE0r2SkA6iMAtuXvNTMNACJLJEXNXaEy94ECuBe4Sk6RzRU80kjdbIo1Q==",
- "hasInstallScript": true,
- "license": "MIT",
- "bin": {
- "vue-demi-fix": "bin/vue-demi-fix.js",
- "vue-demi-switch": "bin/vue-demi-switch.js"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/antfu"
- },
- "peerDependencies": {
- "@vue/composition-api": "^1.0.0-rc.1",
- "vue": "^3.0.0-0 || ^2.6.0"
- },
- "peerDependenciesMeta": {
- "@vue/composition-api": {
- "optional": true
- }
}
},
"node_modules/acorn": {
@@ -12932,32 +12914,6 @@
}
}
},
- "node_modules/pinia/node_modules/vue-demi": {
- "version": "0.14.8",
- "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.8.tgz",
- "integrity": "sha512-Uuqnk9YE9SsWeReYqK2alDI5YzciATE0r2SkA6iMAtuXvNTMNACJLJEXNXaEy94ECuBe4Sk6RzRU80kjdbIo1Q==",
- "hasInstallScript": true,
- "license": "MIT",
- "bin": {
- "vue-demi-fix": "bin/vue-demi-fix.js",
- "vue-demi-switch": "bin/vue-demi-switch.js"
- },
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/antfu"
- },
- "peerDependencies": {
- "@vue/composition-api": "^1.0.0-rc.1",
- "vue": "^3.0.0-0 || ^2.6.0"
- },
- "peerDependenciesMeta": {
- "@vue/composition-api": {
- "optional": true
- }
- }
- },
"node_modules/pinkie": {
"version": "2.0.4",
"resolved": "https://registry.npmmirror.com/pinkie/-/pinkie-2.0.4.tgz",
@@ -18795,6 +18751,31 @@
}
}
},
+ "node_modules/vue-demi": {
+ "version": "0.14.10",
+ "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
+ "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+ "hasInstallScript": true,
+ "bin": {
+ "vue-demi-fix": "bin/vue-demi-fix.js",
+ "vue-demi-switch": "bin/vue-demi-switch.js"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ },
+ "peerDependencies": {
+ "@vue/composition-api": "^1.0.0-rc.1",
+ "vue": "^3.0.0-0 || ^2.6.0"
+ },
+ "peerDependenciesMeta": {
+ "@vue/composition-api": {
+ "optional": true
+ }
+ }
+ },
"node_modules/vue-echarts": {
"version": "6.7.3",
"resolved": "https://registry.npmmirror.com/vue-echarts/-/vue-echarts-6.7.3.tgz",
@@ -20689,6 +20670,18 @@
"path-browserify": "^1.0.1"
}
},
+ "@vue-office/docx": {
+ "version": "1.6.2",
+ "resolved": "https://registry.npmmirror.com/@vue-office/docx/-/docx-1.6.2.tgz",
+ "integrity": "sha512-OHAoUHeY8nHjhWvwDhlPx+/rmRkxmqLpvPgtfCEOZ4H1c1LCdJ6eDbdV3152ww8dcdZ7fgGQu3fmSSaI7JwdpQ==",
+ "requires": {}
+ },
+ "@vue-office/excel": {
+ "version": "1.7.11",
+ "resolved": "https://registry.npmmirror.com/@vue-office/excel/-/excel-1.7.11.tgz",
+ "integrity": "sha512-LF3R9IV573Sf4qTu6Ik5Ee8UMfkrsZQ6HEQE25/2m1c0CMcHX6KanIy6Cz0b0Q+FrLH3TjIsLTm6oPcqAbDGSA==",
+ "requires": {}
+ },
"@vue/babel-helper-vue-transform-on": {
"version": "1.2.2",
"resolved": "https://registry.npmmirror.com/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.2.2.tgz",
@@ -20888,14 +20881,6 @@
"@vueuse/metadata": "9.13.0",
"@vueuse/shared": "9.13.0",
"vue-demi": "*"
- },
- "dependencies": {
- "vue-demi": {
- "version": "0.14.8",
- "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.8.tgz",
- "integrity": "sha512-Uuqnk9YE9SsWeReYqK2alDI5YzciATE0r2SkA6iMAtuXvNTMNACJLJEXNXaEy94ECuBe4Sk6RzRU80kjdbIo1Q==",
- "requires": {}
- }
}
},
"@vueuse/metadata": {
@@ -20909,14 +20894,6 @@
"integrity": "sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==",
"requires": {
"vue-demi": "*"
- },
- "dependencies": {
- "vue-demi": {
- "version": "0.14.8",
- "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.8.tgz",
- "integrity": "sha512-Uuqnk9YE9SsWeReYqK2alDI5YzciATE0r2SkA6iMAtuXvNTMNACJLJEXNXaEy94ECuBe4Sk6RzRU80kjdbIo1Q==",
- "requires": {}
- }
}
},
"acorn": {
@@ -28095,14 +28072,6 @@
"requires": {
"@vue/devtools-api": "^6.5.0",
"vue-demi": ">=0.14.5"
- },
- "dependencies": {
- "vue-demi": {
- "version": "0.14.8",
- "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.8.tgz",
- "integrity": "sha512-Uuqnk9YE9SsWeReYqK2alDI5YzciATE0r2SkA6iMAtuXvNTMNACJLJEXNXaEy94ECuBe4Sk6RzRU80kjdbIo1Q==",
- "requires": {}
- }
}
},
"pinkie": {
@@ -32123,6 +32092,12 @@
"@vue/shared": "3.4.32"
}
},
+ "vue-demi": {
+ "version": "0.14.10",
+ "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
+ "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+ "requires": {}
+ },
"vue-echarts": {
"version": "6.7.3",
"resolved": "https://registry.npmmirror.com/vue-echarts/-/vue-echarts-6.7.3.tgz",
diff --git a/src/views/dmx/model/components/addModel.vue b/src/views/dmx/model/components/addModel.vue
index 42f0482..7726ef7 100644
--- a/src/views/dmx/model/components/addModel.vue
+++ b/src/views/dmx/model/components/addModel.vue
@@ -100,7 +100,7 @@
</template>
<script lang="ts" setup>
- import { onMounted, onBeforeMount, reactive, ref } from 'vue';
+ import { onMounted, onBeforeMount, reactive, ref } from 'vue';
const visible = ref(false);
const loading = ref(false);
diff --git a/src/views/dmx/model/index.vue b/src/views/dmx/model/index.vue
index 05273b1..87a5bc5 100644
--- a/src/views/dmx/model/index.vue
+++ b/src/views/dmx/model/index.vue
@@ -39,7 +39,7 @@
width: '100%',
}"
alt="dessert"
- :src="'http://' + item.logo"
+ :src="item.logo"
/>
</div>
<a-card :bordered="false" hoverable>
@@ -161,7 +161,6 @@
<script lang="ts" setup>
import { ref, reactive, nextTick } from 'vue';
- import addModel from '@/views/dmx/model/components/addModel.vue';
import editModel from '@/views/dmx/model/components/editModel.vue';
import addPageModel from './components/addPageModel.vue';
import addTableName from './components/addTableName.vue';
@@ -220,14 +219,18 @@
const editList = ref({ llm_factory: '' });
//澧炲姞妯″瀷瀛愮被
const handleAddModel = () => {
- if (tabKey.value == 'key') {
- tabShow.value = true;
- } else {
- modelType.value = 2;
- editList.value.llm_factory = tabKey.value;
- show.value = true;
- title.value = '娣诲姞妯″紡';
- }
+ // if (tabKey.value == 'key') {
+ // tabShow.value = true;
+ // } else {
+ // modelType.value = 2;
+ // editList.value.llm_factory = tabKey.value;
+ // show.value = true;
+ // title.value = '娣诲姞妯″紡';
+ // }
+ modelType.value = 2;
+ editList.value.llm_factory = tabKey.value;
+ show.value = true;
+ title.value = '娣诲姞妯″紡';
};
//缂栬緫妯″瀷瀛愮被
const handleEditModel = (val) => {
@@ -271,9 +274,11 @@
const handleDelete = async (key: any) => {
console.log(key, 45455);
// tabData.value = tabData.value.filter((item) => item.key !== key);
- Reflect.deleteProperty(tabData.value, key);
- await deleteLlmFactory(key);
- queryModel();
+ if (key !== 'key') {
+ Reflect.deleteProperty(tabData.value, key);
+ await deleteLlmFactory(key);
+ queryModel();
+ }
};
const visible = ref(false);
@@ -427,12 +432,6 @@
}
}
.card_content {
- position: relative;
- .arco-btn-group {
- position: absolute;
- right: 10px;
- top: 90px;
- }
.card_wrap_box_img {
min-height: 200px;
max-height: 240px;
@@ -447,6 +446,11 @@
border: 1px solid var(--color-neutral-3);
border-radius: 4px;
position: relative;
+ .arco-btn-group {
+ position: absolute;
+ right: 10px;
+ top: 90px;
+ }
&:hover {
transform: translateY(-4px);
// box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.1);
diff --git a/yarn.lock b/yarn.lock
index 04d8775..bd2c117 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -987,14 +987,14 @@
"path-browserify" "^1.0.1"
"@vue-office/docx@^1.6.2":
- version "1.6.2"
- resolved "https://registry.npmmirror.com/@vue-office/docx/-/docx-1.6.2.tgz#c97d28db60db5325dd351d90b0202dd3d54ad427"
- integrity sha512-OHAoUHeY8nHjhWvwDhlPx+/rmRkxmqLpvPgtfCEOZ4H1c1LCdJ6eDbdV3152ww8dcdZ7fgGQu3fmSSaI7JwdpQ==
+ "integrity" "sha512-OHAoUHeY8nHjhWvwDhlPx+/rmRkxmqLpvPgtfCEOZ4H1c1LCdJ6eDbdV3152ww8dcdZ7fgGQu3fmSSaI7JwdpQ=="
+ "resolved" "https://registry.npmmirror.com/@vue-office/docx/-/docx-1.6.2.tgz"
+ "version" "1.6.2"
"@vue-office/excel@^1.7.11":
- version "1.7.11"
- resolved "https://registry.npmmirror.com/@vue-office/excel/-/excel-1.7.11.tgz#e37e5a2c212907a62c9b65e42d9df21f9c68a2cc"
- integrity sha512-LF3R9IV573Sf4qTu6Ik5Ee8UMfkrsZQ6HEQE25/2m1c0CMcHX6KanIy6Cz0b0Q+FrLH3TjIsLTm6oPcqAbDGSA==
+ "integrity" "sha512-LF3R9IV573Sf4qTu6Ik5Ee8UMfkrsZQ6HEQE25/2m1c0CMcHX6KanIy6Cz0b0Q+FrLH3TjIsLTm6oPcqAbDGSA=="
+ "resolved" "https://registry.npmmirror.com/@vue-office/excel/-/excel-1.7.11.tgz"
+ "version" "1.7.11"
"@vue/babel-helper-vue-transform-on@1.2.2":
"integrity" "sha512-nOttamHUR3YzdEqdM/XXDyCSdxMA9VizUKoroLX6yTyRtggzQMHXcmwh8a7ZErcJttIBIc9s68a1B8GZ+Dmvsw=="
@@ -8261,20 +8261,15 @@
optionalDependencies:
"fsevents" "~2.3.2"
-"vue-demi@*":
- "integrity" "sha512-Uuqnk9YE9SsWeReYqK2alDI5YzciATE0r2SkA6iMAtuXvNTMNACJLJEXNXaEy94ECuBe4Sk6RzRU80kjdbIo1Q=="
- "resolved" "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.8.tgz"
- "version" "0.14.8"
+"vue-demi@*", "vue-demi@^0.14.6", "vue-demi@>=0.14.5":
+ "integrity" "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg=="
+ "resolved" "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz"
+ "version" "0.14.10"
"vue-demi@^0.13.11":
"integrity" "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A=="
"resolved" "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.11.tgz"
"version" "0.13.11"
-
-"vue-demi@>=0.14.5":
- "integrity" "sha512-Uuqnk9YE9SsWeReYqK2alDI5YzciATE0r2SkA6iMAtuXvNTMNACJLJEXNXaEy94ECuBe4Sk6RzRU80kjdbIo1Q=="
- "resolved" "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.8.tgz"
- "version" "0.14.8"
"vue-echarts@^6.2.3":
"integrity" "sha512-vXLKpALFjbPphW9IfQPOVfb1KjGZ/f8qa/FZHi9lZIWzAnQC1DgnmEK3pJgEkyo6EP7UnX6Bv/V3Ke7p+qCNXA=="
@@ -8330,7 +8325,7 @@
"@vue/language-core" "1.8.27"
"semver" "^7.5.4"
-"vue@^2.6.12 || ^3.1.1", "vue@^2.6.14 || ^3.3.0", "vue@^3.0.0", "vue@^3.0.0-0 || ^2.6.0", "vue@^3.1.0", "vue@^3.2.0", "vue@^3.2.25", "vue@^3.2.40", "vue@2 || 3", "vue@3.4.32":
+"vue@^2.0.0 || >=3.0.0", "vue@^2.6.12 || ^3.1.1", "vue@^2.6.14 || ^3.3.0", "vue@^3.0.0", "vue@^3.0.0-0 || ^2.6.0", "vue@^3.1.0", "vue@^3.2.0", "vue@^3.2.25", "vue@^3.2.40", "vue@2 || 3", "vue@3.4.32":
"integrity" "sha512-9mCGIAi/CAq7GtaLLLp2J92pEic+HArstG+pq6F+H7+/jB9a0Z7576n4Bh4k79/50L1cKMIhZC3MC0iGpl+1IA=="
"resolved" "https://registry.npmmirror.com/vue/-/vue-3.4.32.tgz"
"version" "3.4.32"
--
Gitblit v1.8.0