优化

懒羊羊

2023-12-27 c95cd5f21d6f2eba6f865d354418312afd06c2b4

优化

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java

@@ -43,6 +43,11 @@
    {
        startPage();
        List<BsFormulaChildInfo> list = bsFormulaChildInfoService.selectBsFormulaChildInfoList(bsFormulaChildInfo);
        for (BsFormulaChildInfo formulaChildInfo : list) {
            formulaChildInfo.setSort(formulaChildInfo.getStepSort());
            formulaChildInfo.setAddress(formulaChildInfo.getTechRequirement());
            formulaChildInfo.setImg(formulaChildInfo.getOperationSteps());
        }
        return getDataTable(list);
    }


 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/domain/BsFormulaChildInfo.java

@@ -90,7 +90,37 @@
    /** 预留字段4 */
    private String spareField4;

    public void setId(Long id) 
    private String sort;

    private String address;

    private String img;

    public String getSort() {
        return sort;
    }

    public void setSort(String sort) {
        this.sort = sort;
    }

    public String getAddress() {
        return address;
    }

    public void setAddress(String address) {
        this.address = address;
    }

    public String getImg() {
        return img;
    }

    public void setImg(String img) {
        this.img = img;
    }

    public void setId(Long id)
    {
        this.id = id;
    }

 jcdm-main/src/main/java/com/jcdm/main/bs/lineInfo/controller/BsLineInfoController.java

@@ -28,7 +28,7 @@
 * @date 2023-12-09
 */
