时间

.env.test

@@ -36,17 +36,16 @@ VITE_INTERFACE_URL='http://10.56.17.106:25111/magic/web/index.html'
 #VITE_INTERFACE_URL='http://dev.ccwin-in.com:25111/magic/web/index.html'
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25111'
+VITE_JMREPORT_BASE_URL='http://10.56.17.106:25111'
 
 # 租户配置
 VITE_TENANT='["东驰新能源"]'
 
 # 查看质检报告环境
-VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'
+VITE_REPORT_URL = 'http://10.56.17.106:25400'
 
 # 是否需要验证码
 VITE_NEED_CODE = true
 
-
 # 是否需要下载PDA链接
 VITE_PDA_URL = true

src/api/battery/monomer/index.ts

@@ -19,77 +19,77 @@ export interface MonomerVO {
   procRemark: String
   type: String
 
-  acoreThi: String
+  // acoreThi: String
-  acoreWid: String
+  // acoreWid: String
-  bcoreThi: String
+  // bcoreThi: String
-  bcoreWid: String
+  // bcoreWid: String
-
+  //
-  oneInjectPreCpk: String
+  // oneInjectPreCpk: String
-  twoInjectPreCpk: String
+  // twoInjectPreCpk: String
-  posCoatDenCpk: String
+  // posCoatDenCpk: String
-  negCoatDenCpk: String
+  // negCoatDenCpk: String
-  posRollThickCpk: String
+  // posRollThickCpk: String
-  negRollThickCpk: String
+  // negRollThickCpk: String
-  oneInjectCpk: String
+  // oneInjectCpk: String
-  finalInjectRetenCpk: String
+  // finalInjectRetenCpk: String
-
+  //
-  temOfPriinjectPlant: String
+  // temOfPriinjectPlant: String
-  temOfPreStandPlant: String
+  // temOfPreStandPlant: String
-  temOfStandPlant: String
+  // temOfStandPlant: String
-  temOfAftStandPlant: String
+  // temOfAftStandPlant: String
-  temOfSecinjectPlant: String
+  // temOfSecinjectPlant: String
-  tempOfBefVolSepPlant: String
+  // tempOfBefVolSepPlant: String
-  tempOfVolSepPlant: String
+  // tempOfVolSepPlant: String
-  humOfVolAssPlant: String
+  // humOfVolAssPlant: String
-  humOfPriinjectPlant: String
+  // humOfPriinjectPlant: String
-  humOfPreStandPlant: String
+  // humOfPreStandPlant: String
-  humOfStandPlant: String
+  // humOfStandPlant: String
-  humOfAftStandPlant: String
+  // humOfAftStandPlant: String
-  humOfSecinjectPlant: String
+  // humOfSecinjectPlant: String
-  humpOfBefVolSepPlant: String
+  // humpOfBefVolSepPlant: String
-  humpOfVolSepPlant: String
+  // humpOfVolSepPlant: String
-  standardOfClean: String
+  // standardOfClean: String
-  cleanOfCoatPlant: String
+  // cleanOfCoatPlant: String
-  cleanOfRollPlant: String
+  // cleanOfRollPlant: String
-  cleanOfSlitPlant: String
+  // cleanOfSlitPlant: String
-  cleanOfStackPlant: String
+  // cleanOfStackPlant: String
-  cleanOfPriInjectPlant: String
+  // cleanOfPriInjectPlant: String
-  cOfPreStandPlant: String
+  // cOfPreStandPlant: String
-  clOfStandPlant: String
+  // clOfStandPlant: String
-  cleanOfAftStandPlant: String
+  // cleanOfAftStandPlant: String
-
+  //
-  passPer: String
+  // passPer: String
-  equAbnList: String
+  // equAbnList: String
-  equAbnAlarm: String
+  // equAbnAlarm: String
-  environAbnoralarm: String
+  // environAbnoralarm: String
-
+  //
-  posPowrMagSub: String
+  // posPowrMagSub: String
-  negPowrMagSub: String
+  // negPowrMagSub: String
-  posSlurMagSub: String
+  // posSlurMagSub: String
-  negSlurMagSub: String
+  // negSlurMagSub: String
-  posPolOneSidDen: String
+  // posPolOneSidDen: String
-  negPolOneSidDen: String
+  // negPolOneSidDen: String
-  posPolDouSidDen: String
+  // posPolDouSidDen: String
-  negPolDouSidDen: String
+  // negPolDouSidDen: String
-  posColTh: String
+  // posColTh: String
-  negColTh: String
+  // negColTh: String
-  posPolLen: String
+  // posPolLen: String
-  negPolLen: String
+  // negPolLen: String
-  diaThiAftDieSli: String
+  // diaThiAftDieSli: String
-  verHeiAftDieSli: String
+  // verHeiAftDieSli: String
-  mosConPolAftBak: String
+  // mosConPolAftBak: String
-
+  //
-  vacLeaValOrHelVal: String
+  // vacLeaValOrHelVal: String
-  helDetAftWel: String
+  // helDetAftWel: String
-  tolInj: String
+  // tolInj: String
-  tolInjPerDev: String
+  // tolInjPerDev: String
-  totWeight: String
+  // totWeight: String
-  facVol: String
+  // facVol: String
-  quantitative: String
+  // quantitative: String
-  impAc: String
+  // impAc: String
-  celLen: String
+  // celLen: String
-  celWid: String
+  // celWid: String
-  celThi: String
+  // celThi: String
 }
 
 // 查询battery_cell_device列表
