Merge branch 'master' of http://159.223.171.199:10439/r/YiWuProject

wu

2 天以前 7c0f20e25e870e055f88952f9ec57677730eda67

Merge branch 'master' of http://159.223.171.199:10439/r/YiWuProject

 UI-Project/src/lang/en.js

@@ -412,6 +412,11 @@
        height: 'Height',
    },
    productStock: {
        inconfirmpassword: 'Please enter the confirmation password',
        passwordNotMatch: 'The passwords entered do not match',
        confirmpassword: 'Confirm Password',
        inputNewPassword: 'Please enter a new password',
        userIdError: 'Failed to obtain user ID',
        configName: 'configure name',
        configNamea:'configure name：',
        configCode: 'Configuration Code',
@@ -806,6 +811,7 @@
        finegrinding: 'Fine grinding',
    },
    hellow: {
        pleaseConfirm: 'Please double-click to confirm this fault after the issue has been resolved to ensure the system operates normally!',
        taskAlreadyClaimed: 'This task has already been claimed and cannot be performed again.',
        claimed: 'Already claimed',
        claimFailed: 'Failed to receive task',

 UI-Project/src/lang/kr.js

@@ -409,6 +409,11 @@
          height:'높이',
      },
      productStock:{
          inconfirmpassword: '비밀번호를 확인해 입력하세요',
          passwordNotMatch: '두 번 입력한 비밀번호가 일치하지 않습니다',
          confirmpassword: '비밀번호 확인',
          inputNewPassword: '새 비밀번호를 입력하세요',
          userIdError: '사용자 ID 가져오기 실패',
          addconfigName:'구성 추가',
          editconfigName:'구성 수정',
          configName:'구성 이름',
@@ -807,6 +812,7 @@
          finegrinding: '정교하게 갈다',
      },
    hellow: {
        pleaseConfirm: '문제가 처리된 후에 이 장애를 확인하려면 더블 클릭하여 시스템이 정상적으로 작동하도록 하세요!',
        taskAlreadyClaimed: '이 작업은 이미 수령되었으며, 반복 수행할 수 없습니다.',
        claimed: '받음',
        claimFailed: '임무 받기 실패',

 UI-Project/src/lang/py.js

@@ -409,6 +409,11 @@
        height: 'Высота',
    },
    productStock: {
        inconfirmpassword: '请输入确认密码',
        passwordNotMatch: '两次输入的密码不一致',
        confirmpassword: '确认密码',
        inputNewPassword: '请输入新密码',
        userIdError: '用户ID获取失败',
        configName:'配置名',
        configNamea:'配置名：',
        configCode:'配置代码',
@@ -726,6 +731,7 @@
        finegrinding: '精磨',
    },
    hellow: {
        pleaseConfirm: '请在问题处理完后，双击确认此故障，保证系统正常运行！',
        taskAlreadyClaimed: '该任务已领取，不可重复操作',
        claimed: '已领取',
        claimFailed: '领取任务失败',

 UI-Project/src/lang/zh.js

@@ -411,6 +411,11 @@
          height:'高度',
      },
      productStock:{
          inconfirmpassword: '请输入确认密码',
          passwordNotMatch: '两次输入的密码不一致',
          confirmpassword: '确认密码',
          inputNewPassword: '请输入新密码',
          userIdError: '用户ID获取失败',
          addconfigName:'添加配置',
          editconfigName:'修改配置',
          configName:'配置名',
@@ -815,6 +820,7 @@
          finegrinding: '精磨',
      },
    hellow: {
        pleaseConfirm: '请在问题处理完后，双击确认此故障，保证系统正常运行！',
        taskAlreadyClaimed: '该任务已领取，不可重复操作',
        claimed: '已领取',
        claimFailed: '领取任务失败',

 UI-Project/src/views/Caching/cachingbefore.vue

@@ -411,6 +411,7 @@
      <el-icon><WarnTriangleFilled /></el-icon>
      <span class="alert-text">
        {{ alertText }} (id:{{ alertMessage }})
        <span class="confirm-text">{{ $t('hellow.pleaseConfirm') }}</span>
      </span>
    </div>
    <button @click="showAlert = false" class="close-btn">×</button>
@@ -686,4 +687,11 @@
  max-width: 80%; /* 防止小屏幕溢出 */
  min-width: 400px; /* 最小宽度保证 */
}
.confirm-text {
  color: rgb(242, 121, 8);
  display: block; /* 强制换行 */
  text-align: center; /* 水平居中 */
  margin-top: 4px; /* 与上一行保持间距 */
  font-weight: 500; /* 加粗突出 */
}
</style>

 UI-Project/src/views/Caching/cachingun.vue