@RestController
@RequestMapping("/main/lineInfo")
@RequestMapping("/bs/lineInfo")
public class BsLineInfoController extends BaseController
{
    @Autowired
@@ -37,7 +37,7 @@
    /**
     * 查询产线信息列表
     */
    @PreAuthorize("@ss.hasPermi('main:lineInfo:list')")
    @PreAuthorize("@ss.hasPermi('bs:lineInfo:list')")
    @GetMapping("/list")
    public TableDataInfo list(BsLineInfo bsLineInfo)
    {
@@ -49,7 +49,7 @@
    /**
     * 导出产线信息列表
     */
    @PreAuthorize("@ss.hasPermi('main:lineInfo:export')")
    @PreAuthorize("@ss.hasPermi('bs:lineInfo:export')")
    @Log(title = "产线信息", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, BsLineInfo bsLineInfo)
@@ -62,7 +62,7 @@
    /**
     * 获取产线信息详细信息
     */
    @PreAuthorize("@ss.hasPermi('main:lineInfo:query')")
    @PreAuthorize("@ss.hasPermi('bs:lineInfo:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
@@ -72,7 +72,7 @@
    /**
     * 新增产线信息
     */
    @PreAuthorize("@ss.hasPermi('main:lineInfo:add')")
    @PreAuthorize("@ss.hasPermi('bs:lineInfo:add')")
    @Log(title = "产线信息", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody BsLineInfo bsLineInfo)
@@ -83,7 +83,7 @@
    /**
     * 修改产线信息
     */
    @PreAuthorize("@ss.hasPermi('main:lineInfo:edit')")
    @PreAuthorize("@ss.hasPermi('bs:lineInfo:edit')")
    @Log(title = "产线信息", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody BsLineInfo bsLineInfo)
@@ -94,7 +94,7 @@
    /**
     * 删除产线信息
     */
    @PreAuthorize("@ss.hasPermi('main:lineInfo:remove')")
    @PreAuthorize("@ss.hasPermi('bs:lineInfo:remove')")
    @Log(title = "产线信息", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)

 jcdm-ui/src/api/main/bs/lineInfo/lineInfo.js

@@ -3,7 +3,7 @@
// 查询产线信息列表
export function listLineInfo(query) {
  return request({
    url: '/main/lineInfo/list',
    url: '/bs/lineInfo/list',
    method: 'get',
    params: query
  })
@@ -12,7 +12,7 @@
// 查询产线信息详细
export function getLineInfo(id) {
  return request({
    url: '/main/lineInfo/' + id,
    url: '/bs/lineInfo/' + id,
    method: 'get'
  })
}
@@ -20,7 +20,7 @@
// 新增产线信息
export function addLineInfo(data) {
  return request({
    url: '/main/lineInfo',
    url: '/bs/lineInfo',
    method: 'post',
    data: data
  })
@@ -29,7 +29,7 @@
// 修改产线信息
export function updateLineInfo(data) {
  return request({
    url: '/main/lineInfo',
    url: '/bs/lineInfo',
    method: 'put',
    data: data
  })
@@ -38,7 +38,7 @@
// 删除产线信息
export function delLineInfo(id) {
  return request({
    url: '/main/lineInfo/' + id,
    url: '/bs/lineInfo/' + id,
    method: 'delete'
  })
}

 jcdm-ui/src/views/main/cfkb/Instructions/index.vue

@@ -8,7 +8,7 @@
      </el-col>
      <el-col :span="3">
        <el-card shadow="always">
          OP030
          {{productCode}}
        </el-card>
      </el-col>
      <el-col :span="15">
@@ -23,10 +23,10 @@
          <div  class="container" style="height: 50px;background-color: #00afff;margin-bottom: 10px">
            <span class="centered">居中文本</span>
          </div>
          <div v-for="(item,index) in tableData" :key="item.date" class="outerDiv" :id="'outerDiv'+index">
          <div v-for="(item,index) in tableData" :key="item.sort" class="outerDiv" :id="'outerDiv'+index">
            <div class="innerDiv1">
              <div class="innerDiv2">
                <span class="content_left">{{ item.date }}</span>
                <span class="content_left">{{ item.sort }}</span>
              </div>
              <div class="content_right">{{ item.address }}</div>
            </div>
@@ -55,13 +55,13 @@
              <el-button type="primary" @click="processDocuments()" style="float: left" icon="el-icon-folder-opened">工艺文件</el-button>
            </el-row>
            <el-row style="height: 50px;margin-top: 5px">
              <el-button type="primary" @click="product2V91()" style="width: 100px" icon="el-icon-s-unfold">2V91</el-button>
              <el-button type="primary" @click="changeProducts('2V91')" style="width: 100px" icon="el-icon-s-unfold">2V91</el-button>
            </el-row>
            <el-row style="height: 50px;">
              <el-button type="primary" @click="product191()" style="width: 100px" icon="el-icon-s-unfold">191</el-button>
              <el-button type="primary" @click="changeProducts('191')" style="width: 100px" icon="el-icon-s-unfold">191</el-button>
            </el-row>
            <el-row style="height: 50px;">
              <el-button type="primary" @click="product0JWF()" style="width: 100px" icon="el-icon-s-unfold">0JWF</el-button>
              <el-button type="primary" @click="changeProducts('0JWF')" style="width: 100px" icon="el-icon-s-unfold">0JWF</el-button>
            </el-row>
          </el-card>
        </el-col>
@@ -72,58 +72,69 @@
</template>

<script>
import {listFormulaChild} from "@/api/main/bs/formulaChild/formulaChild";

export default {
  name: "index",
  data() {
    return {
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        productCode: null,
      },
      productCode: 'OP1010',
      tableData: [{
        img: 'https://fuss10.elemecdn.com/e/5d/4a731a90594',
        date: '2',
        sort: '2',
        address: '上海市普陀区金沙江路 1518 弄上海市普陀区金沙江路 1518 弄上海市普陀区金沙江路 1518 弄上海市普陀区金沙江路 1518 弄'
      }, {
        img: 'https://fuss10.elemecdn.com/e/5d/4a731a90594',
        date: '2',
        sort: '2',
        address: '上海市普陀区金沙江路 1518 弄上海市普陀区金沙江路 1518 弄上海市普陀区金沙江路 1518 弄上海市普陀区金沙江路 1518 弄'
      }, {
        img: 'https://fuss10.elemecdn.com/e/5d/4a731a90594',
        date: '2',
        sort: '2',
        address: '上海市普陀区金沙江路 1519 弄'
      }, {
        img: 'htts://fuss10.elemecdn.com/e/5d/4a731a90594',
        date: '2',
        sort: '2',
        address: '上海市普陀区金沙江路 1516 弄'
      }, {
        img: 'https://fuss10.elemecdn.com/e/5d/4a731a90594',
        date: '2',
        sort: '2',
        address: '上海市普陀区金沙江路 1516 弄'
      }, {
        img: 'https://fuss10.elemecdn.com/e/5d/4a731a90594',
        date: '2',
        sort: '2',
        address: '上海市普陀区金沙江路 1516 弄'
      }, {
        img: 'https://fuss10.elemecdn.com/e/5d/4a731a90594',
        date: '2',
        sort: '2',
        address: '上海市普陀区金沙江路 1516 弄'
      }, {
        img: '222222222222',
        date: '2',
        sort: '2',
        address: '上海市普陀区金沙江路 1516 弄'
      }, {
        img: 'https://fuss10.elemecdn.com/e/5d/4a731a90594',
        date: '2',
        sort: '2',
        address: '上海市普陀区金沙江路 1516 弄'
      }, {
        img: 'https://fuss10.elemecdn.com/e/5d/4a731a90594',
        date: '2',
        sort: '2',
        address: '上海市普陀区金沙江路 1516 弄'
      }, {
        img: 'https://fuss10.elemecdn.com/e/5d/4a731a90594',
        date: '2',
        sort: '2',
        address: '上海市普陀区金沙江路 1516 弄'
      }],
      address: '',
      src: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg'
      src: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
      // src: 'file:///D:/img/qt.jpg'

      intervalId: null,

    };
  },
  created() {
@@ -136,7 +147,7 @@
  methods: {
    autoShow() {
      const _this = this
      setInterval(() => {
      this.intervalId = setInterval(() => {
        _this.setBg()
      }, 2000)
    },
@@ -181,15 +192,45 @@
    processDocuments(){

    },
    product2V91(){
    changeProducts(val){
      this.productCode = val
      const _this = this

      /** 查询配方配置子信息列表 */
      this.queryParams.productCode = val;
      listFormulaChild(this.queryParams).then(response => {
        this.tableData = [];
        this.tableData = response.rows;
        clearInterval(this.intervalId);

        for (let i = 0; i < this.tableData.length; i++) {
          document.getElementById('outerDiv'+i).style.background = 'white'
        }
        setTimeout(() => {
        document.getElementById('outerDiv0').style.background = 'yellow'
          this.intervalId = setInterval(() => {
            if (document.getElementById('outerDiv' + (this.tableData.length - 1)).style.background === 'yellow') {
              this.setImg(0)
              document.getElementById('outerDiv0').style.background = 'yellow'
              for (let j = 1; j < this.tableData.length; j++) {
                document.getElementById('outerDiv' + j).style.background = 'white'
              }
              return;
            }
            for (let i = 0; i < this.tableData.length; i++) {
              if (document.getElementById('outerDiv' + i).style.background === 'yellow') {
                this.setImg(i+1)
                document.getElementById('outerDiv' + i).style.background = 'green'
                document.getElementById('outerDiv' + (i+1)).style.background = 'yellow'
                return;
              }
            }

          }, 2000)
        }, 7000);

      });
    },
    product191(){

    },
    product0JWF(){

    }
  },
}
</script>