diff --git a/src/api/menu/index.ts b/src/api/menu/index.ts
index b231096..b153bdd 100644
--- a/src/api/menu/index.ts
+++ b/src/api/menu/index.ts
@@ -236,7 +236,7 @@ class MenuAPI {
               component: "manage/calculateParam/index",
               name: "calculateParam",
               meta: {
-                title: "算子参数管理",
+                title: "算子程序管理",
                 icon: "user",
                 hidden: false,
                 roles: ["ADMIN", "GUEST"],
@@ -249,7 +249,7 @@ class MenuAPI {
               component: "manage/calculateParam/edit",
               name: "calculateParamEdit",
               meta: {
-                title: "算子参数编辑",
+                title: "算子程序编辑",
                 hidden: true,
                 roles: ["ADMIN", "GUEST"],
                 keepAlive: true,
@@ -261,7 +261,7 @@ class MenuAPI {
               component: "manage/calculateParam/view",
               name: "calculateParamView",
               meta: {
-                title: "算子参数查看",
+                title: "算子程序查看",
                 hidden: true,
                 roles: ["ADMIN", "GUEST"],
                 keepAlive: true,
diff --git a/src/views/manage/calculate/edit.vue b/src/views/manage/calculate/edit.vue
index c9ae298..11f0c8c 100644
--- a/src/views/manage/calculate/edit.vue
+++ b/src/views/manage/calculate/edit.vue
@@ -23,16 +23,6 @@
             <el-form-item label="算子版本" prop="nickname">
               <el-input v-model="formData.nickname" placeholder="请输入算子版本" />
             </el-form-item>
-
-            <el-form-item label="算子说明" prop="mobile">
-              <el-input
-                v-model="formData.mobile"
-                :rows="2"
-                type="textarea"
-                placeholder="请输入算子说明"
-                maxlength="11"
-              />
-            </el-form-item>
             <el-form-item label="算子类型" prop="roleIds">
               <el-row style="width:100%">
                 <el-col :span="12">
@@ -41,42 +31,31 @@
                     placeholder="请选择算子类型"
                     style="width: 100%"
                   >
-                    <el-option label="图像分类" value="1" />
-                    <el-option label="目标检测" value="2" />
+                    <el-option label="前置处理" value="1" />
                   </el-select>
                 </el-col>
                 <el-col :span="12">
                   <el-select
-                    v-model="formData.roleIds"
+                    v-model="formData.roleIds2"
                     placeholder="请选择算子类型"
                     style="width: 100%"
                   >
+                  <el-option label="缩放算子" value="0" />
                     <el-option label="图像分类" value="1" />
                     <el-option label="目标检测" value="2" />
                   </el-select>
                 </el-col>
               </el-row>
             </el-form-item>
-            <el-form-item label="适配硬件" prop="mobile">
+            <el-form-item label="算子说明" prop="mobile">
               <el-input
                 v-model="formData.mobile"
-                :rows="3"
+                :rows="2"
                 type="textarea"
-                placeholder="请输入适配硬件"
+                placeholder="请输入算子说明"
                 maxlength="11"
               />
             </el-form-item>
-            <el-form-item label="算子参数" prop="mobile">
-              <el-select
-                    v-model="formData.roleIds"
-                    placeholder="请选择算子参数"
-                    style="width: 100%"
-                  >
-                    <el-option label="RGB24格式转换算子参数" value="1" />
-                    <el-option label="图像缩放算子参数" value="2" />
-                    <el-option label="人脸识别算子" value="2" />
-                  </el-select>
-            </el-form-item>
             <el-form-item label="算子文件" prop="email">
               <el-upload
                 v-model:file-list="fileList"
@@ -94,7 +73,8 @@
                   >选择文件</el-button
                 >
                 <template #tip>
-                  <div class="el-upload__tip">tar files with a size less than 10M.</div>
+                  <div class="el-upload__tip">请上传大小不超过 <strong style="color: red">10M</strong>，格式为
+                      <strong style="color: red">json</strong> 的文件</div>
                 </template>
               </el-upload>
             </el-form-item>
@@ -146,10 +126,10 @@ const formData = reactive<UserForm>({
 
 // 校验规则
 const rules = reactive({
-  username: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
-  nickname: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
-  deptId: [{ required: true, message: "所属部门不能为空", trigger: "blur" }],
-  roleIds: [{ required: true, message: "用户角色不能为空", trigger: "blur" }],
+  username: [{ required: true, message: "不能为空", trigger: "blur" }],
+  nickname: [{ required: true, message: "不能为空", trigger: "blur" }],
+  deptId: [{ required: true, message: "不能为空", trigger: "blur" }],
+  roleIds: [{ required: true, message: "不能为空", trigger: "blur" }],
   email: [
     {
       pattern: /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/,
diff --git a/src/views/manage/calculate/index.vue b/src/views/manage/calculate/index.vue
index bcd78fc..ba36702 100644
--- a/src/views/manage/calculate/index.vue
+++ b/src/views/manage/calculate/index.vue
@@ -46,11 +46,13 @@
         stripe
         @selection-change="handleSelectionChange"
       >
-        <el-table-column label="算子名称" align="left" prop="szmc" width="250" />
-        <el-table-column label="算子类型" align="left" prop="szlx" />
-        <el-table-column label="版本" width="180" align="left" prop="bb" />
-        <el-table-column label="适配硬件" width="280" align="left" prop="spyj" />
-        <el-table-column label="互联创建时间" width="180" align="left" prop="hlcjsj" />
+        <el-table-column label="算子名称" align="left" prop="szmc" width="300" />
+        <el-table-column label="算子主类型" align="left" prop="szlx" width="180"/>
+        <el-table-column label="算子子类型" align="left" prop="szzlx" width="180" />
+        <!-- <el-table-column label="版本" width="180" align="left" prop="bb" />
+        <el-table-column label="适配硬件" width="280" align="left" prop="spyj" /> -->
+        <el-table-column label="算子说明" align="left" prop="spyj" />
+        <el-table-column label="创建时间" width="180" align="left" prop="hlcjsj" />
         <el-table-column label="操作" fixed="right" width="220">
           <template #default="scope">
             <el-button
@@ -108,28 +110,32 @@ watch(dateTimeRange, (newVal) => {
 const tableData = [
   {
     szmc: "图像分类算子名称",
-    szlx: "图像分类",
+    szlx: "前处理",
+    szzlx: "图像分类",
     bb: "1.2",
     spyj: "进行19种类型的图像分类模型",
     hlcjsj: "2024-05-03",
   },
   {
     szmc: "目标检测算子名称",
-    szlx: "目标检测",
+    szlx: "前处理",
+    szzlx: "目标检测",
     bb: "1.5",
     spyj: "人员检测的模型",
     hlcjsj: "2024-06-07",
   },
   {
     szmc: "人脸识别算子名称",
-    szlx: "人脸识别",
+    szlx: "前处理",
+    szzlx: "人脸识别",
     bb: "1.0.0",
     spyj: "人脸识别",
     hlcjsj: "2024-06-08",
   },
   {
     szmc: "数据分析算子名称",
-    szlx: "数据分析",
+    szlx: "后处理",
+    szzlx: "数据分析",
     bb: "1.6.1",
     spyj: "进行数据分离ETL工具",
     hlcjsj: "2024-06-08",
diff --git a/src/views/manage/calculate/view.vue b/src/views/manage/calculate/view.vue
index 8891196..7268245 100644
--- a/src/views/manage/calculate/view.vue
+++ b/src/views/manage/calculate/view.vue
@@ -14,13 +14,18 @@
             size="small"
           >
             <el-form-item label="算子名称" prop="username"> 目标分类模型 </el-form-item>
-            <el-form-item label="算子版本" prop="nickname">
+            <!-- <el-form-item label="算子版本" prop="nickname">
               <el-tag type="primary" effect="plain">V1.22.1</el-tag>
-            </el-form-item>
-            <el-form-item label="算子类型" prop="nickname33">
+            </el-form-item> -->
+            <el-form-item label="算子主类型" prop="nickname33">
               前处理/缩放算子</el-form-item
             >
-            <el-form-item label="适配硬件" prop="nickname33"> ONNX </el-form-item>
+            <el-form-item label="算子子类型" prop="nickname33">
+              缩放算子</el-form-item
+            >
+            <el-form-item label="创建时间" prop="nickname33">
+              2024-06-24 22:28:12</el-form-item
+            >
             <el-form-item label="算子说明" prop="nickname33">
               <el-input
                 v-model="formData.usernamedd1"
diff --git a/src/views/manage/calculateParam/edit.vue b/src/views/manage/calculateParam/edit.vue
index 019da18..96870b3 100644
--- a/src/views/manage/calculateParam/edit.vue
+++ b/src/views/manage/calculateParam/edit.vue
@@ -3,7 +3,10 @@
   <div class="app-container model-detail">
     <!-- 用户新增/编辑表单 -->
     <el-card>
-      <template #header><svg-icon  icon-class="pause" style="width:20px;height:20px;" /> 算子参数基本信息 </template>
+      <template #header
+        ><svg-icon icon-class="pause" style="width: 20px; height: 20px" />
+        算子参数基本信息
+      </template>
       <el-row>
         <el-col :lg="12" :xs="24">
           <el-form
@@ -13,50 +16,53 @@
             v-loading="loading"
             label-width="80px"
           >
-            <el-form-item label="参数名称" prop="username">
-              <el-input
-                v-model="formData.username"
-                :readonly="!!formData.id"
-                placeholder="请输入算子参数名称"
-              />
-            </el-form-item>
-            <el-form-item label="参数类型" prop="roleIds">
-              <el-row style="width:100%">
+            <el-form-item label="算子类型" prop="roleIds">
+              <el-row style="width: 100%">
                 <el-col :span="12">
                   <el-select
                     v-model="formData.roleIds"
-                    multiple
-                    placeholder="请选择参数主类型"
+                    placeholder="请选择算子类型"
+                    style="width: 100%"
                   >
-                    <el-option
-                      v-for="item in calTypeList"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
+                    <el-option label="前置处理" value="1" />
                   </el-select>
                 </el-col>
                 <el-col :span="12">
                   <el-select
-                    v-model="formData.roleIds"
-                    multiple
-                    placeholder="请选择参数子类型"
+                    v-model="formData.roleIds2"
+                    placeholder="请选择算子类型"
+                    style="width: 100%"
                   >
-                    <el-option
-                      v-for="item in calTypeList"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
+                    <el-option label="缩放算子" value="0" />
+                    <el-option label="图像分类" value="1" />
+                    <el-option label="目标检测" value="2" />
                   </el-select>
                 </el-col>
               </el-row>
             </el-form-item>
-            <el-form-item label="参数说明" prop="mobile">
+            <el-form-item label="适配硬件" prop="mobile">
+              <el-select
+                v-model="formData.roleIds"
+                placeholder="请选择适配硬件"
+                style="width: 100%"
+              >
+                <el-option label="RGB24格式转换算子参数" value="1" />
+                <el-option label="图像缩放算子参数" value="2" />
+                <el-option label="人脸识别算子" value="2" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="算子名称" prop="roleIdsd">
+              <el-select
+                v-model="formData.roleIdsd"
+                placeholder="请选择算子名称"
+                style="width: 100%"
+              >
+                <el-option label="我是刚添加的算子" value="1" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="程序版本" prop="mobile">
               <el-input
                 v-model="formData.mobile"
-                :rows="2"
-                type="textarea"
                 placeholder="请输入参数说明"
                 maxlength="11"
               />
@@ -78,18 +84,40 @@
                   >选择文件</el-button
                 >
                 <template #tip>
-                  <div class="el-upload__tip">json files with a size less than 10M.</div>
+                  <div class="el-upload__tip">请上传大小不超过 <strong style="color: red">10M</strong>，格式为
+                      <strong style="color: red">tar</strong> 的文件</div>
                 </template>
               </el-upload>
             </el-form-item>
           </el-form>
         </el-col>
-        <el-col :lg="12" :xs="24"></el-col>
+        <el-col :lg="12" :xs="24">
+          <div style="padding-left: 35px" v-if="formData.roleIdsd!=null">
+            <el-form
+              ref="userFormRef"
+              :model="formData"
+              v-loading="loading"
+              label-width="100px"
+              size="small"
+            >
+              <el-divider content-position="left"
+                ><strong style="color: #409eff">算子参数信息</strong></el-divider
+              >
+                <el-input
+                v-model="formData.usernamedd2"
+                :disabled="true"
+                placeholder="请输入数据集名称"
+                :rows="12"
+                type="textarea"
+              />
+            </el-form>
+          </div>
+        </el-col>
       </el-row>
     </el-card>
     <el-card class="card-footer">
-        <el-button type="primary" @click="handleSubmit"><i-ep-check />确 定</el-button>
-        <el-button @click="closeBack"><i-ep-close />取 消</el-button>
+      <el-button type="primary" @click="handleSubmit"><i-ep-check />确 定</el-button>
+      <el-button @click="closeBack"><i-ep-close />取 消</el-button>
     </el-card>
   </div>
 </template>
@@ -111,14 +139,42 @@ const calTypeList = ref<OptionType[]>(); // 角色下拉数据源
 // 用户表单数据
 const formData = reactive<UserForm>({
   status: 1,
+  roleIdsd:null,
+  usernamedd2: `{
+    "name" : "图像缩放算子",
+    "uni_id" : "OPER_1234567890",
+    "version" : 100,
+    "main_type" : "pre_process",
+    "sub_type" : "clip",
+    "cmpt_hardware_type" : "atlas200i",
+    "parameters" : {}
+}
+{
+    "name" : "图像缩放算子",
+    "uni_id" : "OPER_1234567890",
+    "version" : 100,
+    "main_type" : "pre_process",
+    "sub_type" : "clip",
+    "cmpt_hardware_type" : "atlas200i",
+    "parameters" : {}
+}
+{
+    "name" : "图像缩放算子",
+    "uni_id" : "OPER_1234567890",
+    "version" : 100,
+    "main_type" : "pre_process",
+    "sub_type" : "clip",
+    "cmpt_hardware_type" : "atlas200i",
+    "parameters" : {}
+}`,
 });
 
 // 校验规则
 const rules = reactive({
-  username: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
-  nickname: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
-  deptId: [{ required: true, message: "所属部门不能为空", trigger: "blur" }],
-  roleIds: [{ required: true, message: "用户角色不能为空", trigger: "blur" }],
+  username: [{ required: true, message: "不能为空", trigger: "blur" }],
+  nickname: [{ required: true, message: "不能为空", trigger: "blur" }],
+  deptId: [{ required: true, message: "不能为空", trigger: "blur" }],
+  roleIds: [{ required: true, message: "不能为空", trigger: "blur" }],
   email: [
     {
       pattern: /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/,
@@ -154,30 +210,30 @@ onMounted(() => {
   //handleQuery();
 });
 </script>
-<style scoped lang='scss'>
-.model-detail{
-    :deep(.el-card__header){
-        padding:8px 4px;
-        display: flex;
-        align-items: center
-    }    
+<style scoped lang="scss">
+.model-detail {
+  :deep(.el-card__header) {
+    padding: 8px 4px;
+    display: flex;
+    align-items: center;
+  }
 }
-.sp-file{
-    color:#29d;    
+.sp-file {
+  color: #29d;
 }
-.tb-base-info{
-    line-height: 30px;
+.tb-base-info {
+  line-height: 30px;
 }
-:deep(.svg-icon){
-    margin-right:8px;
+:deep(.svg-icon) {
+  margin-right: 8px;
 }
-.card-footer{
+.card-footer {
   position: fixed;
   width: calc(100% - 215px);
   bottom: 0px;
-  :deep(.el-card__body){
-    padding:10px;
-    .el-pagination{
+  :deep(.el-card__body) {
+    padding: 10px;
+    .el-pagination {
       justify-content: end;
     }
   }
diff --git a/src/views/manage/calculateParam/index.vue b/src/views/manage/calculateParam/index.vue
index 5d36130..b2a175a 100644
--- a/src/views/manage/calculateParam/index.vue
+++ b/src/views/manage/calculateParam/index.vue
@@ -6,12 +6,12 @@
         <div class="flex justify-between">
           <div>
             <el-button type="primary" @click="openDialog('user-form')"
-              ><i-ep-plus />添加算子参数</el-button
+              ><i-ep-plus />添加算子程序</el-button
             >
           </div>
           <div>
             <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-              <el-form-item label="参数名称" prop="keywords">
+              <el-form-item label="算子名称" prop="keywords">
                 <el-input
                   v-model="queryParams.keywords"
                   placeholder="请输入算子参数名称"
@@ -39,9 +39,11 @@
         stripe
         @selection-change="handleSelectionChange"
       >
-        <el-table-column label="算子参数名称" align="left" prop="szmc" width="250" />
+        <el-table-column label="算子名称" align="left" prop="szmc" width="300" />
         <el-table-column label="算子主类型" align="left" prop="szlx" />
         <el-table-column label="算子子类型" align="left" prop="szzlx" />
+        <el-table-column label="程序版本" width="180" align="left" prop="bb1" />
+        <el-table-column label="程序适应硬件" width="180" align="left" prop="bb2" />
         <el-table-column label="参数描述" width="180" align="left" prop="bb" />
         <el-table-column label="互联时间" width="180" align="left" prop="hlcjsj" />
         <el-table-column label="操作" fixed="right" width="220">
@@ -102,6 +104,8 @@ const tableData = [
     szlx: "前处理",
     szzlx: "格式转换",
     bb: "",
+    bb1: "1.0.0",
+    bb2: "人脸识别",
     hlcjsj: "2024-05-03",
   },
   {
@@ -109,6 +113,8 @@ const tableData = [
     szlx: "前处理",
     szzlx: "图像缩放",
     bb: "专业的图像缩放",
+    bb1: "1.0.0",
+    bb2: "人脸识别",
     hlcjsj: "2024-06-07",
   },
   {
@@ -116,6 +122,8 @@ const tableData = [
     szlx: "后处理",
     szzlx: "人脸识别",
     bb: "好高大上的人脸识别算子模型",
+    bb1: "1.0.0",
+    bb2: "人脸识别",
     hlcjsj: "2024-06-08",
   },
 ];
diff --git a/src/views/manage/datas/edit.vue b/src/views/manage/datas/edit.vue
index 427ce15..ea4f740 100644
--- a/src/views/manage/datas/edit.vue
+++ b/src/views/manage/datas/edit.vue
@@ -62,8 +62,13 @@
                 placeholder="请选择数据集格式"
                 style="width: 100%"
               >
-                <el-option label="图像分类" value="1" />
-                <el-option label="目标检测" value="2" />
+              <el-option label="PNG" value="0" />
+                <el-option label="jPG" value="1" />
+                <el-option label="BMP" value="2" />
+                <el-option label="GRAY8" value="3" />
+                <el-option label="GRAY16" value="4" />
+                <el-option label="RGB24" value="5" />
+                <el-option label="H264" value="6" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -117,10 +122,61 @@
       </el-form>
     </el-card>
     <el-card class="card-footer">
-        <el-button type="primary"><i-ep-upload-filled />上传图片</el-button>
+        <el-button type="primary" @click="handleUpload"><i-ep-upload-filled />上传图片</el-button>
         <el-button type="primary" @click="handleSubmit"><i-ep-check />确 定</el-button>
         <el-button @click="closeBack"><i-ep-close />取 消</el-button>
     </el-card>
+    <el-dialog
+      v-model="dialog.visible"
+      :title="dialog.title"
+      :width="dialog.width"
+      append-to-body
+      @close="closeDialog"
+    >
+      <!-- 用户新增/编辑表单 -->
+      <el-form
+        v-if="dialog.type === 'user-form'"
+        ref="userFormRef"
+        :model="formData"
+        label-width="80px"
+      >
+      <el-upload
+          v-model:file-list="fileList"
+          class="upload-demo"
+          action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
+          multiple
+          :on-preview="handlePreview"
+          :on-remove="handleRemove"
+          :before-remove="beforeRemove"
+          :limit="3"
+          :on-exceed="handleExceed"
+        >
+          <el-button type="primary"
+            ><el-icon class="el-icon--upload"> <i-ep-upload-filled /> </el-icon
+            >选择文件</el-button
+          >
+        </el-upload>
+
+        <el-upload
+          action="https://jsonplaceholder.typicode.com/posts/"
+          list-type="picture-card"
+          :file-list="imgList2"
+          :limit="10"
+          :on-preview="handlePictureCardPreview"
+          :on-remove="handleRemove"
+        >
+          <i class="i-ep-plus"></i>
+        </el-upload>
+      </el-form>
+
+      <!-- 弹窗底部操作按钮 -->
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="dialog.visible=false">开始上传</el-button>
+          <el-button @click="dialog.visible=false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -143,12 +199,20 @@ const formData = reactive<UserForm>({
   status: 1,
 });
 
+// 弹窗对象
+const dialog = reactive({
+  visible: false,
+  type: "user-form",
+  width: 800,
+  title: "",
+});
+
 // 校验规则
 const rules = reactive({
-  username: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
-  nickname: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
-  deptId: [{ required: true, message: "所属部门不能为空", trigger: "blur" }],
-  roleIds: [{ required: true, message: "用户角色不能为空", trigger: "blur" }],
+  username: [{ required: true, message: "不能为空", trigger: "blur" }],
+  nickname: [{ required: true, message: "不能为空", trigger: "blur" }],
+  deptId: [{ required: true, message: "不能为空", trigger: "blur" }],
+  roleIds: [{ required: true, message: "不能为空", trigger: "blur" }],
   email: [
     {
       pattern: /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/,
@@ -228,6 +292,37 @@ const imgList = [
   },
 ];
 
+const imgList2 = [
+  {
+    name: "demo.jepg",
+    url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
+  },
+  {
+    name: "demo.jepg",
+    url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
+  },
+  {
+    name: "demo.jepg",
+    url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
+  },
+  {
+    name: "demo.jepg",
+    url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
+  },
+  {
+    name: "demo.jepg",
+    url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
+  },
+  {
+    name: "demo.jepg",
+    url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
+  },
+  {
+    name: "demo.jepg",
+    url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
+  }
+];
+
 /** 表单提交 */
 const handleSubmit = useThrottleFn(() => {
   loading.value = true;
@@ -238,6 +333,18 @@ const handleSubmit = useThrottleFn(() => {
   }, 1000);
 }, 3000);
 
+/**
+ * 打开弹窗
+ *
+ * @param type 弹窗类型  用户表单：user-form | 用户导入：user-import
+ * @param id 用户ID
+ */
+ async function handleUpload() {
+  dialog.visible = true;
+  dialog.title = "上传标注图片";
+  dialog.width = 880;
+}
+
 /** 返回默认页面 */
 function closeBack() {
   router.replace({ path: "/dataMgr/datas" });
@@ -275,7 +382,12 @@ onMounted(() => {
     }
   }
 }
-.el-upload--picture-card {
-  display: none;
+</style>
+<style scope>
+.el-upload--picture-card{
+  display: none !important;
+}
+.dialog-footer{
+  text-align: center;
 }
 </style>
diff --git a/src/views/manage/datas/index.vue b/src/views/manage/datas/index.vue
index f0212b5..023ec60 100644
--- a/src/views/manage/datas/index.vue
+++ b/src/views/manage/datas/index.vue
@@ -115,7 +115,7 @@ const tableData = [
     bb: "格式转换",
     hlcjsj: "RGB24",
     sl: "86",
-    sfbz: "未备注",
+    sfbz: "未标注",
   },
   {
     szmc: "图像缩放数据集",
@@ -124,7 +124,7 @@ const tableData = [
     bb: "专业的图像缩放",
     hlcjsj: "RGB24",
     sl: "121",
-    sfbz: "未备注",
+    sfbz: "未标注",
   },
   {
     szmc: "人脸识别数据集",
@@ -133,7 +133,7 @@ const tableData = [
     bb: "人脸识别",
     hlcjsj: "GRAY16",
     sl: "288",
-    sfbz: "已备注",
+    sfbz: "已标注",
   },
 ];
 
diff --git a/src/views/manage/equipment/edit.vue b/src/views/manage/equipment/edit.vue
index 8b9ccc1..e22d830 100644
--- a/src/views/manage/equipment/edit.vue
+++ b/src/views/manage/equipment/edit.vue
@@ -131,10 +131,10 @@ const formData = reactive<UserForm>({
 
 // 校验规则
 const rules = reactive({
-  username: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
-  nickname: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
-  deptId: [{ required: true, message: "所属部门不能为空", trigger: "blur" }],
-  roleIds: [{ required: true, message: "用户角色不能为空", trigger: "blur" }],
+  username: [{ required: true, message: "不能为空", trigger: "blur" }],
+  nickname: [{ required: true, message: "不能为空", trigger: "blur" }],
+  deptId: [{ required: true, message: "不能为空", trigger: "blur" }],
+  roleIds: [{ required: true, message: "不能为空", trigger: "blur" }],
   email: [
     {
       pattern: /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/,
diff --git a/src/views/manage/equipment/editNet.vue b/src/views/manage/equipment/editNet.vue
index 440cf1a..0dfcb63 100644
--- a/src/views/manage/equipment/editNet.vue
+++ b/src/views/manage/equipment/editNet.vue
@@ -13,7 +13,11 @@
             label-width="100px"
           >
             <el-table :data="list" style="width: 100%" stripe>
-              <el-table-column type="selection" width="55"> </el-table-column>
+              <el-table-column label="选择" width="60" align="center">
+                <template #default="scope">
+                  <el-radio v-model="radioSelected" :label="scope.row.csmc" @change.native="getCurrentRow(scope.row.csmc)">{{ '' }}</el-radio>
+                </template>
+              </el-table-column>
               <el-table-column prop="csmc" label="IP地址" align="left" />
               <el-table-column prop="csms" label="芯片信息" align="left" />
               <el-table-column prop="csmc1" label="设备型号" align="left" />
@@ -86,7 +90,7 @@
         <el-col :lg="12" :xs="24"> </el-col>
       </el-row>
     </el-card>
-    <el-card class="card-footer">
+<el-card class="card-footer">
         <el-button type="primary" @click="handleSubmit"><i-ep-check />确 定</el-button>
         <el-button @click="closeBack"><i-ep-close />取 消</el-button>
     </el-card>
@@ -112,12 +116,14 @@ const formData = reactive<UserForm>({
   status: 1,
 });
 
+const radioSelected = ref('');
+
 // 校验规则
 const rules = reactive({
-  username: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
-  nickname: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
-  deptId: [{ required: true, message: "所属部门不能为空", trigger: "blur" }],
-  roleIds: [{ required: true, message: "用户角色不能为空", trigger: "blur" }],
+  username: [{ required: true, message: "不能为空", trigger: "blur" }],
+  nickname: [{ required: true, message: "不能为空", trigger: "blur" }],
+  deptId: [{ required: true, message: "不能为空", trigger: "blur" }],
+  roleIds: [{ required: true, message: "不能为空", trigger: "blur" }],
   email: [
     {
       pattern: /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/,
@@ -179,6 +185,11 @@ function closeBack() {
   router.replace({ path: "/tester/equipment" });
 }
 
+// 单选框选中数据
+function getCurrentRow(row) {
+  radioSelected = row;//点击当前行时,radio同样有选中效果
+}
+
 onMounted(() => {
   //handleQuery();
 });
diff --git a/src/views/manage/equipment/editPcie.vue b/src/views/manage/equipment/editPcie.vue
index f08ecd4..3a1ac14 100644
--- a/src/views/manage/equipment/editPcie.vue
+++ b/src/views/manage/equipment/editPcie.vue
@@ -13,7 +13,11 @@
             label-width="100px"
           >
             <el-table :data="list" style="width: 100%" stripe>
-              <el-table-column type="selection" width="55"> </el-table-column>
+              <el-table-column label="选择" width="60" align="center">
+                <template #default="scope">
+                  <el-radio v-model="radioSelected" :label="scope.row.csmc" @change.native="getCurrentRow(scope.row.csmc)">{{ '' }}</el-radio>
+                </template>
+              </el-table-column>
               <el-table-column prop="csmc" label="PCLE设备序号" align="left" />
               <el-table-column prop="csms" label="芯片信息" align="left" />
               <el-table-column prop="csmc1" label="设备型号" align="left" />
@@ -88,12 +92,14 @@ const formData = reactive<UserForm>({
   status: 1,
 });
 
+const radioSelected = ref('');
+
 // 校验规则
 const rules = reactive({
-  username: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
-  nickname: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
-  deptId: [{ required: true, message: "所属部门不能为空", trigger: "blur" }],
-  roleIds: [{ required: true, message: "用户角色不能为空", trigger: "blur" }],
+  username: [{ required: true, message: "不能为空", trigger: "blur" }],
+  nickname: [{ required: true, message: "不能为空", trigger: "blur" }],
+  deptId: [{ required: true, message: "不能为空", trigger: "blur" }],
+  roleIds: [{ required: true, message: "不能为空", trigger: "blur" }],
   email: [
     {
       pattern: /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/,
diff --git a/src/views/manage/otherTool/edit.vue b/src/views/manage/otherTool/edit.vue
index 5e07d52..af16eea 100644
--- a/src/views/manage/otherTool/edit.vue
+++ b/src/views/manage/otherTool/edit.vue
@@ -13,7 +13,11 @@
         <el-col :lg="24" :xs="24">
           <el-form ref="userFormRef" :model="formData" :rules="rules" label-width="100px">
             <el-table :data="list" style="width: 100%" stripe>
-              <el-table-column type="selection" width="55"> </el-table-column>
+              <el-table-column label="选择" width="60" align="center">
+                <template #default="scope">
+                  <el-radio v-model="radioSelected" :label="scope.row.csmc" @change.native="getCurrentRow(scope.row.csmc)">{{ '' }}</el-radio>
+                </template>
+              </el-table-column>
               <el-table-column prop="csmc" label="IP地址" align="left" />
               <el-table-column prop="csmc" label="类型" align="left" />
               <el-table-column prop="csmc1" label="ID编号" align="left" />
@@ -71,12 +75,14 @@ const formData = reactive<UserForm>({
   status: 1,
 });
 
+const radioSelected = ref('');
+
 // 校验规则
 const rules = reactive({
-  username: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
-  nickname: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
-  deptId: [{ required: true, message: "所属部门不能为空", trigger: "blur" }],
-  roleIds: [{ required: true, message: "用户角色不能为空", trigger: "blur" }],
+  username: [{ required: true, message: "不能为空", trigger: "blur" }],
+  nickname: [{ required: true, message: "不能为空", trigger: "blur" }],
+  deptId: [{ required: true, message: "不能为空", trigger: "blur" }],
+  roleIds: [{ required: true, message: "不能为空", trigger: "blur" }],
   email: [
     {
       pattern: /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/,