Skip to content

李君 / carrefour

Go to a project
Commit 1d669e9f by 李君
Options

位置标定重构

1 parent 3f239696
Expand all
Inline Side-by-side
Showing 5 changed files with 22 additions and 14 deletions
src/views/queueManagement/cameraPositionCalibration/index.vue
...@@ -95,8 +95,7 @@ ...@@ -95,8 +95,7 @@
this.getTableData(); this.getTableData();
}, },
bindRow(row){ bindRow(row){
console.log(this.areaObj) this.$refs.bindDevModel.dialogInit(this.areaObj.pic,this.gateList);
// this.$refs.bindDevModel.dialogInit(row);
}, },
searchFun(){ searchFun(){
this.currentPage = 1; this.currentPage = 1;
...@@ -198,7 +197,7 @@ ...@@ -198,7 +197,7 @@
.draw_desks { .draw_desks {
position: relative; position: relative;
width: 100%; width: 100%;
height: 700px; // height: 700px;
} }
.gateWrap{ .gateWrap{
position: relative; position: relative;
......
src/views/queueManagement/channelManagement/addDesk.vue
...@@ -12,6 +12,10 @@ ...@@ -12,6 +12,10 @@
<el-input v-model="addForm.code" :placeholder="$t('pholder.input')"></el-input> <el-input v-model="addForm.code" :placeholder="$t('pholder.input')"></el-input>
<i class="error-tip">*</i> <i class="error-tip">*</i>
</el-form-item> </el-form-item>
<el-form-item :label="$t('dialog.deviceNum')" prop="deviceSerialNum">
<el-input v-model="addForm.deviceSerialNum" :placeholder="$t('pholder.input')"></el-input>
<i class="error-tip">*</i>
</el-form-item>
<el-form-item :label="$t('table.counterType')" prop="counterType"> <el-form-item :label="$t('table.counterType')" prop="counterType">
<el-select v-model="addForm.counterType" :placeholder="$t('pholder.select')"> <el-select v-model="addForm.counterType" :placeholder="$t('pholder.select')">
<el-option v-for="item in counterTypeData" :key="item.key" :label="item.value" :value="item.key" /> <el-option v-for="item in counterTypeData" :key="item.key" :label="item.value" :value="item.key" />
...@@ -76,7 +80,12 @@ export default { ...@@ -76,7 +80,12 @@ export default {
required: true, required: true,
message: this.$t('pholder.select'), message: this.$t('pholder.select'),
trigger: 'blur' trigger: 'blur'
}] }],
deviceSerialNum:[{
required: true,
message: this.$t('pholder.input'),
trigger: 'blur'
}],
} }
} }
}, },
...@@ -87,7 +96,8 @@ export default { ...@@ -87,7 +96,8 @@ export default {
name: '', name: '',
areaId:"", areaId:"",
code:'', code:'',
counterType:'' counterType:'',
deviceSerialNum:''
}; };
this.isEdit = type this.isEdit = type
if(data){ if(data){
...@@ -187,7 +197,7 @@ export default { ...@@ -187,7 +197,7 @@ export default {
<style scoped lang="less"> <style scoped lang="less">
.dialog_lj{ .dialog_lj{
/deep/.el-dialog__body{ /deep/.el-dialog__body{
height: 270px; height: 320px;
} }
/deep/.el-form-item__label{ /deep/.el-form-item__label{
line-height: 30px; line-height: 30px;
......
src/views/queueManagement/channelManagement/index.vue
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<el-table-column :label="$t('table.order')" align="center" type="index" width="100"></el-table-column> <el-table-column :label="$t('table.order')" align="center" type="index" width="100"></el-table-column>
<el-table-column :label="$t('table.laneName')" align="center" prop="name"></el-table-column> <el-table-column :label="$t('table.laneName')" align="center" prop="name"></el-table-column>
<el-table-column :label="$t('table.channelCode')" align="center" prop="code"></el-table-column> <el-table-column :label="$t('table.channelCode')" align="center" prop="code"></el-table-column>
<el-table-column :label="$t('dialog.deviceNum')" align="center" prop="deviceSerialNum"></el-table-column>
<el-table-column :label="$t('table.counterType')" :formatter="formatCounterType" align="center" prop="counterType"></el-table-column> <el-table-column :label="$t('table.counterType')" :formatter="formatCounterType" align="center" prop="counterType"></el-table-column>
<el-table-column :label="$t('table.areaName')" :formatter="formatArea" align="center" prop="areaId"></el-table-column> <el-table-column :label="$t('table.areaName')" :formatter="formatArea" align="center" prop="areaId"></el-table-column>
<el-table-column :label="$t('table.operate')" align="center" width="200"> <el-table-column :label="$t('table.operate')" align="center" width="200">
...@@ -409,7 +410,7 @@ export default { ...@@ -409,7 +410,7 @@ export default {
height: calc(100% - 120px); height: calc(100% - 120px);
} }
.manage-content { .manage-content {
height: calc(100% - 100px); height: calc(100% - 0px);
} }
.bind { .bind {
...@@ -418,12 +419,7 @@ export default { ...@@ -418,12 +419,7 @@ export default {
cursor: pointer; cursor: pointer;
} }
.manage-container { .manage-container {
height: 100%; // height: 100%;
}
.treeMenu {
padding-right: 5px;
border-right: 3px solid #f0f3f9;
height: 100%;
} }
.unbind { .unbind {
color: #0069ff; color: #0069ff;
......
src/views/queueManagement/public/css/common.css
...@@ -10,8 +10,11 @@ ...@@ -10,8 +10,11 @@
.searchFormSocial .el-form-item{ .searchFormSocial .el-form-item{
margin-bottom: 0; margin-bottom: 0;
} }
.single-report-header{
margin-bottom: 0 !important;
}
.socialHeader{ .socialHeader{
padding-top: 10px; padding-top: 0px;
margin-right: 10px !important; margin-right: 10px !important;
} }
.contentSocial{ .contentSocial{
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!