App端设备管理详情接口对接

2025-11-04 17:29:45 +08:00 · 2025-11-04 17:29:45 +08:00 · 3b0aefb486
commit 3b0aefb486
parent 967ce1208a
5 changed files with 152 additions and 68 deletions
--- a/packages/mobile/src/router/index.js
+++ b/packages/mobile/src/router/index.js
@ -12,7 +12,7 @@ const routes = [
    component: () => import('../views/User.vue')
  },
  {
-    path: '/equipManage',
+    path: '/equipManage/:data',
    name: 'EquipManage',
    component: () => import('../views/EquipmentManagement.vue')
  },
--- a/packages/mobile/src/views/EquipmentDetails.vue
+++ b/packages/mobile/src/views/EquipmentDetails.vue
@ -3,7 +3,7 @@
    <van-nav-bar title="设备管理" fixed left-arrow @click-left="onClickLeft" />

    <van-cell-group>
-      <van-cell title="当前站点" value="李家坝仓库" />
+      <van-cell title="当前站点" :value="equipmentInfo.sbwz" />
    </van-cell-group>

    <div class="content">
@ -13,38 +13,41 @@
          style="font-size: 18px; font-weight: bold; line-height: inherit"
        >
          <template #value>
-            <span :class="['status-tag', equipmentInfo.statusClass]">{{
-              equipmentInfo.status
+            <span :class="[
+                'status-tag',
+                `status-` +
+                  (equipmentDetailInfo.sbzt === '完好'
+                    ? 'good'
+                    : equipmentDetailInfo.sbzt === '损坏'
+                    ? 'warning'
+                    : 'danger'),
+              ]">{{
+              equipmentDetailInfo.sbzt
            }}</span>
          </template>
        </van-cell>
-        <van-cell :title="'设备名称： ' + equipmentInfo.title"> </van-cell>
-        <van-cell :title="'设备大类： 小修保养设备'"> </van-cell>
-        <van-cell :title="equipmentInfo.label"> </van-cell>
-        <van-cell :title="'设备编号： 002'"> </van-cell>
-        <van-cell :title="'设备型号： E32、PS2600、专业版1949'"> </van-cell>
-        <van-cell :title="'设备位置： 丰都'"> </van-cell>
+        <van-cell :title="'设备名称： ' + equipmentDetailInfo.sbmc"> </van-cell>
+        <van-cell :title="'设备大类： ' + equipmentDetailInfo.sbdl"> </van-cell>
+        <van-cell :title="'设备类型:  ' + equipmentDetailInfo.sblx"> </van-cell>
+        <van-cell :title="'设备编号： ' + equipmentDetailInfo.sbbh"> </van-cell>
+        <van-cell :title="'设备型号： ' + equipmentDetailInfo.sbxh"> </van-cell>
+        <van-cell :title="'设备位置： ' + equipmentDetailInfo.sbwz"> </van-cell>
        <van-cell :title="'设备经纬度： '">
          <template #label>
-            <span>设备经度: 108.41763025<br />设备纬度: 31.89751472</span>
+            <span>设备经度: {{ equipmentDetailInfo.jd }}<br />设备纬度: {{ equipmentDetailInfo.wd }}</span>
          </template>
        </van-cell>
-        <van-cell :title="'设备管理人员 张三四'"> </van-cell>
-        <van-cell :title="'操作员： 李思思'"> </van-cell>
-        <van-cell :title="'购置日期： 2025/10/10'"> </van-cell>
-        <van-cell :title="'购买费用（万元）： 29'"> </van-cell>
-        <van-cell :title="'应急设备： 否'"> </van-cell>
-        <van-cell :title="'纳入市级补助范围： 否'"> </van-cell>
+        <van-cell :title="'设备管理人员：  '+ equipmentDetailInfo.glry"> </van-cell>
+        <van-cell :title="'操作员：       '+ equipmentDetailInfo.czy"> </van-cell>
+        <van-cell :title="'购置日期：     '+ equipmentDetailInfo.gzrq"> </van-cell>
+        <van-cell :title="'购买费用（万元）： '+ equipmentDetailInfo.gmfy"> </van-cell>
+        <van-cell :title="'应急设备： '+ equipmentDetailInfo.sfyjsb"> </van-cell>
+        <van-cell :title="'纳入市级补助范围： ' + equipmentDetailInfo.sfnrsjbz"> </van-cell>
        <van-cell
-          :title="'辐射范围： G212兰州-龙邦 K1292+460至K1302+250 S544歌石路K44+0至K67+800'"
+          :title="'辐射范围： '+ equipmentDetailInfo.fsfw"
        >
        </van-cell>
