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

树结构样式优化，系统汇总信息图片位置更改



See merge request !64

@@ -5,10 +5,10 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   NODE_ENV: '"development"',
   BASE_API: '"http://192.168.0.59:9095"',
   BASE_API: '"http://192.168.0.59:9095"',
-  MONITOR_GATEWAY: '"http://192.168.0.59:8087"'
+  MONITOR_GATEWAY: '"http://192.168.0.59:8080"'
  /* BASE_API: '"http://192.168.0.75:9095"',
  /* BASE_API: '"http://192.168.0.75:9095"',
   MONITOR_GATEWAY: '"http://192.168.0.75:8080"'*/
   MONITOR_GATEWAY: '"http://192.168.0.75:8080"'*/
-  // BASE_API: '"http://192.168.1.50:9095"',
-  // MONITOR_GATEWAY: '"http://192.168.1.50:8080"'
+  /*BASE_API: '"http://192.168.1.52:8089"',
+  MONITOR_GATEWAY: '"http://192.168.1.52:8080"'*/
 
 
 })
 })

@@ -94,3 +94,10 @@ input:-webkit-autofill {
   font-size: 20px;
   font-size: 20px;
   visibility: hidden;
   visibility: hidden;
 }
 }
+.tree-left .el-tree-node__label{
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
+}

@@ -39,6 +39,22 @@ export const monitorTreeShape = {
         value: true
         value: true
       },
       },
       {
       {
+        type: 'el-input-text',
+        label: '业务系统相关页面编码',
+        name: 'serviceCode',
+        required: false,
+        placeholder: '',
+        value: 'service_capacity_analysis,service_capacity_analysis_second,service_capacity_analysis_tertiary',
+      },
+      {
+        type: 'el-input-text',
+        label: '资源系统相关页面编码',
+        name: 'resourceCode',
+        required: false,
+        placeholder: '',
+        value: 'resource_capacity_analysis',
+      },
+      {
         type: 'el-switch',
         type: 'el-switch',
         label: '加边框',
         label: '加边框',
         name: 'isBorder',
         name: 'isBorder',
@@ -256,7 +272,7 @@ export const monitorTreeShape = {
         name: 'width',
         name: 'width',
         required: false,
         required: false,
         placeholder: '该容器在1920px大屏中的宽度',
         placeholder: '该容器在1920px大屏中的宽度',
-        value: 420,
+        value: 1920,
       },
       },
       {
       {
         type: 'el-input-number',
         type: 'el-input-number',
@@ -264,7 +280,7 @@ export const monitorTreeShape = {
         name: 'height',
         name: 'height',
         required: false,
         required: false,
         placeholder: '该容器在1080px大屏中的高度',
         placeholder: '该容器在1080px大屏中的高度',
-        value: 630,
+        value: 1080,
       },
       },
     ],
     ],
   }
   }

@@ -447,7 +447,7 @@ export default {
         if(nextRouter){
         if(nextRouter){
           this.$router.push({
           this.$router.push({
             path: `/bigscreen/viewer`,
             path: `/bigscreen/viewer`,
-            query: { reportCode: nextRouter,titleName:item.resName ,resId:item.resId,resType: item.resType},
+            query: { reportCode: nextRouter,titleName:item.resName ,resId:item.resId,resType: item.resType,access_token:locationUrl.access_token},
           })
           })
         }
         }
 
 

@@ -9,7 +9,11 @@
         <img :src="imgStyle.infoImageAdress" alt="">
         <img :src="imgStyle.infoImageAdress" alt="">
       </div>
       </div>
       <div class="system-item" :style="itemStyle"  v-for="(item,index) in systemData" :key="index">
       <div class="system-item" :style="itemStyle"  v-for="(item,index) in systemData" :key="index">
-        <div class="system-img"><img :src="'/src/assets/images/monitor/capacityAnalysis/'+item.resType+'.png'" alt=""></div>
+        <div class="system-img">
+<!--          <img :src="'/src/assets/images/monitor/capacityAnalysis/'+item.resType+'.png'" alt="">-->
+          <img :src="'/static/capacityAnalysis/'+item.resType+'.png'" alt="">
+
+        </div>
         <div class="system-info" :style="titleProposalStyle">
         <div class="system-info" :style="titleProposalStyle">
           <span>{{item.resTypeName}}：</span>
           <span>{{item.resTypeName}}：</span>
           <span>{{item.total}}</span>
           <span>{{item.total}}</span>

 <template>
 <template>
   <div :style="styleObj" class="treeContainer">
   <div :style="styleObj" class="treeContainer">
     <div class="tree-left" :style="treeLeftStyle">
     <div class="tree-left" :style="treeLeftStyle">
-      <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" v-if="optionsSetup.isType">
-        <el-tab-pane label="业务" name="first"></el-tab-pane>
-        <el-tab-pane label="资源" name="second"></el-tab-pane>
+      <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" v-if="optionsSetup.isType" stretch>
+        <el-tab-pane label="业务系统" name="first"></el-tab-pane>
+        <el-tab-pane label="资源系统" name="second"></el-tab-pane>
       </el-tabs>
       </el-tabs>
       <el-tree :style="textStyle" class="tree-div" ref="roleTree" :data="treeData" :props="defaultProps" @node-click="handleNodeClick"
       <el-tree :style="textStyle" class="tree-div" ref="roleTree" :data="treeData" :props="defaultProps" @node-click="handleNodeClick"
                node-key="id"  :default-checked-keys="checkedKeys"
                node-key="id"  :default-checked-keys="checkedKeys"
@@ -95,20 +95,41 @@ export default {
     handleClick(tab,event){
     handleClick(tab,event){
       this.handleTableData();
       this.handleTableData();
     },
     },
-    handleNodeClick(data){
-      console.log(data);
-      this.setSrc(data);
+    handleNodeClick(data,node){
+      console.log("*(*(*(",node,data);
+      if(this.optionsSetup.isFrame){
+        this.setSrc(data,node.level);
+      }
       this.$store.commit('CHANGE_TREE',data)
       this.$store.commit('CHANGE_TREE',data)
     },
     },
-    setSrc(data){
+    setSrc(data,level){
       let origin=window.location.origin;//当前域名
       let origin=window.location.origin;//当前域名
       let srcName=origin+'/#/bigscreen/viewer?reportCode=';
       let srcName=origin+'/#/bigscreen/viewer?reportCode=';
-      if(data.id==1){
+      // serviceCode,resourceCode
+      let codeArr=[];
+      if(this.activeName=='first'){
+        codeArr=this.optionsSetup.serviceCode.split(',');
+      }else{
+        codeArr=this.optionsSetup.resourceCode.split(',');
+      }
+      if(level>0){
+        srcName+=codeArr[level-1];
+      }else{
+        srcName+=codeArr[0];
+      }
+
+      /*if(data.id==1){
         srcName+='service_capacity_analysis';
         srcName+='service_capacity_analysis';
       }else{
       }else{
         srcName+='capacity_analysis_second';
         srcName+='capacity_analysis_second';
+      }*/
+      let locationUrl=this.$route.query;
+      let access_token=locationUrl.locationUrl;
+      let tokenUrl='';
+      if(access_token){
+        tokenUrl='&access_token='+access_token
       }
       }
-      this.iframeSrc=srcName;
+      this.iframeSrc=srcName+tokenUrl;
     },
     },
     editorOptions() {
     editorOptions() {
       this.setOptionsData();
       this.setOptionsData();
@@ -161,12 +182,13 @@ export default {
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
 .treeContainer{
 .treeContainer{
-  padding:10px;
+  //padding:10px;
   display: flex;
   display: flex;
 }
 }
 .tree-left{
 .tree-left{
   width:20%;
   width:20%;
   padding:10px;
   padding:10px;
+  background: #ffffff;
 }
 }
 .tree-content{
 .tree-content{
   flex:1;
   flex:1;
@@ -175,4 +197,9 @@ export default {
   height:100%;
   height:100%;
   width:100%;
   width:100%;
 }
 }
+::v-deep .el-tabs_nav-scroll{
+  width:50%!important;
+  margin:0 auto!important;
+}
+
 </style>
 </style>