|
@@ -99,7 +99,7 @@
|
|
|
<!-- 全部与未完成 -->
|
|
|
<div class="build_operate" ref="operate">
|
|
|
<el-radio-group v-model="checked" @change="changeChecked(checked)">
|
|
|
- <el-radio-button label="''" >全部</el-radio-button>
|
|
|
+ <el-radio-button label="" >全部</el-radio-button>
|
|
|
<el-radio-button label="0">未完成修订</el-radio-button>
|
|
|
</el-radio-group>
|
|
|
<!-- <span @click="changeChecked('')" :class="checked === '' ? 'Blue' : ''">全部</span>
|
|
@@ -135,7 +135,7 @@
|
|
|
</el-tabs>
|
|
|
</div>
|
|
|
<!-- 图片查看浮层 -->
|
|
|
- <div class="mouse_move" style="backgroundColor:#ccc;height:3px;cursor: n-resize;" @mousedown="drag" @mouseup="mouseUp"></div>
|
|
|
+ <div class="mouse_move" style="backgroundColor:#ccc;height:3px;cursor:n-resize;" @mousedown="drag" @mouseup="mouseUp"></div>
|
|
|
<div class="build_pic" v-bind:style="{height:picHeight+'px'}" ref="picview">
|
|
|
<!-- <div class="pic_show" @click="picNoShow">关闭</div> -->
|
|
|
<div class="turn_left">
|
|
@@ -521,6 +521,7 @@
|
|
|
}
|
|
|
}).filter(b => b);
|
|
|
let param = {}
|
|
|
+ console.log(this.infos,'------------------------------')
|
|
|
param.BuildId = this.infos.BuildId
|
|
|
param.BuildName = this.infos.BuildName
|
|
|
param.Checked = this.infos.Checked
|
|
@@ -1091,7 +1092,9 @@
|
|
|
//创建点位标签swiper
|
|
|
createPTSwiper() {
|
|
|
this.$nextTick(() => {
|
|
|
- this.$refs['swiperPoint'].style.transform = ''
|
|
|
+ if(this.$refs['swiperPoint']){
|
|
|
+ this.$refs['swiperPoint'].style.transform = ''
|
|
|
+ }
|
|
|
this.swiper = "";
|
|
|
this.swiper = new Swiper("#swiper", {
|
|
|
slidesPerView: 4,
|
|
@@ -1408,6 +1411,7 @@
|
|
|
let param = data.map(item => {
|
|
|
let obj = {}
|
|
|
obj.id = item.FmId
|
|
|
+ obj.Checked = item.Checked
|
|
|
obj.family = item.Family
|
|
|
obj.infos = item.Infos
|
|
|
return obj
|
|
@@ -1421,6 +1425,7 @@
|
|
|
let lastData = changeParam.map(item => {
|
|
|
return {
|
|
|
FmId: item.id,
|
|
|
+ Checked: param.find((value) => { return value.id === item.id }).Checked,
|
|
|
Family: item.family,
|
|
|
Infos: item.infos
|
|
|
}
|
|
@@ -1644,14 +1649,18 @@
|
|
|
afterDocumentKeyDown(e) {
|
|
|
// this.$nextTick(() => {
|
|
|
console.log(e, e.realTarget.value)
|
|
|
- let activeEditer = this.myHotArr[this.tabChecked].getActiveEditor(),
|
|
|
- td = activeEditer.TD,
|
|
|
- row = activeEditer.row,
|
|
|
+ let activeEditer = this.myHotArr[this.tabChecked].getActiveEditor(), td, row, prop,
|
|
|
val = e.realTarget.value,
|
|
|
- prop = activeEditer.prop,
|
|
|
infoArr = ["Brand", "Specification", "Manufacturer", "Supplier", "Maintainer", "Insurer", "SupplierContactor", "SupplierPhone", "SupplierEmail", "SupplierWeb", "SupplierFax", "MaintainerContactor", "MaintainerPhone", "MaintainerEmail", "MaintainerWeb", "MaintainerFax", "InsurerContactor", "InsurerPhone", "InsurerEmail", "InsurerWeb", "InsurerFax"];
|
|
|
+ if(activeEditer){
|
|
|
+ td = activeEditer.TD
|
|
|
+ row = activeEditer.row
|
|
|
+ prop = activeEditer.prop
|
|
|
+ } else {
|
|
|
+ return false
|
|
|
+ }
|
|
|
let filter = this.filtersArr[this.tabChecked];
|
|
|
- console.log(activeEditer, val, document.getElementsByClassName("handsontableInput")[0].value)
|
|
|
+ // console.log(activeEditer, val, document.getElementsByClassName("handsontableInput")[0].value)
|
|
|
//被筛选过后的数组
|
|
|
if (e.which == 8) {
|
|
|
console.log("val", val)
|