first commit

src/api/jixiaoguanli/jitairibaobiao.js

@@ -1,934 +1,7 @@
 
 import service from '@/utils/request'
 
-export const getTab = (data) => {
-  return service({
-    url: '/mes_server/packaging_process_output/getTab',
-    method: 'get',
-    data
-  })
-}
-
-export const getList = (params) => {
-  return service({
-    url: '/mes_server/packaging_process_output/getList',
-    method: 'get',
-    params
-  })
-}
-
-export const getInspectCount = (data) => {
-  return service({
-    url: '/mes_server/inspect/getInspectCount',
-    method: 'get',
-    data
-  })
-}
-
-export const getDateList = (params) => {
-  return service({
-    url: '/mes_server/inspect/getDateList',
-    method: 'get',
-    params
-  })
-}
-
-
-export const getMachineCount = (data) => {
-  return service({
-    url:'/mes_server/inspect/getMachineCount',
-    method: 'get',
-    data
-  })
-}
-export const getDateMachine = (params) => {
-  return service({
-    url:'/mes_server/inspect/getDateMachine',
-    method: 'get',
-    params
-  })
-}
-
-
-//机台生产日报表维护
-//新增
-export const productionadd = (data) => {
-  return service({
-    url:'/mes_server/machine_production_report/add',
-    method: 'post',
-    data
-  })
-}
-export const getproductionCount = (data) => {
-  return service({
-    url:'/mes_server/machine_production_report/getTab',
-    method: 'get',
-    data
-  })
-}
-//导出
-export const Export = (data) => {
-  return service({
-    url:'/mes_server/machine_production_report/export',
-    method: 'get',
-    data
-  })
-}
-//机台生产日报表维护附加
-//新增
-export const reportadd = (data) => {
-  return service({
-    url:'/mes_server/machine_production_report_add/add',
-    method: 'post',
-    data
-  })
-}
-export const getproductionList = (params) => {
-  return service({
-    url:'/mes_server/machine_production_report/getList',
-    method: 'get',
-    params
-  })
-}
-
-
-export const getproductionaddCount = (data) => {
-  return service({
-    url:'/mes_server/machine_production_report_add/getTab',
-    method: 'get',
-    data
-  })
-}
-
-export const getproductionaddList = (params) => {
-  return service({
-    url:'/mes_server/machine_production_report_add/getList',
-    method: 'get',
-    params
-  })
-}
-
-export const locate = (params) => {
-  return service({
-    url:'/mes_server/packaging_process_output/locate',
-    method: 'get',
-    params
-  })
-}
-
-export const getInfo = (params) => {
-  return service({
-    url:'/mes_server/packaging_process_output/getInfo',
-    method: 'get',
-    params
-  })
-}
-
-export const getGxMc = (params) => {
-  return service({
-    url:'/mes_server/packaging_process_output/getGxMc',
-    method: 'get',
-    params
-  })
-}
-
-
-export const edit = (params) => {
-  return service({
-    url:'/mes_server/packaging_process_output/edit',
-    method: 'post',
-    params
-  })
-}
-
-
-export const del = (params) => {
-  return service({
-    url:'/mes_server/packaging_process_output/del',
-    method: 'post',
-    params
-  })
-}
-
-
-export const machineLocate = (params) => {
-  return service({
-    url:'/mes_server/inspect/machineLocate',
-    method: 'get',
-    params
-  })
-}
-
-export const MachineInfo = (params) => {
-  return service({
-    url:'/mes_server/inspect/getMachineInfo',
-    method: 'get',
-    params
-  })
-}
-
-
-export const getYg = (params) => {
-  return service({
-    url:'/mes_server/packaging_count_document/getYg',
-    method: 'get',
-    params
-  })
-}
-
-
-export const getMachineGxMc = (params) => {
-  return service({
-    url:'/mes_server/inspect/getMachineGxMc',
-    method: 'get',
-    params
-  })
-}
-
-
-export const getMachineDedh = (params) => {
-  return service({
-    url:'/mes_server/inspect/getMachineDedh',
-    method: 'get',
-    params
-  })
-}
-
-export const getMachineScrapFactor = (params) => {
-  return service({
-    url:'/mes_server/inspect/getMachineScrapFactor',
-    method: 'get',
-    params
-  })
-}
-
-export const machineAdd = (data) => {
-  return service({
-    url:'/mes_server/inspect/machineAdd',
-    method: 'post',
-    data
-  })
-}
-
-export const packagingAdd = (data) => {
-  return service({
-    url:'/mes_server/packaging_process_output/add',
-    method: 'post',
-    data
-  })
-}
-
-export const getJtbh = (params) => {
-  return service({
-    url:'/mes_server/inspect/getJtbh',
-    method: 'get',
-    params
-  })
-}
-
-export const machineEdit = (params) => {
-  return service({
-    url:'/mes_server/inspect/machineEdit',
-    method: 'post',
-    params
-  })
-}
-
-
-export const machineDel = (params) => {
-  return service({
-    url:'/mes_server/inspect/machineDel',
-    method: 'post',
-    params
-  })
-}
-//手工检验
-//定位
-export const  shougonglocate= (params) => {
-  return service({
-    url:'/mes_server/inspect/locate',
-    method: 'get',
-    params
-  })
-}
-//获取详细信息
-export const  shougonggetInfo= (params) => {
-  return service({
-    url:'/mes_server/inspect/getInfo',
-    method: 'get',
-    params
-  })
-}
-//查询印件工序及产品名称
-export const  shougonggetGxMc= (params) => {
-  return service({
-    url:'/mes_server/inspect/getGxMc',
-    method: 'get',
-    params
-  })
-}
-//获取定额代号
-export const  shougonggetDedh= (params) => {
-  return service({
-    url:'/mes_server/inspect/getDedh',
-    method: 'get',
-    params
-  })
-}
-//查询废品系数
-export const  shougonggetScrapFactor= (params) => {
-  return service({
-    url:'/mes_server/inspect/getScrapFactor',
-    method: 'get',
-    params
-  })
-}
-//修改
-export const  shougongedit= (params) => {
-  return service({
-    url:'/mes_server/inspect/edit',
-    method: 'post',
-    params
-  })
-}
-//删除
-export const  shougongdel= (params) => {
-  return service({
-    url:'/mes_server/inspect/del',
-    method: 'post',
-    params
-  })
-}
-//按工单显示
-export const  getInspectCountByGdbh= (params) => {
-  return service({
-    url:'/mes_server/inspect/getInspectCountByGdbh',
-    method: 'get',
-    params
-  })
-}
-//新增
-export const  inspectadd= (data) => {
-  return service({
-    url:'/mes_server/inspect/add',
-    method: 'post',
-    data
-  })
-}
-//机台生产日报表维护附加
-//获取详细信息
-export const  addgetInfo= (params) => {
-  return service({
-    url:'/mes_server/machine_production_report_add/getInfo',
-    method: 'get',
-    params
-  })
-}
-//获取机台
-export const  addgetJtbh= (params) => {
-  return service({
-    url:'/mes_server/machine_production_report_add/getJtbh',
-    method: 'get',
-    params
-  })
-}
-//修改
-export const  addedit= (params) => {
-  return service({
-    url:'/mes_server/machine_production_report_add/edit',
-    method: 'post',
-    params
-  })
-}
-//删除
-export const  adddel= (params) => {
-  return service({
-    url:'/mes_server/machine_production_report_add/del',
-    method: 'post',
-    params
-  })
-}
-//按工单显示
-export const  getMachineCountByGdbh= (params) => {
-  return service({
-    url:'/mes_server/inspect/getMachineCountByGdbh',
-    method: 'get',
-    params
-  })
-}
-//机台日报表维护
-//定位
-export const  productionlocate= (params) => {
-  return service({
-    url:'/mes_server/machine_production_report/locate',
-    method: 'get',
-    params
-  })
-}
-//按工单显示
-export const  productionByGdbh= (params) => {
-  return service({
-    url:'/mes_server/machine_production_report/getTabByGdbh',
-    method: 'get',
-    params
-  })
-}
-//获取详细信息
-export const  productionInfo= (params) => {
-  return service({
-    url:'/mes_server/machine_production_report/getInfo',
-    method: 'get',
-    params
-  })
-}
-//获取工单名称
-export const  productionGdmc= (params) => {
-  return service({
-    url:'/mes_server/machine_production_report/getGdmc',
-    method: 'get',
-    params
-  })
-}
-//获取印件名称
-export const  productionYjmc= (params) => {
-  return service({
-    url:'/mes_server/machine_production_report/getYjmc',
-    method: 'get',
-    params
-  })
-}
-//获取工序信息
-export const  productionGx= (params) => {
-  return service({
-    url:'/mes_server/machine_production_report/getGx',
-    method: 'get',
-    params
-  })
-}
-//获取定额代号
-export const  productionDedh= (params) => {
-  return service({
-    url:'/mes_server/machine_production_report/getDedh',
-    method: 'get',
-    params
-  })
-}
-//修改
-export const  productionedit= (params) => {
-  return service({
-    url:'/mes_server/machine_production_report/edit',
-    method: 'post',
-    params
-  })
-}
-//删除
-export const  productiondel= (params) => {
-  return service({
-    url:'/mes_server/machine_production_report/del',
-    method: 'post',
-    params
-  })
-}
-//同步
-export const  ProductionData= (params) => {
-  return service({
-    url:'/mes_server/Synchronization/ProductionData',
-    method: 'get',
-    params
-  })
-}
-//员工日工资
-//员工日工资查询侧边栏
-export const  dailygetTab= () => {
-  return service({
-    url:'/mes_server/employee_daily_salary/getTab',
-    method: 'get',
-  })
-}
-//员工日工资查询上侧列表
-export const  dailygetList= (params) => {
-  return service({
-    url:'/mes_server/employee_daily_salary/getList',
-    method: 'get',
-	params
-  })
-}
-//员工日工资查询下侧列表
-export const  dailygetAllList= (params) => {
-  return service({
-    url:'/mes_server/employee_daily_salary/getAllList',
-    method: 'get',
-	params
-  })
-}
-//员工工资明细查询
-export const  dailygetGzByYgbh= (params) => {
-  return service({
-    url:'/mes_server/employee_daily_salary/getGzByYgbh',
-    method: 'get',
-	params
-  })
-}
-//每日工资统计
-export const  statistics= (params) => {
-  return service({
-    url:'/mes_server/employee_daily_salary/statistics',
-    method: 'get',
-	params
-  })
-}
-//月度计时工资调整
-export const  wageAdjustment= (params) => {
-  return service({
-    url:'/mes_server/employee_daily_salary/wageAdjustment',
-    method: 'get',
-	params
-  })
-}
-//员工计件明细
-export const  getPieceDetail= (params) => {
-  return service({
-    url:'/mes_server/employee_daily_salary/getPieceDetail',
-    method: 'get',
-	params
-  })
-}
-//员工日工资查询详情
-export const  dailygetDetail= (params) => {
-  return service({
-    url:'/mes_server/employee_daily_salary/getDetail',
-    method: 'get',
-	params
-  })
-}
-//员工定位
-export const  dailysearch= (params) => {
-  return service({
-    url:'/mes_server/employee_daily_salary/search',
-    method: 'get',
-	params
-  })
-}
-//成品入仓
-//侧边栏
-export const  finishedTab= (params) => {
-  return service({
-    url:'/mes_server/finished_product_warehousing/getTab',
-    method: 'get',
-	params
-  })
-}
-//侧边栏 根据工单
-export const  finishedTabByGdbh= (params) => {
-  return service({
-    url:'/mes_server/finished_product_warehousing/getTabByGdbh',
-    method: 'get',
-	params
-  })
-}
-//列表
-export const  finishedList= (params) => {
-  return service({
-    url:'/mes_server/finished_product_warehousing/getList',
-    method: 'get',
-	params
-  })
-}
-//定位
-export const  finishedlocate= (params) => {
-  return service({
-    url:'/mes_server/finished_product_warehousing/locate',
-    method: 'get',
-	params
-  })
-}
-//获取详细信息
-export const  finishedInfo= (params) => {
-  return service({
-    url:'/mes_server/finished_product_warehousing/getInfo',
-    method: 'get',
-	params
-  })
-}
-//获取仓库信息
-export const  finishedgetCk= (params) => {
-  return service({
-    url:'/mes_server/finished_product_warehousing/getCk',
-    method: 'get',
-	params
-  })
-}
-//新增
-export const  finishedadd= (data) => {
-  return service({
-    url:'/mes_server/finished_product_warehousing/add',
-    method: 'post',
-	data
-  })
-}
-//修改
-export const  finishedEdit= (data) => {
-  return service({
-    url:'/mes_server/finished_product_warehousing/edit',
-    method: 'post',
-	data
-  })
-}
-//各日统计
-export const  getDayList= (params) => {
-  return service({
-    url:'/mes_server/finished_product_warehousing/getDayList',
-    method: 'get',
-	params
-  })
-}
-//入仓末板数据统计
-export const  mbList= (params) => {
-  return service({
-    url:'/mes_server/finished_product_warehousing/mbList',
-    method: 'get',
-	params
-  })
-}
-//获取工单信息
-export const  finishedgetGd= (params) => {
-  return service({
-    url:'/mes_server/finished_product_warehousing/getGd',
-    method: 'get',
-	params
-  })
-}
-//查询工单数量
-export const  finishedgetGdsl= (params) => {
-  return service({
-    url:'/mes_server/finished_product_warehousing/getGdsl',
-    method: 'get',
-	params
-  })
-}
-//删除
-export const  finisheddel= (params) => {
-  return service({
-    url:'/mes_server/finished_product_warehousing/del',
-    method: 'post',
-	params
-  })
-}
-//设备运行跟踪
-//左侧菜单
-export const  facilityTab= (params) => {
-  return service({
-    url:'/mes_server/facility/getTab',
-    method: 'get',
-	params
-  })
-}
-//当日上报产量
-export const  facilitychanLiang= (params) => {
-  return service({
-    url:'/mes_server/facility/chanLiang',
-    method: 'get',
-	params
-  })
-}
-//当日制程检验记录
-export const  facilityInspect= (params) => {
-  return service({
-    url:'/mes_server/facility/Inspect',
-    method: 'get',
-	params
-  })
-}
-//设备工作清单
-export const  facilityWorklist= (params) => {
-  return service({
-    url:'/mes_server/facility/EquipmentWorklist',
-    method: 'get',
-	params
-  })
-}
-//印件、工序、完成数量
-export const  facilityProcedure= (params) => {
-  return service({
-    url:'/mes_server/facility/Procedure',
-    method: 'get',
-	params
-  })
-}
-//机台印版领用->左侧菜单
-export const  facilityPrintGetTab= (params) => {
-  return service({
-    url:'/mes_server/facility/PrintGetTab',
-    method: 'get',
-	params
-  })
-}
-//机台印版领用->右侧详情
-export const  facilityPrintDetail= (params) => {
-  return service({
-    url:'/mes_server/facility/PrintDetail',
-    method: 'get',
-	params
-  })
-}
-//当前生产订单
-export const  facilityProduction= (params) => {
-  return service({
-    url:'/mes_server/facility/Production',
-    method: 'get',
-	params
-  })
-}
-//管理人员现场巡检记录->展示
-export const  fieldInspectionRecord= (params) => {
-  return service({
-    url:'/mes_server/facility/FieldInspectionRecord',
-    method: 'get',
-	params
-  })
-}
-//班组人员及分配比例
-export const  facilityTeam= (params) => {
-  return service({
-    url:'/mes_server/facility/Team',
-    method: 'get',
-	params
-  })
-}
-//当班产量明细
-export const  facilityDetail= (params) => {
-  return service({
-    url:'/mes_server/facility/OutputDetail',
-    method: 'get',
-	params
-  })
-}
-//检验记录
-export const  inspectionRecord= (params) => {
-  return service({
-    url:'/mes_server/facility/InspectionRecord',
-    method: 'get',
-	params
-  })
-}
-//班组维护->机台编号下拉框
-export const  facilityMachineList= (params) => {
-  return service({
-    url:'/mes_server/facility/MachineList',
-    method: 'get',
-	params
-  })
-}
-//设备点检->检验项目
-export const  facilityInspectionItem= (params) => {
-  return service({
-    url:'/mes_server/facility/InspectionItem',
-    method: 'get',
-	params
-  })
-}
-//设备点检->左侧菜单栏
-export const  facilitySpotCheckItem= (params) => {
-  return service({
-    url:'/mes_server/facility/SpotCheckItem',
-    method: 'get',
-	params
-  })
-}
-//客诉记录
-export const  ComplaintRecord= (params) => {
-  return service({
-    url:'/mes_server/facility/ComplaintRecord',
-    method: 'get',
-	params
-  })
-}
-//当日上报产量详情
-export const  MachineChanliangDetail= (params) => {
-  return service({
-    url:'/mes_server/facility/MachineChanliangDetail',
-    method: 'get',
-	params
-  })
-}
-//日产量修改
-export const chanliangEdit = (data) => {
-  return service({
-    url:'/mes_server/facility/chanliangEdit',
-    method: 'post',
-    data
-  })
-}
-export const MachineChanliangDetailEdit = (data) => {
-  return service({
-    url:'/mes_server/facility/MachineChanliangDetailEdit',
-    method: 'post',
-    data
-  })
-}
-//每日上报产量工价
-export const CoefficientEdit = (data) => {
-  return service({
-    url:'/mes_server/Facility/CoefficientEdit',
-    method: 'post',
-    data
-  })
-}
-//每日上报产量色度
-export const ChromaDataEdit = (data) => {
-  return service({
-    url:'/mes_server/Facility/ChromaDataEdit',
-    method: 'post',
-    data
-  })
-}
-//每日上报产量凹印版距修改
-export const PrintingModeDataEdit = (data) => {
-  return service({
-    url:'/mes_server/Facility/PrintingModeDataEdit',
-    method: 'post',
-    data
-  })
-}
-//关联工资核算
-//设备点检->左侧菜单栏
-export const  relatedTab= (params) => {
-  return service({
-    url:'/mes_server/related_salary_accounting/getTab',
-    method: 'get',
-	params
-  })
-}
-//关联工资核算上侧列表
-export const  relatedList= (params) => {
-  return service({
-    url:'/mes_server/related_salary_accounting/getList',
-    method: 'get',
-	params
-  })
-}
-//定位
-export const  relatedsearch= (params) => {
-  return service({
-    url:'/mes_server/related_salary_accounting/search',
-    method: 'get',
-	params
-  })
-}
-//关联工资核算下侧列表
-export const  relatedAllList= (params) => {
-  return service({
-    url:'/mes_server/related_salary_accounting/getAllList',
-    method: 'get',
-	params
-  })
-}
-//关联组员权重查询
-export const  weightDetail= (params) => {
-  return service({
-    url:'/mes_server/related_salary_accounting/weightDetail',
-    method: 'get',
-	params
-  })
-}
-//关联工资设置
-export const  setting= (params) => {
-  return service({
-    url:'/mes_server/related_salary_accounting/setting',
-    method: 'get',
-	params
-  })
-}
-//更新关联系数
-export const  updateNum= (params) => {
-  return service({
-    url:'/mes_server/related_salary_accounting/updateNum',
-    method: 'get',
-	params
-  })
-}
-//批量附加组员定位
-export const  batchAddSearch= (params) => {
-  return service({
-    url:'/mes_server/related_salary_accounting/batchAddSearch',
-    method: 'get',
-	params
-  })
-}
-//批量附加组员列表
-export const  batchAddLst= (params) => {
-  return service({
-    url:'/mes_server/related_salary_accounting/batchAddLst',
-    method: 'get',
-	params
-  })
-}
-//关联组员复制列表
-export const  copyLst= (params) => {
-  return service({
-    url:'/mes_server/related_salary_accounting/copyLst',
-    method: 'get',
-	params
-  })
-}
-//批量附加组员
-export const  batchAdd= (data) => {
-  return service({
-    url:'/mes_server/related_salary_accounting/batchAdd',
-    method: 'post',
-	data
-  })
-}
-//批量删除组员
-export const  batchDel= (data) => {
-  return service({
-    url:'/mes_server/related_salary_accounting/batchDel',
-    method: 'post',
-	data
-  })
-}
-//关联组员复制
-export const  copy= (data) => {
-  return service({
-    url:'/mes_server/related_salary_accounting/copy',
-    method: 'post',
-	data
-  })
-}
-//车间报工
-//获取机台生产信息
-export const  reportProduceInfo= (params) => {
-  return service({
-    url:'/mes_server/reporting_work/getProduceInfo',
-    method: 'get',
-	params
-  })
-}
-//获取员工姓名
-export const  reportName= (params) => {
-  return service({
-    url:'/mes_server/reporting_work/getStaffName',
-    method: 'get',
-	params
-  })
-}
-//获取员工姓名-优化后
-export const  getStaffNameTwo= (params) => {
-  return service({
-    url:'/mes_server/reporting_work/getStaffNameTwo',
-    method: 'get',
-    params
-  })
-}
-//获取报工单其他信息
-export const  reportInfo= (params) => {
-  return service({
-    url:'/mes_server/reporting_work/getMachineReportInfo',
-    method: 'get',
-	params
-  })
-}
-//获取机台编号
+//获取MAC物理地址机台编号
 export const getMachineMac = (params) => {
   return service({
     url: '/mes_server/work_order_spot_check/getMachineMac',
@@ -936,215 +9,3 @@ export const getMachineMac = (params) => {
     params
   })
 }
-
-//设置工单工序完工
-export const setProcessStatus = (data) => {
-  return service({
-    url:'/mes_server/reporting_work/setProcessStatus',
-    method: 'post',
-    data
-  })
-}
-//设置机台状态
-export const SetMachineStatus = (params) => {
-  return service({
-    url:'/mes_server/reporting_work/setMachineStatus',
-    method: 'post',
-    params
-  })
-}
-//日产量上报
-export const submitDailyProduction = (data) => {
-  return service({
-    url:'/mes_server/reporting_work/submitDailyProduction',
-    method: 'post',
-    data
-  })
-}
-//提交巡查记录
-export const submitPatrolRecord = (data) => {
-  return service({
-    url:'/mes_server/reporting_work/submitPatrolRecord',
-    method: 'post',
-    data
-  })
-}
-//设置机台状态
-export const setMachineStatus = (data) => {
-  return service({
-    url:'/mes_server/reporting_work/setMachineStatus',
-    method: 'post',
-    data
-  })
-}
-
-export const InspectionItemAdd = (data) => {
-  return service({
-    url:'/mes_server/facility/InspectionItemAdd',
-    method: 'post',
-    data
-  })
-}
-export const ProcessInspectionRecordsItem = (params) => {
-  return service({
-    url:'/mes_server/facility/ProcessInspectionRecordsItem',
-    method: 'get',
-    params
-  })
-}
-export const MachineDetailList = (params) => {
-  return service({
-    url:'/mes_server/facility/MachineDetailList',
-    method: 'get',
-    params
-  })
-}
-
-//获取机台
-export const  reportGetJtbh= (params) => {
-  return service({
-    url:'/mes_server/machine_production_report/getJtbh',
-    method: 'get',
-    params
-  })
-}
-//定额代号查询比例
-export const  dedhGetRate= (params) => {
-  return service({
-    url:'/mes_server/machine_production_report/dedhGetRate',
-    method: 'get',
-    params
-  })
-}
-//设备运行跟踪---换型清场
-export const remodelGetTab = (data) => {
-  return service({
-    url: '/mes_server/facility/remodelGetTab',
-    method: 'get',
-    data
-  })
-}
-export const ChanliangDel = (params) => {
-  return service({
-    url: '/mes_server/facility/ChanliangDel',
-    method: 'get',
-    params
-  })
-}
-export const ModelChangeRecord = (params) => {
-  return service({
-    url: '/mes_server/facility/ModelChangeRecord',
-    method: 'get',
-    params
-  })
-}
-
-export const index = (params) => {
-  return service({
-    url: '/mes_server/Facility/index',
-    method: 'get',
-    params
-  })
-}
-export const ChanliangAdd = (data) => {
-  return service({
-    url:'/mes_server/facility/ChanliangAdd',
-    method: 'post',
-    data
-  })
-}
-export const AdditionalInspectionRecordAdd = (data) => {
-  return service({
-    url:'/mes_server/facility/AdditionalInspectionRecordAdd',
-    method: 'post',
-    data
-  })
-}
-export const ProcessInspectionRecordsItemAdd = (data) => {
-  return service({
-    url:'/mes_server/facility/ProcessInspectionRecordsItemAdd',
-    method: 'post',
-    data
-  })
-}
-//日产量上报添加->工单资料获取
-export const ChanliangWorkorder = (params) => {
-  return service({
-    url: '/mes_server/facility/ChanliangWorkorder',
-    method: 'get',
-    params
-  })
-}
-//日产量上报->印件资料
-export const ChanliangPrintDetail = (params) => {
-  return service({
-    url: '/mes_server/facility/ChanliangPrintDetail',
-    method: 'get',
-    params
-  })
-}
-//日产量上报添加->工艺资料
-export const ChanliangProcessDetail = (params) => {
-  return service({
-    url: '/mes_server/facility/ChanliangProcessDetail',
-    method: 'get',
-    params
-  })
-}
-//班组维护->员工姓名获取
-export const EmployeeData = (params) => {
-  return service({
-    url: '/mes_server/facility/EmployeeData',
-    method: 'get',
-    params
-  })
-}
-export const RemodelDetail = (params) => {
-  return service({
-    url: '/mes_server/Facility/RemodelDetail',
-    method: 'get',
-    params
-  })
-}
-//日产量上报添加->班组信息批量修改
-export const YieldTeamEdit = (params) => {
-  return service({
-    url: '/mes_server/facility/YieldTeamEdit',
-    method: 'get',
-    params
-  })
-}
-// /reporting_work/getTime
-export const getTimelist = (params) => {
-  return service({
-    url: '/mes_server/reporting_work/getTime',
-    method: 'get',
-    params
-  })
-}
-
-// 检品机日产量上报
-export const JpUploade = (data) => {
-  return service({
-    url: '/mes_server/reporting_work/JpUploade',
-    method: 'post',
-    data
-  })
-}
-
-
-export const JPmachineDetail = (params) => {
-  return service({
-    url: '/mes_server/facility/JPmachineDetail',
-    method: 'get',
-    params
-  })
-}
-
-export const JpChanliangEdit = (data) => {
-  return service({
-    url: '/mes_server/facility/JpChanliangEdit',
-    method: 'post',
-    data
-  })
-}

src/view/dashboard/dashboardCharts/echartsLine.vue

@@ -14,9 +14,9 @@
 import * as echarts from 'echarts'
 import { nextTick, onMounted, onUnmounted, ref, shallowRef } from 'vue'
 // import 'echarts/theme/macarons'
-import {
- index
-} from '@/api/jixiaoguanli/jitairibaobiao'
+// import {
+//  index
+// } from '@/api/jixiaoguanli/jitairibaobiao'
 var dataAxis = [
   
 ]

src/view/dashboard/index.vue

@@ -7,19 +7,19 @@
               <el-icon class="dashboard-icon">
                 <comment />
               </el-icon>
-              <label :for="id" class="label-text">计划中工单数: {{ labelValue1 }}</label>
+              <!-- <label :for="id" class="label-text">计划中工单数: {{ labelValue1 }}</label> -->
             </div>
             <div class="dashboard-item">
               <el-icon class="dashboard-icon">
                 <comment />
               </el-icon>
-              <label :for="id" class="label-text">制程中工单数: {{ labelValue3 }}</label>
+              <!-- <label :for="id" class="label-text">制程中工单数: {{ labelValue3 }}</label> -->
             </div>
             <div class="dashboard-item">
               <el-icon class="dashboard-icon">
                 <comment />
               </el-icon>
-              <label :for="id" class="label-text">已完工工单数: {{ labelValue4 }}</label>
+              <!-- <label :for="id" class="label-text">已完工工单数: {{ labelValue4 }}</label> -->
             </div>
           </div>
           <img src="@/assets/dashboard.png" class="gva-top-card-right" alt>
@@ -85,9 +85,9 @@ import DashboardTable from '@/view/dashboard/dashboardTable/dashboardTable.vue'
 import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { useWeatherInfo } from '@/view/dashboard/weather.js'
-import {
- index
-} from '@/api/jixiaoguanli/jitairibaobiao'
+// import {
+//  index
+// } from '@/api/jixiaoguanli/jitairibaobiao'
 
 defineOptions({
   name: 'Dashboard'

src/view/performance/QualityAssessment/excessive.vue

@@ -34,36 +34,36 @@
 	</el-descriptions>
 	
 	<el-descriptions
-		  title=""
-		  column="7"
-		  border
-		  class="queue-status-box"
-		>
-		  <el-descriptions-item label="总任务数">
-		    <el-tag type="info">{{ stats['总任务数'] }}</el-tag>
-		  </el-descriptions-item>
-		
-		  <el-descriptions-item label="待处理">
-		    <el-tag type="warning">{{ stats['待处理'] }}</el-tag>
-		  </el-descriptions-item>
-		
-		  <el-descriptions-item label="处理中">
-		    <el-tag type="primary">{{ stats['处理中'] }}</el-tag>
-		  </el-descriptions-item>
-		
-		  <el-descriptions-item label="成功">
-		    <el-tag type="success">{{ stats['成功'] }}</el-tag>
-		  </el-descriptions-item>
-		
-		  <el-descriptions-item label="失败">
-		    <el-tag type="danger">{{ stats['失败'] }}</el-tag>
-		  </el-descriptions-item>
+		title=""
+		column="7"
+		border
+		class="queue-status-box">
 		
-		  <el-descriptions-item label="操作">
-		    <el-button type="danger" size="small" @click="stopQueueclick" :loading="isLoading" :disabled="isLoading">全部停止处理</el-button>
+		<el-descriptions-item label="总任务数">
+			<el-tag type="info">{{ queuestats['总任务数'] }}</el-tag>
+		</el-descriptions-item>
+
+		<el-descriptions-item label="待处理">
+			<el-tag type="warning">{{ queuestats['待处理'] }}</el-tag>
+		</el-descriptions-item>
+
+		<el-descriptions-item label="处理中">
+			<el-tag type="primary">{{ queuestats['处理中'] }}</el-tag>
+		</el-descriptions-item>
+
+		<el-descriptions-item label="成功">
+			<el-tag type="success">{{ queuestats['成功'] }}</el-tag>
+		</el-descriptions-item>
+
+		<el-descriptions-item label="失败">
+			<el-tag type="danger">{{ queuestats['失败'] }}</el-tag>
+		</el-descriptions-item>
+
+		<el-descriptions-item label="操作">
+			<el-button type="danger" size="small" @click="stopQueueclick" :loading="isLoading" :disabled="isLoading">全部停止处理</el-button>
 			<el-button type="primary" size="small" @click="handleViewQueue" :loading="isLoading">任务列表</el-button>
-		  </el-descriptions-item>
-		</el-descriptions>
+		</el-descriptions-item>
+	</el-descriptions>
 		
 	<el-dialog
 	  v-model="queueDialogVisible"
@@ -112,10 +112,11 @@
 	<br>
 	<el-table :data="tableData" border height="450" v-loading="loading">
 	  <el-table-column prop="id" label="ID" width="50" />
-	  <el-table-column prop="old_image_url" label="原图目录" width="320" />
-	  <el-table-column prop="new_image_url" label="出图目录" width="320" />
-	  <el-table-column prop="image_count" label="图片数量" width="90" />
-	  <el-table-column prop="count" label="总数量" width="90" />
+	  <el-table-column prop="old_image_url" label="原图目录" width="360" />
+	  <el-table-column prop="new_image_url" label="出图目录" width="360" />
+	  <el-table-column prop="old_img_count" label="图片数量" width="90" />
+	  <el-table-column prop="new_image_count" label="总数量" width="90" />
+	  <el-table-column prop="queueLog_model_name" label="任务执行状态" width="110" />
 	  <el-table-column align="center" label="操作" width="230">
 	  <template #default="{ row, $index }" >
 	    <el-button @click="record_deleteRow(row,$index)" type="primary" size="small" 
@@ -124,32 +125,30 @@
 		  </el-button>
 		  <el-button @click="packRow(row,$index)" type="primary" size="small"
 		  	 style="font-size: 16px;padding: 0px;width: 100px;">
-		  		打包文件zip
+		  		打包压缩zip
 		    </el-button>
 	  </template>
 	  </el-table-column>
 	</el-table>
 	
-	<el-dialog v-model="showDescDialog" title="" width="890px" top="2%">
-	  <div style="display: flex; gap: 10px; max-height: 80vh; overflow: hidden;">
+	<el-dialog v-model="showDescDialog" title="" width="890px" top="0%">
+	  <div style="display: flex; gap: 10px; max-height: 70vh; overflow: hidden;">
 	    <!-- 左侧图片区域，自适应图片尺寸，可滚动查看完整图片 -->
-	    <div
-	      style="flex: 1; display: flex; align-items: start; justify-content: center; border: 1px solid #eee; overflow: auto; max-height: 80vh;"
-	    >
+	    <div style="flex: 1; display: flex; align-items: start; justify-content: center; border: 1px solid #eee; overflow: auto; max-height: 80vh;">
 	      <el-image
-	        :src="formatImageUrl(new_image_url)"
+	        :src="formatImageUrl(path_image_url)"
 	        fit="contain"
 	        style="max-width: 100%; height: auto;"
-	        :preview-src-list="[formatImageUrl(new_image_url)]"
+	        :preview-src-list="[formatImageUrl(path_image_url)]"
 	        :initial-index="0"
 	      />
 	    </div>
 	
-	    <!-- 右侧描述信息，固定高度，可滚动 -->
-	    <div style="width: 350px; white-space: pre-wrap; overflow-y: auto; max-height: 63vh; border: 1px solid #f0f0f0; padding: 10px;">
-			<span style="color: red;">文生图提示词</span>
-			{{ activeDescription }}
-	    </div>
+		<!-- 图像描述弹窗内容区域 -->
+		<div style="width: 350px; white-space: pre-wrap; overflow-y: auto; max-height: 63vh; border: 1px solid #f0f0f0; padding: 10px;">
+		  <div v-html="activeDescription"></div>
+		</div>
+
 	  </div>
 	  
 	  <el-descriptions title="" :column="1" border>
@@ -165,13 +164,6 @@
 	          <span>{{ path_image_url }}</span>
 	      </el-descriptions-item>
 	  </el-descriptions>
-
-<!-- 	  <br />
-	  <span>{{ img_id }}</span>
-	  <br />
-	  <span>{{ model }}</span>
-	  <br />
-	  <span>{{ path_image_url }}</span> -->
 	</el-dialog>
 	
 	<el-dialog
@@ -182,36 +174,6 @@
 	  top="4vh"
 	  destroy-on-close
 	>
-	
-	
-	<!-- <el-descriptions
-		  title=""
-		  column="7"
-		  border
-		  class="queue-status-box"
-		>
-		  <el-descriptions-item label="总任务数">
-		    <el-tag type="info">{{ queuestats['总任务数'] }}</el-tag>
-		  </el-descriptions-item>
-		
-		  <el-descriptions-item label="待处理">
-		    <el-tag type="warning">{{ queuestats['待处理'] }}</el-tag>
-		  </el-descriptions-item>
-		
-		  <el-descriptions-item label="处理中">
-		    <el-tag type="primary">{{ queuestats['处理中'] }}</el-tag>
-		  </el-descriptions-item>
-		
-		  <el-descriptions-item label="成功">
-		    <el-tag type="success">{{ queuestats['成功'] }}</el-tag>
-		  </el-descriptions-item>
-		
-		  <el-descriptions-item label="失败">
-		    <el-tag type="danger">{{ queuestats['失败'] }}</el-tag>
-		  </el-descriptions-item>
-	</el-descriptions> -->
-		
-		
 		<el-table
 		  :data="table_Taskqueue"
 		  row-key="id"
@@ -239,8 +201,9 @@
 	  v-model="mlinventoryVisible"
 	  :before-close="mlcloseDialog"
 	  title=""
-	  width="95%"
-	  top="4vh"
+	  width="100%"
+	  style="height: 97%;margin: 0px;"
+	  top="2vh"
 	  destroy-on-close
 	>
 	  <div class="dialog-body">
@@ -248,6 +211,8 @@
 	    <div class="dialog-left">
 	      <el-form ref="elSearchFormRef" class="demo-form-inline">
 	        <el-form-item>
+			  <el-button type="primary" title="" @click="Refresh_Status" :loading="isLoading">刷新执行状态</el-button>
+			  &nbsp;&nbsp;&nbsp;
 			  <span>选择状态：</span>
 	          <el-select
 	            v-model="filterStatus"
@@ -256,8 +221,12 @@
 	            style="width: 120px;"
 	          >
 	            <el-option label="全部" value="全部" />
-	            <el-option label="已出图" value="已出图" />
+				<el-option label="已出图" value="已出图" />
 	            <el-option label="未出图" value="未出图" />
+				<el-option label="图生文" value="图生文" />
+				<el-option label="文生文" value="文生文" />
+				<el-option label="文生图" value="文生图" />
+				<el-option label="图生图" value="图生图" />
 	          </el-select>
 	        </el-form-item>
 	      </el-form>
@@ -266,43 +235,45 @@
 	        :data="tableData_lsit"
 	        row-key="id"
 	        border
-	        style="width: 100%; height: 60vh;"
+	        style="width: 100%; height: 80vh;"
 	        v-loading="loading"
 	        highlight-current-row
 	        tooltip-effect="dark"
-	        :row-style="{ height: '40px' }"
-	        :cell-style="{ padding: '4px' }"
-	        :header-cell-style="{ padding: '4px' }"
-	        :header-row-style="{ height: '40px' }"
+	        :row-style="{ height: '0px' }"
+	        :cell-style="{ padding: '0px' }"
+	        :header-cell-style="{ padding: '0px' }"
+	        :header-row-style="{ height: '0px' }"
 	        @selection-change="SelectionChange"
 	        :show-overflow-tooltip="true"
 	        @row-click="handleRowClick"
 	      >
 	        <el-table-column type="selection" width="50" align="center" />
-	        <el-table-column prop="id" label="序号" width="70" align="center" />
-	        <el-table-column label="原图尺寸" width="120" align="center">
-	          <template #default="{ row }">
-	            {{ row.width }} x {{ row.height }}
-	          </template>
-	        </el-table-column>
-			
-	      <el-table-column label="状态" width="120" align="center">
+	        <el-table-column prop="id" label="序号" width="60" align="center" />
+	        
+	      <el-table-column label="状态" width="86" align="center">
 	        <template #default="{ row }">
 	          <el-tag v-if="row.status === 1" type="success">已出图</el-tag>
-	          <el-tag v-else type="info">未出图</el-tag>
+	          <el-tag v-else type="danger">未出图</el-tag>
 	        </template>
 	      </el-table-column>
-
+	        <el-table-column prop="status_name" label="操作模型" width="90" align="center" />
+			<el-table-column prop="queue_status" label="状态说明" width="140" align="center" />
 	        <el-table-column prop="same_count" label="出图数量" width="90" align="center" />
-	        <el-table-column label="原图预览" width="150">
+	        <el-table-column label="原图预览" width="120">
 	          <template #default="{ row }">
 	            <img
 	              :src="formatImageUrl(row.path)"
-	              style="width: 100px; height: 100px; object-fit: contain; cursor: pointer;"
+	              style="width: 90px; height: 70px; object-fit: contain; cursor: pointer;"
 	              @click="showDescription(row, 'old')"
 	            />
 	          </template>
 	        </el-table-column>
+			
+			<el-table-column label="原图尺寸" width="120" align="center">
+			  <template #default="{ row }">
+			    {{ row.width }} x {{ row.height }}
+			  </template>
+			</el-table-column>
 	      </el-table>
 	
 	      <div class="gva-pagination">
@@ -310,7 +281,7 @@
 	          @size-change="handleSizeChange"
 	          @current-change="handleCurrentChange"
 	          :current-page="page"
-	          :page-sizes="[10, 30, 50, 100, 500]"
+	          :page-sizes="[10, 30, 50, 100, 500,1000]"
 	          :page-size="pageSize"
 	          layout="total, sizes, prev, pager, next"
 	          :total="total"
@@ -325,25 +296,84 @@
 	          <el-form :model="mlformdata" label-position="top">
 	            <el-descriptions column="1" border>
 					
-	              <el-descriptions-item label="图生文提示词">
-	                <el-input
-	                  v-model="textareaContent"
-	                  disabled
-	                  rows="6"
-	                  class="custom-textarea"
-	                  type="textarea"
-	                />
-	              </el-descriptions-item>
-	
-	              <el-descriptions-item label="文生文提示词">
-	                <el-input
-	                  v-model="english_content"
-	                  disabled
-	                  rows="5"
-	                  class="custom-textarea"
-	                  type="textarea"
-	                />
-	              </el-descriptions-item>
+					<el-descriptions-item label="操作">
+					    <el-button type="primary" title="执行选择中图片到队列中,图生文" @click="imgtotext" :loading="isLoading">执行图生文</el-button>
+					    <el-button type="primary" title="执行选择中图片到队列中,文生文" @click="texttotxt" :loading="isLoading">执行文生文</el-button>
+						<el-button type="primary" title="执行选择中图片到队列中,文生图" @click="texttoimg" :loading="isLoading">执行文生图</el-button>
+					    <el-button type="primary" title="执行选中图片到队列中,执行顺序:图生文->文生文->文生图->图生图" @click="handleSelected" :loading="isLoading" :disabled="isLoading">执行选择任务</el-button>
+					    <el-button type="primary" title="执行当前所有图片到队列中,执行顺序:图生文->文生文->文生图->图生图" @click="handleAll" :loading="isLoading">执行全部任务</el-button>
+						<el-button type="primary" title="执行选择中图片到队列中,图生图" @click="imgtoimg" :loading="isLoading">SD图生图</el-button>
+					</el-descriptions-item>
+					
+					<el-descriptions-item label="文生文模型">
+					   <el-radio-group v-model="txttotxt_selectedOption">
+						   <el-radio label="gemini-2.0-flash">gemini-2.0-flash</el-radio>
+					     <el-radio label="gtp-4">gtp-4</el-radio>
+					   </el-radio-group>
+					 </el-descriptions-item>
+					 
+					 <el-descriptions-item label="文生图模型">
+					    <el-radio-group v-model="selectedOption">
+					      <el-radio label="dall-e-3">dall-e-3</el-radio>
+					      <el-radio label="gpt-image-1">gpt-image-1</el-radio>
+					    </el-radio-group>
+					  </el-descriptions-item>
+					
+					<el-descriptions-item label="出图预览">
+					<div style="display: flex; gap: 20px; align-items: flex-start;">
+					  <!-- 左侧：图片列表区域 -->
+					  <div style="flex: 1;">
+						<div class="image-preview-wrap" style="height: 140px;">
+						  <div
+							v-for="(img, index) in imageList"
+							:key="'fixed-' + index"
+							class="image-item"
+							@click="showDescription(img, 'new')"
+						  >
+							<img :src="formatImageUrl(img.new_image_url)" />
+							1024x1024
+						  </div>
+						</div>
+						<div class="image-preview-wrap" style="margin-top: 16px; height: 145px;">
+						  <div
+							v-for="(img, index) in imageList"
+							:key="'custom-' + index"
+							class="image-items"
+							@click="showDescription(img, 'custom')"
+						  >
+							<img :src="formatImageUrl(img.custom_image_url)" />
+							{{ img.size }}
+						  </div>
+						</div>
+						<div class="image-preview-wrap" style="margin-top: 16px; height: 145px;">
+						  <div
+							v-for="(img, index) in imageList"
+							:key="'imgtoimg-' + index"
+							class="image-itemsimg"
+							@click="showDescription(img, 'san')"
+						  >
+							<img :src="formatImageUrl(img.imgtoimg_url)" />
+							图生图 679x862
+						  </div>
+						</div>
+					  </div>
+		
+					  <!-- 右侧：文字描述区域 -->
+					  <div
+						style="
+						  width: 500px;
+						  white-space: pre-wrap;
+						  overflow-y: auto;
+						  max-height: 50vh;
+						  border: 1px solid #f0f0f0;
+						  padding: 10px;
+						"
+					  >
+						<div v-html="activeDescription"></div>
+					  </div>
+					</div>
+				  </el-descriptions-item>
+					
 	
 	              <el-descriptions-item label="出图尺寸">
 	                <div style="display: flex; align-items: center; flex-wrap: wrap; gap: 12px;">
@@ -357,66 +387,37 @@
 	                <el-input-number v-model="num" :step="1" />
 	              </el-descriptions-item>
 				  
-				   <el-descriptions-item label="出图模型">
-				      <el-radio-group v-model="selectedOption">
-				        <el-radio label="dall-e-3">dall-e-3</el-radio>
-				        <el-radio label="gpt-image-1">gpt-image-1</el-radio>
-				      </el-radio-group>
-				    </el-descriptions-item>
-	
-	              <el-descriptions-item label="操作">
-	                <div class="button-group">
-	                  <el-button type="primary" title="执行选择中图片到队列中" @click="imgtotext" :loading="isLoading">执行图生文</el-button>
-	                  <el-button type="primary" title="执行选择中图片到队列中" @click="texttoimg" :loading="isLoading">执行文生图</el-button>
-	                  <el-button type="primary" title="执行选择中图片到队列中" @click="texttotxt" :loading="isLoading">执行文生文</el-button>
-	                  <el-button type="primary" title="执行选择中图片到队列中" @click="handleSelected" :loading="isLoading" :disabled="isLoading">执行选择任务</el-button>
-	                  <el-button type="primary" title="执行当前页面所有图片到队列中" @click="handleAll" :loading="isLoading">执行全部任务</el-button>
-	                </div>
-	              </el-descriptions-item>
-				  
 				  <el-descriptions-item label="任务队列">
-				    <el-table :data="table_queue" border
-					  style="width: 100%; height: 30vh;"
+				    <el-table 
+					  :data="table_queue" border
+					  :show-overflow-tooltip="true"
+					  v-loading="loading"
+					  tooltip-effect="dark"
+					  :row-style="{ height: '30px' }"
+					  :cell-style="{ padding: '2px' }"
+					  :header-cell-style="{ padding: '0px' }"
+					  :header-row-style="{ height: '30px' }"
+					  style="width: 100%; height: 21vh;"
 					 >
-				      <el-table-column prop="id" label="任务ID" width="80" />
+				      <el-table-column prop="id" label="ID" width="50" />
 				      <el-table-column prop="status" label="状态" width="100" />
-				      <el-table-column prop="model" label="队列模型" width="180" />
-					  <el-table-column prop="image_count" label="执行数量" width="95" />
-					  <el-table-column prop="排队中的数量" label="队列中" width="95" />
-					  <el-table-column prop="处理中数量" label="处理中" width="95" />
-					  <el-table-column prop="已完成数量" label="成功" width="95" />
-					 <!-- <el-table-column align="center" label="操作" width="130">
-					  	  <template #default="{ row, $index }" >
-					  	    <el-button @click="record_queueRow(row,$index)" type="primary" size="small" 
-					  			 style="font-size: 16px;padding: 0px;width: 80px;">
-					  				任务列表
-					  		  </el-button>
-					  		 
-					  	  </template>
-					  	  </el-table-column> -->
+				      <el-table-column prop="model" label="队列模型" width="170" />
+					  <el-table-column prop="model_name" label="队列模型" width="90" />
+					  <el-table-column prop="image_count" label="执行数量" width="90" />
+					  <el-table-column prop="排队中的数量" label="队列中" width="70" />
+					  <el-table-column prop="处理中数量" label="处理中" width="70" />
+					  <el-table-column prop="已完成数量" label="成功" width="70" />
+					  <el-table-column prop="失败数量" label="失败" width="70" />
 				    </el-table>
 				  </el-descriptions-item>
-					   
-	              <el-descriptions-item label="出图预览">
-	                <div class="image-preview-wrap">
-	                  <div v-for="(img, index) in imageList" :key="'fixed-' + index" class="image-item" @click="showDescription(img, 'new')">
-	                    <img :src="formatImageUrl(img.new_image_url)" />
-	                    <div>1024x1024</div>
-	                  </div>
-	                </div>
-	
-	                <div class="image-preview-wrap" style="margin-top: 16px;">
-	                  <div v-for="(img, index) in imageList" :key="'custom-' + index" class="image-item" @click="showDescription(img, 'custom')">
-	                    <img :src="formatImageUrl(img.custom_image_url)" />
-	                    <div>{{ img.size }}</div>
-	                  </div>
-	                </div>
-	              </el-descriptions-item>
+				 
 	            </el-descriptions>
 	          </el-form>
 	        </el-card>
 	      </div>
 	    </div>
+	  
+	  
 	  </div>
 	</el-dialog>
 	
@@ -461,7 +462,7 @@ const uploadsPort = import.meta.env.VITE_UPLOADS_PORT || '9093'
 const uploadUrl = ref(`${basePath}:${uploadsPort}/api/Facility/ImgUpload`)
 const uploadHeaders = { 
   'Content-Type': 'multipart/form-data',
-  'Authorization': 'Bearer ' + localStorage.getItem('token') // 添加认证头
+  'Authorization': 'Bearer ' + localStorage.getItem('token')
 }
 
 // 文件列表
@@ -559,7 +560,7 @@ const handleExceed = (files, fileList) => {
 
 
 // --------------------- 查看队列任务 ---------------------
-const stats = ref({
+const queuestats = ref({
   总任务数: 0,
   待处理: 0,
   处理中: 0,
@@ -569,8 +570,9 @@ const stats = ref({
 //队列状态
 const queueStats_list = async () => {
 	const res = await queueStats()
+	console.log(res)
 	if (res.code === 0) {
-	    stats.value = res.data
+	    queuestats.value = res.data
 	  }
 }
 queueStats_list()
@@ -634,26 +636,7 @@ const queueDialog = async () => {
 	queueDialogVisible.value = false
 }
 
-// --------------------- 更新图片列表方法 ---------------------
-// const updateImageList = async () => {
-// 	const res = await getlsit({ path: _oldrow.value['path'] })
-// 	if (res.data === null) {
-// 		imageList.value = []
-// 	} else {
-// 		imageList.value = res.data.map(item => ({
-// 			chinese_description: item.chinese_description,
-// 			new_image_url: item.new_image_url,
-// 			custom_image_url: item.custom_image_url,
-// 			size: item.size
-// 		}))
-// 	}
-// }
-
 // --------------------- 查看详情 ---------------------
-// 分页
-const page = ref(1)
-const total = ref(0)
-const pageSize = ref(50)
 const fetchPreviewImages = async () => {
   loading.value = true;
   const params = {
@@ -666,6 +649,14 @@ const fetchPreviewImages = async () => {
     params.status = 1
   } else if (filterStatus.value === '未出图') {
     params.status = 0
+  }else if(filterStatus.value === '图生文') {
+	  params.status_name = "图生文"
+  }else if(filterStatus.value === '文生文') {
+	  params.status_name = "文生文"
+  }else if(filterStatus.value === '文生图') {
+	  params.status_name = "文生图"
+  }else if(filterStatus.value === '图生图') {
+	  params.status_name = "图生图"
   }
 
   // 获取分页数据
@@ -675,27 +666,13 @@ const fetchPreviewImages = async () => {
     tableData_lsit.value = res.data;
     total.value = res.total;
   }
-
-  // 再发起全量请求（不分页）
-  const allParams = {
-    path: _resrow.value.old_image_url,
-    limit: 10000 // 给一个极大的值相当于全量
-  };
-
-  if (filterStatus.value === '已出图') {
-    allParams.status = 1
-  } else if (filterStatus.value === '未出图') {
-    allParams.status = 0
-  }
-
-  const allRes = await getPreviewimg(allParams);
-  if (allRes.code === 0) {
-    allTableData.value = allRes.data;
-  }
-	
   loading.value = false;
 };
 
+// 分页
+const page = ref(1)
+const total = ref(0)
+const pageSize = ref(50)
 // 页码变化
 const handleCurrentChange = (val) => {
   page.value = val;
@@ -705,7 +682,7 @@ const handleCurrentChange = (val) => {
 // 每页数量变化
 const handleSizeChange = (val) => {
   pageSize.value = val;
-  page.value = 1; // 切换每页数量时，重置为第一页
+  page.value = 1;
   fetchPreviewImages();
 };
 
@@ -724,26 +701,34 @@ const height = ref('')
 const mlformdata = ref({})
 const tableData_lsit = ref([])
 const _resrow = ref('')
-const textareaContent = ref('');
-const english_content = ref('');
 
 const TaskqueueVisible = ref(false)
 const table_queue = ref([])
 const table_Taskqueue = ref([])
 //查看详情按钮
-const record_deleteRow = async (row) => {	
-	getPreviewSubDirslist()
+const record_deleteRow = async (row) => {
+	// getPreviewSubDirslist()
 	_resrow.value = row;
-	page.value = 1;
+	// page.value = 1;
+	
+	//打开弹窗
 	mlinventoryVisible.value = true;
 	
-	console.log(row['old_image_url'])
+	//清空信息保持数据最新
+	imageList.value = []
+	img_id.value = '';
+	model.value = '';
+	new_image_url.value = '';
+	imgtoimg_url.value = '';
+	path_image_url.value = '';
+	activeDescription.value =  '';
+	
+	// 任务队列
 	const queue_logs = await get_queue_logs({ old_image_file: row['old_image_url'] });
 	table_queue.value = queue_logs.data;
 	
+	// 出图尺寸
 	const res = await Template();
-	textareaContent.value = res.data.content
-	english_content.value = res.data.english_content
 	height.value = res.data.height
 	width.value = res.data.width
 		
@@ -767,27 +752,39 @@ const imageList = ref([]);
 const _oldrow = ref('');
 //点击当前行
 const handleRowClick = async (row) => {
+	// fetchPreviewImages();
+	
 	console.log("当前行信息",row)
-	_oldrow.value = row
 	
-	const queue_logs = await get_queue_logs({ old_image_file: _resrow.value['old_image_url'] });
-	table_queue.value = queue_logs.data;
+	// 文本内容高亮处理
+	const zh = highlightKeywords(row['chinese_description'] || '');
+	const en = highlightKeywords(row['english_description'] || '');
+	const name = highlightKeywords(row['img_name'] || '');
 	
-  const res = await getlsit({ path: row['path'] });
-  if (res.data === null) {
-    imageList.value = [];
-  } else {
-    imageList.value = res.data.map(item => ({
-	  id: item.id,
-	  model: item.model,
-      chinese_description: item.chinese_description,
-	  english_description: item.english_description,
-	  img_name: item.img_name,
-      new_image_url: item.new_image_url,
-      custom_image_url: item.custom_image_url,
-      size: item.size
-    }));
-  }
+	activeDescription.value = `第一段：\n${zh}\n\n第二段：\n${en}\n\n第三段：\n${name}`;
+	
+	_oldrow.value = row
+
+
+
+	const res = await getlsit({ path: row['path'] });
+	if (res.data === null) {
+		imageList.value = [];
+	} else {
+		imageList.value = res.data.map(item => ({
+		  id: item.id,
+		  model: item.model,
+		  chinese_description: item.chinese_description,
+		  english_description: item.english_description,
+		  img_name: item.img_name,
+		  new_image_url: item.new_image_url,
+		  imgtoimg_url:item.imgtoimg_url,
+		  custom_image_url: item.custom_image_url,
+		  size: item.size
+		}));
+		const queue_logs = await get_queue_logs({ old_image_file: _resrow.value['old_image_url'] });
+		table_queue.value = queue_logs.data;
+	}
 };
 
 //关闭按钮
@@ -803,32 +800,64 @@ const path_image_url = ref('');
 const img_id = ref('');
 const model = ref('');
 const new_image_url = ref('');
+const imgtoimg_url = ref('');
 const showDescDialog = ref(false);
-const showDescription = (img, type) => {
-	showDescDialog.value = true;
-	new_image_url.value = ''
-	path_image_url.value = ''
-	if (type === 'new') {
-		img_id.value = img.id;
-		model.value = img.model;
-		new_image_url.value = img.new_image_url || '';
-		path_image_url.value = img.new_image_url || '图片未生成';
-		activeDescription.value =  "\n" +  "\n" + img.chinese_description +  "\n" +  "\n" + img.english_description +  "\n" +  "\n" + img.img_name || '暂无说明';
-	}else if (type === 'custom'){
-		img_id.value = img.id;
-		model.value = img.model;
-		new_image_url.value = img.custom_image_url || '';
-		path_image_url.value = img.custom_image_url || '图片未生成';
-		activeDescription.value =   "\n" +  "\n" + img.chinese_description +  "\n" +  "\n" + img.english_description +  "\n" +  "\n" + img.img_name || '暂无说明';
-	} else if (type === 'old') { 
-		img_id.value = "";
-		model.value = "";
-		new_image_url.value = img.path || '';
-		path_image_url.value = img.path || '暂无说明';
-		activeDescription.value =  '';
-	}else{
-	  console.log('无')
-	}
+// 高亮关键词为红色
+const highlightKeywords = (text) => {
+  const keywords = ['几何', 'geometry', 'geometric'];
+  keywords.forEach(word => {
+    const reg = new RegExp(word, 'gi');
+    text = text.replace(reg, match => `<span style="color:red">${match}</span>`);
+  });
+  return text;
+};
+
+// 显示图像描述
+const showDescription = async (img, type) => {
+  showDescDialog.value = true;
+  
+  Refresh_Status()
+  // 任务队列
+  const queue_logs = await get_queue_logs({ old_image_file: _resrow.value['old_image_url'] });
+  table_queue.value = queue_logs.data;
+  
+  // 公共字段初始化
+  img_id.value = img.id || '';
+  model.value = img.model || '';
+  path_image_url.value = '';
+
+  // 文本内容高亮处理
+  const zh = highlightKeywords(img.chinese_description || '');
+  const en = highlightKeywords(img.english_description || '');
+  const name = highlightKeywords(img.img_name || '');
+
+  if (type === 'new') {
+	  
+    path_image_url.value = img.new_image_url || '图片未生成';
+	activeDescription.value = `第一段：\n${zh}\n\n第二段：\n${en}\n\n第三段：\n${name}`;
+	imgtoimg_url.value = img.imgtoimg_url || '图片未生成';
+	
+  } else if (type === 'custom') {
+	  
+    path_image_url.value = img.custom_image_url || '图片未生成';
+	activeDescription.value = `第一段：\n${zh}\n\n第二段：\n${en}\n\n第三段：\n${name}`;
+	imgtoimg_url.value = img.imgtoimg_url || '图片未生成';
+	
+  }else if (type === 'san') {
+	  
+    path_image_url.value = img.imgtoimg_url || '图片未生成';
+	imgtoimg_url.value = img.imgtoimg_url || '图片未生成';
+	activeDescription.value =  '';
+	model.value =  '';
+  }else if (type === 'old') {
+	  
+    path_image_url.value = img.path || '暂无说明';
+	imgtoimg_url.value = '';
+	activeDescription.value = '';
+	
+  } else {
+    console.log('无效的类型');
+  }
 };
 
 
@@ -840,41 +869,121 @@ const SelectionChange = (rows) => {
 
 //查看详情右侧区域
 const isLoading = ref(false)
+//执行次数默认值
 const num = ref(1)
+
+//文生文模型下拉（默认值）
+const txttotxt_selectedOption = ref('gemini-2.0-flash')
+//文生图模型下拉（默认值）
 const selectedOption = ref('dall-e-3')
 
 
+//刷新表格任务状态
+const Refresh_Status = async () => {
+	// 开始 loading
+	loading.value = true;
+	
+	fetchPreviewImages();
+	// 任务队列
+	  const queue_logs = await get_queue_logs({ old_image_file: _resrow.value['old_image_url'] });
+	  table_queue.value = queue_logs.data;
+	
+	// 延迟2秒再关闭loading
+	await new Promise(resolve => setTimeout(resolve, 3000));
+	isLoading.value = false;
+}
+
 //执行图生文、选择执行选择图片，没有选择执行当前页图片处理
 const imgtotext = () => {
 	processImages(toRaw(_parh.value),'图生文');
 };
-
 //执行文生文、选择执行选择图片，没有选择执行当前页图片处理
 const texttotxt = () => {
 	processImages(toRaw(_parh.value),'文生文');
 };
-
 //执行文生图、选择执行选择图片
 const texttoimg = () => {
 	processImages(toRaw(_parh.value),'文生图');
 };
-
-
+//执行图生图、选择执行选择图片
+const imgtoimg = () => {
+	processImages(toRaw(_parh.value),'图生图');
+};
 
 //执行选择任务
 const handleSelected = () => {
-  processImages(toRaw(_parh.value));
+  processImages(toRaw(_parh.value),'');
 };
 
 //执行全部任务
 const allTableData = ref([]); // 全部数据缓存
-const handleAll = () => {
-  const allPaths = toRaw(allTableData.value).map(item => item.path);
-  processImages(allPaths);
+
+const handleAll = async () => {
+  try {
+    await ElMessageBox.confirm(
+      '确定要执行全部任务吗？',
+      '确认操作',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }
+    );
+
+    // 开始 loading
+    loading.value = true;
+
+    // 发起全量请求
+    const allParams = {
+      path: _resrow.value.old_image_url,
+      page: 1,
+      limit: 10000
+    };
+    
+
+   //  const allRes = await getPreviewimg(allParams);
+   //  console.log(allRes);
+
+   //  if (allRes.code === 0) {
+   //    allTableData.value = allRes.data;
+   //    const allPaths = toRaw(allTableData.value).map(item => item.path);
+	  // processImages(toRaw(allPaths),'');
+   //  } else {
+   //    ElMessage.error(allRes.msg || '获取全部图片失败');
+   //  }
+   
+   const allRes = await getPreviewimg(allParams);
+   console.log(allRes);
+   
+   if (allRes.code === 0) {
+     // 全部原始数据
+     allTableData.value = allRes.data;
+   
+     // 只保留 status 为 0 且 status_name 为空的项
+     const filteredPaths = toRaw(allTableData.value)
+       .filter(item => item.status === 0 && !item.status_name)
+       .map(item => item.path);
+   
+     processImages(filteredPaths, '');
+   } else {
+     ElMessage.error(allRes.msg || '获取全部图片失败');
+   }
+
+  } catch (err) {
+    // 用户点击取消时，不做任何操作
+    if (err !== 'cancel') {
+      ElMessage.error('操作取消');
+    }
+  } finally {
+    // 无论成功/失败/异常，最后关闭 loading
+    loading.value = false;
+  }
 };
 
+
 //队列操作 统一执行操作按钮处理方法
 const processImages = async (files,type) => {
+	
 	if (!Array.isArray(files) || files.length === 0) {
 		ElMessage.warning('请选择要处理的图片')
 		return
@@ -885,17 +994,6 @@ const processImages = async (files,type) => {
 		return
 	}
 
-	let prompt = '';
-	if (type === '图生文') {
-		prompt = textareaContent.value;
-	} else if (type === '文生文') {
-		prompt = english_content.value;
-	}else if (type === '文生图') {
-		prompt = '';
-	}else{
-		prompt = '';
-	}
-	
 	isLoading.value = true
 	let successCount = 0
 	const failList = []
@@ -903,7 +1001,7 @@ const processImages = async (files,type) => {
 		old_image_file:_resrow.value['old_image_url'],
 		type:type,
 		selectedOption:selectedOption.value,
-		prompt: prompt,
+		txttotxt_selectedOption:txttotxt_selectedOption.value,
 		batch:files,
 		num:num.value,
 		width: width.value,
@@ -912,7 +1010,6 @@ const processImages = async (files,type) => {
 	
 	//打印调试区域
 	// console.log(payload);
-	// console.log(selectedOption.value)
 	// await new Promise(resolve => setTimeout(resolve, 2000));
 	// isLoading.value = false;
 	// return;
@@ -927,13 +1024,14 @@ const processImages = async (files,type) => {
 		console.warn('失败列表：', failList)
 	}
 	
-	const queue_logs = await get_queue_logs({ old_image_file: _resrow.value['old_image_url'] });
-	table_queue.value = queue_logs.data;
-	
-	
 	// 延迟2秒再关闭loading
-	await new Promise(resolve => setTimeout(resolve, 2000));
+	await new Promise(resolve => setTimeout(resolve, 3000));
 	isLoading.value = false;
+	
+	const queue_logs = await get_queue_logs({ old_image_file: _resrow.value['old_image_url'] });
+	table_queue.value = queue_logs.data;
+	  
+
 }
 
 // --------------------- 打包zip ---------------------
@@ -944,7 +1042,7 @@ const packRow = async (row) => {
     const res = await getPreviewimg({
       path: row.old_image_url,
       page: 1,
-      limit: 9999
+      limit: 10000
     });
     if (res.code !== 0 || !res.data || res.data.length === 0) {
       ElMessage.warning('未找到出图记录');
@@ -1186,7 +1284,7 @@ const packRow = async (row) => {
 }
 
 .dialog-body {
-  height: 78vh;
+  height: 93vh;
   display: flex;
   gap: 20px;
   overflow: hidden;
@@ -1211,7 +1309,7 @@ const packRow = async (row) => {
 .dialog-right-scroll {
   flex: 1;
   overflow-y: auto;
-  padding-right: 10px;
+  padding-right: 5px;
 }
 
 /* 按钮区域自动换行不拥挤 */
@@ -1219,7 +1317,7 @@ const packRow = async (row) => {
   display: flex;
   flex-wrap: wrap;
   gap: 10px;
-  margin-top: 10px;
+  margin-top: 5px;
 }
 
 /* 图片容器 */
@@ -1244,4 +1342,38 @@ const packRow = async (row) => {
   font-size: 12px;
   color: #666;
 }
+
+.image-items {
+  position: relative;
+  text-align: center;
+  width: 107px;
+}
+.image-items img {
+  width: 95px;
+  height: 120px;
+  border: 1px solid #ccc;
+  object-fit: contain;
+}
+.image-items div {
+  margin-top: 4px;
+  font-size: 12px;
+  color: #666;
+}
+
+.image-itemsimg {
+  position: relative;
+  text-align: center;
+  width: 110px;
+}
+.image-itemsimg img {
+  width: 95px;
+  height: 120px;
+  border: 1px solid #ccc;
+  object-fit: contain;
+}
+.image-itemsimg div {
+  margin-top: 4px;
+  font-size: 12px;
+  color: #666;
+}
 </style>