|
@@ -8,16 +8,16 @@
|
|
<div id="handsontableSteps1" v-if="pages.total">
|
|
<div id="handsontableSteps1" v-if="pages.total">
|
|
<handsontable-component @mouseDown="clickEdit" ref="handsontable"></handsontable-component>
|
|
<handsontable-component @mouseDown="clickEdit" ref="handsontable"></handsontable-component>
|
|
</div>
|
|
</div>
|
|
- <div v-else>
|
|
|
|
- 暂无数据
|
|
|
|
|
|
+ <div v-else class="center">
|
|
|
|
+ <i class="iconwushuju iconfont"></i> 暂无数据
|
|
</div>
|
|
</div>
|
|
<!-- <div class="center">
|
|
<!-- <div class="center">
|
|
- <pagination :page="pages" @change="changePage"></pagination>
|
|
|
|
- </div> -->
|
|
|
|
|
|
+ <pagination :page="pages" @change="changePage"></pagination>
|
|
|
|
+ </div> -->
|
|
<own-dialog :width="'1000px'" :title=" isDataform ? '根据关键内容批量对应数据字典' : '根据关键内容批量标准化设备标识' " :dialogVisible="isDialogShow" @cancel="close">
|
|
<own-dialog :width="'1000px'" :title=" isDataform ? '根据关键内容批量对应数据字典' : '根据关键内容批量标准化设备标识' " :dialogVisible="isDialogShow" @cancel="close">
|
|
<dialog-main v-if="!isDataform"></dialog-main>
|
|
<dialog-main v-if="!isDataform"></dialog-main>
|
|
<steps-main v-if="isDataform"></steps-main>
|
|
<steps-main v-if="isDataform"></steps-main>
|
|
- </own-dialog>
|
|
|
|
|
|
+ </own-dialog>
|
|
<own-dialog :width="'1000px'" :dialogVisible="isEditDialogShow" @cancel="closeEdit">
|
|
<own-dialog :width="'1000px'" :dialogVisible="isEditDialogShow" @cancel="closeEdit">
|
|
<step3-edit v-if="isEditDialogShow" :editData='editData' @refresh='refreshData'></step3-edit>
|
|
<step3-edit v-if="isEditDialogShow" :editData='editData' @refresh='refreshData'></step3-edit>
|
|
</own-dialog>
|
|
</own-dialog>
|
|
@@ -52,8 +52,8 @@
|
|
hot: null,
|
|
hot: null,
|
|
isDataform: false,
|
|
isDataform: false,
|
|
/************point3_step_edit*********************** */
|
|
/************point3_step_edit*********************** */
|
|
- isEditDialogShow: false,
|
|
|
|
- editData:{}, //编辑数据
|
|
|
|
|
|
+ isEditDialogShow: false,
|
|
|
|
+ editData: {}, //编辑数据
|
|
pages: {
|
|
pages: {
|
|
size: 10,
|
|
size: 10,
|
|
sizes: [10, 30, 50, 100],
|
|
sizes: [10, 30, 50, 100],
|
|
@@ -61,7 +61,7 @@
|
|
currentPage: 0
|
|
currentPage: 0
|
|
},
|
|
},
|
|
}
|
|
}
|
|
- },
|
|
|
|
|
|
+ },
|
|
computed: {
|
|
computed: {
|
|
...mapGetters("project", [
|
|
...mapGetters("project", [
|
|
"projectId",
|
|
"projectId",
|
|
@@ -84,16 +84,15 @@
|
|
close() {
|
|
close() {
|
|
this.isDialogShow = false
|
|
this.isDialogShow = false
|
|
},
|
|
},
|
|
-
|
|
|
|
//只显示为标准化的点位标识
|
|
//只显示为标准化的点位标识
|
|
- changeChecked(){
|
|
|
|
- if(this.checked){
|
|
|
|
|
|
+ changeChecked() {
|
|
|
|
+ if (this.checked) {
|
|
getNoDealPoint({
|
|
getNoDealPoint({
|
|
type: this.protocolType,
|
|
type: this.protocolType,
|
|
data: {
|
|
data: {
|
|
DataSourceId: this.datasourceId
|
|
DataSourceId: this.datasourceId
|
|
}
|
|
}
|
|
- },res => {
|
|
|
|
|
|
+ }, res => {
|
|
let content = res.Content
|
|
let content = res.Content
|
|
let settings = {
|
|
let settings = {
|
|
data: content,
|
|
data: content,
|
|
@@ -110,11 +109,10 @@
|
|
this.pages.total = res.Total
|
|
this.pages.total = res.Total
|
|
console.log(this.hot)
|
|
console.log(this.hot)
|
|
})
|
|
})
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
this.getData()
|
|
this.getData()
|
|
}
|
|
}
|
|
},
|
|
},
|
|
-
|
|
|
|
//页面显示num1为标准化设备标识,2为对应数据字典
|
|
//页面显示num1为标准化设备标识,2为对应数据字典
|
|
dialogShow(num) {
|
|
dialogShow(num) {
|
|
if (num == 1) {
|
|
if (num == 1) {
|
|
@@ -128,7 +126,6 @@
|
|
changePage() {
|
|
changePage() {
|
|
this.getData()
|
|
this.getData()
|
|
},
|
|
},
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* 表格点击事件
|
|
* 表格点击事件
|
|
* @param {当前条数据} rowData
|
|
* @param {当前条数据} rowData
|
|
@@ -136,13 +133,17 @@
|
|
*
|
|
*
|
|
* down something
|
|
* down something
|
|
*/
|
|
*/
|
|
- clickEdit(rowData,row){
|
|
|
|
|
|
+ clickEdit(rowData, row) {
|
|
let activeCell = this.hot.getActiveEditor()
|
|
let activeCell = this.hot.getActiveEditor()
|
|
console.log(activeCell.prop)
|
|
console.log(activeCell.prop)
|
|
if (activeCell.prop == "Point.Infos.edit") {
|
|
if (activeCell.prop == "Point.Infos.edit") {
|
|
this.isEditDialogShow = true;
|
|
this.isEditDialogShow = true;
|
|
this.editData = rowData;
|
|
this.editData = rowData;
|
|
- }
|
|
|
|
|
|
+ }
|
|
|
|
+ if(activeCell.prop == "Infos.edit"){
|
|
|
|
+ this.editData = {Point: rowData,RelationList: []};
|
|
|
|
+ this.isEditDialogShow = true;
|
|
|
|
+ }
|
|
},
|
|
},
|
|
closeEdit() {
|
|
closeEdit() {
|
|
this.isEditDialogShow = false;
|
|
this.isEditDialogShow = false;
|
|
@@ -160,7 +161,7 @@
|
|
}
|
|
}
|
|
queryPointRela(param, res => {
|
|
queryPointRela(param, res => {
|
|
let content = res.Content.map(item => {
|
|
let content = res.Content.map(item => {
|
|
- if(item.RelationList.length){
|
|
|
|
|
|
+ if (item.RelationList.length) {
|
|
item.Point.DataRuleType = item.RelationList[0].DataRuleType
|
|
item.Point.DataRuleType = item.RelationList[0].DataRuleType
|
|
item.Point.PhysicalRelated = item.RelationList[0].EquipmentType + '-' + item.RelationList[0].InfomationPoint
|
|
item.Point.PhysicalRelated = item.RelationList[0].EquipmentType + '-' + item.RelationList[0].InfomationPoint
|
|
}
|
|
}
|
|
@@ -178,7 +179,7 @@
|
|
maxRows: res.Content.length
|
|
maxRows: res.Content.length
|
|
}
|
|
}
|
|
this.pages.total = res.Total
|
|
this.pages.total = res.Total
|
|
- if(this.pages.total){
|
|
|
|
|
|
+ if (this.pages.total) {
|
|
this.$nextTick(_ => {
|
|
this.$nextTick(_ => {
|
|
this.hot = this.$refs.handsontable.init(settings)
|
|
this.hot = this.$refs.handsontable.init(settings)
|
|
})
|
|
})
|
|
@@ -206,7 +207,7 @@
|
|
#handsonStep2 {
|
|
#handsonStep2 {
|
|
flex: 1;
|
|
flex: 1;
|
|
display: flex;
|
|
display: flex;
|
|
- flex-flow:column;
|
|
|
|
|
|
+ flex-flow: column;
|
|
.btns-view {
|
|
.btns-view {
|
|
height: 40px;
|
|
height: 40px;
|
|
line-height: 40px;
|
|
line-height: 40px;
|