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

fix:现场测试，大屏显示修改

Browse Source
This commit is contained in:
lishuai
2023-12-20 11:32:14 +08:00
parent 6560d294f8
commit bc4142feb5
8 changed files with 58 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-ui/public/config.js
View File

@@ -1,6 +1,6 @@
window.g = {
dev: {
VUE_APP_BASE_API: 'http://127.0.0.1:8012'
VUE_APP_BASE_API: 'http://127.0.0.1:8015'
},
prod: {
VUE_APP_BASE_API: 'http://127.0.0.1:8012'

4
acs/nladmin-ui/src/views/acs/task/index.vue
View File

@@ -319,10 +319,10 @@
<el-input v-model="form.is_bushing" style="width: 240px;" @change="isDisabled=false" />
</el-form-item>
<!-- 页面中的表单项 -->
<el-form-item label="纸管数组">
<el-form-item v-if="form.task_type === '10'" label="纸管数组">
<el-button v-if="showAddRowButton" style="color: #6b75e9;" @click="addNewRow">添加新行</el-button>
</el-form-item>
<el-form-item>
<el-form-item v-if="form.task_type === '10'">
<el-form :model="form">
<el-table
style="width: 100%;"

26
acs/nladmin-ui/src/views/system/monitor/device/index.vue
View File

@@ -195,6 +195,24 @@
<el-button type="primary" @click="saveBarcode">确 定</el-button>
</div>
</el-dialog>
<el-dialog title="设备设置" :visible.sync="dialogFormVisible10" width="35%">
<el-form :model="form" size="small">
<el-form-item label="设备编号" prop="device_code" label-width="120px">
<el-input v-model="form.device_code" :disabled="true" />
</el-form-item>
<el-form-item label="请求标记" prop="requireSucess" label-width="120px">
<el-radio-group v-model="form.requireSucess">
<el-radio-button :label="0">否</el-radio-button>
<el-radio-button :label="1">是</el-radio-button>
</el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible10 = false">取 消</el-button>
<el-button type="primary" @click="dialogSave">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -231,6 +249,7 @@ export default {
dialogFormVisible6: false,
dialogFormVisible7: false,
dialogFormVisible8: false,
dialogFormVisible10: false,
form: {
device_code: '',
hasGoodStatus: null,
@@ -365,6 +384,7 @@ export default {
this.dialogFormVisible1 = true
} else {
console.log(clickObj.data.driver_type)
if (clickObj.data.driver_type === 'standard_ordinary_site') {
this.dialogFormVisible3 = true
} else if (clickObj.data.driver_type === 'hailiang_packer_station') {
@@ -386,6 +406,8 @@ export default {
this.dialogFormVisible8 = true
} else if (clickObj.data.driver_type === 'standard_conveyor_control_with_scanner') {
this.dialogFormVisible6 = true
} else if (clickObj.data.driver_type === 'station' || clickObj.data.driver_type === 'conveyor') {
this.dialogFormVisible10 = true
} else {
this.dialogFormVisible8 = true
}
@@ -777,6 +799,8 @@ export default {
this.dialogFormVisible6 = false
this.dialogFormVisible7 = false
this.dialogFormVisible8 = false
this.dialogFormVisible10 = false
this.dialogFormVisible11 = false
this.initStageData()
}).catch(err => {
this.dialogFormVisible = false
@@ -785,6 +809,8 @@ export default {
this.dialogFormVisible5 = false
this.dialogFormVisible7 = false
this.dialogFormVisible8 = false
this.dialogFormVisible10 = false
this.dialogFormVisible11 = false
console.log(err.response.data.message)
})
},