优化

2025-08-02 15:52:24 +08:00 · 2025-08-02 15:31:59 +08:00
21 changed files with 356 additions and 113 deletions
--- a/.env.development
+++ b/.env.development
@ -5,8 +5,8 @@ VITE_APP_TITLE = 新能源项目管理平台
 VITE_APP_ENV = 'development'

 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.119:8899'
-# VITE_APP_BASE_API = 'http://58.17.134.85:8899'
+# VITE_APP_BASE_API = 'http://192.168.110.119:8899'
+VITE_APP_BASE_API = 'http://58.17.134.85:8899'
 # GO开发环境
 VITE_APP_BASE_API_GO = 'http://58.17.134.85:8919'

--- a/.env.production
+++ b/.env.production
@ -15,8 +15,6 @@ VITE_APP_SNAILJOB_ADMIN = '/snail-job'

 # 生产环境
 VITE_APP_BASE_API = 'http://58.17.134.85:8899'
-# GO生产环境
-VITE_APP_BASE_API_GO = 'http://58.17.134.85:7363'

 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip
--- a/src/api/materials/company/index.ts
+++ b/src/api/materials/company/index.ts
@ -1,4 +1,4 @@
-import request from '@/utils/request-go';
+import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { CompanyForm, CompanyQuery, CompanyVO } from '@/api/materials/company/types';

