diff --git a/frontend/src/api/plan/interface/index.ts b/frontend/src/api/plan/interface/index.ts
index a8bf0f1..d2df439 100644
--- a/frontend/src/api/plan/interface/index.ts
+++ b/frontend/src/api/plan/interface/index.ts
@@ -27,6 +27,7 @@ export namespace Plan {
     // 检测计划 + 检测源
     export interface PlanAndSourceBO extends PlanBO {
         testSourceName: string;//计划所属检测源
+        testSourceList?: string[];//临时测试
     }
     // // 检测计划列表
     // export interface PlanList {
diff --git a/frontend/src/api/plan/planData.ts b/frontend/src/api/plan/planData.ts
index 630be73..7d11bd8 100644
--- a/frontend/src/api/plan/planData.ts
+++ b/frontend/src/api/plan/planData.ts
@@ -178,6 +178,7 @@ const planData = ref<Plan.PlanAndSourceBO[]>([
     'test_State':'1',
     'report_State':'1',
     'result':'1',
+
   },
   {
     'id': '2',
@@ -191,6 +192,9 @@ const planData = ref<Plan.PlanAndSourceBO[]>([
     'test_State':'2',
     'report_State':'2',
     'result':'0',
+    "testSourceList":[
+      '高精度设备-PQV520-1','高精度设备-PQV520-2',
+    ]
   },
   {
     'id': '3',
diff --git a/frontend/src/views/home/components/changeErrSysPopup.vue b/frontend/src/views/home/components/changeErrSysPopup.vue
new file mode 100644
index 0000000..0f1a3fd
--- /dev/null
+++ b/frontend/src/views/home/components/changeErrSysPopup.vue
@@ -0,0 +1,136 @@
+<template>
+    <!-- 基础信息弹出框 -->
+  <el-dialog :model-value="dialogVisible" title="误差体系编辑" v-bind="dialogSmall" @close="handleCancel" width="500" draggable>
+    <div>
+        <el-form :model="data" 
+                  ref='formRuleRef'
+                  :rules='rules'
+                  >
+        <el-form-item label="设备名称" prop='name' :label-width="100">
+          <el-input v-model="data.name" placeholder="请输入名称" autocomplete="off" />
+        </el-form-item>
+
+        <el-form-item label="选择误差体系" prop='type' :label-width="100">
+          <el-select v-model="data.type" placeholder="请选择误差体系" autocomplete="off">
+          <el-option
+            v-for="item in dictStore.getDictData('roleType')"
+            :key="item.id"
+            :label="item.label"
+            :value="item.code"
+          />
+          </el-select>
+          <el-button type="primary" @click="handleOK">
+          生成报告
+        </el-button>
+        </el-form-item>
+
+        <!-- <el-form-item label="描述" prop='remark' :label-width="100">
+          <el-input v-model="data.remark" :rows="2" type="textarea" placeholder="请输入备注" autocomplete="off" />
+        </el-form-item> -->
+      </el-form>
+      </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="handleCancel">取消</el-button>
+        <el-button type="primary" @click="handleOK">
+          保存
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+
+  </template>
+  
+  <script lang="ts" setup>
+  import { FormInstance,FormItemRule } from 'element-plus'
+  import { ProTableInstance } from '@/components/ProTable/interface'
+  import { ref,computed  } from 'vue'
+  import { Role } from '@/api/role/interface'
+  import {dialogSmall} from '@/utils/elementBind'
+  import { useDictStore } from '@/stores/modules/dict'
+  import {
+    addRole,
+    editRole,
+  } from '@/api/role/role'
+
+  const dictStore = useDictStore()
+
+  const {dialogVisible,title,data,openType,getTableList}  = defineProps<{
+    dialogVisible:boolean;
+    title:string;
+    openType:string;
+    getTableList:Function;
+    data:{
+      id?: string;     //角色类型ID
+      name: string;   //角色类型名称
+      code: string;   //角色代码
+      type: number;
+      remark:string;   //角色描述
+    }
+  }>();
+
+
+  //定义规则
+  const formRuleRef = ref<FormInstance>()
+  //定义校验规则
+  const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
+    name: [{ required: true, message: '名称必填！', trigger: 'blur' }],
+    code: [{ required: true, message: '编码必填！', trigger: 'blur' }],
+  })
+
+  const emit = defineEmits<{
+  (e:'update:visible',value:boolean):void;
+  }>();
+
+  const handleCancel = () => {
+    emit('update:visible',false)
+  }
+  
+  const handleOK = () => {
+
+    ElMessage.info('角色数据提交')
+    try {
+      formRuleRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        // 将表单数据转为json,发送到后端
+        // let confirmFormData = JSON.parse(JSON.stringify(form.value))
+        // console.log(confirmFormData)
+        if(openType === "add")
+        {
+          addRole(data).then(res => {
+            // if(res.code === "200")
+            // {
+              ElMessage.success(res.message)
+              getTableList()
+            // }
+            // else
+            //   ElMessage.error(res.message)
+          })
+        }
+          
+        if(openType === "edit")
+        {
+          editRole(data).then(res => {
+            // if(res.code === "200")
+            // {
+              ElMessage.success(res.message)
+              getTableList()
+            // }
+            // else
+            //   ElMessage.error(res.message)
+          })
+        }
+        
+        emit('update:visible',false)
+      } else {
+        ElMessage.error('表单验证失败！')
+        
+      }
+
+    })
+  } catch (error) {
+    console.error('验证过程中发生错误', error)
+  }
+}
+  
+  </script>
\ No newline at end of file
diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue
index ed35fa6..aec1327 100644
--- a/frontend/src/views/home/components/table.vue
+++ b/frontend/src/views/home/components/table.vue
@@ -81,29 +81,31 @@
         </el-form>
       </template>
       <!-- 表格操作 -->
-      <!-- <template #operation="scope">
+      <template #operation="scope">
         <el-button
-          dictType="primary"
+        type="primary"
           link
           :icon="View"
-          @click="openDrawer('查看', scope.row)"
-          >查看</el-button
+          @click="openDrawer('报告查看', scope.row)"
+          v-if="form.activeTabs === 3"
+          >报告查看</el-button
         >
         <el-button
-          dictType="primary"
+        type="primary"
           link
           :icon="EditPen"
-          @click="openDrawer('编辑', scope.row)"
-          >导出</el-button
+          @click="openDrawer('误差体系编辑', scope.row)"
+          v-if="form.activeTabs === 5"
+          >误差体系编辑</el-button
         >
-        <el-button
+        <!-- <el-button
           dictType="primary"
           link
           :icon="Delete"
           @click="deleteAccount(scope.row)"
           >删除</el-button
