From 1b6dca100a31fe407f90c827c2e3c63bcd2536ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Thu, 25 Jul 2024 15:00:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/index.ts                |  1 +
 src/store/modules/user.ts            |  2 --
 src/views/login/index.vue            |  5 +++++
 src/views/manage/datas/edit.vue      |  6 +++++-
 src/views/manage/otherTool/add.vue   | 13 +------------
 src/views/manage/otherTool/index.vue |  7 +++----
 src/views/manage/otherTool/view.vue  |  9 +++------
 src/views/system/user/index.vue      |  7 +++++--
 8 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/api/auth/index.ts b/src/api/auth/index.ts
index 4b371c2..fb956bb 100644
--- a/src/api/auth/index.ts
+++ b/src/api/auth/index.ts
@@ -1,3 +1,4 @@
+
 import request from "@/utils/request";
 import { CaptchaResult, LoginData, LoginResult } from "./model";
 
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index e7fdb14..269361d 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -1,4 +1,3 @@
-import AuthAPI from "@/api/auth";
 import UserAPI from "@/api/user";
 import { resetRouter } from "@/router";
 import { store } from "@/store";
@@ -63,7 +62,6 @@ export const useUserStore = defineStore("user", () => {
     return new Promise<void>((resolve, reject) => {
       sessionApi.logout()
         .then((d) => {
-          debugger
           localStorage.setItem(TOKEN_KEY, "");
           location.reload(); // 清空路由
           resolve();
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 516ef0a..bc5d632 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -68,6 +68,7 @@
 </template>
 
 <script setup lang="ts">
+import md5 from 'js-md5';
 import { useSettingsStore, useUserStore } from "@/store";
 import AuthAPI from "@/api/auth";
 import { LoginData } from "@/api/auth/model";
@@ -96,6 +97,7 @@ const { height } = useWindowSize();
 const loginData = ref<LoginData>({
   username: "admin",
   password: "12345678",
+  pass: "12345678",
 });
 
 const loginRules = computed(() => {
@@ -145,6 +147,8 @@ function handleLogin() {
   loginFormRef.value?.validate((valid: boolean) => {
     if (valid) {
       loading.value = true;
+      loginData.value.pasw = loginData.value.password;
+      loginData.value.password = md5(loginData.value.password);
       userStore
         .login(loginData.value)
         .then(() => {  
@@ -162,6 +166,7 @@ function handleLogin() {
           router.push({ path: redirect, query: otherQueryParams });
         })
         .catch((e) => {
+          loginData.value.password = loginData.value.pasw;
           //getCaptcha();
           ElMessage.error(e);
         })
diff --git a/src/views/manage/datas/edit.vue b/src/views/manage/datas/edit.vue
index 8cba50e..7ce268a 100644
--- a/src/views/manage/datas/edit.vue
+++ b/src/views/manage/datas/edit.vue
@@ -431,7 +431,11 @@ function handleRemoveAll() {
     cancelButtonText: "取消",
     type: "warning",
   }).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) {
         imageList.value = [];
         imgCount.value = imageList.value.length;
diff --git a/src/views/manage/otherTool/add.vue b/src/views/manage/otherTool/add.vue
index adb5029..21be4a8 100644
--- a/src/views/manage/otherTool/add.vue
+++ b/src/views/manage/otherTool/add.vue
@@ -40,18 +40,7 @@
               <el-table-column prop="manufacturer" label="厂商名称" align="left" />
               <el-table-column prop="tool_version" 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>
           </el-form>
diff --git a/src/views/manage/otherTool/index.vue b/src/views/manage/otherTool/index.vue
index c8dfd58..7f629c4 100644
--- a/src/views/manage/otherTool/index.vue
+++ b/src/views/manage/otherTool/index.vue
@@ -9,11 +9,10 @@
           </div>
           <div>
             <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-              <el-form-item label="工具链名称" prop="keywords">
+              <el-form-item label="工具类型" prop="keywords">
                 <el-select
                   v-model="queryParams.tool_type"
                   placeholder="请选择工具类型"
-                  clearable
                   style="width: 200px"
                   @change="handleQuery"
                 >
@@ -49,7 +48,7 @@
         <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="connection_state" />
-        <el-table-column label="操作" fixed="right" width="280">
+        <el-table-column label="操作" align="center" fixed="right" width="280">
           <template #default="scope">
             <el-button text type="primary" size="small" @click="handleDetail(scope.row)"
               ><i-ep-edit />查看</el-button
@@ -84,7 +83,7 @@ const queryFormRef = ref(ElForm); // 查询表单
 const queryParams = reactive({
   //page_num: 1,
   //page_size: 10,
-  tool_type: null,
+  tool_type: 'compiler',
 });
 
 // 基础数据列表
diff --git a/src/views/manage/otherTool/view.vue b/src/views/manage/otherTool/view.vue
index 2f58480..a6a39e9 100644
--- a/src/views/manage/otherTool/view.vue
+++ b/src/views/manage/otherTool/view.vue
@@ -132,9 +132,8 @@
       v-model="dialogFormVisible"
       title="添加工具链运行参数"
       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-input v-model="form.params_name" placeholder="请输入运行参数名称" />
         </el-form-item>
@@ -205,9 +204,8 @@
       v-model="dialogInfoVisible"
       title="查看工具链运行参数"
       width="880"
-      v-loading="infoLoading"
     >
-      <el-form label-width="108px">
+      <el-form v-loading="infoLoading" label-width="108px">
         <el-form-item label="适用模型类型">
           {{ dataInfo.modl_sub_type_name }}
         </el-form-item>
@@ -319,7 +317,7 @@ const handleSubmit = useThrottleFn(() => {
   baseFormRef.value.validate((valid: any) => {
     if (valid) {
       loading.value = true;
-      ToolChainshApi.editTool(baseForm.tool_id, baseForm)
+      ToolChainshApi.editTool(baseForm.value.tool_id, baseForm.value)
         .then((res) => {
           if (res.data.code == 0) {
             ElMessage.success("修改成功");
@@ -337,7 +335,6 @@ const handleSubmit = useThrottleFn(() => {
 const handleSubmitFile = useThrottleFn(() => {
   formRef.value.validate((valid: any) => {
     if (valid) {
-      ElMessage.error("缺少接口");
       formLoading.value = true;
       ToolChainshApi.addToolParams(form)
         .then((res) => {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 970d4c5..3ac7734 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -44,7 +44,7 @@
         <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_name" />
-        <el-table-column label="操作" fixed="right" width="320">
+        <el-table-column label="操作" align="center" fixed="right" width="320">
           <template #default="scope">
             <el-button type="primary" size="small" text @click="resetPassword(scope.row)"
               ><i-ep-refresh-left />修改密码</el-button
@@ -128,6 +128,7 @@
 </template>
 
 <script setup lang="ts">
+import md5 from 'js-md5';
 import UserAPI from "@/api/myUser";
 
 const router = useRouter();
@@ -221,7 +222,7 @@ function resetPassword(row: { [key: string]: any }) {
       ElMessage.warning("密码至少需要6位字符，请重新输入");
       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) {
         ElMessage.success("密码重置成功，新密码是：" + value);
       } else {
@@ -284,6 +285,8 @@ const handleSubmit = useThrottleFn(() => {
           return false;
         }
         formLoading.value = true;
+        form.password = md5(form.password);
+        form.user_password = md5(form.user_password);
         UserAPI.add(form)
           .then((res) => {
             if (res.data.code == 0) {