Commit 3b978147 authored by 纪泽龙's avatar 纪泽龙

修改一下

parent d5f69714
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
size="mini" size="mini"
:data="tableData" :data="tableData"
style="width: 100%" style="width: 100%"
:height="tableHeight"
class="el-bottom" class="el-bottom"
:key="Math.random()" :key="Math.random()"
> >
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2022-01-11 13:44:17 * @Date: 2022-01-11 13:44:17
* @LastEditTime: 2022-02-26 21:14:21 * @LastEditTime: 2022-02-26 22:11:45
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/views/Home.vue * @FilePath: /test/hello-world/src/views/Home.vue
...@@ -285,11 +285,11 @@ export default { ...@@ -285,11 +285,11 @@ export default {
})); }));
this.selarr = this.company.map((item) => item.conpanyId); this.selarr = this.company.map((item) => item.conpanyId);
// getPipe() getTyx() getFm() getCz() getVideo() getUser() // getPipe() getTyx() getFm() getCz() getVideo() getUser()
// this.goMap(getPipe, this.addPipeLine, Line); this.goMap(getPipe, this.addPipeLine, Line);
// this.goMap(getTyx, this.addDevice, DeviceA); this.goMap(getTyx, this.addDevice, DeviceA);
this.goMap(getFm, this.addDevice, DeviceA); this.goMap(getFm, this.addDevice, DeviceA);
// this.goMap(getCz, this.addDevice, DeviceA); this.goMap(getCz, this.addDevice, DeviceA);
// this.goMap(getVideo, this.addDevice, VideoView); this.goMap(getVideo, this.addDevice, VideoView);
this.goMap(detectorUserList, this.addDevice, User); this.goMap(detectorUserList, this.addDevice, User);
// getVideo().then((res) => { // getVideo().then((res) => {
// console.log("getVideo", res); // console.log("getVideo", res);
...@@ -322,9 +322,7 @@ export default { ...@@ -322,9 +322,7 @@ export default {
}, },
goMap(httpFunc, addFunc, component) { goMap(httpFunc, addFunc, component) {
httpFunc().then((res) => { httpFunc().then((res) => {
console.log("resresres", res); if(res.data&&!res.data[0].iconType){
if(!res.data[0].iconType){
res.data.forEach(item=>{ res.data.forEach(item=>{
item.iconType =6; item.iconType =6;
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment