Merge branch 'dev' of http://222.212.85.86:8222/bdzl2/bxztApp into dev

packages/mobile/src/views/Equipment/EquipmentDetails.vue

@@ -663,7 +663,7 @@ const getEquipmentDetailInfo = async () => {
       method: "GET",
     });
     if (res.code && res.code === "00000") {
-      equipmentDetailInfo.value = res.data;
+      equipmentDetailInfo.value = res.data.equipment;
       console.log("设备详情", toRaw(equipmentDetailInfo.value));
     } else {
       throw new Error(res.data.message);

packages/mobile/src/views/Material/MaterialDetails.vue

@@ -58,7 +58,7 @@ const getwzDetail = async () => {
       method: "GET",
     });
     if (res.code && res.code === "00000") {
-      wzDetailData.value = res.data;
+      wzDetailData.value = res.data.material;
     } else {
       throw new Error(res.message);
     }

packages/screen/src/views/ServiceStationManagePage/index.vue

@@ -39,6 +39,12 @@
         :onCancel="handleCancel"
         width="60%"
       >
+        <el-tabs
+          v-model="activeName"
+          class="demo-tabs"
+          @tab-click="handleClick"
+        >
+          <el-tab-pane label="基本信息" name="Basic">
             <el-form
               label-position="right"
               label-width="auto"
@@ -73,7 +79,11 @@
                     <el-input disabled v-model="detailData.jsdj" />
                   </el-form-item>
                   <el-form-item label="备注:" prop="bz">
-                <el-input disabled v-model="detailData.bz" type="textarea" />
+                    <el-input
+                      disabled
+                      v-model="detailData.bz"
+                      type="textarea"
+                    />
                   </el-form-item>
                 </el-col>
 
@@ -96,12 +106,22 @@
                   <el-form-item label="是否对外开放:" prop="sfdwkf">
                     <el-input disabled v-model="detailData.sfdwkf" />
                   </el-form-item>
-              <el-form-item label="对外开放的是否有如厕功能:" prop="sfdwkfrc">
+                  <el-form-item
+                    label="对外开放的是否有如厕功能:"
+                    prop="sfdwkfrc"
+                  >
                     <el-input disabled v-model="detailData.sfdwkfrc" />
                   </el-form-item>
                 </el-col>
-          </el-row>
+              </el-row> </el-form
-        </el-form>
+          ></el-tab-pane>
+          <el-tab-pane label="人员信息" name="Person">
+            <PersonData 
+              :yhzData="detailData"
+              >
+           </PersonData>
+          </el-tab-pane>
+        </el-tabs>
       </MyDialog>
       <MyDialog
         v-model="editDialogVisible"
@@ -187,6 +207,7 @@ import { useRouter, useRoute } from "vue-router";
 import { request } from "@/utils/request";
 import { Search } from "@element-plus/icons-vue";
 import MyDialog from "../../component/MyDialog";
+import PersonData from "./personData.vue";
 
 const tableData = ref([]);
 const detailData = ref({});
@@ -541,6 +562,9 @@ const handleClickWz = (row) => {
     path: `/yhzwz/${encodeURIComponent(JSON.stringify(row))}`,
   });
 };
+
+// 当前标签
+const activeName = ref("Basic");
 </script>
   
   <style scoped>

packages/screen/src/views/ServiceStationManagePage/personData.vue

@@ -0,0 +1,49 @@
+<template>
+  <div>1145141919810</div>
+</template>
+
+<script lang="ts" setup>
+import { h, ref, onMounted, reactive, watch, toRaw } from "vue";
+
+const props = defineProps({
+  yhzData: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+
+// 养护站ID
+const yhzId = ref(props.yhzData.id);
+// 表格过滤条件
+const filterData = reactive({
+  xm: "", // 姓名
+});
+const pagination = reactive({
+  current: 1,
+  pageSize: 10,
+  total: 0,
+  pageSizes: [10, 20, 50],
+  layout: "prev, pager, next, jumper",
+  onChange: (page, pageSize) => {
+    pagination.current = page;
+    pagination.pageSize = pageSize;
+    getyhzryList(filterData);
+  },
+}); // 表格分页
+
+// 获取养护站人员列表
+const getyhzryList = async (filterData) => {
+  try {
+    
+  } catch (error) {
+    
+  }
+};
+// 分页查询养护站
+onMounted(() => {});
+
+console.log("养护站id", yhzId.value);
+</script>
+
+<style scoped>
+</style>