From 0e6e909fea164de88692f20b97777bdd8c2c69a6 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Mon, 14 Jul 2025 11:44:25 +0800
Subject: [PATCH] feat:把lis迁移和修改关联算法宽度
---
src/views/job/components/TaskAlgorithmBusiness.vue | 2
src/views/system/userinfo.vue | 68 ----------------
src/views/job/components/JobRelatedEvents.vue | 2
src/views/license/upload.vue | 113 +++++++++++++++++++++-------
4 files changed, 88 insertions(+), 97 deletions(-)
diff --git a/src/views/job/components/JobRelatedEvents.vue b/src/views/job/components/JobRelatedEvents.vue
index dc56dd8..6826bef 100644
--- a/src/views/job/components/JobRelatedEvents.vue
+++ b/src/views/job/components/JobRelatedEvents.vue
@@ -28,7 +28,7 @@
</div>
<div class="item">
<div class="itemchild">关联算法：</div>
- <TaskAlgorithmBusiness :setWidth="186 +'px'" :showAlgorithm="true" @algorithmChange="algorithmChange" />
+ <TaskAlgorithmBusiness :setWidth="186" :showAlgorithm="true" @algorithmChange="algorithmChange" />
</div>
</div>
<div class="search-btn">
diff --git a/src/views/job/components/TaskAlgorithmBusiness.vue b/src/views/job/components/TaskAlgorithmBusiness.vue
index 427e708..4eaba7a 100644
--- a/src/views/job/components/TaskAlgorithmBusiness.vue
+++ b/src/views/job/components/TaskAlgorithmBusiness.vue
@@ -31,7 +31,7 @@
<script setup>
import { getMultipleDictionary } from '@/api/job/task'
-import { pxToRem } from '@/utils/rem'
+import { pxToRem } from '@/utils/rem';
// 接收父组件传参
const props = defineProps({
diff --git a/src/views/license/upload.vue b/src/views/license/upload.vue
index c9378c6..3743ac2 100644
--- a/src/views/license/upload.vue
+++ b/src/views/license/upload.vue
@@ -1,6 +1,6 @@
<!-- filepath: /d:/work/drone-web-manage/src/views/license/upload.vue -->
<template>
- <basic-container>
+ <!-- <basic-container>
<el-upload
class="upload-demo"
drag
@@ -12,46 +12,101 @@
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip">仅支持扩展名：lic</div>
</el-upload>
- </basic-container>
+ </basic-container> -->
+ <!-- 密钥上传 -->
+ <div class="upload-file">
+ <img v-if="isSuccess === 'success'" :src="uploadSuccess" alt="" />
+ <div v-if="isSuccess === 'success'">上传成功</div>
+ <img v-if="isSuccess === 'error'" :src="uploadError" alt="" />
+ <div v-if="isSuccess === 'error'">上传失败</div>
+ <el-upload
+ action="/upload"
+ accept=".lic"
+ :show-file-list="false"
+ :before-upload="handleUpload"
+ >
+ <div class="upload-btn">密钥上传</div>
+ </el-upload>
+ <div class="password-time">密钥有效期：{{ passwordTime || '永久有效' }}</div>
+ </div>
</template>
<script>
import { uploadLicense } from '@/api/license/uploadLicense';
+import { findLicenseDate } from '@/api/system/dict';
+import uploadSuccess from '@/assets/images/uoload-success.png';
+import uploadError from '@/assets/images/upload-error.png';
export default {
+ data() {
+ return {
+ isSuccess: '', // 上传状态
+ passwordTime: '', // 密钥有效期
+ uploadSuccess, // 上传成功图片
+ uploadError, // 上传失败图片
+ };
+ },
+ mounted() {
+ this.getFindLicenseDate();
+ },
methods: {
- async customUpload({ file }) {
- try {
- const response = await uploadLicense(file);
- if (response.data.success) {
- this.$message.success('文件上传成功');
- } else {
- this.$message.error(response.data.message || '文件上传失败');
- }
- } catch (error) {
- console.error('上传失败:', error);
- this.$message.error('文件上传失败');
- }
+ handleUpload(file) {
+ uploadLicense(file)
+ .then(res => {
+ console.log(res.data.code,'444')
+ if (res.data.code !== 200) return this.$message.error('上传失败');
+ this.$message.success('上传成功');
+ this.isSuccess = 'success';
+ this.getFindLicenseDate();
+ })
+ .catch(err => {
+ this.isSuccess = 'error';
+ this.$message.error('上传失败');
+ });
+ },
+ getFindLicenseDate() {
+ findLicenseDate()
+ .then(res => {
+ if (res.data.code !== 0) return this.$message.error('上传失败');
+ this.passwordTime = res.data.data;
+ })
+ .catch(err => {
+ this.$message.error('获取失败失败');
+ });
},
},
};
</script>
-<style scoped>
-.upload-demo {
- width: 100%;
- border: 2px dashed #d9d9d9;
- border-radius: 6px;
- background-color: #fafafa;
+<style scoped lang="scss">
+.upload-file {
+ text-align: center;
+ margin-top: 60px;
+ .upload-btn {
+ width: 93px;
+ height: 38px;
+ background: #DDEBFF;
+ border-radius: 8px 8px 8px 8px;
+ border: 1px solid #409EFF;
text-align: center;
- padding: 40px 20px;
-}
-.el-upload__text {
- font-size: 16px;
- color: #606266;
-}
-.el-upload__tip {
- font-size: 12px;
- color: #909399;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: bold;
+ font-size: 14px;
+ color: #228CFA;
+ line-height: 38px;
+ text-align: center;
+ margin-top: 10px;
+ }
+ .password-time {
+ margin-top: 50px;
+ width: 100%;
+ height: 16px;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 400;
+ font-size: 14px;
+ color: #2d9dff;
+ line-height: 16px;
+ // text-align: left;
+ }
}
</style>
\ No newline at end of file
diff --git a/src/views/system/userinfo.vue b/src/views/system/userinfo.vue
index acef2d7..23f8d87 100644
--- a/src/views/system/userinfo.vue
+++ b/src/views/system/userinfo.vue
@@ -108,22 +108,6 @@
<el-button @click="reset">重置</el-button>
</div>
</div>
- <!-- 密钥上传 -->
- <div class="upload-file" v-else-if="checked === 2">
- <img v-if="isSuccess === 'success'" :src="uploadSuccess" alt="" />
- <div v-if="isSuccess === 'success'">上传成功</div>
- <img v-if="isSuccess === 'error'" :src="uploadError" alt="" />
- <div v-if="isSuccess === 'error'">上传失败</div>
- <el-upload
- action="/upload"
- accept=".lic"
- :show-file-list="false"
- :before-upload="handleUpload"
- >
- <div class="upload-btn">密钥上传</div>
- </el-upload>
- <div class="password-time">密钥有效期：{{ passwordTime || '永久有效' }}</div>
- </div>
</div>
</template>
@@ -136,7 +120,6 @@
import request from '@/axios';
import { getUserInfo, updateInfo, updatePassword } from '@/api/system/user';
import { findLicenseDate } from '@/api/system/dict';
-import { uploadLicense } from '@/api/license/uploadLicense';
import uploadSuccess from '@/assets/images/uoload-success.png';
import uploadError from '@/assets/images/upload-error.png';
import cancel1 from '@/assets/images/task/cancel1.png';
@@ -146,7 +129,7 @@
const token = getToken();
const userinforShow = defineModel('show');
const userInfoAs = computed(() => store.state.user.userInfo);
-const titleList = ref(['个人信息', '修改密码', '密钥上传']);
+const titleList = ref(['个人信息', '修改密码']);
const checked = ref(0);
const uploadUrl = computed(
() => `${import.meta.env.VITE_APP_API_URL}/blade-resource/oss/endpoint/put-file`
@@ -221,9 +204,6 @@
const titleClick = (item, index) => {
checked.value = index;
- if (index === 2) {
- getFindLicenseDate();
- }
};
const getUserInfoData = () => {
getUserInfo().then(res => {
@@ -285,21 +265,6 @@
};
const isSuccess = ref('');
const passwordTime = ref('');
-const handleUpload = file => {
- const formData = new FormData();
- formData.append('file', file);
- uploadLicense(formData)
- .then(res => {
- if (res.data.code !== 200) return ElMessage.error('上传失败');
- ElMessage.success('上传成功');
- isSuccess.value = 'success';
- getFindLicenseDate();
- })
- .catch(err => {
- isSuccess.value = 'error';
- ElMessage.error('上传失败');
- });
-};
const getFindLicenseDate = () => {
findLicenseDate()
.then(res => {
@@ -415,34 +380,5 @@
.passwordBox {
margin-top: 40px;
}
-.upload-file {
- text-align: center;
- margin-top: 60px;
- .upload-btn {
- width: 93px;
- height: 38px;
- background: #DDEBFF;
- border-radius: 8px 8px 8px 8px;
- border: 1px solid #409EFF;
- text-align: center;
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: bold;
- font-size: 14px;
- color: #228CFA;
- line-height: 38px;
- text-align: center;
- margin-top: 10px;
- }
- .password-time {
- margin-top: 50px;
- width: 100%;
- height: 16px;
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 400;
- font-size: 14px;
- color: #2d9dff;
- line-height: 16px;
- // text-align: left;
- }
-}
+
</style>
--
Gitblit v1.9.3