@@ -392,6 +392,7 @@
      <el-icon><WarnTriangleFilled /></el-icon>
      <span class="alert-text">
        {{ alertText }} (id:{{ alertMessage }})
        <span class="confirm-text">{{ $t('hellow.pleaseConfirm') }}</span>
      </span>
    </div>
    <button @click="showAlert = false" class="close-btn">×</button>
@@ -593,4 +594,11 @@
  max-width: 80%; /* 防止小屏幕溢出 */
  min-width: 400px; /* 最小宽度保证 */
}
</style>
.confirm-text {
  color: rgb(242, 121, 8);
  display: block; /* 强制换行 */
  text-align: center; /* 水平居中 */
  margin-top: 4px; /* 与上一行保持间距 */
  font-weight: 500; /* 加粗突出 */
}
</style>

 UI-Project/src/views/Slicecage/slicecage.vue

@@ -1248,6 +1248,7 @@
      <el-icon><WarnTriangleFilled /></el-icon>
      <span class="alert-text">
        {{ alertText }} (id:{{ alertMessage }})
        <span class="confirm-text">{{ $t('hellow.pleaseConfirm') }}</span>
      </span>
    </div>
    <button @click="showAlert = false" class="close-btn">×</button>
@@ -1265,7 +1266,7 @@
      style="width: 100%;"
    >
      <el-table-column prop="formattedCreateTime" align="center" :label="$t('film.createtime')" min-width="100" />
      <el-table-column 
      <el-table-column
       :label="$t('hellow.content')" 
       align="center" 
       min-width="220"
@@ -2035,4 +2036,11 @@
.el-loading-mask {
  z-index: 2000 !important;
}
.confirm-text {
  color: rgb(242, 121, 8);
  display: block; /* 强制换行 */
  text-align: center; /* 水平居中 */
  margin-top: 4px; /* 与上一行保持间距 */
  font-weight: 500; /* 加粗突出 */
}
</style>

 UI-Project/src/views/User/permissions.vue

@@ -20,17 +20,27 @@
const currentRow = reactive({}); // 当前行的数据 
const tableData = ref([])
const slot = ref('')
 request.get("/loadGlass/sys/menu/nav").then((res) => {
 if (res.code == 200) {
 tableData.value = res.data.tree
 } else {
 ElMessage.warning(res.msg)
 }
 });
  const fetchList = async () => {  
  try {  
      const response = await request.get('/loadGlass/sys/menu/getMenuTree', {
      params: {
        key: -1
      }
    });
    if (response.code === 200) {  
    tableData.value = response.data
    } else {  
      ElMessage.warning(response.data);  
    }  
  } catch (error) {  
    console.error('Error fetching options:', error);  
  }  
}; 
const titleSelectJsona = ref({
  processType: [],
})
onMounted(() => {
  fetchList()
  fetchOptionsa('');  
}); 
  // 角色下拉选  
