|
@@ -84,7 +84,9 @@
|
|
|
style="width:100%;text-align:center;font-size:30px;color:gray;"
|
|
|
>{{ mess.deviceId ? '请选择设备族' : '无设备'}}</div>
|
|
|
<div v-show="main && main.length" v-loading="loading" id="handsontable" ref="handsontable"></div>
|
|
|
- <my-pagination v-show="main && main.length" @change="getMain" :page="page"></my-pagination>
|
|
|
+ <div v-show="main && main.length" class="right">
|
|
|
+ <my-pagination @change="getMain" :page="page"></my-pagination>
|
|
|
+ </div>
|
|
|
<dialog-assets
|
|
|
@close="getClose"
|
|
|
:graphyId="graphyId"
|
|
@@ -127,6 +129,10 @@ import lookPic from "@/components/ledger/lib/lookImages"
|
|
|
import "@/assets/js/chosen.jquery.min";
|
|
|
import "@/assets/js/handsontable-chosen-editor";
|
|
|
import {mapGetters, mapActions} from "vuex";
|
|
|
+
|
|
|
+import Handsontable from "handsontable-pro"
|
|
|
+import 'handsontable-pro/dist/handsontable.full.css'
|
|
|
+import zhCN from 'handsontable-pro/languages/zh-CN';
|
|
|
export default {
|
|
|
props: ["myParam"],
|
|
|
components: {
|
|
@@ -241,7 +247,6 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
this.floorData = floorData
|
|
|
- console.log(this.floorData)
|
|
|
} else {
|
|
|
this.$message.error(res.data.ResultMsg)
|
|
|
}
|
|
@@ -295,13 +300,16 @@ export default {
|
|
|
this.page.currentPage = 1
|
|
|
this.mess = code
|
|
|
this.changeCader()
|
|
|
- getTableHeader({
|
|
|
- code: this.mess.deviceId,
|
|
|
- ProjId: this.projId
|
|
|
- }).then(res => {
|
|
|
- this.headers = res.data.Content;
|
|
|
- this.getMain()
|
|
|
- });
|
|
|
+ if(this.mess.deviceId){
|
|
|
+ getTableHeader({
|
|
|
+ code: this.mess.deviceId,
|
|
|
+ ProjId: this.projectId
|
|
|
+ }).then(res => {
|
|
|
+ this.headers = res.data.Content;
|
|
|
+ this.getMain()
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
},
|
|
|
|
|
|
//获取主体数据
|
|
@@ -318,8 +326,8 @@ export default {
|
|
|
id: "",
|
|
|
type: [this.mess.deviceId]
|
|
|
},
|
|
|
- secret: this.$route.query.secret,
|
|
|
- ProjId: this.$route.query.projId
|
|
|
+ secret: this.secret,
|
|
|
+ ProjId: this.projectId
|
|
|
}
|
|
|
if (this.mess.buildId == "all") {
|
|
|
param.data.id = this.mess.ProjId
|
|
@@ -364,12 +372,10 @@ export default {
|
|
|
}
|
|
|
return item
|
|
|
})
|
|
|
- console.log(_this.onlyRead, "onlyRead")
|
|
|
if (_this.onlyRead) {
|
|
|
this.getBatch(res.Content)
|
|
|
}
|
|
|
_this.main = res.Content
|
|
|
- console.log(_this.main, "main")
|
|
|
_this.copyMain = tools.deepCopy(res.Content)
|
|
|
_this.page.total = res.TotalCount
|
|
|
if (!!_this.hot) {
|
|
@@ -389,10 +395,9 @@ export default {
|
|
|
|
|
|
//获取动态参数
|
|
|
getBatch(data) {
|
|
|
- console.log(this.headers, data, "data22222")
|
|
|
let param = {
|
|
|
- secret: this.$route.query.secret,
|
|
|
- ProjId: this.$route.query.projId,
|
|
|
+ secret: this.secret,
|
|
|
+ ProjId: this.projectId,
|
|
|
data: {
|
|
|
criterias: []
|
|
|
}
|
|
@@ -435,7 +440,6 @@ export default {
|
|
|
})
|
|
|
return item
|
|
|
})
|
|
|
- console.log(this.main)
|
|
|
this.hot.loadData(this.main)
|
|
|
})
|
|
|
}
|
|
@@ -514,7 +518,6 @@ export default {
|
|
|
|
|
|
let data = showTools.changeHeader(arr, readArr, this.onlyRead, this.isWatch, this.allMess)
|
|
|
data.unshift("操作", "当前关联的资产", "所属系统实例");
|
|
|
- console.log(data)
|
|
|
return data;
|
|
|
},
|
|
|
|
|
@@ -530,9 +533,7 @@ export default {
|
|
|
if (!this.onlyRead) {
|
|
|
// arr = showTools.arrToArr(arr)
|
|
|
}
|
|
|
- console.log("test")
|
|
|
let data = showTools.showTypes(arr, this.onlyRead, this.isWatch, this.allMess)
|
|
|
- console.log("test2")
|
|
|
data.map(item => {
|
|
|
if (
|
|
|
item.data == "infos." + "Drawing" ||
|
|
@@ -578,7 +579,6 @@ export default {
|
|
|
item.readOnly = true
|
|
|
})
|
|
|
}
|
|
|
- console.log(data)
|
|
|
return data;
|
|
|
},
|
|
|
|
|
@@ -790,7 +790,7 @@ export default {
|
|
|
columns: this.getType(this.headers), //数据显示格式
|
|
|
filters: true,
|
|
|
maxRows: this.main.length,
|
|
|
- height: winHeight - 100 - 50 - 150,
|
|
|
+ height: winHeight - 100 - 50 - 290,
|
|
|
columnSorting: true, //添加排序
|
|
|
sortIndicator: true, //添加排序
|
|
|
renderAllRows: true,
|
|
@@ -893,7 +893,6 @@ export default {
|
|
|
params.map(item => {
|
|
|
param.data.criterias.push({ id: item.id })
|
|
|
})
|
|
|
- console.log(params, param)
|
|
|
this.$confirm("此操作将删除设备,是否继续?", "提示", {
|
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消',
|
|
@@ -919,7 +918,6 @@ export default {
|
|
|
|
|
|
// 修改
|
|
|
updateBusiness(data, change) {
|
|
|
- console.log(data)
|
|
|
// data.map(item => {
|
|
|
// if (!!item.flowBuild) {
|
|
|
// item.building_id = item.flowBuild.split("-")[0]
|
|
@@ -998,9 +996,9 @@ export default {
|
|
|
this.iframeSrc =
|
|
|
process.env.BASE_URL +
|
|
|
":8889/#/details?perjectId=" +
|
|
|
- this.$route.query.projId +
|
|
|
+ this.projectId +
|
|
|
"&secret=" +
|
|
|
- this.$route.query.secret +
|
|
|
+ this.secret +
|
|
|
"&FmId=" +
|
|
|
infos.id +
|
|
|
"&type=1&code=" +
|
|
@@ -1156,7 +1154,6 @@ export default {
|
|
|
},
|
|
|
//如果选择供应商之后
|
|
|
supplierChange(data) {
|
|
|
- console.log(data)
|
|
|
for (let key in data) {
|
|
|
if (key == "venderId") {
|
|
|
data[key] = data[key] + "-" + data.name
|
|
@@ -1188,7 +1185,6 @@ export default {
|
|
|
|
|
|
//选择型号修改
|
|
|
firmChange(data) {
|
|
|
- console.log(data, "xinghao")
|
|
|
for (let key in data) {
|
|
|
// this.utilToKey(key, "name", data, "Supplier")
|
|
|
// this.utilToKey(key, "email", data, "SupplierEmail")
|
|
@@ -1206,7 +1202,6 @@ export default {
|
|
|
|
|
|
//保险商变更
|
|
|
changeInsurer(data) {
|
|
|
- console.log(data, "@22")
|
|
|
for (let key in data) {
|
|
|
// this.utilToKey(key, "name", data, "Insurer")
|
|
|
// this.utilToKey(key, "email", data, "InsurerEmail")
|