Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -56,6 +56,7 @@ export default {
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .breadcrumb {
 .breadcrumb {
+  width: 80%;
   text-indent: 10px;
   text-indent: 10px;
   background: url("~@/image/breadcrumb.png") no-repeat;
   background: url("~@/image/breadcrumb.png") no-repeat;
   background-size: 100% 100%;
   background-size: 100% 100%;
@@ -63,7 +64,7 @@ export default {
   height: 32px;
   height: 32px;
   padding-left: 35px;
   padding-left: 35px;
   margin: 8px 0 8px 6px;
   margin: 8px 0 8px 6px;
-  color: #02D9FD;
+  color: #CEF8FF;
 }
 }
 
 
 /deep/.el-icon-arrow-right {
 /deep/.el-icon-arrow-right {
@@ -75,7 +76,7 @@ export default {
 }
 }
 
 
 /deep/.el-breadcrumb__inner {
 /deep/.el-breadcrumb__inner {
-  color: #02D9FD !important;
+  color: #CEF8FF !important;
 }
 }
 
 
 .breadcrumb1366 {
 .breadcrumb1366 {

@@ -175,7 +175,7 @@ export default {
         clearInterval(this.intervalId);
         clearInterval(this.intervalId);
       }
       }
       this.intervalId = setInterval(() => {
       this.intervalId = setInterval(() => {
-        _self.reSelectMapRandomArea();
+        this.$refs.centreLeft2ChartRef && _self.reSelectMapRandomArea();
       }, time);
       }, time);
     },
     },
     // 重新随机选中地图区域
     // 重新随机选中地图区域

@@ -21,7 +21,6 @@ export default {
   watch: {
   watch: {
     cdata: {
     cdata: {
       handler (newData) {
       handler (newData) {
-        console.log("newData",newData);
         this.options = {
         this.options = {
            grid: {
            grid: {
             right:"1%",
             right:"1%",

@@ -64,7 +64,6 @@ export default {
       this.visible = show
       this.visible = show
     },
     },
     handleClick(tab, event) {
     handleClick(tab, event) {
-      console.log(tab, event)
     },
     },
     changeData(iconName) {
     changeData(iconName) {
       this.visible = false
       this.visible = false

@@ -18,10 +18,8 @@ export default {
   },
   },
   methods: {
   methods: {
     onJsonChange (value) {
     onJsonChange (value) {
-      console.log('value:', value);
     },
     },
     onJsonSave (value) {
     onJsonSave (value) {
-      console.log('value:', value);
     }
     }
   }
   }
 }
 }

@@ -69,7 +69,6 @@ export default {
     },
     },
     onJsonSave () {
     onJsonSave () {
       const value = this.resultInfo
       const value = this.resultInfo
-      console.log(this.resultInfo, 'resultInfo')
       if (this.hasJsonFlag === false) {
       if (this.hasJsonFlag === false) {
         this.$message.error({ message: 'json格式验证失败', showClose: true })
         this.$message.error({ message: 'json格式验证失败', showClose: true })
         // alert("json验证失败")
         // alert("json验证失败")
@@ -87,7 +86,6 @@ export default {
       this.dialogVisible = true
       this.dialogVisible = true
     },
     },
     cancel () {
     cancel () {
-      console.log(this.tmpResultInfo, 'tmpResultInfo')
       this.resultInfo = this.tmpResultInfo
       this.resultInfo = this.tmpResultInfo
       this.dialogVisible = false
       this.dialogVisible = false
     },
     },

@@ -129,7 +129,6 @@ export default {
       if (!this.heightNumSetting) {
       if (!this.heightNumSetting) {
         let _this = this
         let _this = this
         if (this.heightNum) {
         if (this.heightNum) {
-          console.log("this.heightNum``",this.heightNum);
           _this.$nextTick(() => {
           _this.$nextTick(() => {
 
 
             window.addEventListener('resize', () => {
             window.addEventListener('resize', () => {

@@ -32,8 +32,6 @@ export default {
       if (typeof val !== 'string') return
       if (typeof val !== 'string') return
       const themeCluster = this.getThemeCluster(val.replace('#', ''))
       const themeCluster = this.getThemeCluster(val.replace('#', ''))
       const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
       const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
-      console.log(themeCluster, originalCluster)
-
       const $message = this.$message({
       const $message = this.$message({
         message: '  Compiling the theme',
         message: '  Compiling the theme',
         customClass: 'theme-message',
         customClass: 'theme-message',

@@ -46,7 +46,6 @@ export default {
       }
       }
 
 
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
-      console.log(this.levelList)
     },
     },
     isDashboard (route) {
     isDashboard (route) {
       const name = route && route.name
       const name = route && route.name

@@ -50,7 +50,7 @@
 
 
     &-header {
     &-header {
         width: 100%;
         width: 100%;
-        padding: 5px 30px 20px 20px;
+        padding: 5px 30px 20px 24px;
         box-sizing: border-box;
         box-sizing: border-box;
         background: url("~@/image/formHeader.png") no-repeat;
         background: url("~@/image/formHeader.png") no-repeat;
         background-size: 100% 100%;
         background-size: 100% 100%;

@@ -32,7 +32,6 @@ export default {
       const { width, height } = this;
       const { width, height } = this;
       const wh = window.innerHeight / height;
       const wh = window.innerHeight / height;
       const ww = window.innerWidth / width;
       const ww = window.innerWidth / width;
-      console.log(ww < wh ? ww : wh);
       return ww < wh ? ww : wh;
       return ww < wh ? ww : wh;
     },
     },
     setScale() {
     setScale() {

@@ -45,12 +45,9 @@ export default {
       try {
       try {
         let { result: res } = await work.addhousetotal();
         let { result: res } = await work.addhousetotal();
         res.map((item, index) => {
         res.map((item, index) => {
-          console.log("item", item);
-          console.log("index", index);
           return (
           return (
             this.config.data.push([index, item.fwyt, item.fwxz, item.mj])
             this.config.data.push([index, item.fwyt, item.fwxz, item.mj])
           )
           )
-
         });
         });
       } catch (error) {
       } catch (error) {
         console.log("error", error);
         console.log("error", error);

@@ -343,15 +343,12 @@ export default {
     },
     },
     // 上移下移
     // 上移下移
     moveUpward (index, row) {
     moveUpward (index, row) {
-      console.log("row上移", row);
-
       realMove(row.dictid, "UP", this.tableData);
       realMove(row.dictid, "UP", this.tableData);
       let id = findParents(this.tableData, row.dictid);
       let id = findParents(this.tableData, row.dictid);
       this.keyList = id;
       this.keyList = id;
       this.key++;
       this.key++;
     },
     },
     moveDown (index, row) {
     moveDown (index, row) {
-      console.log("row下移", row);
       realMove(row.dictid, "DOWN", this.tableData);
       realMove(row.dictid, "DOWN", this.tableData);
       let id = findParents(this.tableData, row.dictid);
       let id = findParents(this.tableData, row.dictid);
       this.keyList = id;
       this.keyList = id;

@@ -119,7 +119,6 @@ export default {
       // })
       // })
     },
     },
     handleSelectionChange (val) {
     handleSelectionChange (val) {
-      console.log("vadddl",val);
       this.multipleSelection = val
       this.multipleSelection = val
     }
     }
   }
   }