@@ -96,12 +106,13 @@
      menuName: menuName.value,
      listSort: listSort.value,
      url: url.value,
      parentId: 0
    }); 
 
    if (response.code === 200) {
      ElMessage.success(response.message);
      add.value = false;
      tableData.value = response.data;
      fetchList()
      menuName.value = '';
      listSort.value = '';
      url.value = '';
@@ -137,7 +148,7 @@
    if (response.code === 200) {
      ElMessage.success(response.message);
      addb.value = false;
     tableData.value = response.data;
      fetchList()
       menuName.value = '';
       listSort.value = '';
       url.value = '';
@@ -186,7 +197,7 @@
    if (response.code === 200) {
      ElMessage.success(response.message);
      adda.value = false;
      tableData.value = response.data;
      fetchList()
      menuName.value = '';
      listSort.value = '';
      url.value = '';
@@ -220,7 +231,7 @@
    if (response.code === 200) {
      ElMessage.success(response.message);
      addc.value = false;
      tableData.value = response.data;
      fetchList()
      menuName.value = '';
      listSort.value = '';
      url.value = '';
@@ -244,11 +255,14 @@
      } 
    );
    if (confirmResult === 'confirm') {
      const response = await request.post("/loadGlass/sys/menu/deleteMenu", {
        menuId: row.id,
    })
      const url = "/loadGlass/sys/menu/deleteMenu?menuId=" + row.id;
      const response = await request.post(url);
    //   const response = await request.post("/loadGlass/sys/menu/deleteMenu", {
    //     menuId: row.id,
    // })
    if (response.code === 200) {
      ElMessage.success(response.message);
      fetchList()
      } else {
      ElMessage.error(response.msg);
      }  

 UI-Project/src/views/User/userlist.vue

@@ -1,363 +1,569 @@
<script setup>
import {Search} from "@element-plus/icons-vue";
import {reactive} from "vue";
import {useRouter} from "vue-router"
const router = useRouter()
const add = ref(false)
const adda = ref(false)
import request from "@/utils/request"
import { ref, onMounted } from "vue";
import { ElMessage, ElMessageBox } from 'element-plus'
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
import { Search, Lock } from "@element-plus/icons-vue"; // 新增Lock图标导入
import { reactive, ref, onMounted } from "vue";
import { useRouter } from "vue-router";
const router = useRouter();
import request from "@/utils/request";
import { ElMessage, ElMessageBox } from "element-plus";
import { useI18n } from "vue-i18n";
const { t } = useI18n();
const selectedProjectNoa = ref(null);
const userName = ref('');
const password = ref('');
const tableData = ref([])
const slot = ref('')
// request.post("/loadGlass/sys/user/listByUserName",{
//   key: ''
// }).then((res) => {
//    if (res.code == 200) {
//    console.log(res.data);
//    tableData.value = res.data
//    } else {
//    ElMessage.warning(res.msg)
//    }
//    });
  const listByUserName = async () => {  
const userName = ref("");
const password = ref("");
const confirmPassword = ref("");
const editPassword = ref("");
const editConfirmPassword = ref("");
const tableData = ref([]);
const slot = ref("");
const add = ref(false);
const adda = ref(false);
let language = ref(localStorage.getItem("lang") || "zh");
// 获取用户列表
const listByUserName = async () => {
  try {
    const response = await request.post('/loadGlass/sys/user/listByUserName',{
      key: ''
     });  
    if (response.code === 200) {  
      tableData.value = response.data
    } else {  
      ElMessage.warning(response.data);  
    }  
  } catch (error) {
  }  
}; 
// 重置密码
 const open = async(row) => {  
  try {
    const confirmResult = await ElMessageBox.confirm(  
      t('productStock.repassword'), 
      t('productStock.prompt'),  
      {  
        confirmButtonText: t('productStock.yes'), 
        cancelButtonText: t('productStock.cancel'),
        type: 'warning',  
      } 
    );
    if (confirmResult === 'confirm') {
      var url="/loadGlass/sys/user/resetPassword?userId="+row.id;
      const response = await request.post(url, {
        esdId: row.esdId
    })
    const response = await request.post("/loadGlass/sys/user/listByUserName", {
      key: "",
    });
    if (response.code === 200) {
      ElMessage.success(response.message);
      tableData.value = response.data;
    } else {
      ElMessage.warning(response.msg);
    }
  } catch (error) {
    ElMessage.error( );
  }
};
// 重置密码
const open = async (row) => {
  try {
    const confirmResult = await ElMessageBox.confirm(
      t("productStock.repassword"),
      t("productStock.prompt"),
      {
        confirmButtonText: t("productStock.yes"),
        cancelButtonText: t("productStock.cancel"),
        type: "warning",
      }
    );
    if (confirmResult === "confirm") {
      const url = "/loadGlass/sys/user/resetPassword?userId=" + row.id;
      const response = await request.post(url, {
        esdId: row.esdId,
      });
      if (response.code === 200) {
        ElMessage.success(response.message);
      } else {
      ElMessage.error(response.msg);
      }  
    }  
        ElMessage.error(response.msg);
      }
    }
  } catch (error) {
  }  
}; 
    if (error !== "cancel") { // 排除取消操作的错误
      ElMessage.error( );
      console.error("重置密码失败：", error);
    }
  }
};
const titleSelectJsona = ref({
  processType: [],
})
onMounted(() => {
  fetchOptionsa('');
  listByUserName('');
}); 
  // 角色下拉选  
  const fetchOptionsa = async () => {  
  processTypea: [],
});
// 获取角色列表
const fetchOptionsa = async () => {
  try {
    const response = await request.post('/loadGlass/sys/role/queryRole',{
      key: ''
     });  
    if (response.code === 200) {  
    titleSelectJsona.value.processTypea = response.data;
    } else {  
      ElMessage.warning(response.data);  
    }  
    const response = await request.post("/loadGlass/sys/role/queryRole", {
      key: "",
    });
    if (response.code === 200) {
      titleSelectJsona.value.processTypea = response.data;
    } else {
      ElMessage.warning(response.msg);
    }
  } catch (error) {
  }  
}; 
// 处理编辑按钮点击  
function handleEdit(row) {  
    ElMessage.error( );
  }
};
// 处理编辑按钮点击
function handleEdit(row) {
  userName.value = row.userName;
  if (row.roleList && row.roleList.length > 0) {  
    const firstRole = row.roleList[0];  
    selectedProjectNoa.value = firstRole.id; // 设置为ID，而不是name  
  }  
  editPassword.value = "";
  editConfirmPassword.value = "";
  if (row.roleList && row.roleList.length > 0) {
    const firstRole = row.roleList[0];
    selectedProjectNoa.value = firstRole.id;
  }
  adda.value = true;
  window.localStorage.setItem('id', row.id)
} 
function closeDialog(row) {
     add.value = false;
     userName.value = '';
     nickName.value = '';
     password.value = '';
     selectedProjectNoa.value = '';
  window.localStorage.setItem("id", row.id);
}
function closeDialoga(row) {
     adda.value = false;
     userName.value = '';
     nickName.value = '';
     password.value = '';
// 关闭添加弹窗
function closeDialog() {
  add.value = false;
  userName.value = "";
  password.value = "";
  confirmPassword.value = "";
  selectedProjectNoa.value = "";
}
// 添加 
// 关闭编辑弹窗
function closeDialoga() {
  adda.value = false;
  userName.value = "";
  editPassword.value = "";
  editConfirmPassword.value = "";
  selectedProjectNoa.value = "";
}
// 添加用户
const getTableRow = async () => {
   if (!userName.value) {
    ElMessage.error(t('productStock.inusername'))
    return
  // 验证用户名
  if (!userName.value) {
    ElMessage.error(t("productStock.inusername"));
    return;
  }
   if (!selectedProjectNoa.value) {
    ElMessage.error(t('productStock.inrole'))
    return
  // 验证角色
  if (!selectedProjectNoa.value) {
    ElMessage.error(t("productStock.inrole"));
    return;
  }
   if (!password.value) {
    ElMessage.error(t('productStock.inpassword'))
    return
  // 验证密码
  if (!password.value) {
    ElMessage.error(t("productStock.inpassword"));
    return;
  }
  // 验证确认密码
  if (!confirmPassword.value) {
    ElMessage.error(t("productStock.inconfirmpassword"));
    return;
  }
  // 验证密码一致性
  if (password.value !== confirmPassword.value) {
    ElMessage.error(t("productStock.passwordNotMatch"));
    return;
  }
  try {
    const response = await request.post('/loadGlass/sys/user/saveUser', {
    const response = await request.post("/loadGlass/sys/user/saveUser", {
      userName: userName.value,
      nickName: userName.value,
      password: password.value,
      roleList: [
    {
      id: selectedProjectNoa.value,
    }]
    }); 
        {
          id: selectedProjectNoa.value,
        },
      ],
    });
    if (response.code === 200) {
      ElMessage.success(response.message);
      add.value = false;
      listByUserName('');
  // tableData.value = response.data;
      closeDialog(); // 关闭弹窗并清空表单
      listByUserName(); // 刷新列表
    } else {
      ElMessage.error(response.message);
    }
  } catch (error) {
    ElMessage.error( );
  }
};
// 编辑
// 编辑用户
const getTableRowa = async () => {
   if (!userName.value) {
    ElMessage.error(t('productStock.inusername'))
    return
  // 验证用户名
  if (!userName.value) {
    ElMessage.error(t("productStock.inusername"));
    return;
  }
   if (!selectedProjectNoa.value) {
    ElMessage.error(t('productStock.inrole'))
    return
  // 验证角色
  if (!selectedProjectNoa.value) {
    ElMessage.error(t("productStock.inrole"));
    return;
  }
   if (!password.value) {
    ElMessage.error(t('productStock.inpassword'))
    return
  if (editPassword.value || editConfirmPassword.value) {
    if (!editPassword.value) {
      ElMessage.error(t("productStock.inpassword"));
      return;
    }
    if (!editConfirmPassword.value) {
      ElMessage.error(t("productStock.inconfirmpassword"));
      return;
    }
    if (editPassword.value !== editConfirmPassword.value) {
      ElMessage.error(t("productStock.passwordNotMatch"));
      return;
    }
  }
  let id = window.localStorage.getItem('id')
  let id = window.localStorage.getItem("id");
  if (!id) {
    ElMessage.error(t("productStock.userIdError"));
    return;
  }
  try {
    const response = await request.post('/loadGlass/sys/user/updateUser', {
    const requestData = {
      id: id,
      userName: userName.value,
      roleList: [
    {
      id: selectedProjectNoa.value,
    }]
  }
  ); 
        {
          id: selectedProjectNoa.value,
        },
      ],
    };
    if (editPassword.value) {
      requestData.password = editPassword.value;
    }
    const response = await request.post("/loadGlass/sys/user/updateUser", requestData);
    if (response.code === 200) {
      ElMessage.success(response.message);
      adda.value = false;
      listByUserName('');
      tableData.value = response.data;
      closeDialoga();
      listByUserName();
    } else {
      ElMessage.error(response.message);
    }
  } catch (error) {
    ElMessage.error( );
  }
};
// 删除 
 const opena = async(row) => {  
// 删除用户
const opena = async (row) => {
  try {
    const confirmResult = await ElMessageBox.confirm(  
      t('productStock.deusername'), 
      t('productStock.prompt'),  
      {  
        confirmButtonText: t('productStock.yes'), 
        cancelButtonText: t('productStock.cancel'),
        type: 'warning',  
      } 
    const confirmResult = await ElMessageBox.confirm(
      t("productStock.deusername"),
      t("productStock.prompt"),
      {
        confirmButtonText: t("productStock.yes"),
        cancelButtonText: t("productStock.cancel"),
        type: "warning",
      }
    );
    if (confirmResult === 'confirm') {
      const response = await request.post("/loadGlass/sys/user/deleteUser",  [row.id])
    if (response.code === 200) {
      ElMessage.success(response.message);
      listByUserName('');
    } else {
      ElMessage.error(response.msg);
      }  
    }  
    if (confirmResult === "confirm") {
      const response = await request.post("/loadGlass/sys/user/deleteUser", [row.id]);
      if (response.code === 200) {
        ElMessage.success(response.message);
        listByUserName(); // 刷新列表
      } else {
        ElMessage.error(response.msg);
      }
    }
  } catch (error) {
  }  
};   
    if (error !== "cancel") {
      ElMessage.error( );
    }
  }
};
onMounted(() => {
  fetchOptionsa();
  listByUserName();
});
</script>
<template>
  <div>
     <el-button type="primary" style="margin-top: 10px;margin-left: 10px;"  id="searchButton" @click="add = true">{{ $t('productStock.addusers') }}</el-button>
    <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" >
      <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
        <el-table height="750" ref="table" 
        :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
          <el-table-column prop="userName" align="center" :label="$t('productStock.username')" min-width="180" />
          <el-table-column align="center" :label="$t('productStock.role')" min-width="80">
            <template #default="scope">  
             <el-tag v-for="role in scope.row.roleList">  
            {{role.name}}  
           </el-tag>   
         </template> 
            </el-table-column>
          <el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="270">
    <el-button
      type="primary"
      style="margin-top: 10px; margin-left: 10px"
      id="searchButton"
      @click="add = true"
    >
      {{ $t("productStock.addusers") }}
    </el-button>
    <el-card style="flex: 1; margin-left: 10px; margin-top: 20px">
      <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto">
        <el-table
          height="750"
          ref="table"
          :data="tableData"
          :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }"
        >
          <el-table-column
            prop="userName"
            align="center"
            :label="$t('productStock.username')"
            min-width="180"
          />
          <el-table-column
            align="center"
            :label="$t('productStock.role')"
            min-width="80"
          >
            <template #default="scope">
              <el-button type="text" plain @click="open(scope.row)">{{ $t('productStock.resetpassword') }}</el-button>
              <el-button type="text" plain @click="handleEdit(scope.row)">{{ $t('productStock.exit') }}</el-button>
              <el-button type="text" plain @click="opena(scope.row)">{{ $t('productStock.delete') }}</el-button>
              <el-tag v-for="role in scope.row.roleList" :key="role.id">
                {{ role.name }}
              </el-tag>
            </template>
        </el-table-column>
          </el-table-column>
          <el-table-column
            fixed="right"
            :label="$t('productStock.operate')"
            align="center"
            width="270"
          >
            <template #default="scope">
              <el-button
                type="text"
                plain
                @click="open(scope.row)"
              >
                {{ $t('productStock.resetpassword') }}
              </el-button>
              <el-button
                type="text"
                plain
                @click="handleEdit(scope.row)"
              >
                {{ $t('productStock.exit') }}
              </el-button>
              <el-button
                type="text"
                plain
                @click="opena(scope.row)"
              >
                {{ $t('productStock.delete') }}
              </el-button>
            </template>
          </el-table-column>
        </el-table>
      </div>
    </el-card>
  </div>
  <el-dialog v-model="add" top="23vh" width="37%" :title="$t('productStock.addusers')">
    <div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
            <el-form  label-width="150px">
      <el-form label-width="105px" label-position="right">
        <el-row style="margin-top: -15px;margin-bottom: -2px;">
          <el-col :span="6">
              <div id="dt" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('productStock.usernamea')" :required="true" style="width: 25vw">
                <el-input v-model="userName" autocomplete="off" style="width: 350px;" :placeholder="$t('productStock.inusername')" />
              </el-form-item></div></div>
          </el-col>
        </el-row>
        <el-row style="margin-top: 10px;">
          <el-col :span="6">
              <div id="dt" style="font-size: 15px;">
        <div>
              <el-form-item :label="$t('productStock.rolea')" :required="true" style="width: 25vw;">
                <el-select
               v-model="selectedProjectNoa"
               filterable
               clearable
               :placeholder="$t('productStock.inrole')"
               style="width: 350px;"
             >
               <el-option
            v-for="item in titleSelectJsona['processTypea']"  
            :key="item.id"
            :label="item.name"
            :value="item.id"
          />
        </el-select>
              </el-form-item></div></div>
          </el-col>
        </el-row>
        <el-row style="margin-top: 10px;">
          <el-col :span="6">
              <div id="dt" style="font-size: 15px;">
        <div>
              <el-form-item :label="$t('productStock.password')" :required="true" style="width: 25vw;">
                <el-input style="width: 350px;"
                        v-model="password"
                        :placeholder="$t('productStock.inpassword')"
                        autocomplete="off"
                        :prefix-icon="Lock"
                        show-password/>
              </el-form-item></div></div>
          </el-col>
        </el-row>
  <!-- 添加用户弹窗 -->
  <el-dialog
    v-model="add"
    top="23vh"
    width="37%"
    :title="$t('productStock.addusers')"
    @close="closeDialog"
  >
    <div style="margin-left: -50px; margin-top: 10px; margin-bottom: 10px">
      <el-form label-width="150px">
        <el-form label-width="105px" label-position="right">
          <el-row style="margin-top: -15px; margin-bottom: -2px">
            <el-col :span="6">
              <div id="dt" style="font-size: 15px">
                <el-form-item
                  :label="$t('productStock.usernamea')"
                  :required="true"
                  style="width: 25vw"
                >
                  <el-input
                    v-model="userName"
                    autocomplete="off"
                    style="width: 350px"
                    :placeholder="$t('productStock.inusername')"
                  />
                </el-form-item>
              </div>
            </el-col>
          </el-row>
          <el-row style="margin-top: 10px">
            <el-col :span="6">
              <div id="dt" style="font-size: 15px">
                <el-form-item
                  :label="$t('productStock.rolea')"
                  :required="true"
                  style="width: 25vw"
                >
                  <el-select
                    v-model="selectedProjectNoa"
                    filterable
                    clearable
                    :placeholder="$t('productStock.inrole')"
                    style="width: 350px"
                  >
                    <el-option
                      v-for="item in titleSelectJsona.processTypea"
                      :key="item.id"
                      :label="item.name"
                      :value="item.id"
                    />
                  </el-select>
                </el-form-item>
              </div>
            </el-col>
          </el-row>
          <el-row style="margin-top: 10px">
            <el-col :span="6">
              <div id="dt" style="font-size: 15px">
                <el-form-item
                  :label="$t('productStock.password')"
                  :required="true"
                  style="width: 25vw"
                >
                  <el-input
                    v-model="password"
                    :placeholder="$t('productStock.inpassword')"
                    autocomplete="off"
                    :prefix-icon="Lock"
                    show-password
                    style="width: 350px"
                  />
                </el-form-item>
              </div>
            </el-col>
          </el-row>
          <!-- 新增确认密码 -->
          <el-row style="margin-top: 10px">
            <el-col :span="6">
              <div id="dt" style="font-size: 15px">
                <el-form-item
                  :label="$t('productStock.confirmpassword')"
                  :required="true"
                  style="width: 25vw"
                >
                  <el-input
                    v-model="confirmPassword"
                    :placeholder="$t('productStock.inconfirmpassword')" 
                    autocomplete="off"
                    :prefix-icon="Lock"
                    show-password
                    style="width: 350px"
                  />
                </el-form-item>
              </div>
            </el-col>
          </el-row>
        </el-form>
            </el-form>
          </div>
      </el-form>
    </div>
    <template #footer>
      <div id="dialog-footer">
        <el-button type="primary" @click="getTableRow">
          {{ $t('productStock.sure') }}
        </el-button>
        <el-button @click="closeDialog">{{ $t('productStock.cancel') }}</el-button>
        <el-button @click="closeDialog">
          {{ $t('productStock.cancel') }}
        </el-button>
      </div>
    </template>
  </el-dialog> 
  <el-dialog v-model="adda" top="23vh" width="37%" :title="$t('productStock.reusername')" >
    <div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
            <el-form ref="formRef" label-width="150px">
      <el-form label-width="105px" label-position="right">
        <el-row style="margin-top: -15px;margin-bottom: -2px;">
          <el-col :span="6">
              <div id="dt" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('productStock.usernamea')" :required="true" style="width: 25vw">
                <el-input :placeholder="$t('productStock.inusername')" v-model="userName" autocomplete="off" style="width: 350px;"/>
              </el-form-item></div></div>
          </el-col>
        </el-row>
        <el-row style="margin-top: 10px;">
          <el-col :span="6">
              <div id="dt" style="font-size: 15px;">
        <div>
              <el-form-item :label="$t('productStock.rolea')" :required="true" style="width: 25vw;">
                <el-select
               v-model="selectedProjectNoa"
               filterable
               clearable
               :placeholder="$t('productStock.inrole')"
               style="width: 350px;"
             >
               <el-option
         v-for="item in titleSelectJsona['processTypea']"
            :key="item.id"
            :label="item.name"
            :value="item.id"
          />
        </el-select>
              </el-form-item></div></div>
          </el-col>
        </el-row>
  </el-dialog>
  <!-- 编辑用户弹窗 -->
  <el-dialog
    v-model="adda"
    top="23vh"
    width="37%"
    :title="$t('productStock.reusername')"
    @close="closeDialoga"
  >
    <div style="margin-left: -50px; margin-top: 10px; margin-bottom: 10px">
      <el-form ref="formRef" label-width="150px">
        <el-form label-width="105px" label-position="right">
          <el-row style="margin-top: -15px; margin-bottom: -2px">
            <el-col :span="6">
              <div id="dt" style="font-size: 15px">
                <el-form-item
                  :label="$t('productStock.usernamea')"
                  :required="true"
                  style="width: 25vw"
                >
                  <el-input
                    v-model="userName"
                    :placeholder="$t('productStock.inusername')"
                    autocomplete="off"
                    style="width: 350px"
                  />
                </el-form-item>
              </div>
            </el-col>
          </el-row>
          <el-row style="margin-top: 10px">
            <el-col :span="6">
              <div id="dt" style="font-size: 15px">
                <el-form-item
                  :label="$t('productStock.rolea')"
                  :required="true"
                  style="width: 25vw"
                >
                  <el-select
                    v-model="selectedProjectNoa"
                    filterable
                    clearable
                    :placeholder="$t('productStock.inrole')"
                    style="width: 350px"
                  >
                    <el-option
                      v-for="item in titleSelectJsona.processTypea"
                      :key="item.id"
                      :label="item.name"
                      :value="item.id"
                    />
                  </el-select>
                </el-form-item>
              </div>
            </el-col>
          </el-row>
          <!-- 新增编辑密码 -->
          <el-row style="margin-top: 10px">
            <el-col :span="6">
              <div id="dt" style="font-size: 15px">
                <el-form-item
                  :label="$t('productStock.password')"
                  :required="false"
                  style="width: 25vw"
                >
                  <el-input
                    v-model="editPassword"
                    :placeholder="$t('productStock.inputNewPassword')"
                    autocomplete="off"
                    :prefix-icon="Lock"
                    show-password
                    style="width: 350px"
                  />
                </el-form-item>
              </div>
            </el-col>
          </el-row>
          <!-- 新增编辑确认密码 -->
          <el-row style="margin-top: 10px">
            <el-col :span="6">
              <div id="dt" style="font-size: 15px">
                <el-form-item
                  :label="$t('productStock.confirmpassword')"
                  :required="false"
                  style="width: 25vw"
                >
                  <el-input
                    v-model="editConfirmPassword"
                    :placeholder="$t('productStock.inconfirmpassword')"
                    autocomplete="off"
                    :prefix-icon="Lock"
                    show-password
                    style="width: 350px"
                  />
                </el-form-item>
              </div>
            </el-col>
          </el-row>
        </el-form>
            </el-form>
          </div>
      </el-form>
    </div>
    <template #footer>
      <div id="dialog-footer">
        <el-button type="primary" @click="getTableRowa">
          {{ $t('productStock.sure') }}
        </el-button>
        <el-button @click="closeDialoga">{{ $t('productStock.cancel') }}</el-button>
        <el-button @click="closeDialoga">
          {{ $t('productStock.cancel') }}
        </el-button>
      </div>
    </template>
  </el-dialog> 
  </el-dialog>
</template>
<style scoped>
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dialog-footer{
#dt {
  display: block;
  float: left;
  line-height: 20px;
  margin-left: 100px;
}
#dta {
  display: block;
  float: left;
  line-height: 20px;
  margin-left: 80%;
}
#dialog-footer {
  text-align: center;
  margin-top: -15px;
}
#message{
#message {
  text-align: center;
  align-items: center;
  color: black;
   width: 200px;
   height: 100px;
   background-color: #337ecc;
   margin-left: 28%;
  width: 200px;
  height: 100px;
  background-color: #337ecc;
  margin-left: 28%;
}
#awatch{
#awatch {
  height: 460px;
  /* margin-top: -60px; */
}
</style>

 UI-Project/src/views/User/userpageNo.vue