@@ -113,6 +113,13 @@ export const createMonomer = async (data: MonomerVO) => {
   return await request.post({ url: `/battery/monomer/create`, data })
 }
 
+export const releaseStatic = async (data: MonomerVO) => {
+  return await request.put({ url: `/battery/monomer/release-static`, data })
+}
+
+export const releaseMoving = async (data: MonomerVO) => {
+  return await request.put({ url: `/battery/monomer/release-moving`, data })
+}
 // 修改battery_cell_device
 export const updateMonomer = async (data: MonomerVO) => {
   return await request.put({ url: `/battery/monomer/update`, data })

src/hooks/web/useMessage.ts

@@ -1,5 +1,6 @@
 import { ElMessage, ElMessageBox, ElNotification } from 'element-plus'
 import { useI18n } from './useI18n'
+import {releaseStatic} from "@/api/battery/monomer";
 export const useMessage = () => {
   const { t } = useI18n()
   return {
@@ -77,6 +78,17 @@ export const useMessage = () => {
         type: 'warning'
       })
     },
+    releaseConfirm(content?: string, tip?: string) {
+      return ElMessageBox.confirm(
+        content ? content : t('common.releaseMessage'),
+        tip ? tip : t('common.confirmTitle'),
+        {
+          confirmButtonText: t('common.ok'),
+          cancelButtonText: t('common.cancel'),
+          type: 'warning'
+        }
+      )
+    },
     // 删除窗体
     delConfirm(content?: string, tip?: string) {
       return ElMessageBox.confirm(

src/locales/zh-CN.ts

@@ -46,7 +46,9 @@ export default {
     updateSuccess: '修改成功',
     emailSentSuccess: '邮件发送成功',
     delMessage: '是否删除所选中数据？',
+    releaseMessage: '是否发布所选中数据？',
     delDataMessage: '是否删除数据？',
+    releaseDataMessage: '是否发布数据？',
     delNoData: '请选择需要删除的数据',
     delSuccess: '删除成功',
     index: '序号',

src/views/battery/monomer/index.vue

@@ -226,6 +226,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import {defaultAddStaticBtn} from "@/utils/disposition/defaultButtons";
+import {releaseMoving, releaseStatic} from "@/api/battery/monomer";
 
 defineOptions({ name: 'CellDevice' })
 
@@ -263,7 +264,7 @@ const HeadButttondata = [
   defaultButtons.defaultAddStaticBtn({hasPermi:'battery:monomer:update'}), // 静态数据
   defaultButtons.defaultAddBtn({hasPermi:'battery:monomer:create'}), // 新增
   // defaultButtons.defaultImportBtn({hasPermi:'battery:cellDevice:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'battery:monomer:export'}), // 导出
+  // defaultButtons.defaultExportBtn({hasPermi:'battery:monomer:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   // defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -293,13 +294,23 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
+// isShowButton
+const isShowButton = (row,val) => {
+  if (row.type == 'static') {
+    return false
+  } else if (row.sending == '0') {
+    return false
+  } else{
+    return true
+  }
+}
 
 // 列表-操作按钮
 const butttondata = (row,$index) => {
 
   return [
-    defaultButtons.mainListEditBtn({hasPermi:'battery:monomer:update'}), // 编辑
+    defaultButtons.mainListEditBtn({hide:isShowButton(row,['FALSE']),hasPermi:'battery:monomer:update'}), // 编辑
-    defaultButtons.mainListReleaseBtn({hide:(row.release =='0' || row.type !='static'),hasPermi:'battery:monomer:update'}), // 发布
+    defaultButtons.mainListReleaseBtn({hide:isShowButton(row,['FALSE']),hasPermi:'battery:monomer:update'}), // 发布
     defaultButtons.mainListDeleteBtn({hide:row.type =='static' ,hasPermi:'battery:monomer:delete'}), // 删除
   ]
 }
@@ -307,10 +318,11 @@ const butttondata = (row,$index) => {
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'edit') { // 编辑
-    
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
+  }else if (val == 'release') { // 发布
+    handleRelease(row)
   }
 }
 
@@ -410,6 +422,23 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'basicCellDevice')
 }
 
+const handleRelease = async (row?: any) => {
+  try {
+    // 删除的二次确认
+    await message.releaseConfirm()
+    // 发起删除
+    if(row.type == 'static'){
+      await MonomerApi.releaseStatic(row);
+    }else{
+      await MonomerApi.releaseMoving(row);
+    }
+    message.success('发送成功')
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {