Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx

2025-09-06 18:24:00 +08:00
parent e71ec5b9c1 3e4b85fc48
commit e39823db40
10 changed files with 1020 additions and 342 deletions
--- a/.env.development
+++ b/.env.development
@ -5,6 +5,7 @@ VITE_APP_TITLE = 煤科建管平台
 VITE_APP_ENV = 'development'

 # 开发环境
+VITE_APP_BASE_API = 'http://192.168.110.149:8899'
 # 李陈杰 209
 VITE_APP_BASE_API = 'http://192.168.110.209:8899'
 # 曾涛
--- a/absolute/path/to/index.vue
+++ b/absolute/path/to/index.vue
@ -0,0 +1 @@
+
--- a/src/api/equipment/index.ts
+++ b/src/api/equipment/index.ts
@ -101,3 +101,11 @@ export function getProjectId() {
    method: 'get'
  });
 }
+
+export const getFootNote = (data) => {
+  return request({
+    url: 'gps/equipmentSon/getList',
+    method: 'get',
+    data: data
+  });
+};
--- a/src/api/out/monthPlan/index.ts
+++ b/src/api/out/monthPlan/index.ts
@ -8,7 +8,7 @@ import { MonthPlanVO, MonthPlanForm, MonthPlanQuery } from '@/api/out/monthPlan/
 * @returns {*}
 */

