Merge pull request 'fix : 修复echart弹窗默认小屏' (#352) from dengjie into dev

Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/352

src/components/content/airInfo/AirInfo.vue

@@ -241,8 +241,8 @@ const getChartInfo = (equipmentId, type = 'day', time = '', flag, startTime, end
   nextTick(() => {
     if (flag) {
       const fan = document.getElementById('airDialog')
-      fan.classList.remove('shrink-screen-dialog')
+      fan.classList.add('shrink-screen-dialog')
-      if (!isFullScreen.value) {
+      if (isFullScreen.value) {
         const titleName = document.getElementsByClassName('el-dialog__title')[0]
         titleName.style.fontSize = '70px'
       }
@@ -260,8 +260,8 @@ const getChartInfo = (equipmentId, type = 'day', time = '', flag, startTime, end
             fanChart.style.height = element.offsetHeight - 140 + 'px'
             myEcharts.resize();
           });
-          if (!isFullScreen.value) {
+          if (isFullScreen.value) {
-            initChart(res.data.dates, res.data.values, '93%')
+            initChart(res.data.dates, res.data.values, dataZoomTop)
           }
         } else {
           shrinkScreen()
@@ -288,7 +288,7 @@ const handleOpenChart = (id, type) => {
       chooseDayRef.value.clearData()
     }
   })
-  isFullScreen.value = false
+  isFullScreen.value = true
   if (type === 'air') {
     dialogTitle.value = id.name
     openDialogId.value = id.equipmentId

src/components/content/badGasInfo/BadGasInfo.vue

@@ -281,8 +281,8 @@ const getBadGasChartInfo = (type, time = '', flag, startTime, endTime) => {
   nextTick(() => {
     if (flag) {
       const fan = document.getElementById('badDialog')
-      fan.classList.remove('shrink-screen-dialog')
+      fan.classList.add('shrink-screen-dialog')
-      if (!isFullScreen.value) {
+      if (isFullScreen.value) {
         const titleName = document.getElementsByClassName('el-dialog__title')[0]
         titleName.style.fontSize = '70px'
       }
@@ -300,8 +300,8 @@ const getBadGasChartInfo = (type, time = '', flag, startTime, endTime) => {
             fanChart.style.height = element.offsetHeight - 140 + 'px'
             myEcharts.resize();
           });
-          if (!isFullScreen.value) {
+          if (isFullScreen.value) {
-            initChart(res.data.dates, res.data, '93%')
+            initChart(res.data.dates, res.data, dataZoomTop)
           }
         } else {
           shrinkScreen()
@@ -322,7 +322,7 @@ const handleOpenChart = () => {
     }
   })
   isBadGasVisited.value = true
-  isFullScreen.value = false
+  isFullScreen.value = true
   getBadGasChartInfo('day', '', true)
 };
 const getImageUrl = (name) => {

src/components/content/fanInfo/FanInfo.vue

@@ -425,8 +425,8 @@ const getFanInfo = (equipmentId, type = 'day', time = '', flag, startTime, endTi
   nextTick(() => {
     if (flag) {
       const fan = document.getElementById('fanDialog')
-      fan.classList.remove('shrink-screen-dialog')
+      fan.classList.add('shrink-screen-dialog')
-      if (!isFullScreen.value) {
+      if (isFullScreen.value) {
         const titleName = document.getElementsByClassName('el-dialog__title')[0]
         titleName.style.fontSize = '70px'
       }
@@ -444,8 +444,8 @@ const getFanInfo = (equipmentId, type = 'day', time = '', flag, startTime, endTi
             fanChart.style.height = element.offsetHeight - 140 + 'px'
             myEcharts.resize();
           });
-          if (!isFullScreen.value) {
+          if (isFullScreen.value) {
-            initChart(res.data.dates, res.data.currentsA, res.data.currentsB, res.data.currentsC, '93%')
+            initChart(res.data.dates, res.data.currentsA, res.data.currentsB, res.data.currentsC, dataZoomTop)
           }
         } else {
           shrinkScreen()
@@ -471,7 +471,7 @@ const handleOpenChart = (item) => {
   isVisited.value = true
   selectTimeButton.value = 2
   openEquipmentId.value = item.equipmentId
-  isFullScreen.value = false
+  isFullScreen.value = true
   getFanInfo(item.equipmentId, 'day', '', true)
   if (item.equipmentType === "frequency1") {
     fanIndex.value = '一'

src/components/content/usedEle/UsedEle.vue

@@ -292,8 +292,8 @@ const getFanInfo = (equipmentId, type = 'month', time = '', flag) => {
   nextTick(() => {
     if (flag) {
       const fan = document.getElementById('eleDialog')
-      fan.classList.remove('shrink-screen-dialog')
+      fan.classList.add('shrink-screen-dialog')
-      if (!isFullScreen.value) {
+      if (isFullScreen.value) {
         const titleName = document.getElementsByClassName('el-dialog__title')[0]
         titleName.style.fontSize = '70px'
       }
@@ -313,8 +313,8 @@ const getFanInfo = (equipmentId, type = 'month', time = '', flag) => {
             fanChart.style.height = element.offsetHeight - 280 + 'px'
             myEcharts.resize();
           });
-          if (!isFullScreen.value) {
+          if (isFullScreen.value) {
-            initChart(res.data.dates, res.data.consumptionValues, res.data.saveElectricityValues, '94%')
+            initChart(res.data.dates, res.data.consumptionValues, res.data.saveElectricityValues, dataZoomTop)
           }
         } else {
           shrinkScreen()
@@ -337,7 +337,7 @@ const handleOpenChart = () => {
       chooseMonthRef.value.clearData()
     }
   })
-  isFullScreen.value = false
+  isFullScreen.value = true
   getFanInfo(openEquipmentId.value, 'month', '', true)
 }
 /**

src/components/content/windPressure/WindPressureList.vue

@@ -194,8 +194,8 @@ const getWindInfo = (equipmentId, type = 'day', time = '', flag, startTime, endT
   nextTick(() => {
     if (flag) {
       const fan = document.getElementById('windDialog')
-      fan.classList.remove('shrink-screen-dialog')
+      fan.classList.add('shrink-screen-dialog')
-      if (!isFullScreen.value) {
+      if (isFullScreen.value) {
         const titleName = document.getElementsByClassName('el-dialog__title')[0]
         titleName.style.fontSize = '70px'
       }
@@ -213,8 +213,8 @@ const getWindInfo = (equipmentId, type = 'day', time = '', flag, startTime, endT
             fanChart.style.height = element.offsetHeight - 140 + 'px'
             myEcharts.resize();
           });
-          if (!isFullScreen.value) {
+          if (isFullScreen.value) {
-            initChart(res.data.dates, res.data.values, '93%')
+            initChart(res.data.dates, res.data.values, dataZoomTop)
           }
         } else {
           shrinkScreen()
@@ -241,7 +241,7 @@ const handleOpenChart = (item) => {
       chooseDayRef.value.clearData()
     }
   })
-  isFullScreen.value = false
+  isFullScreen.value = true
   getWindInfo(item.equipmentId, 'day', '', true)
   windSort.value = item.equipmentName
   windSortId.value = item.equipmentId

src/views/login/index.vue

@@ -46,7 +46,7 @@ const router = useRouter();
 const authStore = useAuthStore();
 const loginForm = reactive({
   // username: "admin",
-  password: "123456",
+  password: "",
   username: "administrator",
   // password: "",
   code: "",