-        >
-      </template> -->
+        > -->
+      </template>
     </ProTable>
   </div>
 </template>
@@ -116,7 +118,7 @@ import { ElMessage, ElMessageBox } from "element-plus";
 import ProTable from "@/components/ProTable/index.vue";
 import { type ProTableInstance, type ColumnProps } from '@/components/ProTable/interface'
 import {
-  Search,
+  Search,View,EditPen
 } from "@element-plus/icons-vue";
 import { getPlanList } from "@/api/plan/planList";
 import deviceDataList from '@/api/device/deviceData'
@@ -129,7 +131,7 @@ const tableHeight = ref(0);
 console.log(window.innerHeight, "+++++++++");
 tableHeight.value = window.innerHeight - 630;
 const deviceData = deviceDataList.plan_devicedata
-
+const operationShow = ref(false);
 //下拉框数据
 //检测状态数据
 let checkStatusList = reactive([
@@ -327,7 +329,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
       label: '归档状态',
       minWidth: 130,
     },
-    // { prop: 'operation', label: '操作', fixed: 'right', minWidth: 200 },
+    { prop: 'operation', label: '操作', fixed: 'right', minWidth: 150 ,isShow: operationShow},
   ])
 
 // 表格配置项
@@ -567,36 +569,41 @@ function tableHeaderInit(val: number) {
       form.value.checkResult = 0;//检测结果默认为未出结果
       disableCheckStatus("检测中")
       disableCheckStatus("归档")
+      operationShow.value = false;
       break;
     case 2://设备复检
       form.value.checkStatus = 2;//检测状态默认为检测完成
       form.value.checkReportStatus = 0;//检测报告状态默认为未生成报告
       form.value.checkResult = 1;//检测结果默认为不合格
-      disableCheckStatus("未检")
+      disableCheckStatus("未检测")
       disableCheckStatus("检测中")
       disableCheckStatus("归档")
       disablecheckResultList("未出结果")
+      operationShow.value = false;
     break;
     case 3://报告生成
       form.value.checkStatus = 2;//检测状态默认为检测完成
       form.value.checkReportStatus = 0;//检测报告状态默认为未生成报告
       form.value.checkResult = 2;//检测结果默认为合格
-      disableCheckStatus("未检")
+      disableCheckStatus("未检测")
       disableCheckStatus("检测中")
       disableCheckStatus("归档")
       disablecheckResultList("未出结果")
+      operationShow.value = true;
     break;
     case 4://设备归档
       form.value.checkStatus = 2;//检测状态默认为检测完成
       form.value.checkReportStatus = 1;//检测报告状态默认为已生成报告
       form.value.checkResult = 2;//检测结果默认为合格
-      disableCheckStatus("未检")
+      disableCheckStatus("未检测")
       disableCheckStatus("检测中")
       disableCheckStatus("归档")
       disableCheckReportStatus("未生成报告")
       disablecheckResultList("未出结果")
+      operationShow.value = false;
     break;
-    case 5://报告浏览
+    case 5://设备浏览
+    operationShow.value = true;
     break;
   }
 }
@@ -656,6 +663,16 @@ const handleTest = () => {
   }
 };
 
+// 打开 drawer(新增、查看、编辑)
+const openDrawer = (title: string, row: any) => {
+  if (title === '报告查看')
+      console.log(title);
+      
+    else if (title === '误差体系编辑')
+    console.log(title);
+
+}
+
 onMounted(() => {
   console.log(proTable.value?.tableData);
 });
diff --git a/frontend/src/views/home/components/tree.vue b/frontend/src/views/home/components/tree.vue
index 72c3a77..14d2f2f 100644
--- a/frontend/src/views/home/components/tree.vue
+++ b/frontend/src/views/home/components/tree.vue
@@ -53,6 +53,9 @@ const getTreeData = (val: any) => {
 }
 const filterText = ref('')
 const treeRef = ref()
+const {updateSelectedTreeNode}  = defineProps<{
+    updateSelectedTreeNode:Function;
+  }>();
 watch(
   () => searchForm.value.planName,
   (val) => {
@@ -64,6 +67,7 @@ watch(
 )
 const handleNodeClick = (data) => {
   console.log(data)
+  updateSelectedTreeNode()
 }
 const filterNode = (value: string, data) => {
   if (!value) return true
@@ -110,12 +114,12 @@ defineExpose({ getTreeData })
   .tree_container {
     flex: 1;
     overflow-y: auto;
-    // width: 100%;
-    // overflow-x: auto;
+    width: 100%;
+    overflow-x: auto;
 
     .el-tree {
       height: 100%;
-      // width: 2000px;
+      width: 100%;
     }
   }
 }
diff --git a/frontend/src/views/home/tabs/dashboard.vue b/frontend/src/views/home/tabs/dashboard.vue
index 4e7111e..bea076f 100644
--- a/frontend/src/views/home/tabs/dashboard.vue
+++ b/frontend/src/views/home/tabs/dashboard.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="static">
     <div class="left_tree">
-      <tree ref="treeRef" />
+      <tree ref="treeRef" :updateSelectedTreeNode="getPieData || (() => {})"/>
     </div>
     <!-- <span class="new_span">测试scss颜色</span> -->
     <div class="right_container">
@@ -25,61 +25,82 @@
           </div>
         </div>
       </div>
-      <!-- 饼图 -->
-      <div class="container_charts">
-        <div class="charts_info">
-          <pie
-            :customData="{
-              title: '检测状态',
-              textAlign: 'right',
-            }"
-            :legendData="{
-              icon: 'circle',
-              left: 'left',
-            }"
-            :chartsData="chartsData1"
-            ref="pieRef1"
-          ></pie>
-        </div>
-        <div class="charts_info">
-          <pie
-            :customData="{
-              title: '检测结果',
-              textAlign: 'right',
-            }"
-            :legendData="{
-              icon: 'circle',
-              left: 'left',
-            }"
-            :chartsData="chartsData2"
-            ref="pieRef2"
-          ></pie>
-        </div>
-        <div class="charts_info">
-          <pie
-            :customData="{
-              title: '报告状态',
-              textAlign: 'right',
-              label: {
-                normal: {
-                  position: 'inner',
+
+        <el-collapse v-model="activeNames" @change="handleChange">
+          <el-collapse-item title="检测进度展示" name="1">
+
+        <!-- 饼图 -->
+        <div class="container_charts">
+          <div class="charts_info">
+            <pie
+              :customData="{
+                title: '检测状态',
+                textAlign: 'right',
+              }"
+              :legendData="{
+                icon: 'circle',
+                left: 'left',
+              }"
+              :chartsData="chartsData1"
+              ref="pieRef1"
+            ></pie>
+          </div>
+          <div class="charts_info">
+            <pie
+              :customData="{
+                title: '检测结果',
+                textAlign: 'right',
+              }"
+              :legendData="{
+                icon: 'circle',
+                left: 'left',
+              }"
+              :chartsData="chartsData2"
+              ref="pieRef2"
+            ></pie>
+          </div>
+          <div class="charts_info">
+            <pie
+              :customData="{
+                title: '报告状态',
+                textAlign: 'right',
+                label: {
+                  normal: {
+                    position: 'inner',
+                  },
                 },
-              },
-            }"
-            :legendData="{
-              icon: 'circle',
-              left: 'left',
-            }"
-            :chartsData="chartsData3"
-            ref="pieRef3"
-          ></pie>
+              }"
+              :legendData="{
+                icon: 'circle',
+                left: 'left',
+              }"
+              :chartsData="chartsData3"
+              ref="pieRef3"
+            ></pie>
+          </div>
         </div>
-      </div>
+
+          </el-collapse-item>
+        </el-collapse>
+
+  <el-tabs type="border-card" @tab-change="handleTabsChange" v-model="editableTabsValue">
+    <el-tab-pane :label="tabLabel1"> 
       <!-- 列表数据 -->
       <div class="container_table">
-        <Table ref="tableRef"></Table>
+        <Table ref="tableRef1"></Table>
+      </div>
+    </el-tab-pane>
+   
+    <el-tab-pane label="已检设备"  v-if="tabShow">
+      <!-- 列表数据 -->
+      <div class="container_table">
+        <Table ref="tableRef2"></Table>
+      </div>
+    </el-tab-pane>
+  </el-tabs>
+
+
       </div>
-    </div>
   </div>
 </template>
 <script lang="ts" setup>
@@ -100,6 +121,19 @@ const form: any = ref({
   manufacturer: 0, //制造厂商
 });
 const router = useRouter();
