Merge branch 'master-500-dev-LH' into 'master-500-dev'

业务视图左侧菜单最大宽度、对比分析点击编辑 初始化echars



See merge request !493

@@ -2640,6 +2640,7 @@ grayColor{
     order: 1;
     /*width: 250px;*/
     min-width: 250px;
+    max-width: 300px;
     overflow: hidden;
     /*margin-left: 10px;*/
     margin-left: 5px;
@@ -7272,7 +7273,7 @@ form[lay-filter="tax-statistical-statement-condition"] {
 }
 /****** 动环配置   结束  ******/
 
-/*资源视图、业务视图左侧树选中时添加背景颜色类似菜单树选择的样式*/
+/*资源视图、左侧树选中时添加背景颜色类似菜单树选择的样式*/
 .resIndexLeft .tree-node-select,.bizIndexLeft .tree-node-select {
     font-size: 17px;
     font-weight: bold;

@@ -15,7 +15,6 @@ const timeRange = () => {
         proxy.$http.post(`/api-web/manage/ddic/findSucDdics/time_scope`, {}, function (res) {
             if (res && res.data) {
                 timeRangeArr.value = res.data;
-
                 if (callback) {
                     callback(res.data[0].ddicCode);
                 }
@@ -280,12 +279,20 @@ export default {
             loadTimeRange,
         } = timeRange();
 
+
+
         let timeRangeChange = (item) => {
-            let code = item.ddicCode;
-            loadFrequency(code);
+            setTimeout(function(){
+                let code = item.ddicCode;
+                loadFrequency(code);
+            },300);
+
 
             // 加载echar
-            getChartData();
+            setTimeout(function(){
+                getChartData();
+            },600);
+
         }
 
         //根菜单选择事件
@@ -319,6 +326,7 @@ export default {
 
         let getChartData = () => {
 
+            console.log("======form.value.scene===00000000--------",form.value.scene);
             let timeScope = '';
             try {
                 timeScope = form.value.scene.timeScope.replaceAll("time_scope_", "")
@@ -572,15 +580,18 @@ export default {
             });
 
             //LH
+            setTimeout(function(){
+                let arrs= timeRangeArr.value
+                timeRangeChange(arrs[0]);
+            },300)
+
         }
         //查询对比分析基础数据
         let getBContrastInfoById=(id)=>{
             proxy.$http.get(`/api-web/ContrastAnalysis/getBContrastInfoById`,{id:id}, function (res) {
                 if (res.success) {
-                    console.log("=============",res);
                     form.value.scene.name=res.object.configName;
                     form.value.scene.desc=res.object.configDepict;
-                    // console.log("==================",res);
 
                  }
             });
@@ -589,7 +600,7 @@ export default {
         // 挂载完
         Vue.onMounted(() => {
 
-            init();
+
 
             if(!id){
                 activeName.value = 'second';
@@ -611,6 +622,7 @@ export default {
                     }
                 });
             });
+            init();
             console.log('onMounted');
         })