义乌上片前后端界面接口及样式

wangfei

2024-11-12 5f67e7f233dbedaeb4ffacc726c396604dee669a

义乌上片前后端界面接口及样式

 UI-Project/config.js

@@ -1,10 +1,10 @@
export default {
    serverUrl: "10.153.19.150:88/api",
    // serverUrl: "10.153.19.150:88/api",
//  serverUrl: "192.168.1.199:88/api",
//  serverUrl: "127.0.0.1:88/api",
    serverUrl2: "10.153.19.150:88"
    serverUrl: "127.0.0.1:88/api",
    // serverUrl2: "10.153.19.150:88"
    // serverUrl2: "192.168.1.199:88"
    // serverUrl2: "127.0.0.1:88"
    serverUrl2: "127.0.0.1:88"

    //serverUrl:"res.abeim.cn"
}

 UI-Project/src/utils/constants.js

@@ -1,4 +1,4 @@
//  export const WebSocketHost = "192.168.1.199";
export const WebSocketHost = "10.153.19.150";
// export const WebSocketHost = "127.0.0.1";
export const host = "88";
// export const WebSocketHost = "10.153.19.150";
export const WebSocketHost = "127.0.0.1";
export const host = "8083";

 UI-Project/src/views/Returns/upreturns.vue

@@ -105,8 +105,10 @@
      ElMessage.success(response.message);
      tableData.value = response.data;
      dialogFormVisible.value = false;
      selectedProjectNo.value = ''
      filmRemove.value = ''
      selectedProjectNo.value = '';
      filmRemove.value = '';
      markingMachineStatus.value = '#911005';
      cuttingMachineStatus.value = '#911005';
    } else {
      ElMessage.error(response.message);
    }
