-

public/static/config.js

@@ -1,9 +1,9 @@
 // api 请求路径
 var PLATFROM_CONFIG = {};
-PLATFROM_CONFIG.baseUrl = "http://172.16.120.104:8010/" //杨强本地
-    // PLATFROM_CONFIG.baseUrl = "http://172.16.1.196:8010/" //超博本地
+// PLATFROM_CONFIG.baseUrl = "http://172.16.120.104:8010/" //杨强本地
+// PLATFROM_CONFIG.baseUrl = "http://172.16.1.196:8010/" //超博本地
 
-// PLATFROM_CONFIG.baseUrl = "https://qhome.usky.cn/fivapi/" //线上
+PLATFROM_CONFIG.baseUrl = "https://qhome.usky.cn/fivapi/" //线上
 PLATFROM_CONFIG.images = "https://qhome.usky.cn/file/" //线上图片
 PLATFROM_CONFIG.fileUrl = "https://qhome.usky.cn/file/" //xlsx文件访问路径
 

src/views/dataManage/chainAnalysis/index.vue

@@ -86,13 +86,12 @@
           </div>
         </el-radio-group>
       </div>
-      <div class="chainEcharts" >
+      <div class="chainEcharts">
         <echarts
           v-for="(item, index) in echartsDataObj"
           :key="index"
           :echartsDataOne="item"
         ></echarts>
-      
       </div>
     </div>
   </div>
@@ -138,7 +137,7 @@ export default defineComponent({
     const ecahrtsData = ref({})
     const echartsDataCurrent = ref([])
     const echartsDataBefore = ref([])
-    const echartsDataObj=ref([])
+    const echartsDataObj = ref([])
     const state = reactive({
       value1: [new Date(2000, 10, 10, 10, 10), new Date(2000, 10, 11, 10, 10)],
     })
@@ -232,22 +231,20 @@ export default defineComponent({
             }
           })
 
-
         var jsona = JSON.stringify(echartsDataCurrent.value)
         var jsonb = jsona.replace(/"list"/g, '"list2"')
         jsonb = jsonb.replace(/"listDate"/g, '"listDate2"')
         var obj1 = JSON.parse(jsonb)
 
-        var obj2 = echartsDataBefore.value;
-         echartsDataObj.value = obj1.map((item, index) => {
+        var obj2 = echartsDataBefore.value
+        echartsDataObj.value = obj1.map((item, index) => {
           return { ...item, ...obj2[index] }
         })
         console.log('echartsDataObj.value')
         console.log(echartsDataObj.value)
-         if(echartsDataObj.value.length==[]){
-           ElMessage.error('暂无结果') 
-         }
-
+        if (echartsDataObj.value.length == []) {
+          ElMessage.error('暂无结果')
+        }
       } else {
         console.log('', 1)
         ElNotification({
@@ -311,7 +308,7 @@ export default defineComponent({
       ecahrtsData,
       echartsDataCurrent,
       echartsDataBefore,
-         echartsDataObj,
+      echartsDataObj,
 
       valueCalculation,
       typeSrarch,
@@ -327,6 +324,21 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
+.chainSwitch::-webkit-scrollbar {
+  /*滚动条整体样式*/
+  width: 3px; /*高宽分别对应横竖滚动条的尺寸*/
+}
+.chainSwitch::-webkit-scrollbar-thumb {
+  /*滚动条里面小方块*/
+  border-radius: 10px;
+  background: rgb(226, 224, 224);
+}
+.chainSwitch::-webkit-scrollbar-track {
+  /*滚动条里面轨道*/
+  border-radius: 10px;
+  background: rgb(245, 245, 265);
+}
+
 .chainAnalysis {
   display: flex;
   height: calc(100vh - 130px);
@@ -339,12 +351,14 @@ export default defineComponent({
     margin-right: 25px;
     padding: 20px;
     min-width: 200px;
-        overflow-y: auto;
+    // overflow-y: auto;
     .chainSwitch {
       margin-top: 20px;
       width: 100%;
       height: 20px;
       cursor: pointer;
+      height: calc(100% - 50px);
+      overflow-y: auto;
       .chainSwitchOne {
         display: flex;
         border: 0.5px solid silver;

src/views/dataManage/demandAnalysis/ehcarts/index.vue

@@ -52,7 +52,7 @@ export default defineComponent({
             // dataView: { show: true, readOnly: false },
             // magicType: { show: true, type: ["line", "bar"] },
             // restore: { show: true },
-            saveAsImage: { show: true, color: 'black' },
+            saveAsImage: { show: true, color: 'black' , title:'',name:'图表下载'},
           },
           iconStyle: {
             borderColor: '#666',

src/views/dataManage/energyReport/ehcarts/index.vue

@@ -47,7 +47,7 @@ export default defineComponent({
             // dataView: { show: true, readOnly: false },
             // magicType: { show: true, type: ["line", "bar"] },
             // restore: { show: true },
-            saveAsImage: { show: true, color: 'black' },
+            saveAsImage: { show: true, color: 'black',title:'',name:'图表下载' },
           },
           iconStyle: {
             borderColor: '#666',

src/views/dataManage/sameAnalysis/index.vue

@@ -243,6 +243,19 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
+
+
+.sameSwitch::-webkit-scrollbar {/*滚动条整体样式*/
+        width: 3px;     /*高宽分别对应横竖滚动条的尺寸*/
+    }
+.sameSwitch::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
+        border-radius: 10px;
+        background: rgb(226, 224, 224);
+}
+.sameSwitch::-webkit-scrollbar-track {/*滚动条里面轨道*/
+        border-radius: 10px;
+        background: rgb(245, 245, 265);
+}
 .sameAnalysis {
   display: flex;
   height: calc(100vh - 130px);
@@ -255,12 +268,14 @@ export default defineComponent({
     margin-right: 25px;
     padding: 20px;
     min-width: 200px;
-        overflow-y: auto;
+        // overflow-y: auto;
     .sameSwitch {
       margin-top: 20px;
       width: 100%;
       height: 20px;
       cursor: pointer;
+      height: calc(100% - 50px);
+      overflow-y: auto;
       .sameSwitchOne {
         display: flex;
         border: 0.5px solid silver;

src/views/deviceManage/powerEquip/communicateEquip/dialog/insert_update.vue

@@ -215,9 +215,9 @@ export default defineComponent({
             trigger: 'blur',
           },
           {
-            min: 5,
+            min: 2,
             max: 50,
-            message: '设备安装位置长度不能小于5大于50',
+            message: '设备安装位置长度不能小于2大于50',
             trigger: 'blur',
           },
         ],

src/views/deviceManage/powerEquip/powerDialog/insertDialog.vue

@@ -31,6 +31,7 @@
           </el-form-item>
           <el-form-item label="所属站点：" prop="siteId">
             <el-select
+            filterable
               v-model="form.siteId"
               :disabled="
                 deviceNumDataContent != '' &&
@@ -261,8 +262,8 @@ export default defineComponent({
           },
           {
             min: 3,
-            max: 10,
-            message: '名称长度不能小于3大于10',
+            max: 25,
+            message: '名称长度不能小于3大于25',
             trigger: 'blur',
           },
         ],
@@ -273,9 +274,9 @@ export default defineComponent({
             trigger: 'blur',
           },
           {
-            min: 5,
+            min: 3,
             max: 25,
-            message: '设备编号长度不能小于5大于25',
+            message: '设备编号长度不能小于3大于25',
             trigger: 'blur',
           },
         ],

src/views/planOutage/dialogComponent.vue

@@ -47,7 +47,7 @@
       <el-form-item label="联系人:" prop="contacts">
         <el-input v-model="form.contacts"></el-input>
       </el-form-item>
-      <el-form-item label="状态:" prop="planType">
+      <el-form-item label="类型:" prop="planType">
         <el-select
           v-model="form.planType"
           placeholder="请选择"

src/views/siteManage/basicInfo/index.vue

@@ -601,7 +601,7 @@ export default defineComponent({
           newArray.value = []
 
           resetForm()
-          
+
           getSite()
           dynamicPropertiesDroplist(2)
           dynamicPropertiesDroplist(1)
@@ -669,8 +669,8 @@ export default defineComponent({
           { required: true, message: '请输入站点名称', trigger: 'blur' },
           {
             min: 1,
-            max: 11,
-            message: '长度在 1 到 11 个字符',
+            max: 30,
+            message: '长度在 1 到 30 个字符',
             trigger: 'blur',
           },
         ],

src/views/siteManage/camera/checkVideo.vue

@@ -41,10 +41,8 @@ export default defineComponent({
 
     // open(): Dialog弹窗打开之前做的事
     const open = () => {
-
-      // videoUrl.value = 'http://47.103.74.123/hls/'+props.deviceCode+'.m3u8';
-      videoUrl.value ='http://cctvalih5ca.v.myalicdn.com/live/cctv1_2/index.m3u8'
-
+      videoUrl.value = 'http://47.103.74.123/hls/'+props.deviceCode+'.m3u8';
+      // videoUrl.value ='http://cctvalih5ca.v.myalicdn.com/live/cctv1_2/index.m3u8'
       window.setTimeout(getVideo, 100)
 
     }