*

lsh

5 天以前 23e81c5d24c37a87fbbbf67c68b17e8f78832148

 src/main/webapp/views/deviceOperate/crnOperate.html

@@ -18,13 +18,19 @@
            max-height="350" style="width: 100%">
            <el-table-column property="crnNo" label="堆垛机">
            </el-table-column>
            <el-table-column property="laneNo" label="巷道号">
            </el-table-column>
            <el-table-column property="workNo" label="工作号">
            </el-table-column>
            <el-table-column property="statusType" label="模式">
            </el-table-column>
            <el-table-column property="wrkStatus" label="任务状态">
            <el-table-column property="wrkStatus$" label="任务状态">
            </el-table-column>
            <el-table-column property="deviceStatus" label="设备状态">
            </el-table-column>
            <el-table-column property="taskComplete" label="任务完成指令">
            </el-table-column>
            <el-table-column property="errorCrn" label="异常提示">
            </el-table-column>
         </el-table>
      </div>
@@ -37,9 +43,9 @@
               </div>
               <div>
                  <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">
                     <el-form-item label="源站/源库位">
                        <el-input v-model="formParam.sourceStaNo" placeholder="源站/源库位"></el-input>
                     </el-form-item>
<!--                     <el-form-item label="源站/源库位">-->
<!--                        <el-input v-model="formParam.sourceStaNo" placeholder="源站/源库位"></el-input>-->
<!--                     </el-form-item>-->
                     <el-form-item label="排">
                        <el-input v-model="formParam.sourceRow" placeholder="排"></el-input>
                     </el-form-item>
@@ -51,9 +57,9 @@
                     </el-form-item>
                  </el-form>
                  <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">
                     <el-form-item label="目标站/目标库位">
                        <el-input v-model="formParam.staNo" placeholder="目标站/目标库位"></el-input>
                     </el-form-item>
<!--                     <el-form-item label="目标站/目标库位">-->
<!--                        <el-input v-model="formParam.staNo" placeholder="目标站/目标库位"></el-input>-->
<!--                     </el-form-item>-->
                     <el-form-item label="排">
                        <el-input v-model="formParam.row" placeholder="排"></el-input>
                     </el-form-item>
@@ -73,13 +79,28 @@
                     </el-form-item>
                  </el-form>
                  <div>
                     <el-button @click="requestOperate('put')" type="primary">入库</el-button>
                     <el-button @click="requestOperate('take')" type="primary">出库</el-button>
<!--                     <el-button @click="requestOperate('put')" type="primary">入库</el-button>-->
<!--                     <el-button @click="requestOperate('take')" type="primary">出库</el-button>-->
                     <el-button @click="requestOperate('stockMove')" type="primary">库位转移</el-button>
                     <el-button @click="requestOperate('siteMove')" type="primary">站到站</el-button>
                     <el-button @click="requestOperate('taskComplete')" type="primary">任务完成</el-button>
                     <el-button @click="requestOperate('clearCommand')" type="primary">清除命令</el-button>
                     <el-button @click="requestOperate('handleReset')" type="primary">复位</el-button>

                     <div style="margin-top: 10px">
                        <el-button @click="requestOperate('taskComplete')" type="primary">任务完成</el-button>
                        <el-button @click="requestOperate('taskCompleteClearCommand')" type="primary">任务完成指令清除</el-button>
                     </div>
<!--                     <el-button @click="requestOperate('siteMove')" type="primary">站到站</el-button>-->
<!--                     <el-button @click="requestOperate('clearCommand')" type="primary">清除命令</el-button>-->
<!--                     <el-button @click="requestOperate('reset')" type="primary">复位</el-button>-->
                     <br/>
                     <br/>
<!--                     <el-button @click="requestOperate('auto')" type="warning">联机</el-button>-->
<!--                     <el-button @click="requestOperate('semiAutomatic')" type="warning">半自动</el-button>-->
<!--                     <el-button @click="requestOperate('hand')" type="warning">手动</el-button>-->
<!--                     <el-button @click="requestOperate('onlineWrk4')" type="warning">恢复联机任务</el-button>-->
<!--                     <el-button @click="requestOperate('onlineWrk3')" type="warning">清除联机任务</el-button>-->
<!--                     <el-button @click="requestOperate('onlineWrk1')" type="warning">申请完成任务</el-button>-->
                     <br/>
                     <br/>
<!--                     <el-button @click="requestOperate('onlineWrk2')" type="warning">申请取消任务</el-button>-->
                  </div>
               </div>
            </el-card>
@@ -153,6 +174,8 @@
                        </el-descriptions-item>
                        <el-descriptions-item label="升降时长(H)">{{ tableData[currentIndex].yduration }}
                        </el-descriptions-item>
                        <el-descriptions-item label="异常提示">{{ tableData[currentIndex].errorCrn }}
                        </el-descriptions-item>
                     </el-descriptions>
                  </div>
               </div>
@@ -223,27 +246,34 @@
            },
            requestOperate(method) {
               let that = this
               $.ajax({
                  url: baseUrl + "/crn/operator/" + method,
                  headers: {
                     'token': localStorage.getItem('token')
                  },
                  data: this.formParam,
                  method: 'POST',
                  success: function (res) {
                     if (res.code == 200) {
                        that.$message({
                           message: res.msg,
                           type: 'success'
                        });
                     } else {
                        that.$message({
                           message: res.msg,
                           type: 'error'
                        });
               that.$confirm('此操作存在风险，是否继续','提示',{
                  confirmButtonText: '确定',
                  cancelButtonText: '取消',
                  type: 'warning'
               }).then(()=>{
                  $.ajax({
                     url: baseUrl + "/crn/operator/" + method,
                     headers: {
                        'token': localStorage.getItem('token')
                     },
                     data: this.formParam,
                     method: 'POST',
                     success: function (res) {
                        if (res.code == 200) {
                           that.$message({
                              message: res.msg,
                              type: 'success'
                           });
                        } else {
                           that.$message({
                              message: res.msg,
                              type: 'error'
                           });
                        }
                     }
                  }
               });
                  });
               })

            },
            updateEnableInOut(type) {
               let that = this