@@ -134,10 +134,14 @@
    ElMessage.error(t('productStock.inconfigValue'))
    return
  }
    if (!isEnable.value) {
    ElMessage.error(t('searchOrder.choicestartstatus'))
    return
    if (isEnable.value === '' || isEnable.value === undefined || isEnable.value === null) {
    ElMessage.error(t('searchOrder.choicestartstatus'));
    return;
  }
  //   if (!isEnable.value) {
  //   ElMessage.error(t('searchOrder.choicestartstatus'))
  //   return
  // }
  try {
    const response = await request.post('/loadGlass/sys/sysConfig/updateConfig',{
      id: id,

 UI-Project/src/views/hollow/hollowequipment.vue

@@ -992,7 +992,7 @@
</template>
<script setup>
import { ElMessage, ElMessageBox } from 'element-plus'
import { onBeforeUnmount, onMounted, onUnmounted, ref, reactive, watch, computed, getCurrentInstance  } from "vue";
import { onBeforeUnmount, onMounted, onUnmounted, ref, reactive, watch, computed, getCurrentInstance ,toRaw } from "vue";
import request from "@/utils/request"
import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService';
import { useI18n } from 'vue-i18n'
@@ -1468,6 +1468,9 @@
function nestedTableRowClassName(parentRow, row) {
  if (parentRow.isThroughSlot == true) {
    return 'row-red-background';
  }
  if (row.row?.sumCount !== undefined && row.row?.pairCount !== undefined && row.row.sumCount !== row.row.pairCount) {
    return 'sum-equal-pair-row' // 返回自定义类名
  }
  return '';
}
@@ -1951,6 +1954,7 @@
  value: null,
  size: null
})

</script>
<style scoped>
#dt {
@@ -2013,4 +2017,9 @@
.el-loading-mask {
  z-index: 2000 !important;
}
/* 核心3：添加行变色样式，通过:deep穿透scoped */
:deep(.sum-equal-pair-row) {
  background-color: #fdf2e8 !important; /* 浅橙底色，可自行修改 */
  color: #e64340 !important; /* 文字色，可选 */
}
</style>

 UI-Project/src/views/hollow/hollowequipmenthree.vue

@@ -799,6 +799,9 @@
  if (parentRow.isThroughSlot == true) {
    return 'row-red-background';
  }
  if (row.row?.sumCount !== undefined && row.row?.pairCount !== undefined && row.row.sumCount !== row.row.pairCount) {
    return 'sum-equal-pair-row' // 返回自定义类名
  }
  return '';
}
const fetchFlowCardsearch = async () => {
@@ -1259,4 +1262,9 @@
.el-loading-mask {
  z-index: 2000 !important;
}
/* 核心3：添加行变色样式，通过:deep穿透scoped */
:deep(.sum-equal-pair-row) {
  background-color: #fdf2e8 !important; /* 浅橙底色，可自行修改 */
  color: #e64340 !important; /* 文字色，可选 */
}
</style>

 UI-Project/src/views/hollow/hollowequipmenttwo.vue

@@ -785,6 +785,9 @@
  if (parentRow.isThroughSlot == true) {
    return 'row-red-background';
  }
  if (row.row?.sumCount !== undefined && row.row?.pairCount !== undefined && row.row.sumCount !== row.row.pairCount) {
    return 'sum-equal-pair-row' // 返回自定义类名
  }
  return '';
}
const fetchFlowCardsearch = async () => {
@@ -1284,4 +1287,9 @@
.el-loading-mask {
  z-index: 2000 !important;
}
/* 核心3：添加行变色样式，通过:deep穿透scoped */
:deep(.sum-equal-pair-row) {
  background-color: #fdf2e8 !important; /* 浅橙底色，可自行修改 */
  color: #e64340 !important; /* 文字色，可选 */
}
</style>

 UI-Project/src/views/hollow/hollowslicecage.vue

@@ -135,7 +135,6 @@
      sums[index] = '合计';
      return;
    }
    
    // 只对需要计算的列进行求和
    const needSumColumns = ['sumCount', 'pairCount', 'totalNumber', 'realCount'];
    if (needSumColumns.includes(column.property)) {
@@ -942,6 +941,7 @@
      <el-icon><WarnTriangleFilled /></el-icon>
      <span class="alert-text">
        {{ alertText }} (id:{{ alertMessage }})
        <span class="confirm-text">{{ $t('hellow.pleaseConfirm') }}</span>
      </span>
    </div>
    <button @click="showAlert = false" class="close-btn">×</button>
@@ -1517,4 +1517,11 @@
#app-container {
  padding-top: 60px; /* 根据alert高度调整 */
}
.confirm-text {
  color: rgb(242, 121, 8);
  display: block; /* 强制换行 */
  text-align: center; /* 水平居中 */
  margin-top: 4px; /* 与上一行保持间距 */
  font-weight: 500; /* 加粗突出 */
}
</style>