diff --git a/.env.development b/.env.development
index 16dd3b6..441908a 100644
--- a/.env.development
+++ b/.env.development
@@ -5,12 +5,8 @@ VITE_APP_TITLE = 伊特机械MES
 VITE_APP_ENV = 'development'
 
 # 开发环境
-<<<<<<< HEAD
-VITE_APP_BASE_API = 'http://192.168.5.232:8888/api'
-=======
 
 #VITE_APP_BASE_API = 'http://192.168.12.4:8888/api'
->>>>>>> f1e25f58a96a8b7737687ce50afef4b34cda2541
 #VITE_APP_BASE_API = 'http://192.168.5.14:9100/gateway'
 
 VITE_APP_BASE_API = 'http://localhost/api'
diff --git a/package.json b/package.json
index 980d815..e19a9b8 100644
--- a/package.json
+++ b/package.json
@@ -24,9 +24,10 @@
     "html2canvas": "^1.4.1",
     "jsencrypt": "^3.3.2",
     "jspdf": "^4.2.1",
-    "naive-ui":"^2.37.3",
+    "naive-ui": "^2.37.3",
     "pinia": "^2.1.7",
     "pinia-plugin-persistedstate": "^3.2.1",
+    "seemly": "^0.3.10",
     "three": "^0.184.0",
     "vue": "^3.4.15",
     "vue-draggable-plus": "^0.6.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b2e0043..dc77b09 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,6 +50,9 @@ importers:
       pinia-plugin-persistedstate:
         specifier: ^3.2.1
         version: 3.2.3(pinia@2.3.1(typescript@5.9.3)(vue@3.5.31(typescript@5.9.3)))
+      seemly:
+        specifier: ^0.3.10
+        version: 0.3.10
       three:
         specifier: ^0.184.0
         version: 0.184.0
diff --git a/src/api/nccode.ts b/src/api/nccode.ts
index ba893a7..cb6facc 100644
--- a/src/api/nccode.ts
+++ b/src/api/nccode.ts
@@ -30,7 +30,7 @@ export function nccodelist(params:any) {
 //下发
 export function batchIssue(data:any) {
     return request({ 
-        url: '/api/biz/ncCode/issue', 
+        url: '/biz/ncCode/issue', 
         method: 'post',
         data
     })
@@ -39,7 +39,7 @@ export function batchIssue(data:any) {
 //删除
 export function deleteIssue(ids:any) {
     return request({ 
-        url: `api/biz/ncCode/${ids}`, 
+        url: `/biz/ncCode/${ids}`, 
         method: 'delete'
     })
 }
@@ -52,3 +52,28 @@ export function issuecopy(data:any) {
         data
     })
 }
+
+//任务树
+export function opertree() {
+    return request({ 
+        url: `biz/ncCode/operationTree`, 
+        method: 'get'
+    })
+}
+
+//生产NC编码
+export function generateNccode() {
+    return request({ 
+        url: `biz/ncCode/generateNcCode`, 
+        method: 'get'
+    })
+}
+
+//导出
+export function exportNccode(params:any) {
+    return request({ 
+        url: `biz/ncCode/export`, 
+        method: 'get',
+        params
+    })
+}
diff --git a/src/api/proterminal.ts b/src/api/proterminal.ts
index a926f5e..8c9e84b 100644
--- a/src/api/proterminal.ts
+++ b/src/api/proterminal.ts
@@ -43,3 +43,13 @@ export function reportingwork(data:any) {
         data
     })
 }
+
+
+//登出设备
+export function terlogout(data:any) {
+    return request({ 
+        url: '/terminal/logout', 
+        method: 'post',
+        data
+    })
+}
\ No newline at end of file
diff --git a/src/views/proterminal/index.vue b/src/views/proterminal/index.vue
index d55b003..6ed0d6b 100644
--- a/src/views/proterminal/index.vue
+++ b/src/views/proterminal/index.vue
@@ -40,7 +40,7 @@
             </template>
               全屏
           </n-button> -->
-          <!-- <n-button @click="refresh" ghost style="margin-right: 20px;color: #fff;">
+          <n-button @click="refresh" ghost style="margin-right: 20px;color: #fff;">
             <template #icon>
               <n-icon>
                 <Sync />
