root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:内包间逻辑修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2024-03-05 09:49:49 +08:00
parent 1faf1dd652
commit fdb53b5d30
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java
View File

@@ -127,14 +127,14 @@ public class PaperTubeTask extends AbstractAcsTask {
//todo:创建桁架任务搬运一个符合的气涨轴 //todo:创建桁架任务搬运一个符合的气涨轴
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();
jo.put("task_type", "010602"); jo.put("task_type", "010602");
String public_area = ""; /*String public_area = "";
if (product_area.equals("A1") || product_area.equals("A2")) { if (product_area.equals("A1") || product_area.equals("A2")) {
public_area = "A1"; public_area = "A1";
} }
if (product_area.equals("A3") || product_area.equals("A4")) { if (product_area.equals("A3") || product_area.equals("A4")) {
public_area = "A3"; public_area = "A3";
} }*/
JSONObject qhd_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '6' AND product_area = '" + public_area + "'").uniqueResult(0); JSONObject qhd_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '6' AND product_area = '" + product_area + "'").uniqueResult(0);
jo.put("point_code1", qhd_jo.getString("point_code")); jo.put("point_code1", qhd_jo.getString("point_code"));
jo.put("point_code2", cbz_jo.getString("point_code")); jo.put("point_code2", cbz_jo.getString("point_code"));
jo.put("truss_type", "8"); jo.put("truss_type", "8");

8
lms/nladmin-ui/src/views/tools/storage/index.vue
View File

@@ -65,7 +65,7 @@
> >
<a <a
slot="reference" slot="reference"
:href="baseApi + '/file/' + scope.row.type + '/' + scope.row.realName" :href="baseURLStr + '/file/' + scope.row.type + '/' + scope.row.realName"
class="el-link--primary" class="el-link--primary"
style="word-break:keep-all;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color: #1890ff;font-size: 13px;" style="word-break:keep-all;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color: #1890ff;font-size: 13px;"
target="_blank" target="_blank"
@@ -78,8 +78,8 @@
<el-table-column prop="path" label="预览图"> <el-table-column prop="path" label="预览图">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-image <el-image
:src=" baseApi + '/file/' + row.type + '/' + row.realName" :src=" baseURLStr + '/file/' + row.type + '/' + row.realName"
:preview-src-list="[baseApi + '/file/' + row.type + '/' + row.realName]" :preview-src-list="[baseURLStr + '/file/' + row.type + '/' + row.realName]"
fit="contain" fit="contain"
lazy lazy
class="el-avatar" class="el-avatar"
@@ -115,6 +115,7 @@ import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination' import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker' import DateRangePicker from '@/components/DateRangePicker'
const defaultForm = { id: null, name: '' } const defaultForm = { id: null, name: '' }
export default { export default {
components: { pagination, crudOperation, rrOperation, DateRangePicker }, components: { pagination, crudOperation, rrOperation, DateRangePicker },
@@ -125,6 +126,7 @@ export default {
data() { data() {
return { return {
delAllLoading: false, delAllLoading: false,
baseURLStr: window.g.prod.VUE_APP_BASE_API,
loading: false, loading: false,
headers: { 'Authorization': getToken() }, headers: { 'Authorization': getToken() },
permission: { permission: {