提交代码

main
姜玉琦 2024-07-25 15:00:47 +08:00
parent 171c93fc0e
commit 1b6dca100a
8 changed files with 23 additions and 27 deletions

View File

@ -1,3 +1,4 @@
import request from "@/utils/request"; import request from "@/utils/request";
import { CaptchaResult, LoginData, LoginResult } from "./model"; import { CaptchaResult, LoginData, LoginResult } from "./model";

View File

@ -1,4 +1,3 @@
import AuthAPI from "@/api/auth";
import UserAPI from "@/api/user"; import UserAPI from "@/api/user";
import { resetRouter } from "@/router"; import { resetRouter } from "@/router";
import { store } from "@/store"; import { store } from "@/store";
@ -63,7 +62,6 @@ export const useUserStore = defineStore("user", () => {
return new Promise<void>((resolve, reject) => { return new Promise<void>((resolve, reject) => {
sessionApi.logout() sessionApi.logout()
.then((d) => { .then((d) => {
debugger
localStorage.setItem(TOKEN_KEY, ""); localStorage.setItem(TOKEN_KEY, "");
location.reload(); // 清空路由 location.reload(); // 清空路由
resolve(); resolve();

View File

@ -68,6 +68,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import md5 from 'js-md5';
import { useSettingsStore, useUserStore } from "@/store"; import { useSettingsStore, useUserStore } from "@/store";
import AuthAPI from "@/api/auth"; import AuthAPI from "@/api/auth";
import { LoginData } from "@/api/auth/model"; import { LoginData } from "@/api/auth/model";
@ -96,6 +97,7 @@ const { height } = useWindowSize();
const loginData = ref<LoginData>({ const loginData = ref<LoginData>({
username: "admin", username: "admin",
password: "12345678", password: "12345678",
pass: "12345678",
}); });
const loginRules = computed(() => { const loginRules = computed(() => {
@ -145,6 +147,8 @@ function handleLogin() {
loginFormRef.value?.validate((valid: boolean) => { loginFormRef.value?.validate((valid: boolean) => {
if (valid) { if (valid) {
loading.value = true; loading.value = true;
loginData.value.pasw = loginData.value.password;
loginData.value.password = md5(loginData.value.password);
userStore userStore
.login(loginData.value) .login(loginData.value)
.then(() => { .then(() => {
@ -162,6 +166,7 @@ function handleLogin() {
router.push({ path: redirect, query: otherQueryParams }); router.push({ path: redirect, query: otherQueryParams });
}) })
.catch((e) => { .catch((e) => {
loginData.value.password = loginData.value.pasw;
//getCaptcha(); //getCaptcha();
ElMessage.error(e); ElMessage.error(e);
}) })

View File

@ -431,7 +431,11 @@ function handleRemoveAll() {
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}).then(function () { }).then(function () {
DataSetApi.deleteFile(ID.value, { file_name_list: imageList.value }).then((res) => { let list = [];
imageList.value.forEach(item => {
list.push(item.name);
});
DataSetApi.deleteFile(ID.value, { file_name_list: list }).then((res) => {
if (res.data.code == 0) { if (res.data.code == 0) {
imageList.value = []; imageList.value = [];
imgCount.value = imageList.value.length; imgCount.value = imageList.value.length;

View File

@ -40,18 +40,7 @@
<el-table-column prop="manufacturer" label="厂商名称" align="left" /> <el-table-column prop="manufacturer" label="厂商名称" align="left" />
<el-table-column prop="tool_version" label="服务程序版本" align="left" /> <el-table-column prop="tool_version" label="服务程序版本" align="left" />
<el-table-column prop="connection_state" label="连接状态" align="left"> <el-table-column prop="connection_state" label="连接状态" align="left">
<template #default="scope">
<el-tag
v-if="scope.row.connection_state == '已连接'"
type="success"
effect="dark"
>
{{ scope.row.connection_state }}
</el-tag>
<el-tag v-else type="danger" effect="dark">
{{ scope.row.connection_state }}
</el-tag>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-form> </el-form>

View File

@ -9,11 +9,10 @@
</div> </div>
<div> <div>
<el-form ref="queryFormRef" :model="queryParams" :inline="true"> <el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="工具链名称" prop="keywords"> <el-form-item label="工具类型" prop="keywords">
<el-select <el-select
v-model="queryParams.tool_type" v-model="queryParams.tool_type"
placeholder="请选择工具类型" placeholder="请选择工具类型"
clearable
style="width: 200px" style="width: 200px"
@change="handleQuery" @change="handleQuery"
> >
@ -49,7 +48,7 @@
<el-table-column label="匹配硬件" align="left" prop="cmpt_hardware_type" /> <el-table-column label="匹配硬件" align="left" prop="cmpt_hardware_type" />
<el-table-column label="工作状态" align="left" prop="working_state_name" /> <el-table-column label="工作状态" align="left" prop="working_state_name" />
<el-table-column label="连接状态" align="left" prop="connection_state" /> <el-table-column label="连接状态" align="left" prop="connection_state" />
<el-table-column label="操作" fixed="right" width="280"> <el-table-column label="操作" align="center" fixed="right" width="280">
<template #default="scope"> <template #default="scope">
<el-button text type="primary" size="small" @click="handleDetail(scope.row)" <el-button text type="primary" size="small" @click="handleDetail(scope.row)"
><i-ep-edit />查看</el-button ><i-ep-edit />查看</el-button
@ -84,7 +83,7 @@ const queryFormRef = ref(ElForm); // 查询表单
const queryParams = reactive({ const queryParams = reactive({
//page_num: 1, //page_num: 1,
//page_size: 10, //page_size: 10,
tool_type: null, tool_type: 'compiler',
}); });
// //

View File

@ -132,9 +132,8 @@
v-model="dialogFormVisible" v-model="dialogFormVisible"
title="添加工具链运行参数" title="添加工具链运行参数"
width="880" width="880"
v-loading="formLoading"
> >
<el-form ref="formRef" :model="form" :rules="rules" label-width="108px"> <el-form ref="formRef" :model="form" v-loading="formLoading" :rules="rules" label-width="108px">
<el-form-item label="运行参数名称" prop="params_name"> <el-form-item label="运行参数名称" prop="params_name">
<el-input v-model="form.params_name" placeholder="请输入运行参数名称" /> <el-input v-model="form.params_name" placeholder="请输入运行参数名称" />
</el-form-item> </el-form-item>
@ -205,9 +204,8 @@
v-model="dialogInfoVisible" v-model="dialogInfoVisible"
title="查看工具链运行参数" title="查看工具链运行参数"
width="880" width="880"
v-loading="infoLoading"
> >
<el-form label-width="108px"> <el-form v-loading="infoLoading" label-width="108px">
<el-form-item label="适用模型类型"> <el-form-item label="适用模型类型">
{{ dataInfo.modl_sub_type_name }} {{ dataInfo.modl_sub_type_name }}
</el-form-item> </el-form-item>
@ -319,7 +317,7 @@ const handleSubmit = useThrottleFn(() => {
baseFormRef.value.validate((valid: any) => { baseFormRef.value.validate((valid: any) => {
if (valid) { if (valid) {
loading.value = true; loading.value = true;
ToolChainshApi.editTool(baseForm.tool_id, baseForm) ToolChainshApi.editTool(baseForm.value.tool_id, baseForm.value)
.then((res) => { .then((res) => {
if (res.data.code == 0) { if (res.data.code == 0) {
ElMessage.success("修改成功"); ElMessage.success("修改成功");
@ -337,7 +335,6 @@ const handleSubmit = useThrottleFn(() => {
const handleSubmitFile = useThrottleFn(() => { const handleSubmitFile = useThrottleFn(() => {
formRef.value.validate((valid: any) => { formRef.value.validate((valid: any) => {
if (valid) { if (valid) {
ElMessage.error("缺少接口");
formLoading.value = true; formLoading.value = true;
ToolChainshApi.addToolParams(form) ToolChainshApi.addToolParams(form)
.then((res) => { .then((res) => {

View File

@ -44,7 +44,7 @@
<el-table-column label="用户名" align="left" prop="user_name" /> <el-table-column label="用户名" align="left" prop="user_name" />
<el-table-column label="角色编号" align="left" prop="user_role" /> <el-table-column label="角色编号" align="left" prop="user_role" />
<el-table-column label="角色名称" align="left" prop="user_role_name" /> <el-table-column label="角色名称" align="left" prop="user_role_name" />
<el-table-column label="操作" fixed="right" width="320"> <el-table-column label="操作" align="center" fixed="right" width="320">
<template #default="scope"> <template #default="scope">
<el-button type="primary" size="small" text @click="resetPassword(scope.row)" <el-button type="primary" size="small" text @click="resetPassword(scope.row)"
><i-ep-refresh-left />修改密码</el-button ><i-ep-refresh-left />修改密码</el-button
@ -128,6 +128,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import md5 from 'js-md5';
import UserAPI from "@/api/myUser"; import UserAPI from "@/api/myUser";
const router = useRouter(); const router = useRouter();
@ -221,7 +222,7 @@ function resetPassword(row: { [key: string]: any }) {
ElMessage.warning("密码至少需要6位字符请重新输入"); ElMessage.warning("密码至少需要6位字符请重新输入");
return false; return false;
} }
UserAPI.updatePassword(row.user_id, { password: value }).then((res) => { UserAPI.updatePassword(row.user_id, { password: md5(value) }).then((res) => {
if (res.data.code == 0) { if (res.data.code == 0) {
ElMessage.success("密码重置成功,新密码是:" + value); ElMessage.success("密码重置成功,新密码是:" + value);
} else { } else {
@ -284,6 +285,8 @@ const handleSubmit = useThrottleFn(() => {
return false; return false;
} }
formLoading.value = true; formLoading.value = true;
form.password = md5(form.password);
form.user_password = md5(form.user_password);
UserAPI.add(form) UserAPI.add(form)
.then((res) => { .then((res) => {
if (res.data.code == 0) { if (res.data.code == 0) {