@@ -48,9 +48,9 @@
             </template>
             
               刷新
-          </n-button> -->
+          </n-button>
           <!--switchworks-->
-          <n-button ghost style="color: #fff;" @click="handover">
+          <n-button ghost style="margin-right: 20px;color: #fff;" @click="handover">
             <template #icon>
               <n-icon>
                 <SwapHorizontalOutline />
@@ -58,6 +58,14 @@
             </template>
               工位交接
           </n-button>
+          <n-button ghost style="color: #fff;" @click="handover">
+            <template #icon>
+              <n-icon>
+                <LogOutOutline />
+              </n-icon>
+            </template>
+              退出登录
+          </n-button>
         </div>
       </div>
       <div class="total" style="display: none;">
@@ -422,10 +430,10 @@
             <template v-if="loglist.length > 0">
               <div v-for="n in loglist" style="margin-bottom: 18px;padding: 12px;border:1px solid #afafaf;border-radius:10px;background:#2d475c;">
                 <div style="display: flex;align-items: center;justify-content: space-between;font-size: 16px;">
-                  <div>张三三</div>
+                  <div>{{n.userName}}</div>
                   <div>{{n.createTime}}</div>
                 </div>
-                <div style="font-size: 20px;">{{operationType[n.operationType]}}</div>
+                <div style="font-size: 20px;">{{operationType[n.operationType+'']}}</div>
               </div>
             </template>
             <template v-else>
@@ -571,7 +579,7 @@
         </n-form>
       </div> -->
 
-      <div style="position: absolute;top: 50%;left: 50%;width: 400px;height: 580px;padding: 20px;transform: translate(-50%,-50%);border-radius: 20px;border: 1px #b7b7b7 solid;background: #1e2a40;">
+      <div style="position: absolute;top: 50%;left: 50%;width: 400px;height: 500px;padding: 20px;transform: translate(-50%,-50%);border-radius: 20px;border: 1px #b7b7b7 solid;background: #1e2a40;">
         <div style="width: 100%;padding:10px 20px;text-align: center;">
           <n-icon size="40" color="#00a2ff">
             <EarthOutline />
@@ -718,7 +726,8 @@ import {
   StopCircleOutline,
   ShapesOutline,
   LogoWebComponent,
-  TimerSharp
+  TimerSharp,
+  LogOutOutline
 } from '@vicons/ionicons5'
 
 import Circlebom from './circle.vue'
@@ -730,10 +739,10 @@ import {
   workstation,
   taskdetail,
   operationlist,
-  reportingwork
+  reportingwork,
+  terlogout
 } from '@/api/proterminal'
-import { element, label } from 'three/tsl'
-import { Value } from 'three/examples/jsm/inspector/ui/Values.js'
+
 
 //import { dictDataApi } from '@/api/org'
 
@@ -800,10 +809,16 @@ const ticketStatus :any = {
 
 //日志类型
 const operationType :any = {
-  1:'开始',
-  2:'暂停',
-  3:'报工',
-  4:'撤回'
+  '-1':'登出',
+  '0':'登入',
+  '1':'开始',
+  '2':'暂停',
+  '3':'报工',
+  '4':'撤回',
+  '5':'叫料',
+  '6':'调车',
+  '7':'工位交接',
+  '8':'工位交接确认'
 }
 
 
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
index 526c40c..25b6c65 100644
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -10,4 +10,4 @@ interface Window {
   $message: import('naive-ui').MessageApi
   $dialog: import('naive-ui').DialogApi
   $loadingBar: import('naive-ui').LoadingBarApi
-}
+}
\ No newline at end of file
diff --git a/vite.config.ts b/vite.config.ts
index fc591c8..ccd6b59 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -20,7 +20,8 @@ export default defineConfig({
     port: 3000,
     proxy: {
       '/api': {
-        target:'http://192.168.12.4:8888/', //'http://192.168.5.230:8888',
+        target:'http://192.168.12.4:8888/', 
+        //target:'http://192.168.12.230:8888',
         //target:'http://192.168.5.230:8888',
         //target:'http://192.168.5.232:8888/',
         //target:'http://localhost:8888',