@@ -173,12 +175,12 @@
// 查询数据
const selectReportData = async () => {
  let stateList = []
  if (selectValuesa[1] != null && selectValuesa[1] != 'undefined') {
    if (selectValuesa[1] != "") {
      stateList = [selectValuesa[1]];
  if (selectValuesa[0] != null && selectValuesa[0] != 'undefined') {
    if (selectValuesa[0] != "") {
      stateList = [selectValuesa[0]];
    }
  }
  const response = await request.post("/cacheVerticalGlass/damage/selectDamage", {
  const response = await request.post("/loadGlass/up-patten-usage/setUpPattenRequest", {
    taskState: stateList,
    taskType: 1
  })

 UI-Project/src/views/Returns/upreturns2.vue

@@ -95,6 +95,7 @@
  try {
    const response = await request.post('/loadGlass/up-patten-usage/selectUpPattenUsage', {
      stationCell: 2,
      // engineerId: 'P24101602',
      engineerId: selectedProjectNo.value,
      filmRemove: filmRemove.value,
    })
@@ -102,9 +103,12 @@
    window.localStorage.setItem('filmRemove', filmRemove.value)
    if (response.code == 200) {
      ElMessage.success(response.message);
      blinda.value = false;
      selectedProjectNo.value = ''
      filmRemove.value = ''
      tableData.value = response.data;
      dialogFormVisible.value = false;
      selectedProjectNo.value = '';
      filmRemove.value = '';
      markingMachineStatus.value = '#911005';
      cuttingMachineStatus.value = '#911005';
    } else {
      ElMessage.error(response.message);
    }
@@ -121,6 +125,7 @@
      const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
        stationCell: 2,
        filmRemove: filmRemove,
        // engineerId: 'P24101602',
        engineerId: engineeringId,
        state: 1,
      })
@@ -146,17 +151,17 @@
    if (engineeringId !== '') {
      const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
        stationCell: 2,
        // engineerId: 'P24101602',
        engineeringId: engineeringId,
        state: 0,
      })
      if (response.code == 200) {
      ElMessage.success(response.message);
      blinda.value = false;
        ElMessage.success(response.message);
        blinda.value = false;
      } else {
        ElMessage.error(response.message);
      }
    } else {
      ElMessage.error(response.message);
    }
  }
    else  {
      ElMessage({
        type: 'info',
        message: t('basicData.infonull'),
@@ -170,14 +175,14 @@
// 查询数据
const selectReportData = async () => {
  let stateList = []
  if (selectValuesa[1] != null && selectValuesa[1] != 'undefined') {
    if (selectValuesa[1] != "") {
      stateList = [selectValuesa[1]];
  if (selectValuesa[0] != null && selectValuesa[0] != 'undefined') {
    if (selectValuesa[0] != "") {
      stateList = [selectValuesa[0]];
    }
  }
  const response = await request.post("/cacheVerticalGlass/damage/selectDamage", {
  const response = await request.post("/loadGlass/up-patten-usage/setUpPattenRequest", {
    taskState: stateList,
    taskType: 1
    taskType: 2
  })
  if (response.code === 200) {
    tableData.value = response.data;
@@ -301,25 +306,11 @@
      </div>
    </el-card>
    <div style="display: flex;">
      <!-- <div style="width: 49%;float: left;margin-left: 300px;">
        <div style="display: flex;">
            <img src="../../assets/shangpianji.png" alt="" style="max-width: 25%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
            <el-table :data="tableDataa" border style="width: 75%;margin-top: 10%;margin-left: 2%;"
         :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
            >
              <el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="60" />
              <el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="80" />
              <el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="80" />
              <el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80" />
              <el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80" />
            </el-table>
        </div>
      </div> -->
      <div style="width: 48%;float: right;margin-left: 300px;">
      <div style="width: 49%;float: left;margin-left: 300px;">
        <div style="display: flex;">
          <img src="../../assets/shangpianji.png" alt=""
               style="max-width: 25%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
          <el-table :data="tableDatab" border style="width: 75%;margin-top: 10%;margin-left: 2%;"
          <el-table :data="tableDataa" border style="width: 75%;margin-top: 10%;margin-left: 2%;"
                    :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
          >
            <el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="60"/>
@@ -328,8 +319,22 @@
            <el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80"/>
            <el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/>
          </el-table>
    </div>
</div>
        </div>
      </div>
      <!-- <div style="width: 48%;float: right;">
        <div style="display: flex;">
          <img src="../../assets/shangpianji.png" alt="" style="max-width: 25%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
          <el-table :data="tableDatab" border style="width: 75%;margin-top: 10%;margin-left: 2%;"
       :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
          >
            <el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="60" />
            <el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="80" />
            <el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="80" />
            <el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80" />
            <el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80" />
          </el-table>
      </div>
  </div> -->
</div>
  <el-dialog v-model="blind" top="30vh" width="25%" :title="$t('basicData.startfilm')">
    <template #footer>

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java

@@ -35,6 +35,8 @@
    private  EngineeringService engineeringService;
    @Autowired
    private OptimizeProjectService optimizeProjectService;


    @ApiOperation("显示选择的工程信息")
    @GetMapping("/prioritylist") //查询现在上片机的玻璃信息
    @ResponseBody
@@ -69,13 +71,18 @@
    @ResponseBody
    public Result<Boolean> updateGlassState(@RequestBody UpPattenUsage upPattenUsage) {
        Boolean whether = upPattenUsageService.updateGlassState(upPattenUsage);
        if (whether){
        if (whether) {
            return Result.build(200, "成功", whether);
        }else {
        } else {
            return Result.build(100, "失败", whether);
        }

    }

    @ApiOperation("设置上片查询条件")
    @PostMapping("/setUpPattenRequest")
    public Result setRawGlassTaskRequest(@RequestBody Engineering request) {
        return Result.build(200, "查询成功", upPattenUsageService.Engineering(request));
    }
}


 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java

@@ -1,5 +1,7 @@
package com.mes.uppattenusage.service;

import com.github.yulichang.base.MPJBaseService;
import com.mes.engineering.entity.Engineering;
import com.mes.uppattenusage.entity.UpPattenUsage;

import java.util.List;
@@ -58,5 +60,6 @@
      */
     Boolean updateGlassState(UpPattenUsage upPattenUsage);

     Object Engineering(Engineering request);
}