diff --git a/src/common/flexible.js b/src/common/flexible.js
index 693b592..86a357c 100644
--- a/src/common/flexible.js
+++ b/src/common/flexible.js
@@ -91,12 +91,14 @@
     // }
     // // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     // var rem = width / 24;
-    var height = docEl.getBoundingClientRect().height;
-    if (height / dpr < 500) {
-      height = 607 * dpr;
-    } else if (height / dpr > 1296) {
-      height = 1296 * dpr;
-    }
+    // var height = docEl.getBoundingClientRect().height;
+    var height = window.screen.height; // 获取全屏的屏幕高度
+    // if (height / dpr < 500) {
+    //   height = 607 * dpr;
+    // } else if (height / dpr > 1296) {
+    //   height = 1296 * dpr;
+    // }
+    height = height*dpr;
     // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     var rem = height / 24;
     console.log('rem = '+ rem)

diff --git a/src/common/flexible.js b/src/common/flexible.js
index 693b592..86a357c 100644
--- a/src/common/flexible.js
+++ b/src/common/flexible.js
@@ -91,12 +91,14 @@
     // }
     // // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     // var rem = width / 24;
-    var height = docEl.getBoundingClientRect().height;
-    if (height / dpr < 500) {
-      height = 607 * dpr;
-    } else if (height / dpr > 1296) {
-      height = 1296 * dpr;
-    }
+    // var height = docEl.getBoundingClientRect().height;
+    var height = window.screen.height; // 获取全屏的屏幕高度
+    // if (height / dpr < 500) {
+    //   height = 607 * dpr;
+    // } else if (height / dpr > 1296) {
+    //   height = 1296 * dpr;
+    // }
+    height = height*dpr;
     // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     var rem = height / 24;
     console.log('rem = '+ rem)
diff --git a/src/components/block/simpleBlock.vue b/src/components/block/simpleBlock.vue
index 9763891..014251e 100644
--- a/src/components/block/simpleBlock.vue
+++ b/src/components/block/simpleBlock.vue
@@ -38,9 +38,9 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.3rem',
+          titleSize:'0.25rem',
           valueSize:'0.4rem',
-          unitSize:'0.2rem',
+          unitSize:'0.1rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
           color: '#fffff', // 数值颜色

diff --git a/src/common/flexible.js b/src/common/flexible.js
index 693b592..86a357c 100644
--- a/src/common/flexible.js
+++ b/src/common/flexible.js
@@ -91,12 +91,14 @@
     // }
     // // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     // var rem = width / 24;
-    var height = docEl.getBoundingClientRect().height;
-    if (height / dpr < 500) {
-      height = 607 * dpr;
-    } else if (height / dpr > 1296) {
-      height = 1296 * dpr;
-    }
+    // var height = docEl.getBoundingClientRect().height;
+    var height = window.screen.height; // 获取全屏的屏幕高度
+    // if (height / dpr < 500) {
+    //   height = 607 * dpr;
+    // } else if (height / dpr > 1296) {
+    //   height = 1296 * dpr;
+    // }
+    height = height*dpr;
     // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     var rem = height / 24;
     console.log('rem = '+ rem)
diff --git a/src/components/block/simpleBlock.vue b/src/components/block/simpleBlock.vue
index 9763891..014251e 100644
--- a/src/components/block/simpleBlock.vue
+++ b/src/components/block/simpleBlock.vue
@@ -38,9 +38,9 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.3rem',
+          titleSize:'0.25rem',
           valueSize:'0.4rem',
-          unitSize:'0.2rem',
+          unitSize:'0.1rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
           color: '#fffff', // 数值颜色
diff --git a/src/components/block/simpleBlock2.vue b/src/components/block/simpleBlock2.vue
index 6d4be77..6904004 100644
--- a/src/components/block/simpleBlock2.vue
+++ b/src/components/block/simpleBlock2.vue
@@ -37,8 +37,8 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.4rem',
-          valueSize:'0.6rem',
+          titleSize:'0.3rem',
+          valueSize:'0.5rem',
           unitSize:'0.3rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色

diff --git a/src/common/flexible.js b/src/common/flexible.js
index 693b592..86a357c 100644
--- a/src/common/flexible.js
+++ b/src/common/flexible.js
@@ -91,12 +91,14 @@
     // }
     // // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     // var rem = width / 24;
-    var height = docEl.getBoundingClientRect().height;
-    if (height / dpr < 500) {
-      height = 607 * dpr;
-    } else if (height / dpr > 1296) {
-      height = 1296 * dpr;
-    }
+    // var height = docEl.getBoundingClientRect().height;
+    var height = window.screen.height; // 获取全屏的屏幕高度
+    // if (height / dpr < 500) {
+    //   height = 607 * dpr;
+    // } else if (height / dpr > 1296) {
+    //   height = 1296 * dpr;
+    // }
+    height = height*dpr;
     // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     var rem = height / 24;
     console.log('rem = '+ rem)
diff --git a/src/components/block/simpleBlock.vue b/src/components/block/simpleBlock.vue
index 9763891..014251e 100644
--- a/src/components/block/simpleBlock.vue
+++ b/src/components/block/simpleBlock.vue
@@ -38,9 +38,9 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.3rem',
+          titleSize:'0.25rem',
           valueSize:'0.4rem',
-          unitSize:'0.2rem',
+          unitSize:'0.1rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
           color: '#fffff', // 数值颜色
diff --git a/src/components/block/simpleBlock2.vue b/src/components/block/simpleBlock2.vue
index 6d4be77..6904004 100644
--- a/src/components/block/simpleBlock2.vue
+++ b/src/components/block/simpleBlock2.vue
@@ -37,8 +37,8 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.4rem',
-          valueSize:'0.6rem',
+          titleSize:'0.3rem',
+          valueSize:'0.5rem',
           unitSize:'0.3rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
diff --git a/src/components/echart/gauge/gauge1.vue b/src/components/echart/gauge/gauge1.vue
index 5a6b9da..488acc9 100644
--- a/src/components/echart/gauge/gauge1.vue
+++ b/src/components/echart/gauge/gauge1.vue
@@ -41,8 +41,8 @@
       },
       lineWidth:{
         type: Number,
-        default: 12
-      }
+        default: 0.3
+      } // 轨迹宽度，rem为单位
     },
     data(){
       return{
@@ -76,7 +76,7 @@
                 formatter: '{value}%',
                 offsetCenter: [0, '-5%'],
                 color: 'red',
-                fontSize: '200%',
+                fontSize: countSize(0.5),
                 fontWeight: 'bold',
                 fontFamily: 'sans-serif'
               },
@@ -101,7 +101,7 @@
                 show: true,
                 lineStyle: {
                   // 属性lineStyle控制线条样式
-                  width: this.lineWidth,
+                  width: countSize(this.lineWidth),
                   color: [[1, '#262795']]
                 }
               }
@@ -122,7 +122,7 @@
                 show: true,
                 lineStyle: {
                   // 属性lineStyle控制线条样式
-                  width: this.lineWidth,
+                  width: countSize(this.lineWidth),
                   color: [
                     [
                       1,

diff --git a/src/common/flexible.js b/src/common/flexible.js
index 693b592..86a357c 100644
--- a/src/common/flexible.js
+++ b/src/common/flexible.js
@@ -91,12 +91,14 @@
     // }
     // // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     // var rem = width / 24;
-    var height = docEl.getBoundingClientRect().height;
-    if (height / dpr < 500) {
-      height = 607 * dpr;
-    } else if (height / dpr > 1296) {
-      height = 1296 * dpr;
-    }
+    // var height = docEl.getBoundingClientRect().height;
+    var height = window.screen.height; // 获取全屏的屏幕高度
+    // if (height / dpr < 500) {
+    //   height = 607 * dpr;
+    // } else if (height / dpr > 1296) {
+    //   height = 1296 * dpr;
+    // }
+    height = height*dpr;
     // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     var rem = height / 24;
     console.log('rem = '+ rem)
diff --git a/src/components/block/simpleBlock.vue b/src/components/block/simpleBlock.vue
index 9763891..014251e 100644
--- a/src/components/block/simpleBlock.vue
+++ b/src/components/block/simpleBlock.vue
@@ -38,9 +38,9 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.3rem',
+          titleSize:'0.25rem',
           valueSize:'0.4rem',
-          unitSize:'0.2rem',
+          unitSize:'0.1rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
           color: '#fffff', // 数值颜色
diff --git a/src/components/block/simpleBlock2.vue b/src/components/block/simpleBlock2.vue
index 6d4be77..6904004 100644
--- a/src/components/block/simpleBlock2.vue
+++ b/src/components/block/simpleBlock2.vue
@@ -37,8 +37,8 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.4rem',
-          valueSize:'0.6rem',
+          titleSize:'0.3rem',
+          valueSize:'0.5rem',
           unitSize:'0.3rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
diff --git a/src/components/echart/gauge/gauge1.vue b/src/components/echart/gauge/gauge1.vue
index 5a6b9da..488acc9 100644
--- a/src/components/echart/gauge/gauge1.vue
+++ b/src/components/echart/gauge/gauge1.vue
@@ -41,8 +41,8 @@
       },
       lineWidth:{
         type: Number,
-        default: 12
-      }
+        default: 0.3
+      } // 轨迹宽度，rem为单位
     },
     data(){
       return{
@@ -76,7 +76,7 @@
                 formatter: '{value}%',
                 offsetCenter: [0, '-5%'],
                 color: 'red',
-                fontSize: '200%',
+                fontSize: countSize(0.5),
                 fontWeight: 'bold',
                 fontFamily: 'sans-serif'
               },
@@ -101,7 +101,7 @@
                 show: true,
                 lineStyle: {
                   // 属性lineStyle控制线条样式
-                  width: this.lineWidth,
+                  width: countSize(this.lineWidth),
                   color: [[1, '#262795']]
                 }
               }