-export const listMonthPlan = (query?: MonthPlanQuery): AxiosPromise<MonthPlanVO[]> => {
+export const listMonthPlan = (query?: any) => {
  return request({
    url: '/out/monthPlan/list',
    method: 'get',
--- a/src/api/system/landTransfer/landTransferLedger/index.ts
+++ b/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'
+  });
+};
--- a/src/api/system/landTransfer/landTransferLedger/types.ts
+++ b/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
   */
@ -256,11 +263,8 @@ export interface LandTransferLedgerQuery extends PageQuery {
   */
  nextStrategy?: string;

-    /**
-     * 日期范围参数
-     */
-    params?: any;
+  /**
+   * 日期范围参数
+   */
+  params?: any;
 }
-
-
-
--- a/src/views/equipment/equipmentGPS.vue
+++ b/src/views/equipment/equipmentGPS.vue
@ -1,187 +1,56 @@
 <template>
-  <div class="p5" style="width: 100%;height: calc(100vh - 84px);" v-loading="loading">
-    <div id="TrajectoryEarth" style="width: 100%;height: 100%;"></div>
+  <div class="p5" style="width: 100%; height: calc(100vh - 84px)" v-loading="loading">
+    <div id="TrajectoryEarth" style="width: 100%; height: 100%"></div>
  </div>
 </template>

 <script setup name="equipmentGPS">
 import { ref, onMounted, onUnmounted } from 'vue';
+import { ElMessage } from 'element-plus';
+import { useRoute } from 'vue-router';
+import { getFootNote } from '@/api/equipment/index';

+const route = useRoute();
 const loading = ref(true);
 let earthInstance = null;
 let data = [
  {
-    "lng": 106.45637808828741,
-    "lat": 29.5597535878972,
-    "alt": 0
-  },
-  {
-    "lng": 106.45971817314378,
-    "lat": 29.54708008996366,
-    "alt": 0
-  },
-  {
-    "lng": 106.4594902314301,
-    "lat": 29.53682043192008,
-    "alt": 0
-  },
-  {
-    "lng": 106.47398277208025,
-    "lat": 29.5448688679258,
-    "alt": 0
-  },
-  {
-    "lng": 106.4793889453858,
-    "lat": 29.549294608101395,
-    "alt": 0.0016450895529057888
-  },
-  {
-    "lng": 106.49100748408087,
-    "lat": 29.551808876409023,
-    "alt": 0
-  },
-  {
-    "lng": 106.5040076285079,
-    "lat": 29.55321574288158,
-    "alt": 0
-  },
-  {
-    "lng": 106.51355510567937,
-    "lat": 29.546776414794298,
-    "alt": 0
-  },
-  {
-    "lng": 106.51838453732344,
-    "lat": 29.537721996213506,
-    "alt": 0
-  },
-  {
-    "lng": 106.51457768703192,
-    "lat": 29.524855377287736,
-    "alt": 0.0009144105438296915
-  },
-  {
-    "lng": 106.52872030672225,
-    "lat": 29.53289655789934,
-    "alt": 0.0005979679117487334
-  },
-  {
-    "lng": 106.53493249730421,
-    "lat": 29.541341118458874,
-    "alt": 0
-  },
-  {
-    "lng": 106.53390022310705,
-    "lat": 29.54848036964581,
-    "alt": 0
-  },
-  {
-    "lng": 106.53471751083796,
-    "lat": 29.55380771856629,
-    "alt": 0
-  },
-  {
-    "lng": 106.53518023558718,
-    "lat": 29.560247052020156,
-    "alt": 0
-  },
-  {
-    "lng": 106.52470634506619,
-    "lat": 29.560148336926677,
-    "alt": 0
-  },
-  {
-    "lng": 106.52527983360243,
-    "lat": 29.55240114606003,
-    "alt": 0
-  },
-  {
-    "lng": 106.51837614087053,
-    "lat": 29.557734494325807,
-    "alt": 0.0021893863172707047
-  },
-  {
-    "lng": 106.51573052195917,
-    "lat": 29.564878142363643,
-    "alt": 0
-  },
-  {
-    "lng": 106.50951515081469,
-    "lat": 29.556427329943944,
-    "alt": 0
-  },
-  {
-    "lng": 106.5076746620389,
-    "lat": 29.565884717127823,
-    "alt": 0
-  },
-  {
-    "lng": 106.50341642164544,
-    "lat": 29.558842113740727,
-    "alt": 0
-  },
-  {
-    "lng": 106.50065453145776,
-    "lat": 29.567897073636868,
-    "alt": 0
-  },
-  {
-    "lng": 106.49328990493458,
-    "lat": 29.558741275828908,
-    "alt": 0
-  },
-  {
-    "lng": 106.49363360765534,
-    "lat": 29.57333026493932,
-    "alt": 0
-  },
-  {
-    "lng": 106.51905977395505,
-    "lat": 29.57828423907017,
-    "alt": 0
-  },
-  {
-    "lng": 106.51145952743101,
-    "lat": 29.584527208426245,
-    "alt": 0
-  },
-  {
-    "lng": 106.49372239119027,
-    "lat": 29.58774998459616,
-    "alt": 0
-  },
-  {
-    "lng": 106.48214171543982,
-    "lat": 29.580866974898736,
-    "alt": 0.006089177027688381
-  },
-  {
-    "lng": 106.48801515807557,
-    "lat": 29.57049465877845,
-    "alt": 0
-  },
-  {
-    "lng": 106.47638485150803,
-    "lat": 29.571501851940585,
-    "alt": 0.0011061005102942808
-  },
-  {
-    "lng": 106.47903303165843,
-    "lat": 29.562542838689904,
-    "alt": 0.0011137835517156711
-  },
-  {
-    "lng": 106.4645244823306,
-    "lat": 29.56868284644567,
-    "alt": 0.00008251706068442191
-  },
-  {
-    "lng": 106.47108853087332,
-    "lat": 29.555194220499004,
-    "alt": 0
-  },
-]
+    'locLongitude': 106.45637808828741,
+    'locLatitude': 29.5597535878972,
+    'locAltitude': 0
+  }
+];

