0906

.env.development

@@ -6,7 +6,7 @@ VITE_APP_ENV = 'development'
 
 # 开发环境
 # 李陈杰 209
-VITE_APP_BASE_API = 'http://192.168.110.149:8899'
+VITE_APP_BASE_API = 'http://192.168.110.210:8899'
 # 曾涛
 # VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 # 罗成

absolute/path/to/index.vue

@@ -0,0 +1 @@
+

src/api/system/landTransfer/landTransferLedger/index.ts

@@ -79,3 +79,26 @@ export const landTransferLedgerCount = (id: string | number | Array<string | num
     method: 'get'
   });
 };
+
+export const addSonLandTransferLedger = (data) => {
+  return request({
+    url: '/land/landTransferLedger/children/add',
+    method: 'post',
+    data: data
+  });
+};
+
+export const listSonLandTransferLedger = (query) => {
+  return request({
+    url: '/land/landTransferLedger/children/list',
+    method: 'get',
+    params: query
+  });
+};
+// api/yourApiModule.js
+export const listallCountValue = (projectId) => {
+  return request({
+    url: '/land/landTransferLedger/allCountValue/' + projectId,
+    method: 'get'
+  });
+};

src/api/system/landTransfer/landTransferLedger/types.ts

@@ -4,6 +4,11 @@ export interface LandTransferLedgerVO {
    */
   id: string | number;
 
+  /**
+   * 父级ID
+   */
+  parentId: string | number;
+
   /**
    * 项目ID
    */
@@ -83,7 +88,6 @@ export interface LandTransferLedgerVO {
    * 下一步策略
    */
   nextStrategy: string;
-
 }
 
 export interface LandTransferLedgerForm extends BaseEntity {
@@ -92,6 +96,11 @@ export interface LandTransferLedgerForm extends BaseEntity {
    */
   id?: string | number;
 
+  /**
+   * 父级ID
+   */
+  parentId: string | number;
+
   /**
    * 项目ID
    */
@@ -171,11 +180,9 @@ export interface LandTransferLedgerForm extends BaseEntity {
    * 下一步策略
    */
   nextStrategy?: string;
-
 }
 
 export interface LandTransferLedgerQuery extends PageQuery {
-
   /**
    * 项目ID
    */
@@ -261,6 +268,3 @@ export interface LandTransferLedgerQuery extends PageQuery {
    */
   params?: any;
 }
-
-
-

src/views/equipment/index.vue

@@ -42,11 +42,6 @@
             <el-button type="primary" plain @click="handleViewAll" v-hasPermi="['system:equipment:view']">{{ viewAllButtonText }}</el-button>
           </el-col>
 
-          <!-- 新增：跳转空页面按钮 -->
-          <el-col :span="2">
-            <el-button type="primary" plain icon="international" @click="handleGoToEmptyPage"> GPS定位 </el-button>
-          </el-col>
-
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -68,17 +63,7 @@
         </el-table-column>
 
         <!-- 设备名称列 -->
-        <el-table-column label="设备名称" align="center">
+        <el-table-column label="设备名称" align="center" prop="deviceName" />
-          <template #default="scope">
-            <el-button
-              type="text"
-              @click="handleOpenHistoryUser(scope.row.clientId, scope.row.userId)"
-              style="padding: 0; color: #409eff; cursor: pointer"
-            >
-              {{ scope.row.deviceName || '-' }}
-            </el-button>
-          </template>
-        </el-table-column>
 
         <el-table-column label="远程连接地址" align="center" prop="remoteAddressStr" />
         <el-table-column label="连接创建时间" align="center">
@@ -110,6 +95,13 @@
               >
               </el-button>
             </el-tooltip>
+            <!-- 新增：跳转空页面按钮 -->
+            <el-tooltip content="足迹" placement="top">
+              <el-button link type="primary" icon="Location" @click="handleGoToEmptyPage(scope.row.userId)"></el-button>
+            </el-tooltip>
+            <el-tooltip content="历史记录" placement="top">
+              <el-button link type="primary" icon="Clock" @click="handleOpenHistoryUser(scope.row.clientId, scope.row.userId)"> </el-button>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -240,7 +232,7 @@ const projectList = ref<any[]>([]);
 const projectLoading = ref(false);
 const userLoading = ref(false);
 const viewAllButtonText = computed(() => {
-  return queryParams.value.type === 1 ? '查看未绑定设备' : '查看已绑定设备';
+  return queryParams.value.type === 1 ? '查看未绑定项目设备' : '查看已绑定项目设备';
 });
 
 // 对话框相关
@@ -473,7 +465,7 @@ const handleViewAll = () => {
   getList();
 };
 
-const handleGoToEmptyPage = () => {
+const handleGoToEmptyPage = (userId: any) => {
   router.push({
     path: './equipmentGPS'
   });