-        <van-cell :title="'上传人： 张三三'"> </van-cell>
-        <van-cell :title="'上传时间： 2025/10/10 10:00:00'"> </van-cell>
-        <van-cell :title="'生产商： 富士重工业株式会社群马制作所'"> </van-cell>
-        <van-cell :title="'所属服务站： 李家坝仓库'"> </van-cell>
-        <van-cell :title="'损坏原因： 坏了'"> </van-cell>
-        <van-cell :title="'报废原因： 发动机报废'"> </van-cell>
+        <van-cell :title="'所属服务站： '+ equipmentDetailInfo.sbwz"> </van-cell>
      </van-cell-group>
    </div>

@ -222,9 +225,10 @@
 </template>
  
  <script setup>
-import { ref, onMounted } from "vue";
+import { ref, onMounted, toRaw } from "vue";
 import { useRouter, useRoute } from "vue-router";
 import { showToast } from "vant";
+import { request } from "../../../shared/utils/request";

 const router = useRouter();
 const route = useRoute();
@ -239,19 +243,39 @@ const onSelect = (action) => {
    show报废Popup.value = true;
  }
 };
-const equipmentInfo = ref({
-  title: "",
-  label: "",
-  status: "",
-  statusClass: "",
+const equipmentInfo = ref({});
+const equipmentDetailInfo = ref({});
+
+// 获取设备详情
+const getEquipmentDetailInfo = async () => {
+    try {
+      const res = await request({
+        url: `/api/yjsb/${equipmentInfo.value.rid}`,
+        method: "GET",
      });
+      if (res.code && res.code === '00000') {
+        equipmentDetailInfo.value = res.data;
+        console.log('equipmentDetailInfo',toRaw(equipmentDetailInfo.value));
+      }
+      else{
+        throw new Error(res.data.message);
+      }
+    } catch (error) {
+      showToast({ type: "error", message: error.message });
+    }
+};
+
 onMounted(() => {
  equipmentInfo.value = JSON.parse(decodeURIComponent(route.params.data));
-  console.log("equipmentInfo", equipmentInfo.value);
+  console.log("equipmentInfo", toRaw(equipmentInfo.value));
+  getEquipmentDetailInfo();
 });

 const onClickLeft = () => {
-  router.push("/EquipManage");
+  router.push({
+    name: "EquipManage",
+    params: { data: encodeURIComponent(JSON.stringify(equipmentInfo.value)) },
+  });
 };

 const show报废Popup = ref(false);
--- a/packages/mobile/src/views/EquipmentManagement.vue
+++ b/packages/mobile/src/views/EquipmentManagement.vue
@ -4,12 +4,12 @@
    </van-nav-bar>
    <van-search
      shape="round"
-      :value="searchValue"
+      v-model="searchValue"
      :show-action="false"
      placeholder="请输入设备名称"
    />
    <van-cell-group>
-      <van-cell title="当前站点" value="李家坝仓库" />
+      <van-cell title="当前站点" :value="detailData.mc || detailData.sbwz" />
    </van-cell-group>
    <van-notice-bar mode="link">20台设备待确认</van-notice-bar>

@ -18,18 +18,27 @@
        <van-cell
          v-for="(item, index) in equipmentList"
          :key="index"
-          :title="item.title"
+          :title="item.sbmc"
          is-link
-          :label="item.label"
+          :label="`设备类型: ` + item.sblx"
          :to="{
            name: 'EquipDetail',
            params: { data: encodeURIComponent(JSON.stringify(item)) },
          }"
        >
          <template #value>
-            <span :class="['status-tag', item.statusClass]">{{
-              item.status
-            }}</span>
+            <span
+              :class="[
+                'status-tag',
+                `status-` +
+                  (item.sbzt === '完好'
+                    ? 'good'
+                    : item.sbzt === '损坏'
+                    ? 'warning'
+                    : 'danger'),
+              ]"
+              >{{ item.sbzt }}</span
+            >
          </template>
        </van-cell>
      </van-cell-group>
@ -240,32 +249,57 @@
 </template>
  
  <script setup>
-import { ref } from "vue";
-import { useRouter } from "vue-router";
+import { ref, onMounted, reactive, toRaw, watch } from "vue";
+import { useRouter, useRoute } from "vue-router";
 import { showToast } from "vant";
+import { request } from "../../../shared/utils/request";

 const router = useRouter();