@@ -122,7 +122,7 @@
                 show: true,
                 lineStyle: {
                   // 属性lineStyle控制线条样式
-                  width: this.lineWidth,
+                  width: countSize(this.lineWidth),
                   color: [
                     [
                       1,
diff --git a/src/main.js b/src/main.js
index 5492dd6..eb88707 100644
--- a/src/main.js
+++ b/src/main.js
@@ -51,7 +51,7 @@
 // 获取配置文件
 import axios from 'axios'
 import service from '@/utils/request'
-axios.get('/static/project.config.json').then((result) => {
+axios.get('static/project.config.json').then((result) => {
   console.log('get config')
   Vue.prototype.baseConfig = result.data
   document.title = result.data.title // 首先设置网页的title

diff --git a/src/common/flexible.js b/src/common/flexible.js
index 693b592..86a357c 100644
--- a/src/common/flexible.js
+++ b/src/common/flexible.js
@@ -91,12 +91,14 @@
     // }
     // // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     // var rem = width / 24;
-    var height = docEl.getBoundingClientRect().height;
-    if (height / dpr < 500) {
-      height = 607 * dpr;
-    } else if (height / dpr > 1296) {
-      height = 1296 * dpr;
-    }
+    // var height = docEl.getBoundingClientRect().height;
+    var height = window.screen.height; // 获取全屏的屏幕高度
+    // if (height / dpr < 500) {
+    //   height = 607 * dpr;
+    // } else if (height / dpr > 1296) {
+    //   height = 1296 * dpr;
+    // }
+    height = height*dpr;
     // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     var rem = height / 24;
     console.log('rem = '+ rem)
diff --git a/src/components/block/simpleBlock.vue b/src/components/block/simpleBlock.vue
index 9763891..014251e 100644
--- a/src/components/block/simpleBlock.vue
+++ b/src/components/block/simpleBlock.vue
@@ -38,9 +38,9 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.3rem',
+          titleSize:'0.25rem',
           valueSize:'0.4rem',
-          unitSize:'0.2rem',
+          unitSize:'0.1rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
           color: '#fffff', // 数值颜色
diff --git a/src/components/block/simpleBlock2.vue b/src/components/block/simpleBlock2.vue
index 6d4be77..6904004 100644
--- a/src/components/block/simpleBlock2.vue
+++ b/src/components/block/simpleBlock2.vue
@@ -37,8 +37,8 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.4rem',
-          valueSize:'0.6rem',
+          titleSize:'0.3rem',
+          valueSize:'0.5rem',
           unitSize:'0.3rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
diff --git a/src/components/echart/gauge/gauge1.vue b/src/components/echart/gauge/gauge1.vue
index 5a6b9da..488acc9 100644
--- a/src/components/echart/gauge/gauge1.vue
+++ b/src/components/echart/gauge/gauge1.vue
@@ -41,8 +41,8 @@
       },
       lineWidth:{
         type: Number,
-        default: 12
-      }
+        default: 0.3
+      } // 轨迹宽度，rem为单位
     },
     data(){
       return{
@@ -76,7 +76,7 @@
                 formatter: '{value}%',
                 offsetCenter: [0, '-5%'],
                 color: 'red',
-                fontSize: '200%',
+                fontSize: countSize(0.5),
                 fontWeight: 'bold',
                 fontFamily: 'sans-serif'
               },
@@ -101,7 +101,7 @@
                 show: true,
                 lineStyle: {
                   // 属性lineStyle控制线条样式
-                  width: this.lineWidth,
+                  width: countSize(this.lineWidth),
                   color: [[1, '#262795']]
                 }
               }
@@ -122,7 +122,7 @@
                 show: true,
                 lineStyle: {
                   // 属性lineStyle控制线条样式
-                  width: this.lineWidth,
+                  width: countSize(this.lineWidth),
                   color: [
                     [
                       1,
diff --git a/src/main.js b/src/main.js
index 5492dd6..eb88707 100644
--- a/src/main.js
+++ b/src/main.js
@@ -51,7 +51,7 @@
 // 获取配置文件
 import axios from 'axios'
 import service from '@/utils/request'
-axios.get('/static/project.config.json').then((result) => {
+axios.get('static/project.config.json').then((result) => {
   console.log('get config')
   Vue.prototype.baseConfig = result.data
   document.title = result.data.title // 首先设置网页的title
diff --git a/src/views/screen/mainComponents/bizStatistic.vue b/src/views/screen/mainComponents/bizStatistic.vue
index 637f439..f948a33 100644
--- a/src/views/screen/mainComponents/bizStatistic.vue
+++ b/src/views/screen/mainComponents/bizStatistic.vue
@@ -24,11 +24,11 @@
         data:[
           {name:'路灯亮灯率', value:{already:34, total:100,rate:34}, color:'#009eec'},
           // {name:'地下管线监测设备报警率', value:[{already:34, total:100,rate:34}]},
-          {name:'井盖状态检测仪', value:{already:34, total:100,rate:50}, color:'#9fe6b8'},
-          {name:'液位监测仪', value:{already:34, total:100,rate:79}, color:'#99ccff'},
-          {name:'有害气体监测仪', value:{already:34, total:100,rate:20, color:'#ffdb5c'}},
-          {name:'噪声监测仪', value:{already:34, total:100,rate:15}, color:'#ff9f7f'},
-          {name:'消防栓防盗水监测仪', value:{already:34, total:100,rate:54}, color:'#fb7293'}
+          {name:'井盖报警率', value:{already:34, total:100,rate:50}, color:'#9fe6b8'},
+          {name:'液位报警率', value:{already:34, total:100,rate:79}, color:'#99ccff'},
+          {name:'有害气体报警率', value:{already:34, total:100,rate:20, color:'#ffdb5c'}},
+          {name:'噪声报警率', value:{already:34, total:100,rate:15}, color:'#ff9f7f'},
+          {name:'消防栓报警率', value:{already:34, total:100,rate:54}, color:'#fb7293'}
         ]
       }
     },

diff --git a/src/common/flexible.js b/src/common/flexible.js
index 693b592..86a357c 100644
--- a/src/common/flexible.js
+++ b/src/common/flexible.js
@@ -91,12 +91,14 @@
     // }
     // // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     // var rem = width / 24;
-    var height = docEl.getBoundingClientRect().height;
-    if (height / dpr < 500) {
-      height = 607 * dpr;
-    } else if (height / dpr > 1296) {
-      height = 1296 * dpr;
-    }
+    // var height = docEl.getBoundingClientRect().height;
+    var height = window.screen.height; // 获取全屏的屏幕高度
+    // if (height / dpr < 500) {
+    //   height = 607 * dpr;
+    // } else if (height / dpr > 1296) {
+    //   height = 1296 * dpr;
+    // }
+    height = height*dpr;
     // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     var rem = height / 24;
     console.log('rem = '+ rem)
diff --git a/src/components/block/simpleBlock.vue b/src/components/block/simpleBlock.vue
index 9763891..014251e 100644
--- a/src/components/block/simpleBlock.vue
+++ b/src/components/block/simpleBlock.vue
@@ -38,9 +38,9 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.3rem',
+          titleSize:'0.25rem',
           valueSize:'0.4rem',
-          unitSize:'0.2rem',
+          unitSize:'0.1rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
           color: '#fffff', // 数值颜色
diff --git a/src/components/block/simpleBlock2.vue b/src/components/block/simpleBlock2.vue
index 6d4be77..6904004 100644
--- a/src/components/block/simpleBlock2.vue
+++ b/src/components/block/simpleBlock2.vue
@@ -37,8 +37,8 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.4rem',
-          valueSize:'0.6rem',
+          titleSize:'0.3rem',
+          valueSize:'0.5rem',
           unitSize:'0.3rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
diff --git a/src/components/echart/gauge/gauge1.vue b/src/components/echart/gauge/gauge1.vue
index 5a6b9da..488acc9 100644
--- a/src/components/echart/gauge/gauge1.vue
+++ b/src/components/echart/gauge/gauge1.vue
@@ -41,8 +41,8 @@
       },
       lineWidth:{
         type: Number,
-        default: 12
-      }
+        default: 0.3
+      } // 轨迹宽度，rem为单位
     },
     data(){
       return{
@@ -76,7 +76,7 @@
                 formatter: '{value}%',
                 offsetCenter: [0, '-5%'],
                 color: 'red',
-                fontSize: '200%',
+                fontSize: countSize(0.5),
                 fontWeight: 'bold',
                 fontFamily: 'sans-serif'
               },
@@ -101,7 +101,7 @@
                 show: true,
                 lineStyle: {
                   // 属性lineStyle控制线条样式
-                  width: this.lineWidth,
+                  width: countSize(this.lineWidth),
                   color: [[1, '#262795']]
                 }
               }
@@ -122,7 +122,7 @@
                 show: true,
                 lineStyle: {
                   // 属性lineStyle控制线条样式
-                  width: this.lineWidth,
+                  width: countSize(this.lineWidth),
                   color: [
                     [
                       1,
diff --git a/src/main.js b/src/main.js
index 5492dd6..eb88707 100644
--- a/src/main.js
+++ b/src/main.js
@@ -51,7 +51,7 @@
 // 获取配置文件
 import axios from 'axios'
 import service from '@/utils/request'
-axios.get('/static/project.config.json').then((result) => {
+axios.get('static/project.config.json').then((result) => {
   console.log('get config')
   Vue.prototype.baseConfig = result.data
   document.title = result.data.title // 首先设置网页的title
diff --git a/src/views/screen/mainComponents/bizStatistic.vue b/src/views/screen/mainComponents/bizStatistic.vue
index 637f439..f948a33 100644
--- a/src/views/screen/mainComponents/bizStatistic.vue
+++ b/src/views/screen/mainComponents/bizStatistic.vue
@@ -24,11 +24,11 @@
         data:[
           {name:'路灯亮灯率', value:{already:34, total:100,rate:34}, color:'#009eec'},
           // {name:'地下管线监测设备报警率', value:[{already:34, total:100,rate:34}]},
-          {name:'井盖状态检测仪', value:{already:34, total:100,rate:50}, color:'#9fe6b8'},
-          {name:'液位监测仪', value:{already:34, total:100,rate:79}, color:'#99ccff'},
-          {name:'有害气体监测仪', value:{already:34, total:100,rate:20, color:'#ffdb5c'}},
-          {name:'噪声监测仪', value:{already:34, total:100,rate:15}, color:'#ff9f7f'},
-          {name:'消防栓防盗水监测仪', value:{already:34, total:100,rate:54}, color:'#fb7293'}
+          {name:'井盖报警率', value:{already:34, total:100,rate:50}, color:'#9fe6b8'},
+          {name:'液位报警率', value:{already:34, total:100,rate:79}, color:'#99ccff'},
+          {name:'有害气体报警率', value:{already:34, total:100,rate:20, color:'#ffdb5c'}},
+          {name:'噪声报警率', value:{already:34, total:100,rate:15}, color:'#ff9f7f'},
+          {name:'消防栓报警率', value:{already:34, total:100,rate:54}, color:'#fb7293'}
         ]
       }
     },
diff --git a/src/views/screen/mainComponents/deviceAlarmHistory.vue b/src/views/screen/mainComponents/deviceAlarmHistory.vue
index e160447..ef5f27a 100644
--- a/src/views/screen/mainComponents/deviceAlarmHistory.vue
+++ b/src/views/screen/mainComponents/deviceAlarmHistory.vue
@@ -26,8 +26,8 @@
     components: {GradientLineChart, Container1},
     data(){
       return {
-        currentTab:'井盖状态监测仪',
-        tabList:['井盖状态监测仪','液位监测仪','有害气体监测仪','消防栓防盗水监测仪'],
+        currentTab:'井盖状态监测',
+        tabList:['井盖状态监测','液位监测','有害气体监测','消防栓监测'],
         xAxisData:['周一','周二','周三','周四','周五','周六','周日'],
         seriesData:[
           // {name:'井盖状态监测仪',data:[120, 252, 101, 134, 290, 230, 110],color:'58,55,194'},
@@ -62,6 +62,9 @@
           font-size: 0.1rem;
           line-height: 3;
           margin: 0 auto;
+          /*display:-webkit-box;*/
+          /*overflow:hidden;*/
+          /*text-overflow:ellipsis;*/
         }
       }
       .current-tab{

diff --git a/src/common/flexible.js b/src/common/flexible.js
index 693b592..86a357c 100644
--- a/src/common/flexible.js
+++ b/src/common/flexible.js
@@ -91,12 +91,14 @@
     // }
     // // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     // var rem = width / 24;
-    var height = docEl.getBoundingClientRect().height;
-    if (height / dpr < 500) {
-      height = 607 * dpr;
-    } else if (height / dpr > 1296) {
-      height = 1296 * dpr;
-    }
+    // var height = docEl.getBoundingClientRect().height;
+    var height = window.screen.height; // 获取全屏的屏幕高度
+    // if (height / dpr < 500) {
+    //   height = 607 * dpr;
+    // } else if (height / dpr > 1296) {
+    //   height = 1296 * dpr;
+    // }
+    height = height*dpr;
     // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     var rem = height / 24;
     console.log('rem = '+ rem)
diff --git a/src/components/block/simpleBlock.vue b/src/components/block/simpleBlock.vue
index 9763891..014251e 100644
--- a/src/components/block/simpleBlock.vue
+++ b/src/components/block/simpleBlock.vue
@@ -38,9 +38,9 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.3rem',
+          titleSize:'0.25rem',
           valueSize:'0.4rem',
-          unitSize:'0.2rem',
+          unitSize:'0.1rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
           color: '#fffff', // 数值颜色
diff --git a/src/components/block/simpleBlock2.vue b/src/components/block/simpleBlock2.vue
index 6d4be77..6904004 100644
--- a/src/components/block/simpleBlock2.vue
+++ b/src/components/block/simpleBlock2.vue
@@ -37,8 +37,8 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.4rem',
-          valueSize:'0.6rem',
+          titleSize:'0.3rem',
+          valueSize:'0.5rem',
           unitSize:'0.3rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
diff --git a/src/components/echart/gauge/gauge1.vue b/src/components/echart/gauge/gauge1.vue
index 5a6b9da..488acc9 100644
--- a/src/components/echart/gauge/gauge1.vue
+++ b/src/components/echart/gauge/gauge1.vue
@@ -41,8 +41,8 @@
       },
       lineWidth:{
         type: Number,
-        default: 12
-      }
+        default: 0.3
+      } // 轨迹宽度，rem为单位
     },
     data(){
       return{
@@ -76,7 +76,7 @@
                 formatter: '{value}%',
                 offsetCenter: [0, '-5%'],
                 color: 'red',
-                fontSize: '200%',
+                fontSize: countSize(0.5),
                 fontWeight: 'bold',
                 fontFamily: 'sans-serif'
               },
@@ -101,7 +101,7 @@
                 show: true,
                 lineStyle: {
                   // 属性lineStyle控制线条样式
-                  width: this.lineWidth,
+                  width: countSize(this.lineWidth),
                   color: [[1, '#262795']]
                 }
               }
@@ -122,7 +122,7 @@
                 show: true,
                 lineStyle: {
                   // 属性lineStyle控制线条样式
-                  width: this.lineWidth,
+                  width: countSize(this.lineWidth),
                   color: [
                     [
                       1,
diff --git a/src/main.js b/src/main.js
index 5492dd6..eb88707 100644
--- a/src/main.js
+++ b/src/main.js
@@ -51,7 +51,7 @@
 // 获取配置文件
 import axios from 'axios'
 import service from '@/utils/request'
-axios.get('/static/project.config.json').then((result) => {
+axios.get('static/project.config.json').then((result) => {
   console.log('get config')
   Vue.prototype.baseConfig = result.data
   document.title = result.data.title // 首先设置网页的title
diff --git a/src/views/screen/mainComponents/bizStatistic.vue b/src/views/screen/mainComponents/bizStatistic.vue
index 637f439..f948a33 100644
--- a/src/views/screen/mainComponents/bizStatistic.vue
+++ b/src/views/screen/mainComponents/bizStatistic.vue
@@ -24,11 +24,11 @@
         data:[
           {name:'路灯亮灯率', value:{already:34, total:100,rate:34}, color:'#009eec'},
           // {name:'地下管线监测设备报警率', value:[{already:34, total:100,rate:34}]},
-          {name:'井盖状态检测仪', value:{already:34, total:100,rate:50}, color:'#9fe6b8'},
-          {name:'液位监测仪', value:{already:34, total:100,rate:79}, color:'#99ccff'},
-          {name:'有害气体监测仪', value:{already:34, total:100,rate:20, color:'#ffdb5c'}},
-          {name:'噪声监测仪', value:{already:34, total:100,rate:15}, color:'#ff9f7f'},
-          {name:'消防栓防盗水监测仪', value:{already:34, total:100,rate:54}, color:'#fb7293'}
+          {name:'井盖报警率', value:{already:34, total:100,rate:50}, color:'#9fe6b8'},
+          {name:'液位报警率', value:{already:34, total:100,rate:79}, color:'#99ccff'},
+          {name:'有害气体报警率', value:{already:34, total:100,rate:20, color:'#ffdb5c'}},
+          {name:'噪声报警率', value:{already:34, total:100,rate:15}, color:'#ff9f7f'},
+          {name:'消防栓报警率', value:{already:34, total:100,rate:54}, color:'#fb7293'}
         ]
       }
     },
diff --git a/src/views/screen/mainComponents/deviceAlarmHistory.vue b/src/views/screen/mainComponents/deviceAlarmHistory.vue
index e160447..ef5f27a 100644
--- a/src/views/screen/mainComponents/deviceAlarmHistory.vue
+++ b/src/views/screen/mainComponents/deviceAlarmHistory.vue
@@ -26,8 +26,8 @@
     components: {GradientLineChart, Container1},
     data(){
       return {
-        currentTab:'井盖状态监测仪',
-        tabList:['井盖状态监测仪','液位监测仪','有害气体监测仪','消防栓防盗水监测仪'],
+        currentTab:'井盖状态监测',
+        tabList:['井盖状态监测','液位监测','有害气体监测','消防栓监测'],
         xAxisData:['周一','周二','周三','周四','周五','周六','周日'],
         seriesData:[
           // {name:'井盖状态监测仪',data:[120, 252, 101, 134, 290, 230, 110],color:'58,55,194'},
@@ -62,6 +62,9 @@
           font-size: 0.1rem;
           line-height: 3;
           margin: 0 auto;
+          /*display:-webkit-box;*/
+          /*overflow:hidden;*/
+          /*text-overflow:ellipsis;*/
         }
       }
       .current-tab{
diff --git a/src/views/screen/mainComponents/pipeSafety.vue b/src/views/screen/mainComponents/pipeSafety.vue
index 3fd0664..ce305b6 100644
--- a/src/views/screen/mainComponents/pipeSafety.vue
+++ b/src/views/screen/mainComponents/pipeSafety.vue
@@ -5,16 +5,16 @@
  -->
 <template>
   <container1 title="管网运行状态">
-    <div style="width: 100%;height: 100%;padding: 0.1rem; display: flex;justify-content: flex-end">
+    <div style="width: 100%;height: 100%;padding: 0.05rem; display: flex;justify-content: flex-end">
       <div style="width:40%;height:100%;display: flex; flex-direction: column; justify-content: center">
         <simple-block :data="data1" style="height:40%;width:100%">
-          <span style="margin-right:0.5rem">
+          <span style="margin-right:0.3rem">
             <img :src="require('@/assets/img/main_screen/pipe-device.png')" class="icon"/>
             <!--<a-icon type="setting" theme="twoTone" :style="{fontSize:'0.8rem'}"/>-->
           </span>
         </simple-block>
         <simple-block :data="data2" style="height:40%;width:100%">
-          <span style="margin-right:0.5rem">
+          <span style="margin-right:0.3rem">
             <img :src="require('@/assets/img/main_screen/pipe-alarm.png')" class="icon"/>
           </span>
         </simple-block>

diff --git a/src/common/flexible.js b/src/common/flexible.js
index 693b592..86a357c 100644
--- a/src/common/flexible.js
+++ b/src/common/flexible.js
@@ -91,12 +91,14 @@
     // }
     // // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     // var rem = width / 24;
-    var height = docEl.getBoundingClientRect().height;
-    if (height / dpr < 500) {
-      height = 607 * dpr;
-    } else if (height / dpr > 1296) {
-      height = 1296 * dpr;
-    }
+    // var height = docEl.getBoundingClientRect().height;
+    var height = window.screen.height; // 获取全屏的屏幕高度
+    // if (height / dpr < 500) {
+    //   height = 607 * dpr;
+    // } else if (height / dpr > 1296) {
+    //   height = 1296 * dpr;
+    // }
+    height = height*dpr;
     // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     var rem = height / 24;
     console.log('rem = '+ rem)
diff --git a/src/components/block/simpleBlock.vue b/src/components/block/simpleBlock.vue
index 9763891..014251e 100644
--- a/src/components/block/simpleBlock.vue
+++ b/src/components/block/simpleBlock.vue
@@ -38,9 +38,9 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.3rem',
+          titleSize:'0.25rem',
           valueSize:'0.4rem',
-          unitSize:'0.2rem',
+          unitSize:'0.1rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
           color: '#fffff', // 数值颜色
diff --git a/src/components/block/simpleBlock2.vue b/src/components/block/simpleBlock2.vue
index 6d4be77..6904004 100644
--- a/src/components/block/simpleBlock2.vue
+++ b/src/components/block/simpleBlock2.vue
@@ -37,8 +37,8 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.4rem',
-          valueSize:'0.6rem',
+          titleSize:'0.3rem',
+          valueSize:'0.5rem',
           unitSize:'0.3rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
diff --git a/src/components/echart/gauge/gauge1.vue b/src/components/echart/gauge/gauge1.vue
index 5a6b9da..488acc9 100644
--- a/src/components/echart/gauge/gauge1.vue
+++ b/src/components/echart/gauge/gauge1.vue
@@ -41,8 +41,8 @@
       },
       lineWidth:{
         type: Number,
-        default: 12
-      }
+        default: 0.3
+      } // 轨迹宽度，rem为单位
     },
     data(){
       return{
@@ -76,7 +76,7 @@
                 formatter: '{value}%',
                 offsetCenter: [0, '-5%'],
                 color: 'red',
-                fontSize: '200%',
+                fontSize: countSize(0.5),
                 fontWeight: 'bold',
                 fontFamily: 'sans-serif'
               },
@@ -101,7 +101,7 @@
                 show: true,
                 lineStyle: {
                   // 属性lineStyle控制线条样式
-                  width: this.lineWidth,
+                  width: countSize(this.lineWidth),
                   color: [[1, '#262795']]
                 }
               }
@@ -122,7 +122,7 @@
                 show: true,
                 lineStyle: {
                   // 属性lineStyle控制线条样式
-                  width: this.lineWidth,
+                  width: countSize(this.lineWidth),
                   color: [
                     [
                       1,
diff --git a/src/main.js b/src/main.js
index 5492dd6..eb88707 100644
--- a/src/main.js
+++ b/src/main.js
@@ -51,7 +51,7 @@
 // 获取配置文件
 import axios from 'axios'
 import service from '@/utils/request'
-axios.get('/static/project.config.json').then((result) => {
+axios.get('static/project.config.json').then((result) => {
   console.log('get config')
   Vue.prototype.baseConfig = result.data
   document.title = result.data.title // 首先设置网页的title
diff --git a/src/views/screen/mainComponents/bizStatistic.vue b/src/views/screen/mainComponents/bizStatistic.vue
index 637f439..f948a33 100644
--- a/src/views/screen/mainComponents/bizStatistic.vue
+++ b/src/views/screen/mainComponents/bizStatistic.vue
@@ -24,11 +24,11 @@
         data:[
           {name:'路灯亮灯率', value:{already:34, total:100,rate:34}, color:'#009eec'},
           // {name:'地下管线监测设备报警率', value:[{already:34, total:100,rate:34}]},
-          {name:'井盖状态检测仪', value:{already:34, total:100,rate:50}, color:'#9fe6b8'},
-          {name:'液位监测仪', value:{already:34, total:100,rate:79}, color:'#99ccff'},
-          {name:'有害气体监测仪', value:{already:34, total:100,rate:20, color:'#ffdb5c'}},
-          {name:'噪声监测仪', value:{already:34, total:100,rate:15}, color:'#ff9f7f'},
-          {name:'消防栓防盗水监测仪', value:{already:34, total:100,rate:54}, color:'#fb7293'}
+          {name:'井盖报警率', value:{already:34, total:100,rate:50}, color:'#9fe6b8'},
+          {name:'液位报警率', value:{already:34, total:100,rate:79}, color:'#99ccff'},
+          {name:'有害气体报警率', value:{already:34, total:100,rate:20, color:'#ffdb5c'}},
+          {name:'噪声报警率', value:{already:34, total:100,rate:15}, color:'#ff9f7f'},
+          {name:'消防栓报警率', value:{already:34, total:100,rate:54}, color:'#fb7293'}
         ]
       }
     },
diff --git a/src/views/screen/mainComponents/deviceAlarmHistory.vue b/src/views/screen/mainComponents/deviceAlarmHistory.vue
index e160447..ef5f27a 100644
--- a/src/views/screen/mainComponents/deviceAlarmHistory.vue
+++ b/src/views/screen/mainComponents/deviceAlarmHistory.vue
@@ -26,8 +26,8 @@
     components: {GradientLineChart, Container1},
     data(){
       return {
-        currentTab:'井盖状态监测仪',
-        tabList:['井盖状态监测仪','液位监测仪','有害气体监测仪','消防栓防盗水监测仪'],
+        currentTab:'井盖状态监测',
+        tabList:['井盖状态监测','液位监测','有害气体监测','消防栓监测'],
         xAxisData:['周一','周二','周三','周四','周五','周六','周日'],
         seriesData:[
           // {name:'井盖状态监测仪',data:[120, 252, 101, 134, 290, 230, 110],color:'58,55,194'},
@@ -62,6 +62,9 @@
           font-size: 0.1rem;
           line-height: 3;
           margin: 0 auto;
+          /*display:-webkit-box;*/
+          /*overflow:hidden;*/
+          /*text-overflow:ellipsis;*/
         }
       }
       .current-tab{
diff --git a/src/views/screen/mainComponents/pipeSafety.vue b/src/views/screen/mainComponents/pipeSafety.vue
index 3fd0664..ce305b6 100644
--- a/src/views/screen/mainComponents/pipeSafety.vue
+++ b/src/views/screen/mainComponents/pipeSafety.vue
@@ -5,16 +5,16 @@
  -->
 <template>
   <container1 title="管网运行状态">
-    <div style="width: 100%;height: 100%;padding: 0.1rem; display: flex;justify-content: flex-end">
+    <div style="width: 100%;height: 100%;padding: 0.05rem; display: flex;justify-content: flex-end">
       <div style="width:40%;height:100%;display: flex; flex-direction: column; justify-content: center">
         <simple-block :data="data1" style="height:40%;width:100%">
-          <span style="margin-right:0.5rem">
+          <span style="margin-right:0.3rem">
             <img :src="require('@/assets/img/main_screen/pipe-device.png')" class="icon"/>
             <!--<a-icon type="setting" theme="twoTone" :style="{fontSize:'0.8rem'}"/>-->
           </span>
         </simple-block>
         <simple-block :data="data2" style="height:40%;width:100%">
-          <span style="margin-right:0.5rem">
+          <span style="margin-right:0.3rem">
             <img :src="require('@/assets/img/main_screen/pipe-alarm.png')" class="icon"/>
           </span>
         </simple-block>
diff --git a/src/views/screen/mainComponents/statisticCount.vue b/src/views/screen/mainComponents/statisticCount.vue
index 4f0979a..2f25554 100644
--- a/src/views/screen/mainComponents/statisticCount.vue
+++ b/src/views/screen/mainComponents/statisticCount.vue
@@ -8,9 +8,9 @@
     <a-row type="flex" justify="start" style="height:32%;margin-bottom: 0.1rem">
       <a-col v-for="item of data" :span="6" :key="item.name" style="height:100%;;padding:0.05rem">
         <simple-block :data="item">
-          <div style="padding:0.3rem">
-            <a-icon :type="item.icon" theme="twoTone" :style="{fontSize:'0.5rem'}"/>
-          </div>
+          <!--<div style="padding:0.3rem">-->
+            <!--<a-icon :type="item.icon" theme="twoTone" :style="{fontSize:'0.5rem'}"/>-->
+          <!--</div>-->
         </simple-block>
       </a-col>
     </a-row>

diff --git a/src/common/flexible.js b/src/common/flexible.js
index 693b592..86a357c 100644
--- a/src/common/flexible.js
+++ b/src/common/flexible.js
@@ -91,12 +91,14 @@
     // }
     // // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     // var rem = width / 24;
-    var height = docEl.getBoundingClientRect().height;
-    if (height / dpr < 500) {
-      height = 607 * dpr;
-    } else if (height / dpr > 1296) {
-      height = 1296 * dpr;
-    }
+    // var height = docEl.getBoundingClientRect().height;
+    var height = window.screen.height; // 获取全屏的屏幕高度
+    // if (height / dpr < 500) {
+    //   height = 607 * dpr;
+    // } else if (height / dpr > 1296) {
+    //   height = 1296 * dpr;
+    // }
+    height = height*dpr;
     // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     var rem = height / 24;
     console.log('rem = '+ rem)
diff --git a/src/components/block/simpleBlock.vue b/src/components/block/simpleBlock.vue
index 9763891..014251e 100644
--- a/src/components/block/simpleBlock.vue
+++ b/src/components/block/simpleBlock.vue
@@ -38,9 +38,9 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.3rem',
+          titleSize:'0.25rem',
           valueSize:'0.4rem',
-          unitSize:'0.2rem',
+          unitSize:'0.1rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
           color: '#fffff', // 数值颜色
diff --git a/src/components/block/simpleBlock2.vue b/src/components/block/simpleBlock2.vue
index 6d4be77..6904004 100644
--- a/src/components/block/simpleBlock2.vue
+++ b/src/components/block/simpleBlock2.vue
@@ -37,8 +37,8 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.4rem',
-          valueSize:'0.6rem',
+          titleSize:'0.3rem',
+          valueSize:'0.5rem',
           unitSize:'0.3rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
diff --git a/src/components/echart/gauge/gauge1.vue b/src/components/echart/gauge/gauge1.vue
index 5a6b9da..488acc9 100644
--- a/src/components/echart/gauge/gauge1.vue
+++ b/src/components/echart/gauge/gauge1.vue
@@ -41,8 +41,8 @@
       },
       lineWidth:{
         type: Number,
-        default: 12
-      }
+        default: 0.3
+      } // 轨迹宽度，rem为单位
     },
     data(){
       return{
@@ -76,7 +76,7 @@
                 formatter: '{value}%',
                 offsetCenter: [0, '-5%'],
                 color: 'red',
-                fontSize: '200%',
+                fontSize: countSize(0.5),
                 fontWeight: 'bold',
                 fontFamily: 'sans-serif'
               },
@@ -101,7 +101,7 @@
                 show: true,
                 lineStyle: {
                   // 属性lineStyle控制线条样式
-                  width: this.lineWidth,
+                  width: countSize(this.lineWidth),
                   color: [[1, '#262795']]
                 }
               }
@@ -122,7 +122,7 @@
                 show: true,
                 lineStyle: {
                   // 属性lineStyle控制线条样式
-                  width: this.lineWidth,
+                  width: countSize(this.lineWidth),
                   color: [
                     [
                       1,
diff --git a/src/main.js b/src/main.js
index 5492dd6..eb88707 100644
--- a/src/main.js
+++ b/src/main.js
@@ -51,7 +51,7 @@
 // 获取配置文件
 import axios from 'axios'
 import service from '@/utils/request'
-axios.get('/static/project.config.json').then((result) => {
+axios.get('static/project.config.json').then((result) => {
   console.log('get config')
   Vue.prototype.baseConfig = result.data
   document.title = result.data.title // 首先设置网页的title
diff --git a/src/views/screen/mainComponents/bizStatistic.vue b/src/views/screen/mainComponents/bizStatistic.vue
index 637f439..f948a33 100644
--- a/src/views/screen/mainComponents/bizStatistic.vue
+++ b/src/views/screen/mainComponents/bizStatistic.vue
@@ -24,11 +24,11 @@
         data:[
           {name:'路灯亮灯率', value:{already:34, total:100,rate:34}, color:'#009eec'},
           // {name:'地下管线监测设备报警率', value:[{already:34, total:100,rate:34}]},
-          {name:'井盖状态检测仪', value:{already:34, total:100,rate:50}, color:'#9fe6b8'},
-          {name:'液位监测仪', value:{already:34, total:100,rate:79}, color:'#99ccff'},
-          {name:'有害气体监测仪', value:{already:34, total:100,rate:20, color:'#ffdb5c'}},
-          {name:'噪声监测仪', value:{already:34, total:100,rate:15}, color:'#ff9f7f'},
-          {name:'消防栓防盗水监测仪', value:{already:34, total:100,rate:54}, color:'#fb7293'}
+          {name:'井盖报警率', value:{already:34, total:100,rate:50}, color:'#9fe6b8'},
+          {name:'液位报警率', value:{already:34, total:100,rate:79}, color:'#99ccff'},
+          {name:'有害气体报警率', value:{already:34, total:100,rate:20, color:'#ffdb5c'}},
+          {name:'噪声报警率', value:{already:34, total:100,rate:15}, color:'#ff9f7f'},
+          {name:'消防栓报警率', value:{already:34, total:100,rate:54}, color:'#fb7293'}
         ]
       }
     },
diff --git a/src/views/screen/mainComponents/deviceAlarmHistory.vue b/src/views/screen/mainComponents/deviceAlarmHistory.vue
index e160447..ef5f27a 100644
--- a/src/views/screen/mainComponents/deviceAlarmHistory.vue
+++ b/src/views/screen/mainComponents/deviceAlarmHistory.vue
@@ -26,8 +26,8 @@
     components: {GradientLineChart, Container1},
     data(){
       return {
-        currentTab:'井盖状态监测仪',
-        tabList:['井盖状态监测仪','液位监测仪','有害气体监测仪','消防栓防盗水监测仪'],
+        currentTab:'井盖状态监测',
+        tabList:['井盖状态监测','液位监测','有害气体监测','消防栓监测'],
         xAxisData:['周一','周二','周三','周四','周五','周六','周日'],
         seriesData:[
           // {name:'井盖状态监测仪',data:[120, 252, 101, 134, 290, 230, 110],color:'58,55,194'},
@@ -62,6 +62,9 @@
           font-size: 0.1rem;
           line-height: 3;
           margin: 0 auto;
+          /*display:-webkit-box;*/
+          /*overflow:hidden;*/
+          /*text-overflow:ellipsis;*/
         }
       }
       .current-tab{
diff --git a/src/views/screen/mainComponents/pipeSafety.vue b/src/views/screen/mainComponents/pipeSafety.vue
index 3fd0664..ce305b6 100644
--- a/src/views/screen/mainComponents/pipeSafety.vue
+++ b/src/views/screen/mainComponents/pipeSafety.vue
@@ -5,16 +5,16 @@
  -->
 <template>
   <container1 title="管网运行状态">
-    <div style="width: 100%;height: 100%;padding: 0.1rem; display: flex;justify-content: flex-end">
+    <div style="width: 100%;height: 100%;padding: 0.05rem; display: flex;justify-content: flex-end">
       <div style="width:40%;height:100%;display: flex; flex-direction: column; justify-content: center">
         <simple-block :data="data1" style="height:40%;width:100%">
-          <span style="margin-right:0.5rem">
+          <span style="margin-right:0.3rem">
             <img :src="require('@/assets/img/main_screen/pipe-device.png')" class="icon"/>
             <!--<a-icon type="setting" theme="twoTone" :style="{fontSize:'0.8rem'}"/>-->
           </span>
         </simple-block>
         <simple-block :data="data2" style="height:40%;width:100%">
-          <span style="margin-right:0.5rem">
+          <span style="margin-right:0.3rem">
             <img :src="require('@/assets/img/main_screen/pipe-alarm.png')" class="icon"/>
           </span>
         </simple-block>
diff --git a/src/views/screen/mainComponents/statisticCount.vue b/src/views/screen/mainComponents/statisticCount.vue
index 4f0979a..2f25554 100644
--- a/src/views/screen/mainComponents/statisticCount.vue
+++ b/src/views/screen/mainComponents/statisticCount.vue
@@ -8,9 +8,9 @@
     <a-row type="flex" justify="start" style="height:32%;margin-bottom: 0.1rem">
       <a-col v-for="item of data" :span="6" :key="item.name" style="height:100%;;padding:0.05rem">
         <simple-block :data="item">
-          <div style="padding:0.3rem">
-            <a-icon :type="item.icon" theme="twoTone" :style="{fontSize:'0.5rem'}"/>
-          </div>
+          <!--<div style="padding:0.3rem">-->
+            <!--<a-icon :type="item.icon" theme="twoTone" :style="{fontSize:'0.5rem'}"/>-->
+          <!--</div>-->
         </simple-block>
       </a-col>
     </a-row>
diff --git a/src/views/screen/mainDashboard.vue b/src/views/screen/mainDashboard.vue
index 51a3f83..041f028 100644
--- a/src/views/screen/mainDashboard.vue
+++ b/src/views/screen/mainDashboard.vue
@@ -5,7 +5,7 @@
  -->
 <template>
   <common-layout1 class="layout" :loading="loading" titleHeight="1.7rem">
-    <top-header slot="title" title="珠海市香洲区指挥小镇指挥中心"/>
+    <top-header slot="title" title="珠海三溪科创小镇智慧园区平台"/>
     <!--左-->
     <dv-border-box-12 slot="left">
       <div class="left-container">

diff --git a/src/common/flexible.js b/src/common/flexible.js
index 693b592..86a357c 100644
--- a/src/common/flexible.js
+++ b/src/common/flexible.js
@@ -91,12 +91,14 @@
     // }
     // // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     // var rem = width / 24;
-    var height = docEl.getBoundingClientRect().height;
-    if (height / dpr < 500) {
-      height = 607 * dpr;
-    } else if (height / dpr > 1296) {
-      height = 1296 * dpr;
-    }
+    // var height = docEl.getBoundingClientRect().height;
+    var height = window.screen.height; // 获取全屏的屏幕高度
+    // if (height / dpr < 500) {
+    //   height = 607 * dpr;
+    // } else if (height / dpr > 1296) {
+    //   height = 1296 * dpr;
+    // }
+    height = height*dpr;
     // 设置成24等份，设计稿时1920px的，这样1rem就是80px
     var rem = height / 24;
     console.log('rem = '+ rem)
diff --git a/src/components/block/simpleBlock.vue b/src/components/block/simpleBlock.vue
index 9763891..014251e 100644
--- a/src/components/block/simpleBlock.vue
+++ b/src/components/block/simpleBlock.vue
@@ -38,9 +38,9 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.3rem',
+          titleSize:'0.25rem',
           valueSize:'0.4rem',
-          unitSize:'0.2rem',
+          unitSize:'0.1rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
           color: '#fffff', // 数值颜色
diff --git a/src/components/block/simpleBlock2.vue b/src/components/block/simpleBlock2.vue
index 6d4be77..6904004 100644
--- a/src/components/block/simpleBlock2.vue
+++ b/src/components/block/simpleBlock2.vue
@@ -37,8 +37,8 @@
       type: Object,
       default: () => {
         return {
-          titleSize:'0.4rem',
-          valueSize:'0.6rem',
+          titleSize:'0.3rem',
+          valueSize:'0.5rem',
           unitSize:'0.3rem',
           bgColor: '', // 背景颜色,
           titleColor: '#99ccff', // 标题颜色
diff --git a/src/components/echart/gauge/gauge1.vue b/src/components/echart/gauge/gauge1.vue
index 5a6b9da..488acc9 100644
--- a/src/components/echart/gauge/gauge1.vue
+++ b/src/components/echart/gauge/gauge1.vue
@@ -41,8 +41,8 @@
       },
       lineWidth:{
         type: Number,
-        default: 12
-      }
+        default: 0.3
+      } // 轨迹宽度，rem为单位
     },
     data(){
       return{
@@ -76,7 +76,7 @@
                 formatter: '{value}%',
                 offsetCenter: [0, '-5%'],
                 color: 'red',
-                fontSize: '200%',
+                fontSize: countSize(0.5),
                 fontWeight: 'bold',
                 fontFamily: 'sans-serif'
               },
@@ -101,7 +101,7 @@
                 show: true,
                 lineStyle: {
                   // 属性lineStyle控制线条样式
-                  width: this.lineWidth,
+                  width: countSize(this.lineWidth),
                   color: [[1, '#262795']]
                 }
               }
@@ -122,7 +122,7 @@
                 show: true,
                 lineStyle: {
                   // 属性lineStyle控制线条样式
-                  width: this.lineWidth,
+                  width: countSize(this.lineWidth),
                   color: [
                     [
                       1,
diff --git a/src/main.js b/src/main.js
index 5492dd6..eb88707 100644
--- a/src/main.js
+++ b/src/main.js
@@ -51,7 +51,7 @@
 // 获取配置文件
 import axios from 'axios'
 import service from '@/utils/request'
-axios.get('/static/project.config.json').then((result) => {
+axios.get('static/project.config.json').then((result) => {
   console.log('get config')
   Vue.prototype.baseConfig = result.data
   document.title = result.data.title // 首先设置网页的title
diff --git a/src/views/screen/mainComponents/bizStatistic.vue b/src/views/screen/mainComponents/bizStatistic.vue
index 637f439..f948a33 100644
--- a/src/views/screen/mainComponents/bizStatistic.vue
+++ b/src/views/screen/mainComponents/bizStatistic.vue
@@ -24,11 +24,11 @@
         data:[
           {name:'路灯亮灯率', value:{already:34, total:100,rate:34}, color:'#009eec'},
           // {name:'地下管线监测设备报警率', value:[{already:34, total:100,rate:34}]},
-          {name:'井盖状态检测仪', value:{already:34, total:100,rate:50}, color:'#9fe6b8'},
-          {name:'液位监测仪', value:{already:34, total:100,rate:79}, color:'#99ccff'},
-          {name:'有害气体监测仪', value:{already:34, total:100,rate:20, color:'#ffdb5c'}},
-          {name:'噪声监测仪', value:{already:34, total:100,rate:15}, color:'#ff9f7f'},
-          {name:'消防栓防盗水监测仪', value:{already:34, total:100,rate:54}, color:'#fb7293'}
+          {name:'井盖报警率', value:{already:34, total:100,rate:50}, color:'#9fe6b8'},
+          {name:'液位报警率', value:{already:34, total:100,rate:79}, color:'#99ccff'},
+          {name:'有害气体报警率', value:{already:34, total:100,rate:20, color:'#ffdb5c'}},
+          {name:'噪声报警率', value:{already:34, total:100,rate:15}, color:'#ff9f7f'},
+          {name:'消防栓报警率', value:{already:34, total:100,rate:54}, color:'#fb7293'}
         ]
       }
     },
diff --git a/src/views/screen/mainComponents/deviceAlarmHistory.vue b/src/views/screen/mainComponents/deviceAlarmHistory.vue
index e160447..ef5f27a 100644
--- a/src/views/screen/mainComponents/deviceAlarmHistory.vue
+++ b/src/views/screen/mainComponents/deviceAlarmHistory.vue
@@ -26,8 +26,8 @@
     components: {GradientLineChart, Container1},
     data(){
       return {
-        currentTab:'井盖状态监测仪',
-        tabList:['井盖状态监测仪','液位监测仪','有害气体监测仪','消防栓防盗水监测仪'],
+        currentTab:'井盖状态监测',
+        tabList:['井盖状态监测','液位监测','有害气体监测','消防栓监测'],
         xAxisData:['周一','周二','周三','周四','周五','周六','周日'],
         seriesData:[
           // {name:'井盖状态监测仪',data:[120, 252, 101, 134, 290, 230, 110],color:'58,55,194'},
@@ -62,6 +62,9 @@
           font-size: 0.1rem;
           line-height: 3;
           margin: 0 auto;
+          /*display:-webkit-box;*/
+          /*overflow:hidden;*/
+          /*text-overflow:ellipsis;*/
         }
       }
       .current-tab{
diff --git a/src/views/screen/mainComponents/pipeSafety.vue b/src/views/screen/mainComponents/pipeSafety.vue
index 3fd0664..ce305b6 100644
--- a/src/views/screen/mainComponents/pipeSafety.vue
+++ b/src/views/screen/mainComponents/pipeSafety.vue
@@ -5,16 +5,16 @@
  -->
 <template>
   <container1 title="管网运行状态">
-    <div style="width: 100%;height: 100%;padding: 0.1rem; display: flex;justify-content: flex-end">
+    <div style="width: 100%;height: 100%;padding: 0.05rem; display: flex;justify-content: flex-end">
       <div style="width:40%;height:100%;display: flex; flex-direction: column; justify-content: center">
         <simple-block :data="data1" style="height:40%;width:100%">
-          <span style="margin-right:0.5rem">
+          <span style="margin-right:0.3rem">
             <img :src="require('@/assets/img/main_screen/pipe-device.png')" class="icon"/>
             <!--<a-icon type="setting" theme="twoTone" :style="{fontSize:'0.8rem'}"/>-->
           </span>
         </simple-block>
         <simple-block :data="data2" style="height:40%;width:100%">
-          <span style="margin-right:0.5rem">
+          <span style="margin-right:0.3rem">
             <img :src="require('@/assets/img/main_screen/pipe-alarm.png')" class="icon"/>
           </span>
         </simple-block>
diff --git a/src/views/screen/mainComponents/statisticCount.vue b/src/views/screen/mainComponents/statisticCount.vue
index 4f0979a..2f25554 100644
--- a/src/views/screen/mainComponents/statisticCount.vue
+++ b/src/views/screen/mainComponents/statisticCount.vue
@@ -8,9 +8,9 @@
     <a-row type="flex" justify="start" style="height:32%;margin-bottom: 0.1rem">
       <a-col v-for="item of data" :span="6" :key="item.name" style="height:100%;;padding:0.05rem">
         <simple-block :data="item">
-          <div style="padding:0.3rem">
-            <a-icon :type="item.icon" theme="twoTone" :style="{fontSize:'0.5rem'}"/>
-          </div>
+          <!--<div style="padding:0.3rem">-->
+            <!--<a-icon :type="item.icon" theme="twoTone" :style="{fontSize:'0.5rem'}"/>-->
+          <!--</div>-->
         </simple-block>
       </a-col>
     </a-row>
diff --git a/src/views/screen/mainDashboard.vue b/src/views/screen/mainDashboard.vue
index 51a3f83..041f028 100644
--- a/src/views/screen/mainDashboard.vue
+++ b/src/views/screen/mainDashboard.vue
@@ -5,7 +5,7 @@
  -->
 <template>
   <common-layout1 class="layout" :loading="loading" titleHeight="1.7rem">
-    <top-header slot="title" title="珠海市香洲区指挥小镇指挥中心"/>
+    <top-header slot="title" title="珠海三溪科创小镇智慧园区平台"/>
     <!--左-->
     <dv-border-box-12 slot="left">
       <div class="left-container">
diff --git a/vue.config.js b/vue.config.js
index 654df6b..31505c9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,7 +5,7 @@
 module.exports = {
   publicPath: './', // 部署应用包是的基本URL， ./为相对路径
   outputDir: 'dist', // build后生产环境构建文件的目录
-  assetsDir: '', // 放置生成的静态资源的相对于outputDir的目录
+  assetsDir: 'static', // 放置生成的静态资源的相对于outputDir的目录
   chainWebpack: config => {
     config.resolve.symlinks(true)
     config.resolve.alias