+// 获取轨迹数据
+const getTrajectoryData = async () => {
+  try {
+    // 从URL参数中获取clientId、projectId和userId
+    const { clientId, projectId, userId } = route.query;
+
+    if (!clientId || !projectId || !userId) {
+      ElMessage.warning('缺少必要参数，请检查传入的参数');
+      return;
+    }
+
+    loading.value = true;
+    const res = await getFootNote({ clientId, projectId, userId });
+
+    if (res && res.code === 200 && res.data && res.data.length > 0) {
+      data = res.data;
+      // 渲染轨迹
+      if (earthInstance && earthInstance.viewer) {
+        renderRange(data);
+      }
+    } else {
+      ElMessage.warning('暂无轨迹数据');
+    }
+  } catch (error) {
+    console.error('获取轨迹数据失败:', error);
+    ElMessage.error('获取轨迹数据失败，请稍后重试');
+  } finally {
+    loading.value = false;
+  }
+};

 // 创建地球
 const createEarth = () => {
@ -191,48 +60,51 @@ const createEarth = () => {
  }

  window.YJ.on({
-    ws: true,
+    ws: true
    // host: getIP(), // 资源所在服务器地址
    // username: this.loginForm.username, // 用户名
    // password: md5pass, // 密码
-  }).then((res) => {
-    loading.value = false;
-    // 创建地球实例
-    earthInstance = new YJ.YJEarth('TrajectoryEarth');
-    window.Earth3 = earthInstance;
+  })
+    .then((res) => {
+      // 创建地球实例
+      earthInstance = new YJ.YJEarth('TrajectoryEarth');
+      window.Earth3 = earthInstance;

-    // 开启右键和左键点击事件
-    YJ.Global.openRightClick(window.Earth3);
-    YJ.Global.openLeftClick(window.Earth3);
+      // 开启右键和左键点击事件
+      YJ.Global.openRightClick(window.Earth3);
+      YJ.Global.openLeftClick(window.Earth3);

-    // 设置初始视角
-    const view = {
-      position: {
-        lng: 102.03643298211526,
-        lat: 34.393586474501,
-        alt: 11298179.51993155
-      },
-      orientation: {
-        heading: 360,
-        pitch: -89.94481747201486,
-        roll: 0
-      }
-    };
+      // 设置初始视角
+      const view = {
+        position: {
+          lng: 102.03643298211526,
+          lat: 34.393586474501,
+          alt: 11298179.51993155
+        },
+        orientation: {
+          heading: 360,
+          pitch: -89.94481747201486,
+          roll: 0
+        }
+      };

-    YJ.Global.CesiumContainer(window.Earth3, {
-      compass: false, //罗盘
+      YJ.Global.CesiumContainer(window.Earth3, {
+        compass: false //罗盘
+      });
+      // 加载底图
+      loadBaseMap(earthInstance.viewer);
+
+      // 可以取消注释以下代码来设置初始视角
+      // YJ.Global.flyTo(earthInstance, view);
+      // YJ.Global.setDefaultView(earthInstance.viewer, view)
+
+      // 地球创建完成后获取并渲染轨迹数据
+      getTrajectoryData();
+    })
+    .catch((err) => {
+      console.error('初始化地球失败:', err);
+      ElMessage.error('初始化地球失败，请稍后重试');
    });
-    // 加载底图
-    loadBaseMap(earthInstance.viewer);
-
-    // 可以取消注释以下代码来设置初始视角
-    // YJ.Global.flyTo(earthInstance, view);
-    // YJ.Global.setDefaultView(earthInstance.viewer, view)
-    renderRange(data);
-  }).catch((err) => {
-    console.error('初始化地球失败:', err);
-    ElMessage.error('初始化地球失败，请稍后重试');
-  });
 };

 // 加载底图