+const route = useRoute();
+const detailData = ref({}); // 养护站详情数据
 const searchValue = ref(""); // 搜索框输入值
-const equipmentList = ref([
-  {
-    title: "高枝锯、绿篱机、油锯",
-    label: "设备类型： 绿化修剪设备",
-    status: "完好",
-    statusClass: "status-good",
-  },
-  {
-    title: "撒布机三台",
-    label: "设备类型：除雪设备",
-    status: "损坏",
-    statusClass: "status-warning",
-  },
-  {
-    title: "撒布机三台",
-    label: "设备类型：除雪设备",
-    status: "报废",
-    statusClass: "status-danger",
-  },
-]);
+const equipmentList = ref([]);
+
+// 获取养护站详情数据
+onMounted(() => {
+  detailData.value = JSON.parse(decodeURIComponent(route.params.data));
+  getEquipmentList();
+});
+
+watch(
+  () => searchValue.value,
+  (newVal, oldVal) => {
+    if (newVal !== oldVal) {
+      getEquipmentList(newVal);
+    }
+  }
+);
+
+// 获取养护站设备列表
+const getEquipmentList = async (sbmc) => {
+  try {
+    const data = {
+      yhzid: detailData.value.id || detailData.value.yhzid,
+      sbmc: sbmc,
+      pageNum: 1,
+      pageSize: 9999,
+    };
+    const res = await request({
+      url: "/api/yjsb/list",
+      method: "get",
+      params: data,
+    });
+    if (res.code && res.code === "00000") {
+      equipmentList.value = res.data.records;
+    } else {
+      throw new Error(res.message);
+    }
+  } catch (error) {
+    console.log(error);
+    showToast(error.message || "获取设备列表失败");
+  }
+};
+
 const showPopup = ref(false); // 控制弹出层显示隐藏

 const onClickLeft = () => {
--- a/packages/mobile/src/views/Home.vue
+++ b/packages/mobile/src/views/Home.vue
@ -3,12 +3,19 @@
    <van-nav-bar title="愉快政" fixed left-arrow />

    <van-cell-group>
-      <van-cell title="当前站点" value="李家坝仓库" />
+      <van-cell title="当前站点" :value="detailData.mc" />
    </van-cell-group>

    <div class="content">
      <van-grid :gutter="10" :column-num="3" class="grid">
-        <van-grid-item icon="setting-o" text="设备管理" to="/EquipManage" />
+        <van-grid-item
+          icon="setting-o"
+          text="设备管理"
+          :to="{
+            name: 'EquipManage',
+            params: { data: encodeURIComponent(JSON.stringify(detailData)) },
+          }"
+        />
        <van-grid-item icon="setting-o" text="物资管理" to="/MaterialManage" />
        <van-grid-item icon="setting-o" text="人员管理" to="/StaffManage" />
        <van-grid-item icon="setting-o" text="冰雪灾害" to="/IceHail" />
@ -23,13 +30,14 @@
 </template>

 <script setup>
-import { ref } from "vue";
+import { ref, onMounted } from "vue";
 import { useRouter } from "vue-router";
 import { showToast } from "vant";
 import { request } from "../../../shared/utils/request";

 const router = useRouter();
 const active = ref(0);
+const detailData = ref({});

 // 获取养护站详情
 const getYHZDetail = async () => {
@ -38,11 +46,23 @@ const getYHZDetail = async () => {
      url: `/api/yhz/${53}`, // 假设获取的是id为53的养护站的详情
      method: "GET",
    });
+    if (res.code && res.code === "00000") {
+      detailData.value = res.data;
+    } else {
+      throw new Error(res.message);
+    }
  } catch (error) {
-    
+    showToast({
+      message: error.message,
+      type: "error",
+    });
  }
 };

+onMounted(() => {
+  getYHZDetail();
+});
+
 const goToUser = () => {
  router.push("/user");
 };
--- a/packages/mobile/vite.config.js
+++ b/packages/mobile/vite.config.js
@ -5,7 +5,7 @@ import Components from 'unplugin-vue-components/vite'
 import { VantResolver } from 'unplugin-vue-components/resolvers'

 export default defineConfig({
-  base: '/app/',
+  // base: '/app/',
  plugins: [
    vue(),
    Components({
@ -21,7 +21,13 @@ export default defineConfig({
  server: {
    port: 8080,
    host: '0.0.0.0',
-    open: true
+    open: true,
+    proxy: {
+      '/api': {
+        target: 'http://8.137.54.85:8661/',
+        changeOrigin: true,
+      },
+    }
  },
  build: {
    outDir: 'dist',