+const activeNames = ref(['2'])
+const tabShow= ref(false);
+const tabLabel1 = ref('自动检测')
+const editableTabsValue = ref('0')
+const handleChange = (val: string[]) => {
+  console.log(val)
+}
+
+const handleTabsChange = (val) => {
+  form.value.activeTabs = 0;
+  form.value.activeTabs = 3;
+  console.log(val)
+}
 localStorage.setItem("color", "red");
 //功能选择数据
 const tabsList = ref([
@@ -142,12 +176,25 @@ const tabsList = ref([
 ]);
 
 form.value.activeTabs = tabsList.value[0].value;
-const tableRef = ref();
+const tableRef1 = ref();
+const tableRef2 = ref();
 watch(
   () => form.value,
   (val, oldVal) => {
     if (val) {
-      tableRef.value && tableRef.value.changeActiveTabs(form.value.activeTabs);
+      tableRef1.value && tableRef1.value.changeActiveTabs(form.value.activeTabs);
+    }
+  },
+  {
+    immediate: true,
+    deep: true,
+  }
+);
+watch(
+  () => form.value,
+  (val, oldVal) => {
+    if (val) {
+      tableRef2.value && tableRef2.value.changeActiveTabs(form.value.activeTabs);
     }
   },
   {
@@ -155,7 +202,6 @@ watch(
     deep: true,
   }
 );
-
 const pieRef1 = ref(),
   pieRef2 = ref(),
   pieRef3 = ref();
@@ -167,6 +213,8 @@ const chartsData1: any = ref([]),
   chartsData2: any = ref([]),
   chartsData3: any = ref([]);
 const getPieData = () => {
+
+  
   chartsData1.value = [
     { value: Math.floor(Math.random() * 100) + 1, name: "未检测" },
     { value: Math.floor(Math.random() * 100) + 1, name: "检测中" },
@@ -208,8 +256,8 @@ const planDetail = () => {
 };
 //功能选择css切换
 const handleCheckFunction = (val: any) => {
-  console.log("test1",val);
-  
+  console.log("test",val);
+  editableTabsValue.value = '0';
   tabsList.value.map((item: any, index: any) => {
     if (val == index) {
       item.checked = true;
@@ -217,6 +265,28 @@ const handleCheckFunction = (val: any) => {
       item.checked = false;
     }
   });
+
+  tabShow.value = false;
+
+  switch (val) {
+    case 0://自动检测
+    tabLabel1.value = "自动检测";
+    break;
+    case 1://手动检测
+    tabLabel1.value = "手动检测";
+    break;
+    case 2://设备复检
+    tabLabel1.value = "设备复检";
+    break;
+    case 3://报告生成
+    tabLabel1.value = "未检设备";
+    tabShow.value = true;
+    break;
+    case 4://设备归档
+    tabLabel1.value = "设备归档";
+    break;
+  }
+    
   form.value.activeTabs = val;
 };
 
@@ -331,9 +401,29 @@ onMounted(() => {
       }
     }
 
+    .el-collapse {
+      width: 100% !important;
+      // min-height: 200px !important;
+      height:auto;
+      background-color: #eee;
+      // display: flex;
+      // justify-content: space-between;
+      // padding-left: 2ch;
+      margin-bottom: 10px;
+      }
+
+      .el-collapse-item{
+        width: 100% !important;
+      // min-height: 200px !important;
+      height:100% !important;
+      background-color: #eee;
+      // display: flex !important;
+      }
+
     .container_charts {
       width: 100%;
-      min-height: 200px !important;
+      // min-height: 200px !important;
+      height:100%;
       background-color: #eee;
       display: flex;
       justify-content: space-between;
@@ -348,10 +438,15 @@ onMounted(() => {
       }
     }
 
+    .el-tabs{
+      width: 100% !important;
+      border-radius: 4px;
+    }
+
     .container_table {
       // width: 100%;
       flex: 1 !important;
-      height: calc(100vh - 360px);
+      height: calc(100vh - 360px - 100px);
       border-radius: 4px;
       width: 100% !important;
       // display: none;
diff --git a/frontend/src/views/plan/autoTest/components/ShowDataPopup.vue b/frontend/src/views/plan/autoTest/components/ShowDataPopup.vue
new file mode 100644
index 0000000..dfd3dbf
--- /dev/null
+++ b/frontend/src/views/plan/autoTest/components/ShowDataPopup.vue
@@ -0,0 +1,276 @@
+<template>
+        <el-dialog class='table-box'
+        title="数据查询"
+               v-model='dialogVisible'
+               v-bind="dialogSmall" 
+               width="1200"
+               height="600"
+               draggable
+>
+    <div class='table-box'>
+    <el-tabs type="border-card">
+    <el-tab-pane label="检测结果"> 
+      <!-- 列表数据 -->
+      <div class="container_table1">
+        <ProTable
+        ref='proTable1'
+        :columns='columns1'
+        :data="testResultDatas"
+      >
+         
+      </ProTable>
+      </div>
+    </el-tab-pane>
+
+    <el-tab-pane label="原始数据">
+      <!-- 列表数据 -->
+      <div class="container_table2">
+      <ProTable
+        ref='proTable2'
+        :columns='columns2'
+        :data="testDatas"
+      >
+      </ProTable>
+      </div>
+    </el-tab-pane>
+    </el-tabs>
+    </div>
+</el-dialog>
+  </template>
+  
+  <script setup lang='tsx' name='useRole'>
+  import { Role } from '@/api/role/interface'
+  import { useHandleData } from '@/hooks/useHandleData'
+  import { useDownload } from '@/hooks/useDownload'
+  import { useAuthButtons } from '@/hooks/useAuthButtons'
+  import ProTable from '@/components/ProTable/index.vue'
+  import rolePopup from './components/rolePopup.vue'
+  import permissionUnit from './components/permissionUnit.vue'
+  import ImportExcel from '@/components/ImportExcel/index.vue'
+  import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
+  import {dialogSmall} from '@/utils/elementBind'
+  import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
+  import { useDictStore } from '@/stores/modules/dict'
+  import {
+    getRoleList,
+    deleteRole,
+  } from '@/api/role/role'
+  import { deleteUser } from '@/api/user/user'
+  const dialogVisible = ref(false)
+  
+  const open = () => {
+    dialogVisible.value = true
+  }
+  defineExpose({ open })
+
+  
+  // ProTable 实例
+  const proTable1 = ref<ProTableInstance>()
+  const proTable2 = ref<ProTableInstance>()
+  
+  
+  // dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total 这些字段，可以在这里进行处理成这些字段
+  // 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
+  const dataCallback = (data: any) => {
+    return {
+      records: data.list,
+      total: data.total,
+      current: data.pageNum,
+      size: data.pageSize,
+    }
+  }
+  
+  // 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
+  // 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
+  const getTableList = (params: any) => {
+    let newParams = JSON.parse(JSON.stringify(params))
+    newParams.createTime && (newParams.startTime = newParams.createTime[0])
+    newParams.createTime && (newParams.endTime = newParams.createTime[1])
+    delete newParams.createTime
+    return getRoleList(newParams)
+  }
+  
+  // 页面按钮权限（按钮权限既可以使用 hooks，也可以直接使用 v-auth 指令，指令适合直接绑定在按钮上，hooks 适合根据按钮权限显示不同的内容）
+  const { BUTTONS } = useAuthButtons()
+  
+interface TestResultData {
+    standardData: number,//标准值
+    testedData: number,//被检值
+    errorData: number,//误差值
+    errorValue: number,//误差允许值
+    testResult: string,//检测结果（合格、不合格、无法比较）   
+}
+interface TestData {
+    dataTime: string,//数据时间（合格、不合格、无法比较）   
+    standardData: number,//标准值
+    testedData: number,//被检值
+}
+//检测结果数组
+const testResultDatas = [
+{
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+    errorData: 0.01,//误差值
+    errorValue: 0.05774,//误差允许值
+    testResult: "合格",//检测结果（合格、不合格、无法比较）
+}
+];
+
+//原始数据数组
+const testDatas = [
+{
+    dataTime: "2024-11-11 14:05:00",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+{
+    dataTime: "2024-11-11 14:05:03",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+{
+    dataTime: "2024-11-11 14:05:06",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+{
+    dataTime: "2024-11-11 14:05:09",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+{
+    dataTime: "2024-11-11 14:05:12",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+{
+    dataTime: "2024-11-11 14:05:15",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+{
+    dataTime: "2024-11-11 14:05:18",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+{
+    dataTime: "2024-11-11 14:05:21",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+{
+    dataTime: "2024-11-11 14:05:24",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+{
+    dataTime: "2024-11-11 14:05:27",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+{
+    dataTime: "2024-11-11 14:05:30",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+{
+    dataTime: "2024-11-11 14:05:33",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+{
+    dataTime: "2024-11-11 14:05:36",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+{
+    dataTime: "2024-11-11 14:05:39",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+{
+    dataTime: "2024-11-11 14:05:42",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+{
+    dataTime: "2024-11-11 14:05:45",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+{
+    dataTime: "2024-11-11 14:05:48",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+{
+    dataTime: "2024-11-11 14:05:51",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+{
+    dataTime: "2024-11-11 14:05:54",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+{
+    dataTime: "2024-11-11 14:05:57",//检测数据时间
+    standardData: 57.74,//标准值
+    testedData: 57.73,//被检值
+},
+];
+
+  // 表格配置项
+  const columns1 = reactive<ColumnProps<TestResultData>[]>([
+    { type: 'selection', fixed: 'left', width: 70 },
+    { type: 'index', fixed: 'left', width: 70, label: '序号' },
+    {
+      prop: 'standardData',
+      label: '标准值',
+      minWidth: 150,
+    },
+    {
+      prop: 'testedData',
+      label: '被检值',
+      minWidth: 150,
+    },
+    {
+      prop: 'errorData',
+      label: '误差值',
+      minWidth: 150,
+    },
+    {
+      prop: 'errorValue',
+      label: '误差允许值',
+      minWidth: 150,
+    },
+    {
+      prop: 'testResult',
+      label: '检测结果',
+      minWidth: 150,
+    },
+  ])
+  
+  // 表格配置项
+  const columns2 = reactive<ColumnProps<TestData>[]>([
+    { type: 'selection', fixed: 'left', width: 70 },
+    { type: 'index', fixed: 'left', width: 70, label: '序号' },
+    {
+      prop: 'dataTime',
+      label: '数据时间',
+      minWidth: 200,
+    },
+    {
+      prop: 'standardData',
+      label: '标准值',
+      minWidth: 150,
+    },
+    {
+      prop: 'testedData',
+      label: '被检值',
+      minWidth: 150,
+    },
+  ])
+
+  </script>
+    
\ No newline at end of file
diff --git a/frontend/src/views/plan/autoTest/index.vue b/frontend/src/views/plan/autoTest/index.vue
index 1205dd4..9ae0ef8 100644
--- a/frontend/src/views/plan/autoTest/index.vue
+++ b/frontend/src/views/plan/autoTest/index.vue
@@ -1,7 +1,25 @@
 <template>
   <!-- 自动检测页面 -->
   <div class="test">
-    <div class="test_left">
+        <!-- 顶部筛选条件&返回按钮 -->
+    <!-- {{ printText }} -->
+    <div class="test_top">
+      <el-checkbox
+        v-for="(item, index) in detectionOptions"
+        :model-value="item.id"
+        :true-value="item.id"
+        :key="index"
+        style="pointer-events: none"
+        >{{ item.name }}</el-checkbox
+      >
+      <el-button type="primary" @click="handlePreTest">启动预检测</el-button>
+      <el-button type="primary" @click="handleAutoTest">进入检测流程</el-button>
+      <el-button type="primary" @click="handleBackDeviceList"
+        >返回检测首页</el-button
+      >
+    </div>
+    <div class="test_bot">
+      <div class="test_left">
       <Tree ref="treeRef"></Tree>
     </div>
     <div class="test_right">
@@ -42,7 +60,7 @@
             >
           </div>
         </template>
-        <el-descriptions-item width="0px" label="上送数据总数">
+        <!-- <el-descriptions-item width="0px" label="上送数据总数">
           {{ num }}
         </el-descriptions-item>
         <el-descriptions-item width="0px" label="已上送数据数">
@@ -50,7 +68,7 @@
         </el-descriptions-item>
         <el-descriptions-item width="0px" label="待上送数据数">
           {{ num2 }}
-        </el-descriptions-item>
+        </el-descriptions-item> -->
       </el-descriptions>
       <!-- 右侧列表 -->
       <div class="right_table">
@@ -74,9 +92,18 @@
               v-for="(item, index) in deviceTestList"
               :key="index"
             >
-              <p v-for="(vv, vvs) in item.children" :key="vvs">
+              <!-- <p v-for="(vv, vvs) in item.children" :key="vvs">
                 {{ vv.status }}
-              </p>
+              </p> -->
+              <el-button
+                v-for="(vv, vvs) in item.children"
+                :key="vvs"
+                :type="vv.type"
+                text
+                @click="handleClick(item,index,vvs)"
+              >
+                {{ vv.label }}
+              </el-button>
             </div>
           </div>
         </div>
@@ -106,7 +133,10 @@
         </p>
       </div>
     </div>
-  </div>
+    </div>
+
+    </div>
+    <ShowDataPopup ref='showDataPopup'/>
 </template>
 <script lang="ts" setup>
 import { ref, onMounted, reactive, nextTick } from "vue";
@@ -116,6 +146,7 @@ import ProTable from "@/components/ProTable/index.vue";
 import { useTransition } from "@vueuse/core";
 import { getPlanList } from "@/api/plan/planList";
 import { ElMessage, ElMessageBox } from "element-plus";
+import ShowDataPopup from './components/ShowDataPopup.vue'
 import {
   CirclePlus,
   Delete,
@@ -130,6 +161,111 @@ import {
   Close,
 } from "@element-plus/icons-vue";
 const treeRef = ref<any>();
+const PopupVisible = ref(false)
+const showDataPopup = ref()
+
+//定义与预检测配置数组
+const detectionOptions = [
+  {
+    id: 0,
+    name: "标准源通讯检测",
+  },
+  {
+    id: 1,
+    name: "设备通讯检测",
+  },
+  {
+    id: 2,
+    name: "协议校验",
+  },
+  {
+    id: 3,
+    name: "数据校对",
+  },
+];
+
+const leftDeviceData = ref<any>([
+  // {
+  //   id: 0,
+  //   name: "设备1-预检测",
+  //   status: 0,
+  // },
+  // {
+  //   id: 1,
+  //   name: "设备2-预检测",
+  //   status: 1,
+  // },
+  // {
+  //   id: 2,
+  //   name: "设备3-预检测",
+  //   status: 1,
+  // },
+  // {
+  //   id: 3,
+  //   name: "设备4-预检测",
+  //   status: 0,
+  // },
+  // {
+  //   id: 4,
+  //   name: "设备5-预检测",
+  //   status: 1,
+  // },
+  // {
+  //   id: 5,
+  //   name: "设备6-预检测",
+  //   status: 0,
+  // },
+]);
+const initLeftDeviceData = () => {
+  leftDeviceData.value.map((item, index) => {
+    // handlePrintText(item.name, index);
+  });
+};
+// 点击数据结果
+const handleClick = (item,index,vvs) => {
+  //const data = "检测脚本为："+item.name+";被检设备为："+item.children.value.devID+";被检通道序号为："+ item.children.monitorIndex;
+  console.log(vvs,index,item.name,item.children)
+  PopupVisible.value = true
+  showDataPopup.value.open()
+};
+//启动预检测
+const handlePreTest = () => {
+  ElMessage.success("启动预检测");
+  let count = 0;
+  if (timer) {
+    clearInterval(timer);
+    count = 0;
+    leftDeviceData.value = [];
+  }
+  if (count == 5) {
+    count = 0;
+  } else {
+    timer = setInterval(async () => {
+      count++;
+      if (count > 15) return;
+      await nextTick(() => {
+        leftDeviceData.value.push({
+          id: count,
+          name: "设备" + count + "预检测",
+          status: count % 2 == 0 ? 0 : 1,
+        });
+      });
+    }, 2000);
+  }
+};
+//进入检测流程
+const handleAutoTest = () => {
+  router.push({
+    path: "/plan/autoTest",
+  });
+};
+//返回设备列表
+const handleBackDeviceList = () => {
+  router.push({
+    path: "/plan/home/index",
+  });
+};
+
 // 表格配置项
 const columns = reactive<ColumnProps<User.ResUserList>[]>([
   { type: "selection", fixed: "left", width: 70 },
@@ -283,22 +419,22 @@ const getTableList = (params: any) => {
 const percentage = ref(0);
 
 const customColors = [
-  { color: "red", percentage: 0 },
-  { color: "red", percentage: 10 },
-  { color: "red", percentage: 20 },
-  { color: "red", percentage: 30 }, //红
-  { color: "red", percentage: 40 },
-  { color: "#e6a23c", percentage: 50 },
-  { color: "#e6a23c", percentage: 60 },
-  { color: "#e6a23c", percentage: 70 }, //黄
-  { color: "#e6a23c", percentage: 80 }, //1989fa
-  { color: "#e6a23c", percentage: 90 }, //1989fa
+  // { color: "red", percentage: 0 },
+  // { color: "red", percentage: 10 },
+  // { color: "red", percentage: 20 },
+  // { color: "red", percentage: 30 }, //红
+  // { color: "red", percentage: 40 },
+  // { color: "#e6a23c", percentage: 50 },
+  // { color: "#e6a23c", percentage: 60 },
+  // { color: "#e6a23c", percentage: 70 }, //黄
+  // { color: "#e6a23c", percentage: 80 }, //1989fa
+  // { color: "#e6a23c", percentage: 90 }, //1989fa
   { color: "#5cb87a", percentage: 100 }, //绿
 ];
 //加载进度条
 const refreshProgress = () => {
   if (percentage.value < 100) {
-    percentage.value += 10;
+    percentage.value += 1;
     num1.value += 1001;
     num2.value -= 1001;
   } else {
@@ -323,21 +459,37 @@ const deviceData = ref([
     id: 0,
     name: "设备1通道1",
     status: Math.floor(Math.random() * 4),
+    type:"info",
+    label:"/",
+    devID:"dev1",
+    monitorIndex:1,
   },
   {
     id: 1,
-    name: "设备2通道2",
+    name: "设备1通道2",
     status: Math.floor(Math.random() * 4),
+    type:"success",
+    label:"√",
+    devID:"dev1",
+    monitorIndex:2,
   },
   {
     id: 2,
-    name: "设备3通道3",
+    name: "设备2通道1",
     status: Math.floor(Math.random() * 4),
+    type:"danger",
+    label:"×",
+    devID:"dev2",
+    monitorIndex:1,
   },
   {
     id: 3,
-    name: "设备4通道4",
+    name: "设备3通道1",
     status: Math.floor(Math.random() * 4),
+    type:"success",
+    label:"√",
+    devID:"dev3",
+    monitorIndex:1,
   },
 ]);
 const interValTest = () => {
@@ -348,6 +500,8 @@ const interValTest = () => {
       children: deviceData.value,
       // status: Math.floor(Math.random() * 4),
     });
+    // console.log(deviceTestList.value,11111);
+    
     refreshProgress();
   }, 2000);
   statusTimer.value = setInterval(() => {
@@ -431,7 +585,31 @@ onMounted(() => {
   height: 100%;
   box-sizing: border-box;
   display: flex;
+  flex-direction: column;
   justify-content: space-between;
+  
+  .test_top {
+    width: 100%;
+    height: 50px;
+    display: flex;
+    background-color: #fff;
+    justify-content: flex-start;
+    align-items: center;
+    border-radius: 4px;
+    padding: 0 10px;
+    box-sizing: border-box;
+    .el-button {
+      margin-top: 10px;
+      margin-bottom: 10px;
+      margin-left: 20px;
+    }
+  }
+
+  .test_bot {
+    flex: 1;
+    margin-top: 10px;
+    display: flex;
+    height: calc(100vh - 240px);
   .test_left {
     max-width: 300px;
     min-width: 200px;
@@ -484,11 +662,13 @@ onMounted(() => {
         .right_device_title {
           width: 100%;
           display: flex;
-          justify-content: space-between;
+          justify-content: center;
+
           // overflow-x: auto !important;
           p {
             flex: 1;
             // max-width: 150px;
+            text-align: center; 
             width: auto;
             padding: 0 10px;
             margin: 0;
@@ -503,7 +683,7 @@ onMounted(() => {
             display: flex;
             justify-content: space-between;
             align-items: center;
-            p {
+            .el-button {
               flex: 1;
               // max-width: 150px;
               min-width: auto;
@@ -534,6 +714,7 @@ onMounted(() => {
       }
     }
   }
+  }
 }
 
 ::v-deep .header-button-lf {
diff --git a/frontend/src/views/plan/planList/components/devTransfer.vue b/frontend/src/views/plan/planList/components/devTransfer.vue
index dffafa2..68945c1 100644
--- a/frontend/src/views/plan/planList/components/devTransfer.vue
+++ b/frontend/src/views/plan/planList/components/devTransfer.vue
@@ -1,13 +1,20 @@
 <template>
     <!-- 权限信息弹出框 -->
-<el-dialog :model-value="dialogVisible" title="编辑计划所属设备" v-bind="dialogBig" @close="handleCancel" width="600" draggable>
+<el-dialog :model-value="dialogVisible" title="设备绑定" v-bind="dialogBig" @close="handleCancel" width="600" draggable>
     <div>
         <el-transfer v-model="value" 
         filterable
       :filter-method="filterMethod"
       filter-placeholder="请输入内容搜索"
       :data="data" 
-      :titles="['未绑定设备', '计划所属设备']"/>
+      :titles="['未绑定设备', '已绑定设备']">
+      <template #default="{ option }">
+        <el-tooltip :content="option.tips" placement="top" :show-after=1000>
+          <span>{{ option.label }}</span>
+        </el-tooltip>
+      </template>
+      </el-transfer>
+      
     </div>
     <template #footer>
       <div class="dialog-footer">
@@ -34,6 +41,7 @@
     key: number
     label: string
     initial: string
+    tips: string
   }
   
     const generateData = () => {
@@ -47,14 +55,21 @@
       '易司拓测试装置',
       '山大电力测试装置1',
       '山大电力测试装置2',
+      '滚动条测试1',
+      '滚动条测试2',
+      '滚动条测试3',
+      '滚动条测试4',
+      '滚动条测试5',
+      '滚动条测试6',
     ]
-    const initials = ['CA', 'IL', 'MD', 'TX', 'FL', 'CO', 'CT', 'GT']
+    const initials = ['CA', 'IL', 'MD', 'TX', 'FL', 'CO', 'CT', 'GT', 'IL', 'MD', 'TX', 'FL', 'CO', 'CT', 'GT']
     states.forEach((city, index) => {
 
         data.push({
         label: city,
         key: index,
         initial: initials[index],
+        tips:"PQS882A 192.16.1.136",
       })
     })
     return data
diff --git a/frontend/src/views/plan/planList/components/sourceTransfer.vue b/frontend/src/views/plan/planList/components/sourceTransfer.vue
new file mode 100644
index 0000000..7fcdd4d
--- /dev/null
+++ b/frontend/src/views/plan/planList/components/sourceTransfer.vue
@@ -0,0 +1,119 @@
+<template>
+    <!-- 权限信息弹出框 -->
+<el-dialog :model-value="dialogVisible" title="检测源绑定" v-bind="dialogBig" @close="handleCancel" width="600" draggable>
+    <div>
+        <el-transfer v-model="value" 
+        class="custom-transfer"
+        filterable
+      :filter-method="filterMethod"
+      filter-placeholder="请输入内容搜索"
+      :data="data" 
+      :titles="['未绑定检测源', '已绑定检测源']">
+      <template #default="{ option }">
+        <el-tooltip :content="option.tips" placement="top" :show-after=1000>
+          <span>{{ option.label }}</span>
+        </el-tooltip>
+      </template>
+      </el-transfer>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="handleCancel">取消</el-button>
+        <el-button type="primary" @click="handleCancel">
+          保存
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+  </template>
+  
+  <script lang="ts" setup>
+  import { ref } from 'vue'
+  import type { Device } from '@/api/device/interface'
+  import deviceDataList from '@/api/device/deviceData'
+  import { dialogBig } from '@/utils/elementBind'
+  
+  const {dialogVisible} = defineProps<{
+  dialogVisible: boolean;
+}>()
+
+  interface Option {
+    key: number
+    label: string
+    initial: string
+    tips: string
+  }
+  
+    const generateData = () => {
+    const data: Option[] = []
+    const states = [
+      '标准源-福禄克-6100A',
+      '标准源-昂立-PF2',
+      '标准源-丹迪克-DKLN1',
+      '标准源-博电源-PQC600A',
+      '高精度设备-PQV520-1',
+      '高精度设备-PQV520-2',
+    ]
+    const initials = ['FLUKE.6100A', 'ANGLI-FP2', 'DKLN-1', 'PQC600A', 'PQV520-1', 'PQV520-2']
+    states.forEach((city, index) => {
+
+        data.push({
+        label: city,
+        key: index,
+        initial: initials[index],
+        tips:"IP:192.16.1.124",
+      })
+    })
+    return data
+  }
+  const generateValue = () => {
+  const data: number[] = []
+  const states = [
+  '高精度设备-PQV520-1',
+  '高精度设备-PQV520-2',
+  ]
+  const initials = ['PQV520-1', 'PQV520-2']
+  states.forEach((city, index) => {
+    const key = states.indexOf(city)
+    if (key !== -1) {
+      data.push(key)
+    }
+  })
+  return data
+}
+//   const generateValue = () => {
+//     const data: Option[] = []
+//     const states = [
+//       '山大电力测试装置1',
+//       '山大电力测试装置2',
+//     ]
+//     const initials = ['AB', 'CD']
+//     states.forEach((city, index) => {
+
+//         data.push({
+//         label: city,
+//         key: index,
+//         initial: initials[index],
+//       })
+//     })
+//     return data
+//   }
+  const data = ref<Option[]>(generateData())
+  const value = ref<number[]>(generateValue())
+  const emit = defineEmits<{
+  (e:'update:visible',value:boolean):void;
+  }>();
+
+  const handleCancel = () => {
+    emit('update:visible',false)
+  }
+  const filterMethod = (query, item) => {
+    return item.label.toLowerCase().includes(query.toLowerCase())
+  }
+  </script>
+  <style scoped>
+  .custom-transfer .el-transfer-panel{
+    overflow-x: auto !important;
+  }
+
+  </style>
\ No newline at end of file
diff --git a/frontend/src/views/plan/planList/components/temp.vue b/frontend/src/views/plan/planList/components/temp.vue
new file mode 100644
index 0000000..9bbec88
--- /dev/null
+++ b/frontend/src/views/plan/planList/components/temp.vue
@@ -0,0 +1,31 @@
+<template>
+    <el-dropdown @command="handleCommand">
+      <span class="el-dropdown-link">
+        更多<el-icon class="el-icon--right"><arrow-down /></el-icon>
+      </span>
+      <template #dropdown>
+        <el-dropdown-menu>
+          <el-dropdown-item command="a">高精度设备-PQV520-2</el-dropdown-item>
+          <el-dropdown-item command="b">高精度设备-PQV520-3</el-dropdown-item>
+          <el-dropdown-item command="c">高精度设备-PQV520-4</el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
+  </template>
+  
+  <script lang="ts" setup>
+  import { ElMessage } from 'element-plus'
+  import { ArrowDown } from '@element-plus/icons-vue'
+  
+  const handleCommand = (command: string | number | object) => {
+    ElMessage(`click on item ${command}`)
+  }
+  </script>
+  <style scoped>
+  .example-showcase .el-dropdown-link {
+    cursor: pointer;
+    color: var(--el-button-text-color);
+    display: flex;
+    align-items: center;
+  }
+  </style>
\ No newline at end of file
diff --git a/frontend/src/views/plan/planList/index.vue b/frontend/src/views/plan/planList/index.vue
index a518017..385de39 100644
--- a/frontend/src/views/plan/planList/index.vue
+++ b/frontend/src/views/plan/planList/index.vue
@@ -21,11 +21,12 @@
          <el-button type='primary' link :icon='Upload' @click="exportClick">导出</el-button>
          <el-button type='primary' link :icon='EditPen' @click="openEditDialog(scope.row)">编辑</el-button>
          <el-button type='primary' link :icon='Delete' >删除</el-button>
-         <el-button type='primary' link :icon='List' @click="showDeviceOpen(scope.row)">所属设备</el-button>
-         <el-button type='primary' link :icon='List' @click="showtestSourceOpen(scope.row)">所属检测源</el-button>
+         <el-button type='primary' link :icon='List' @click="showDeviceOpen(scope.row)">设备绑定</el-button>
+         <el-button type='primary' link :icon='Tools' @click="showtestSourceOpen(scope.row)">检测源绑定</el-button>
        </template>
    </ProTable>
 
+   <temp></temp>
       <!-- 向计划导入/导出设备对话框 -->
       <planPopup     
       :visible="dialogFormVisible"
@@ -35,32 +36,47 @@
       @update:visible="dialogFormVisible = $event"
     />
 
+        <!-- 查看误差体系详细信息 -->
+        <ErrorStandardDialog     
+      :visible="detail_dialogFormVisible"
+      :formData="detail_dialogForm"
+       :dialogTitle="detail_dialogTitle"
+      @update:visible="detail_dialogFormVisible = $event"
+    />
  </div>
  <devTransfer
     :dialogVisible=devTransferVisible
     @update:visible='devTransferVisible = $event'
   />
+  <sourceTransfer
+    :dialogVisible=sourceTransferVisible
+    @update:visible='sourceTransferVisible = $event'
+  />
  <DeviceOpen :width='viewWidth' :height='viewHeight' ref='openDeviceView' />
  <SourceOpen :width='viewWidth' :height='viewHeight' ref='openSourceView' />
 </template>
 
-<script setup lang="ts" name='useProTable'>
+<script setup lang="tsx" name='useProTable'>
 import ProTable from '@/components/ProTable/index.vue'
 import TimeControl from '@/components/TimeControl/index.vue'
 import type { ProTableInstance,ColumnProps } from '@/components/ProTable/interface'
-import { CirclePlus, Delete,EditPen,View,Upload,Download,List} from '@element-plus/icons-vue'
+import { CirclePlus, Delete,EditPen,View,Upload,Download,List,Tools} from '@element-plus/icons-vue'
 import {dictPattern,dictTestState,dictReportState,dictResult,testPlanDataList,testSoureDataList,testScriptDataList,testErrSystDataList,planData,testFatherPlanList} from '@/api/plan/planData'
 import { reactive,ref } from 'vue'
 import type { Plan } from '@/api/plan/interface'
 import planPopup from "@/views/plan/planList/components/planPopup.vue"; // 导入子组件
 import DeviceOpen from '@/views/plan/planList/components/devPopup.vue'
 import SourceOpen from '@/views/plan/planList/components/sourcePopup.vue'
+import temp from './components/temp.vue'
 import devTransfer from './components/devTransfer.vue'
+import sourceTransfer from './components/sourceTransfer.vue'
 import { useViewSize } from '@/hooks/useViewSize'
 import { useRouter } from "vue-router";
 import { useDictStore } from '@/stores/modules/dict'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { Action } from 'element-plus'
+import type { ErrorSystem } from '@/api/error/interface'
+import ErrorStandardDialog from "@/views/machine/errorSystem/components/ErrorStandardDialog.vue"; // 导入子组件
 
 const dictStore = useDictStore()
 // 定义包含和排除的单位
@@ -71,7 +87,7 @@ const { popupBaseView, viewWidth, viewHeight } = useViewSize()
 const openDeviceView = ref()
 const openSourceView = ref()
 const devTransferVisible = ref(false)
-
+const sourceTransferVisible = ref(false)
 // ProTable 实例
 const proTable = ref<ProTableInstance>()
 // const planData = planData
@@ -94,9 +110,18 @@ const dialogForm = ref<Plan.PlanBO>({
                          
 });
 
+const detail_dialogFormVisible = ref(false)
+const detail_dialogTitle = ref('Q/GDW 10650.2-2021 误差体系')
+const detail_dialogForm = ref<ErrorSystem.Error_detail>({
+                              measured: '',//被测量
+                              deviceLevel: '',//检测装置级别
+                              measurementType:'',
+                              condition: '',//测量条件
+                              maxErrorValue: '',//最大误差     
+});
 
 // 表格配置项
-const columns = reactive<ColumnProps<Plan.PlanBO>[]>([
+const columns = reactive<ColumnProps<Plan.PlanAndSourceBO>[]>([
  { type: 'selection', fixed: 'left', width: 70 },
  { type: 'index', fixed: 'left', width: 70, label: '序号' },
  {
@@ -109,6 +134,24 @@ const columns = reactive<ColumnProps<Plan.PlanBO>[]>([
    prop: 'testSourceName',
    label: '检测源名称',
    width: 200,
+   render: scope => {
+    return (
+    //   <el-button 
+    //   v-for="(button, index) in scope.row.testSourceList"
+    //   :key="index"
+    //   @click="handleClick(button)"
+    // >
+    //   {{ button.text }}
+    // </el-button>
+    <div class='flx-flex-start'>
+              <el-button type = "primary" link onClick = {() => showData(scope.row.testSourceName)}>
+          {scope.row.testSourceName}
+        </el-button>
+              <temp></temp>
+            </div>
+
+    );
+ }
  },
  {
    prop: 'script_Id',
@@ -116,6 +159,13 @@ const columns = reactive<ColumnProps<Plan.PlanBO>[]>([
    width: 300,
    enum: testScriptDataList,
    fieldNames: { label: 'label', value: 'id' },
+   render: scope => {
+    return (
+        <el-button type = "primary" link onClick = {() => showData(scope.row.script_Id)}>
+          {getScriptName(scope.row.script_Id)}
+        </el-button>
+    );
+ }
  },
  {
    prop: 'error_Sys_Id',
@@ -123,6 +173,14 @@ const columns = reactive<ColumnProps<Plan.PlanBO>[]>([
    width: 200,
    enum: testErrSystDataList,
    fieldNames: { label: 'label', value: 'id' },
+   render: scope => {
+    const errSysName = getErrSysName(scope.row.error_Sys_Id);
+    return (
+        <el-button type = "primary" link onClick = {() => showData(errSysName || '')}>
+          {errSysName}
+        </el-button>
+    );
+ }
  },
  {
    prop: 'dataSource_Id',
@@ -182,6 +240,12 @@ const columns = reactive<ColumnProps<Plan.PlanBO>[]>([
  { prop: 'operation', label: '操作', fixed: 'right' ,width: 450, },
 ])
 
+function getScriptName(id:string){
+   return testScriptDataList.find(item=>item.id==id)?.label
+}
+function getErrSysName(id:string){
+   return testErrSystDataList.find(item=>item.id==id)?.label
+}
 
 const fileInput = ref<HTMLInputElement | null>(null); // 声明 fileInput
   function openFileDialog() {
@@ -190,6 +254,17 @@ const fileInput = ref<HTMLInputElement | null>(null); // 声明 fileInput
   }
 }
 
+function showData(row: string) {
+
+  detail_dialogTitle.value = row;
+  detail_dialogFormVisible.value = true; // 显示对话框
+
+  // router.push({
+  //   path: "/machine/device",
+  //   query: { id: row }
+  // });
+}
+
 function handleFiles(event: Event) {
   const target = event.target as HTMLInputElement;
   const files = target.files;
@@ -289,7 +364,8 @@ const showDeviceOpen = (planSystem: Plan.PlanBO) => {
 }
 
 const showtestSourceOpen=(planSystem: Plan.PlanBO)=>{
-  openSourceView.value.open('计划检测源列表')
+  sourceTransferVisible.value = true;
+  // openSourceView.value.open('计划检测源列表')
   // router.push({
   //   path: "/machine/testSource",
   // });
diff --git a/frontend/src/views/plan/preTest/index.vue b/frontend/src/views/plan/preTest/index.vue
index 21ba7f5..9ac4f2e 100644
--- a/frontend/src/views/plan/preTest/index.vue
+++ b/frontend/src/views/plan/preTest/index.vue
@@ -13,10 +13,10 @@
         >{{ item.name }}</el-checkbox
       >
       <el-button type="primary" @click="handlePreTest">启动预检测</el-button>
-      <el-button type="primary" @click="handleBackDeviceList"
-        >返回设备列表</el-button
-      >
       <el-button type="primary" @click="handleAutoTest">进入检测流程</el-button>
+      <el-button type="primary" @click="handleBackDeviceList"
+        >返回检测首页</el-button
+      >
     </div>
     <div class="test_bot">
       <div class="bot_left">
@@ -158,7 +158,7 @@ const handlePreTest = () => {
   } else {
     timer = setInterval(async () => {
       count++;
-      if (count > 5) return;
+      if (count > 15) return;
       await nextTick(() => {
         leftDeviceData.value.push({
           id: count,
@@ -178,7 +178,7 @@ const handleAutoTest = () => {
 //返回设备列表
 const handleBackDeviceList = () => {
   router.push({
-    path: "/plan/singlePlanList",
+    path: "/plan/home/index",
   });
 };
 //左侧数据