@ -10,7 +10,7 @@ import { CompanyForm, CompanyQuery, CompanyVO } from '@/api/materials/company/ty

 export const listCompany = (query?: CompanyQuery): AxiosPromise<CompanyVO[]> => {
  return request({
-    url: '/zm/api/v1/system/busCompany/list',
+    url: '/materials/company/list',
    method: 'get',
    params: query
  });
--- a/src/api/materials/materials/index.ts
+++ b/src/api/materials/materials/index.ts
@ -1,4 +1,4 @@
-import request from '@/utils/request-go';
+import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { MaterialsForm, MaterialsQuery, MaterialsVO } from '@/api/materials/materials/types';

@ -9,7 +9,7 @@ import { MaterialsForm, MaterialsQuery, MaterialsVO } from '@/api/materials/mate
 */
 export const listMaterials = (query?: MaterialsQuery): AxiosPromise<MaterialsVO[]> => {
  return request({
-    url: '/zm/api/v1/system/busEquipmentMaterials/list',
+    url: '/materials/materials/list',
    method: 'get',
    params: query
  });
@ -21,11 +21,8 @@ export const listMaterials = (query?: MaterialsQuery): AxiosPromise<MaterialsVO[
 */
 export const getMaterials = (id: string | number): AxiosPromise<MaterialsVO> => {
  return request({
-    url: '/zm/api/v1/system/busEquipmentMaterials/get',
-    method: 'get',
-    params: {
-      equipmentMaterialsId: id
-    }
+    url: '/materials/materials/' + id,
+    method: 'get'
  });
 };

--- a/src/api/materials/materialsInventory/index.ts
+++ b/src/api/materials/materialsInventory/index.ts
@ -1,4 +1,4 @@
-import request from '@/utils/request-go';
+import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { MaterialsInventoryForm, MaterialsInventoryQuery, MaterialsInventoryVO } from '@/api/materials/materialsInventory/types';

@ -10,7 +10,7 @@ import { MaterialsInventoryForm, MaterialsInventoryQuery, MaterialsInventoryVO }

 export const listMaterialsInventory = (query?: MaterialsInventoryQuery): AxiosPromise<MaterialsInventoryVO[]> => {
  return request({
-    url: '/zm/api/v1/system/busEquipmentMaterialsInventory/excellist',
+    url: '/materials/materialsInventory/list',
    method: 'get',
    params: query
  });
--- a/src/api/project/project/index.ts
+++ b/src/api/project/project/index.ts
@ -1,7 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { childProjectQuery, ProjectForm, ProjectQuery, ProjectVO } from '@/api/project/project/types';
-import requestGo from '@/utils/request-go';

 /**
 * 查询项目列表
@ -10,10 +9,10 @@ import requestGo from '@/utils/request-go';
 */

 export const listProject = (query?: ProjectQuery): AxiosPromise<ProjectVO[]> => {
-  return requestGo({
-    url: '/zm/api/v1/system/sysProject/list',
+  return request({
+    url: '/project/project/list',
    method: 'get',
-    params: { ...query, isShow: '2' }
+    params: query
  });
 };

--- a/src/views/design/volumeCatalog/index.vue
+++ b/src/views/design/volumeCatalog/index.vue
@ -1,16 +0,0 @@
-<template>
-  <div>init</div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-  setup() {
-    // todo
-    return {};
-  }
-});
-</script>
-
-<style lang="stylus" scoped></style>
--- a/src/views/materials/company/index.vue
+++ b/src/views/materials/company/index.vue
@ -24,7 +24,7 @@
    <el-card shadow="never">
      <template #header>
        <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
+          <el-col :span="1.5">
            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['materials:company:add']">新增 </el-button>
          </el-col>
          <el-col :span="1.5">
@ -36,7 +36,7 @@
            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['materials:company:remove']"
              >删除
            </el-button>
-          </el-col> -->
+          </el-col>
          <el-col :span="1.5">
            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['materials:company:export']">导出 </el-button>
          </el-col>
@ -49,20 +49,24 @@
        <!-- <el-table-column label="主键id" align="center" prop="id" v-if="true" /> -->
        <el-table-column label="序号" type="index" width="60" align="center" />
        <el-table-column label="公司名称" align="center" prop="companyName" />
+        <el-table-column label="负责人" align="center" prop="principal" />
+        <el-table-column label="负责人电话" align="center" prop="principalPhone" />
        <el-table-column label="公司状态" align="center" prop="status">
          <template #default="scope">
            <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
          </template>
        </el-table-column>
-        <el-table-column label="创建时间" align="center" prop="createdAt" width="180" />
-        <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="资质情况" align="center" prop="qualification" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
          <template #default="scope">
            <el-space wrap>
              <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:company:edit']">修改 </el-button>
              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['materials:company:remove']">删除 </el-button>
            </el-space>
          </template>
-        </el-table-column> -->
+        </el-table-column>
      </el-table>

      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
@ -130,7 +134,7 @@ const dialog = reactive<DialogOption>({
 const initFormData: CompanyForm = {
  id: undefined,
  companyName: undefined,
-  projectId: currentProject.value.goId,
+  projectId: currentProject.value.id,
  status: undefined,
  remark: undefined,
  qualification: undefined,
@ -143,7 +147,7 @@ const data = reactive<PageData<CompanyForm, CompanyQuery>>({
    pageNum: 1,
    pageSize: 10,
    companyName: undefined,
-    projectId: currentProject.value.goId,
+    projectId: currentProject.value.id,
    status: undefined,
    qualification: undefined,
    principalPhone: undefined,
@ -164,8 +168,8 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
  loading.value = true;
  const res = await listCompany(queryParams.value);
-  companyList.value = res.data.list;
-  total.value = res.data.total;
+  companyList.value = res.rows;
+  total.value = res.total;
  loading.value = false;
 };

@ -257,7 +261,7 @@ const handleExport = () => {

 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value.goId,
+  () => currentProject.value.id,
  (nid, oid) => {
    queryParams.value.projectId = nid;
    form.value.projectId = nid;
--- a/src/views/materials/materials/index.vue
+++ b/src/views/materials/materials/index.vue
@ -52,12 +52,8 @@
        </el-table-column>
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column label="序号" type="index" width="60" align="center" />
-        <el-table-column label="材料名称" align="center" prop="equipmentMaterialsName" />
-        <el-table-column label="公司名称" align="center" prop="companyId">
-          <template #default="scope">
-            <dict-tag :options="companyOptions" :value="scope.row.companyId" />
-          </template>
-        </el-table-column>
+        <el-table-column label="材料名称" align="center" prop="materialsName" />
+        <el-table-column label="公司名称" align="center" prop="companyVo.companyName" />
        <el-table-column label="规格型号" align="center" prop="typeSpecificationName" />
        <el-table-column label="使用部位" align="center" prop="usePart" />
        <el-table-column label="计量单位" align="center" prop="weightId" />
@ -68,8 +64,8 @@
          </template>
        </el-table-column>
        <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="创建时间" align="center" prop="createdAt" width="180" />
-        <!-- <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="320">
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
+        <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="320">
          <template #default="scope">
            <el-space>
              <el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)" v-hasPermi="['materials:materials:query']">
@ -82,7 +78,7 @@
              <el-button link type="primary" icon="Plus" @click="handleAddMaterialsInventory(scope.row)"> 出入库 </el-button>
            </el-space>
          </template>
-        </el-table-column> -->
+        </el-table-column>
      </el-table>

      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
@ -181,7 +177,7 @@ const initFormData: MaterialsForm = {
  id: undefined,
  materialsName: undefined,
  companyId: undefined,
-  projectId: currentProject.value.goId,
+  projectId: currentProject.value.id,
  typeSpecificationName: undefined,
  fileOssIdMap: undefined,
  usePart: undefined,
@ -197,7 +193,7 @@ const data = reactive<PageData<MaterialsForm, MaterialsQuery>>({
    pageSize: 10,
    materialsName: undefined,
    companyId: undefined,
-    projectId: currentProject.value.goId,
+    projectId: currentProject.value.id,
    typeSpecificationName: undefined,
    fileOssIdMap: undefined,
    usePart: undefined,
@ -218,8 +214,8 @@ const companyOptions = ref([]);
 const getList = async () => {
  loading.value = true;
  const res = await listMaterials(queryParams.value);
-  materialsList.value = res.data.list;
-  total.value = res.data.total;
+  materialsList.value = res.rows;
+  total.value = res.total;
  loading.value = false;
 };

@ -231,12 +227,10 @@ const getCompanyList = async () => {
    pageSize: 1000,
    projectId: currentProject.value.id
  });
-  companyOptions.value = companyRes.data.list.map((company: CompanyVO) => ({
-    value: company.companyId + '',
-    label: company.companyName,
-    elTagType: 'default'
+  companyOptions.value = companyRes.rows.map((company: CompanyVO) => ({
+    value: company.id,
+    label: company.companyName
  }));
-  console.log('🚀 ~ getCompanyList ~ companyOptions.value:', companyOptions.value);
  loading.value = false;
 };

@ -274,7 +268,7 @@ const handleSelectionChange = (selection: MaterialsVO[]) => {
 /** 展开材料详情抽屉操作 */
 const showDetailDrawer = ref<boolean>(false);
 const handleShowDrawer = (row?: MaterialsVO) => {
-  currentMaterialsId.value = row.companyId;
+  currentMaterialsId.value = row.id;
  showDetailDrawer.value = true;
 };

@ -360,7 +354,7 @@ const handleOssUpdate = (ossId: string, value: string) => {

 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value.goId,
+  () => currentProject.value.id,
  (nid, oid) => {
    queryParams.value.projectId = nid;
    form.value.projectId = nid;
--- a/src/views/materials/materialsInventory/index.vue
+++ b/src/views/materials/materialsInventory/index.vue
@ -31,53 +31,53 @@
      <el-table v-loading="loading" :data="materialsInventoryList" @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column label="序号" type="index" width="60" align="center" />
-        <el-table-column label="材料名称" align="center" prop="equipmentMaterialsName" />
+        <el-table-column label="材料名称" align="center" prop="materialsName" />
        <el-table-column label="入库登记" align="center">
          <el-table-column label="数量" align="center" prop="number">
            <template #default="scope">
-              <span>{{ scope.row.inventory.number }}</span>
+              <span v-if="scope.row.outPut === '0'">{{ scope.row.number }}</span>
+              <span v-else></span>
            </template>
          </el-table-column>
          <el-table-column label="签收人" align="center" prop="operator">
            <template #default="scope">
-              <span>{{ scope.row.inventory.operator }}</span>
+              <span v-if="scope.row.outPut === '0'">{{ scope.row.operator }}</span>
+              <span v-else></span>
            </template>
          </el-table-column>
          <el-table-column label="日期" align="center" prop="outPutTime" width="160">
            <template #default="scope">
-              <span>{{ parseTime(scope.row.inventory.outPutTime, '{y}年{m}月{d}日') }}</span>
+              <span v-if="scope.row.outPut === '0'">{{ parseTime(scope.row.outPutTime, '{y}年{m}月{d}日') }}</span>
+              <span v-else></span>
            </template>
          </el-table-column>
        </el-table-column>
-        <el-table-column label="出库登记" align="center" prop="outbound">
-          <el-table-column label="交接单位" align="center" prop="recipient">
-            <template #default="scope">
-              <span>{{ scope.row.outbound.recipient }}</span>
-            </template>
-          </el-table-column>
+        <el-table-column label="出库登记" align="center">
+          <el-table-column label="交接单位" align="center" prop="recipient" />
          <el-table-column label="数量" align="center" prop="number">
            <template #default="scope">
-              <span>{{ scope.row.outbound.number }}</span>
+              <span v-if="scope.row.outPut === '1'">{{ scope.row.number }}</span>
+              <span v-else></span>
            </template>
          </el-table-column>
          <el-table-column label="出库人" align="center" prop="operator">
            <template #default="scope">
-              <span>{{ scope.row.outbound.operator }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="领用人" align="center" prop="shipper">
-            <template #default="scope">
-              <span>{{ scope.row.outbound.shipper }}</span>
+              <span v-if="scope.row.outPut === '1'">{{ scope.row.operator }}</span>
+              <span v-else></span>
            </template>
          </el-table-column>
+          <el-table-column label="领用人" align="center" prop="shipper" />
          <el-table-column label="日期" align="center" prop="outPutTime" width="160">
            <template #default="scope">
-              <span>{{ parseTime(scope.row.outbound.outPutTime, '{y}年{m}月{d}日') }}</span>
+              <span v-if="scope.row.outPut === '1'">{{ parseTime(scope.row.outPutTime, '{y}年{m}月{d}日') }}</span>
+              <span v-else></span>
            </template>
          </el-table-column>
        </el-table-column>
-        <el-table-column label="剩余量" align="center" prop="residue" />
-
+        <el-table-column label="剩余处理" align="center">
+          <el-table-column label="剩余量" align="center" prop="residue" />
+          <el-table-column label="处理方式" align="center" prop="disposition" />
+        </el-table-column>
        <el-table-column label="备注" align="center" prop="remark" />
        <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
          <template #default="scope">
@ -179,7 +179,7 @@ const dialog = reactive<DialogOption>({
 const initFormData: MaterialsInventoryForm = {
  id: undefined,
  materialsId: undefined,
-  projectId: currentProject.value.goId,
+  projectId: currentProject.value.id,
  outPut: undefined,
  number: undefined,
  outPutTime: undefined,
@ -197,7 +197,7 @@ const data = reactive<PageData<MaterialsInventoryForm, MaterialsInventoryQuery>>
    pageNum: 1,
    pageSize: 10,
    materialsId: undefined,
-    projectId: currentProject.value.goId,
+    projectId: currentProject.value.id,
    outPut: undefined,
    number: undefined,
    outPutTime: undefined,
@ -222,8 +222,8 @@ const materialsOptions = ref([]);
 const getList = async () => {
  loading.value = true;
  const res = await listMaterialsInventory(queryParams.value);
-  materialsInventoryList.value = res.data.list;
-  total.value = res.data.total;
+  materialsInventoryList.value = res.rows;
+  total.value = res.total;
  const materialsMap = new Map();
  materialsOptions.value = Array.from(materialsMap.values());
  loading.value = false;
@ -310,7 +310,7 @@ const handleExport = () => {

 //监听项目id刷新数据
 const listeningProject = watch(
-  () => currentProject.value.goId,
+  () => currentProject.value.id,
  (nid, oid) => {
    queryParams.value.projectId = nid;
    form.value.projectId = nid;
--- a/src/views/other/ys7DeviceImg/index.vue
+++ b/src/views/other/ys7DeviceImg/index.vue
@ -30,7 +30,13 @@
        <el-table-column label="摄像头名称" align="center" prop="name" />
        <el-table-column label="图片地址" align="center" prop="url">
          <template #default="scope">
-            <el-image :z-index="9999" :preview-src-list="[scope.row.path]" preview-teleported :src="scope.row.path" class="w20" />
+            <el-image
+              :z-index="9999"
+              :preview-src-list="['http://58.17.134.85:8919' + scope.row.path]"
+              preview-teleported
+              :src="'http://58.17.134.85:8919' + scope.row.path"
+              class="w20"
+            />
          </template>
        </el-table-column>
        <el-table-column label="拍摄时间" align="center" prop="createdAt" />
--- a/src/views/project/contractorMaterial/index.vue
+++ b/src/views/project/contractorMaterial/index.vue
@ -153,7 +153,6 @@ import { useUserStoreHook } from '@/store/modules/user';
 import { listContractor } from '@/api/project/contractor';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { contractor_material_type } = toRefs<any>(proxy?.useDict('contractor_material_type'));
-console.log('🚀 ~ contractor_material_type:', contractor_material_type);
 // 获取用户 store
 const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
--- a/src/views/project/project/index.vue
+++ b/src/views/project/project/index.vue
@ -22,7 +22,7 @@
    <el-card shadow="never">
      <template #header>
        <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
+          <el-col :span="1.5">
            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['project:project:add']">新增 </el-button>
          </el-col>
          <el-col :span="1.5">
@ -37,13 +37,13 @@
          </el-col>
          <el-col :span="1.5">
            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:project:export']">导出 </el-button>
-          </el-col> -->
+          </el-col>
          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
        </el-row>
      </template>

      <el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange">
-        <!-- <el-table-column type="expand" width="50">
+        <el-table-column type="expand" width="50">
          <template #default="{ row }">
            <div class="w212.25 ml-12.5">
              <el-button class="mb" type="primary" size="small" @click="handleOpenSetChild(row.id)" icon="plus">添加子项目</el-button>
@ -92,24 +92,34 @@
              </el-table>
            </div>
          </template>
-        </el-table-column> -->
+        </el-table-column>
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column label="序号" type="index" width="60" align="center" />
-        <!-- <el-table-column label="项目名称" align="center" prop="projectName"/> -->
+        <el-table-column label="项目名称" align="center" prop="projectName">
+          <!-- <template #default="scope">
+            <el-link
+              :type="scope.row.designId ? 'primary' : 'default'"
+              :disabled="!scope.row.designId"
+              @click="handleOpenLayer(scope.row)"
+              v-loading.fullscreen.lock="fullscreenLoading"
+              >{{ scope.row.projectName }}</el-link
+            >
+          </template> -->
+        </el-table-column>
        <el-table-column label="项目简称" align="center" prop="shortName" />
        <el-table-column label="状态" align="center" prop="status">
          <template #default="scope">
            <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
          </template>
        </el-table-column>
-        <el-table-column label="项目类型" align="center" prop="type" width="120">
+        <el-table-column label="项目类型" align="center" prop="projectType" width="120">
          <template #default="scope">
-            <dict-tag :options="project_type" :value="scope.row.type" />
+            <dict-tag :options="project_type" :value="scope.row.projectType" />
          </template>
        </el-table-column>
-        <el-table-column label="项目类别" align="center" prop="isType">
+        <el-table-column label="项目类别" align="center" prop="projectCategory">
          <template #default="scope">
-            <dict-tag :options="project_category_type" :value="scope.row.isType" />
+            <dict-tag :options="project_category_type" :value="scope.row.projectCategory" />
          </template>
        </el-table-column>
        <el-table-column label="负责人" align="center" prop="principal" />
@ -118,7 +128,7 @@
        <el-table-column label="计划容量(M)" align="center" prop="plan" width="100" />
        <el-table-column label="开工时间" align="center" prop="onStreamTime" width="120" />
        <el-table-column label="打卡范围" align="center" prop="punchRange" />
-        <!-- <el-table-column label="设计总量" align="center" prop="designTotal" /> -->
+        <el-table-column label="设计总量" align="center" prop="designTotal" />
        <!-- <el-table-column label="是否上传DXF" align="center" prop="designId" width="140">
          <template #default="scope">
            <el-link
@ -130,9 +140,9 @@
            >
          </template>
        </el-table-column> -->
-        <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
+        <el-table-column label="备注" align="center" prop="remark" />
        <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
-        <!-- <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="400">
+        <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="400">
          <template #default="scope">
            <el-space>
              <el-button link type="primary" icon="FolderOpened" @click="handleShowUpload(scope.row)">导入安全协议书 </el-button>
@ -141,7 +151,7 @@
              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['project:project:remove']">删除 </el-button>
            </el-space>
          </template>
-        </el-table-column> -->
+        </el-table-column>
      </el-table>

      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
@ -450,8 +460,8 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
  loading.value = true;
  const res = await listProject(queryParams.value);
-  projectList.value = res.data.list;
-  total.value = res.data.total;
+  projectList.value = res.rows;
+  total.value = res.total;
  loading.value = false;
 };
 /** 取消按钮 */
--- a/src/views/project/projectUser/component/ConstructionUserDetail.vue
+++ b/src/views/project/projectUser/component/ConstructionUserDetail.vue
@ -6,7 +6,7 @@
        <el-row :gutter="20" justify="space-around">
          <el-col :span="12">
            <el-form-item label="人脸照">
-              <el-image :src="userDetail?.facePicUrl" style="width: 150px; height: 150px" />
+              <el-image :src="'http://58.17.134.85:8919' + userDetail?.pacePhoto" style="width: 150px; height: 150px" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
--- a/src/views/project/subManagementUser/index.vue
+++ b/src/views/project/subManagementUser/index.vue
@ -517,7 +517,6 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { type_of_work, user_sex_type, user_clock_type, user_file_type, user_status_type, wage_measure_unit_type } = toRefs<any>(
  proxy?.useDict('type_of_work', 'user_sex_type', 'user_clock_type', 'user_file_type', 'user_status_type', 'wage_measure_unit_type')
 );
-console.log('🚀 ~ user_sex_type:', user_sex_type);
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
--- a/src/views/safety/recognizeRecord/index.vue
+++ b/src/views/safety/recognizeRecord/index.vue
@ -42,7 +42,7 @@
        </el-table-column>
        <el-table-column label="图片路径" align="center" prop="picture" width="100">
          <template #default="scope">
-            <image-preview :src="scope.row.picture" :width="50" :height="50" />
+            <image-preview :src="'http://58.17.134.85:8919' + scope.row.picture" :width="50" :height="50" />
          </template>
        </el-table-column>
        <el-table-column label="故障描述" align="center" prop="describe" />
--- a/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue
+++ b/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue
@ -72,7 +72,7 @@
                <image-preview :src="item.path" width="200px" />
              </span>
              <span v-else>
-                <el-link :href="`${item.url}`" :underline="false" target="_blank">
+                <el-link :href="`${'http://58.17.134.85:8919' + item.url}`" :underline="false" target="_blank">
                  <span> {{ item.originalName }} </span>
                </el-link>
              </span>
--- a/src/views/safety/safetyInspection/index.vue
+++ b/src/views/safety/safetyInspection/index.vue
@ -241,12 +241,20 @@ const { queryParams, form, rules } = toRefs(data);

 const teamOpt = ref([]);
 const foremanOpt = ref([]);
+const teamList = ref<ProjectTeamForemanResp[]>();
 /** 查询安全巡检工单列表 */
 const getList = async () => {
  loading.value = true;
  const res = await listSafetyInspection(queryParams.value);
  safetyInspectionList.value = res.data.list;
  total.value = res.data.total;
+  // // 获取项目班组信息
+  // const teamRes = await listProjectTeamForeman(currentProject.value.id);
+  // teamList.value = teamRes.data;
+  // teamOpt.value = teamList.value.map((team: ProjectTeamForemanResp) => ({
+  //   label: team.teamName,
+  //   value: team.id
+  // }));

  loading.value = false;
 };
@ -257,6 +265,14 @@ const getDictDataList = async () => {
  const res1 = await getDictData('tour_type');
  safety_inspection_violation_type.value = res1.data.values;
 };
+const changeForeman = (value: string | number) => {
+  const team = teamList.value.filter((team) => team.id === value)[0];
+  foremanOpt.value = team.foremanList?.map((foreman: foremanQuery) => ({
+    label: foreman.foremanName,
+    value: foreman.foremanId
+  }));
+  form.value.correctorId = '';
+};

 /** 展开安全巡检工单详情对话框操作 */
 const currentSafetyInspectionId = ref<string | number>();
--- a/src/views/safety/teamMeeting/component/TeamMeetingDetailDrawer.vue
+++ b/src/views/safety/teamMeeting/component/TeamMeetingDetailDrawer.vue
@ -13,7 +13,7 @@
      <el-descriptions-item :span="2" label="班会图片">
        <el-space wrap>
          <span :key="item" v-for="item in teamMeetingDetail?.pictureUrlList">
-            <image-preview :src="item" width="200px" />
+            <image-preview :src="'http://xny.yj-3d.com:7363' + item" width="200px" />
          </span>
        </el-space>
      </el-descriptions-item>
@ -38,6 +38,7 @@ const get = async () => {
  const res = await getTeamMeeting({ id: props.teamMeetingId });
  if (res.data && res.code === 0) {
    teamMeetingDetail.value = res.data;
+    teamMeetingDetail.value.pictureUrlList = res.data?.picture.split(',');
  }
  loading.value = false;
 };
--- a/src/views/safety/violationRecord/component/violationRecordDetailDialog.vue
+++ b/src/views/safety/violationRecord/component/violationRecordDetailDialog.vue
@ -41,7 +41,7 @@
          <el-space wrap>
            <div v-for="item in safetyInspectionDetail.checkAttachment" :key="item.ossId">
              <span v-if="['png', 'jpg', 'jpeg'].includes(item.fileType)">
-                <image-preview :src="item.path" width="200px" />
+                <image-preview :src="'http://58.17.134.85:8919' + item.path" width="200px" />
              </span>
              <span v-else>
                <el-link :href="`${item.path}`" type="primary" :underline="false" target="_blank">
--- a/vite.config.ts.timestamp-1754120930342-7e68e85b4df1e.mjs
+++ b/vite.config.ts.timestamp-1754120930342-7e68e85b4df1e.mjs
Author	SHA1	Message	Date
taoge1020	760b707116	优化	2025-08-02 15:52:24 +08:00
taoge1020	e60c435fa6	优化	2025-08-02 15:31:59 +08:00