@ -275,7 +147,7 @@ const renderRange = (data) => {

  try {
    const positions = data.map((point) => {
-      return Cesium.Cartesian3.fromDegrees(point.lng, point.lat, point.alt || 0);
+      return Cesium.Cartesian3.fromDegrees(point.locLongitude, point.locLatitude, point.locAltitude || 0);
    });

    const entity = earthInstance.viewer.entities.add({
@ -295,7 +167,6 @@ const renderRange = (data) => {
  }
 };

-
 //
 onMounted(() => {
  createEarth();
--- a/src/views/equipment/index.vue
+++ b/src/views/equipment/index.vue
@ -24,27 +24,28 @@
      <template #header>
        <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:equipment:edit']"
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['gps:equipment:edit']"
              >修改</el-button
            >
          </el-col>
          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:equipment:remove']"
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['gps:equipment:remove']"
              >删除</el-button
            >
          </el-col>
          <el-col :span="1.8">
-            <el-button type="primary" plain icon="User" :disabled="single" @click="handleBindUser()" v-hasPermi="['system:equipment:bindUser']"
+            <el-button
+              type="primary"
+              plain
+              icon="User"
+              :disabled="single"
+              @click="handleBindUser()"
+              v-hasPermi="['gps:equipment:unbindManmachine', 'gps:equipment:bindManmachine']"
              >绑定用户</el-button
            >
          </el-col>
          <el-col :span="2">
-            <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-button type="primary" plain @click="handleViewAll">{{ viewAllButtonText }}</el-button>
          </el-col>

          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@ -68,17 +69,7 @@
        </el-table-column>

        <!-- 设备名称列 -->
-        <el-table-column label="设备名称" align="center">
-          <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="deviceName" />

        <el-table-column label="远程连接地址" align="center" prop="remoteAddressStr" />
        <el-table-column label="连接创建时间" align="center">
@ -106,10 +97,24 @@
                type="primary"
                icon="User"
                @click="scope.row.type === 1 ? handleUnbindUser(scope.row) : handleBindUser(scope.row)"
-                v-hasPermi="['gps:equipment:bindUser']"
+                v-hasPermi="['gps:equipment:unbindManmachine', 'gps:equipment:bindManmachine']"
              >
              </el-button>
            </el-tooltip>
+            <!-- 新增：跳转空页面按钮 -->
+            <el-tooltip content="足迹" placement="top">
+              <el-button
+                link
+                type="primary"
+                icon="Location"
+                v-hasPermi="['gps:equipmentSon:getList']"
+                @click="handleGoToEmptyPage(scope.row.userId, scope.row.projectId, scope.row.clientId)"
+                :disabled="!scope.row.userId || !scope.row.projectId"
+              ></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 +245,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,9 +478,14 @@ const handleViewAll = () => {
  getList();
 };

-const handleGoToEmptyPage = () => {
+const handleGoToEmptyPage = (userId: any, projectId: any, clientId: any) => {
  router.push({
-    path: './equipmentGPS'
+    path: './equipmentGPS',
+    query: {
+      userId: userId,
+      projectId: projectId,
+      clientId: clientId
+    }
  });
 };

--- a/src/views/out/monthPlan/index.vue
+++ b/src/views/out/monthPlan/index.vue
@ -14,6 +14,7 @@
            </el-form-item>
            <el-form-item label="类型" prop="type">
              <el-select v-model="queryParams.type" placeholder="请选择类型">
+                <el-option label="全部" value="0" />
                <el-option label="对甲" value="1" />
                <el-option label="对乙" value="2" />
              </el-select>
@ -102,7 +103,7 @@

 <script setup name="MonthPlan" lang="ts">
 import { listMonthPlan, getMonthPlan, delMonthPlan, addMonthPlan, updateMonthPlan } from '@/api/out/monthPlan';
-import { MonthPlanVO, MonthPlanQuery, MonthPlanForm } from '@/api/out/monthPlan/types';
+import { MonthPlanVO } from '@/api/out/monthPlan/types';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { out_value_type } = toRefs<any>(proxy?.useDict('out_value_type'));
 const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
@ -163,7 +164,7 @@ const data = reactive({
    valueType: undefined,
    planAuditStatus: undefined,
    completeAuditStatus: undefined,
-    type: '1',
+    type: '0',
    params: {}
  },
  rules: {
@ -180,7 +181,11 @@ const { queryParams, form, rules } = toRefs(data);
 /** 查询月度产值计划列表 */
 const getList = async () => {
  loading.value = true;
-  const res = await listMonthPlan(queryParams.value);
+  let type = queryParams.value.type;
+  if (type == '0') {
+    type = '';
+  }
+  const res = await listMonthPlan({ ...queryParams.value, type: type });
  monthPlanList.value = res.rows;
  total.value = res.total;
  loading.value = false;
--- a/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
+++ b/src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue