Merge branch 'feature-Station-dev-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
This commit is contained in:
		
						commit
						4cd6430bd0
					
				| 
						 | 
				
			
			@ -147,6 +147,7 @@
 | 
			
		|||
      :footer="null"
 | 
			
		||||
      @fullscreen="onModalFullScreen"
 | 
			
		||||
      :getContainer="getModalContainer"
 | 
			
		||||
      destroy-on-close
 | 
			
		||||
    >
 | 
			
		||||
      <div class="data-receive-status">
 | 
			
		||||
        <!-- 左侧配置栏 -->
 | 
			
		||||
| 
						 | 
				
			
			@ -624,6 +625,7 @@ export default {
 | 
			
		|||
    // 打开分析弹窗
 | 
			
		||||
    handleOpenAnalyzeModal(stationInfo) {
 | 
			
		||||
      this.stationInfo = stationInfo
 | 
			
		||||
      this.statusList = []
 | 
			
		||||
      this.dataStatusModalVisible = true
 | 
			
		||||
    },
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -97,7 +97,7 @@ export default {
 | 
			
		|||
  },
 | 
			
		||||
  data() {
 | 
			
		||||
    return {
 | 
			
		||||
      legendList,
 | 
			
		||||
      legendList: cloneDeep(legendList),
 | 
			
		||||
      option: {}
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
| 
						 | 
				
			
			@ -168,7 +168,6 @@ export default {
 | 
			
		|||
      const option = cloneDeep(initialOption)
 | 
			
		||||
      const { grid, xAxis, yAxis, series, dataZoom } = option
 | 
			
		||||
      this.list.forEach((item, index) => {
 | 
			
		||||
        console.log('%c [ item ]-185', 'font-size:13px; background:pink; color:#bf2c9f;', item)
 | 
			
		||||
        grid.push({
 | 
			
		||||
          left: 70,
 | 
			
		||||
          right: 20,
 | 
			
		||||
| 
						 | 
				
			
			@ -238,7 +237,7 @@ export default {
 | 
			
		|||
          const endTime = new Date(item.endTime * 1000).getTime()
 | 
			
		||||
          const duration = endTime - startTime
 | 
			
		||||
          const index = typeList.findIndex(type => item.type == type)
 | 
			
		||||
          const find = legendList.find(legendItem => legendItem.title == item.status)
 | 
			
		||||
          const find = this.legendList.find(legendItem => legendItem.title == item.status)
 | 
			
		||||
          if (find.isShow) {
 | 
			
		||||
            data.push({
 | 
			
		||||
              name: item.status,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue
	
	Block a user