Merge branch 'baiyanting1' of http://124.70.43.205:3000/xieshengjie/jn_sis_zhfx into daping-power

src/assets/styles/form.less

@@ -372,7 +372,11 @@
           }
 
           &.today span {
-            color: @green;
+            color: @blue;
+          }
+          &.today.end-date span,
+          &.today.start-date span {
+            color: #fff;
           }
 
           &.current:not(.disabled) span {
@@ -452,6 +456,7 @@
   .el-month-table td.current:not(.disabled) .cell {
     color: @green;
   }
+  
 }
 
 // .el-input-number {

src/components/alarm-badge/index.vue

@@ -1,10 +1,9 @@
 <template>
-  <div></div>
   <div
     draggable="true"
     @dragstart="startDrag"
     @dragend="stopDrag"
-    :style="{ left: x + 'px', top: y + 'px' }"
+    :style="{ right: x + 'px', bottom: y + 'px' }"
     style="cursor: pointer; position: absolute; z-index: 999"
   >
     <el-badge
@@ -152,8 +151,8 @@ export default {
   },
   created() {
     this.getAlarmConfig();
-    this.x = window.innerWidth - 82;
-    this.y = window.innerHeight - 32;
+    this.x = 80;
+    this.y = 80;
     let requestResult = [];
     this.requestAlarmHistoryParams.forEach(({ alarmType, deviceType }) => {
       requestResult.push(this.getAlarmHistory(alarmType, deviceType));
@@ -506,18 +505,16 @@ export default {
     stopDrag(event) {
       let x = event.clientX - this.currentX;
       let y = event.clientY - this.currentY;
-      this.x += x;
-      //   if (this.x < 60) {
-      //     this.x = 60;
-      //   } else if (this.x > window.innerWidth - 20) {
-      //     this.x = window.innerWidth - 82;
-      //   }
-      this.y += y;
-      //   if (this.y > window.innerHeight - 20) {
-      //     this.y = window.innerHeight - 32;
-      //   } else if (this.y < 0) {
-      //     this.y = 0;
-      //   }
+      if (event.clientX <= 80 || event.clientX >= window.innerWidth - 40) {
+        this.x = this.x;
+      } else {
+        this.x -= x;
+      }
+      if (event.clientY <= 70 || event.clientY >= window.innerHeight - 60) {
+        this.y = this.y;
+      } else {
+        this.y -= y;
+      }
     },
     //开关列表
     displayAlarm(val) {

src/views/IntegratedAlarm/reliability/customAnalyse/index.vue

@@ -110,6 +110,7 @@
               type="datetime"
               placeholder="选择日期"
               value-format="YYYY-MM-DD HH:mm:ss"
+              popper-class="date-select"
             >
             </el-date-picker>
           </div>
@@ -123,6 +124,7 @@
               type="datetime"
               placeholder="选择日期"
               value-format="YYYY-MM-DD HH:mm:ss"
+              popper-class="date-select"
             >
             </el-date-picker>
           </div>

src/views/IntegratedAlarm/reliability/historyAnalyse/index.vue

@@ -114,6 +114,7 @@
               type="datetime"
               placeholder="选择日期"
               value-format="YYYY-MM-DD HH:mm:ss"
+              popper-class="date-select"
             >
             </el-date-picker>
           </div>
@@ -127,6 +128,7 @@
               type="datetime"
               placeholder="选择日期"
               value-format="YYYY-MM-DD HH:mm:ss"
+              popper-class="date-select"
             >
             </el-date-picker>
           </div>

src/views/IntegratedAlarm/safe/customWarning/index.vue

@@ -137,6 +137,7 @@
               value-format="YYYY-MM-DD HH:mm:ss"
               start-placeholder="开始"
               end-placeholder="结束"
+              popper-class="date-select"
             >
             </el-date-picker>
           </div>

src/views/IntegratedAlarm/safe/historyWarning/index.vue

@@ -130,7 +130,7 @@
               format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               start-placeholder="开始"
-              end-placeholder="结束"
+              end-placeholder="结束"   popper-class="date-select"
             >
             </el-date-picker>
           </div>

src/views/IntegratedAlarm/safe/stopQuery/index.vue

@@ -87,6 +87,7 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               @change="getTableData"
+              popper-class="date-select"
             >
             </el-date-picker>
           </div>

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/components/sy-map.vue

@@ -149,91 +149,91 @@ export default {
           y: "360",
         },
         {
-          name: "13方阵",
+          name: "N13方阵",
           x: "1415",
           y: "195",
           type: 3,
         },
         {
-          name: "14方阵",
+          name: "N14方阵",
           x: "1430",
           y: "325",
           type: 3,
         },
         {
-          name: "15方阵",
+          name: "N15方阵",
           x: "1440",
           y: "465",
           type: 3,
         },
         {
-          name: "1方阵",
+          name: "N01方阵",
           x: "1215",
           y: "215",
           type: 3,
         },
         {
-          name: "5方阵",
+          name: "N05方阵",
           x: "1215",
           y: "325",
           type: 3,
         },
         {
-          name: "10方阵",
+          name: "N10方阵",
           x: "1220",
           y: "465",
           type: 3,
         },
         {
-          name: "12方阵",
+          name: "N12方阵",
           x: "1135",
           y: "555",
           type: 3,
         },
         {
-          name: "4方阵",
+          name: "N04方阵",
           x: "1005",
           y: "315",
           type: 3,
         },
         {
-          name: "9方阵",
+          name: "N09方阵",
           x: "995",
           y: "455",
           type: 3,
         },
         {
-          name: "3方阵",
+          name: "N03方阵",
           x: "785",
           y: "315",
           type: 3,
         },
         {
-          name: "8方阵",
+          name: "N08方阵",
           x: "765",
           y: "455",
           type: 3,
         },
         {
-          name: "2方阵",
+          name: "N02方阵",
           x: "580",
           y: "310",
           type: 3,
         },
         {
-          name: "7方阵",
+          name: "N07方阵",
           x: "545",
           y: "455",
           type: 3,
         },
         {
-          name: "11方阵",
+          name: "N11方阵",
           x: "605",
           y: "540",
           type: 3,
         },
         {
-          name: "6方阵",
+          name: "N06方阵",
           x: "325",
           y: "450",
           type: 3,

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/components/sy2-map.vue

@@ -149,367 +149,367 @@ export default {
           y: "255",
         },
         {
-          name: "8方阵",
+          name: "T08方阵",
           x: "1440",
           y: "60",
           type: 3,
         },
         {
-          name: "9方阵",
+          name: "T09方阵",
           x: "1420",
           y: "70",
           type: 3,
         },
         {
-          name: "10方阵",
+          name: "T10方阵",
           x: "1397",
           y: "80",
           type: 3,
         },
         {
-          name: "11方阵",
+          name: "T11方阵",
           x: "1360",
           y: "90",
           type: 3,
         },
         {
-          name: "40方阵",
+          name: "T40方阵",
           x: "1385",
           y: "28",
           type: 3,
         },
         {
-          name: "41方阵",
+          name: "T41方阵",
           x: "1360",
           y: "35",
           type: 3,
         },
         {
-          name: "43方阵",
+          name: "T43方阵",
           x: "1325",
           y: "30",
           type: 3,
         },
         {
-          name: "45方阵",
+          name: "T45方阵",
           x: "1295",
           y: "55",
           type: 3,
         },
         {
-          name: "53方阵",
+          name: "T53方阵",
           x: "1265",
           y: "80",
           type: 3,
         },
         {
-          name: "42方阵",
+          name: "T42方阵",
           x: "1265",
           y: "25",
           type: 3,
         },
         {
-          name: "46方阵",
+          name: "T46方阵",
           x: "1240",
           y: "45",
           type: 3,
         },
         {
-          name: "52方阵",
+          name: "T52方阵",
           x: "1210",
           y: "70",
           type: 3,
         },
         {
-          name: "47方阵",
+          name: "T47方阵",
           x: "1185",
           y: "20",
           type: 3,
         },
         {
-          name: "54方阵",
+          name: "T54方阵",
           x: "1185",
           y: "100",
           type: 3,
         },
         {
-          name: "51方阵",
+          name: "T51方阵",
           x: "1160",
           y: "55",
           type: 3,
         },
         {
-          name: "48方阵",
+          name: "T48方阵",
           x: "1130",
           y: "40",
           type: 3,
         },
         {
-          name: "55方阵",
+          name: "T55方阵",
           x: "1125",
           y: "80",
           type: 3,
         },
         {
-          name: "50方阵",
+          name: "T50方阵",
           x: "1105",
           y: "25",
           type: 3,
         },
         {
-          name: "61方阵",
+          name: "T61方阵",
           x: "1090",
           y: "100",
           type: 3,
         },
         {
-          name: "59方阵",
+          name: "T59方阵",
           x: "1065",
           y: "60",
           type: 3,
         },
         {
-          name: "60方阵",
+          name: "T60方阵",
           x: "1040",
           y: "85",
           type: 3,
         },
         {
-          name: "49方阵",
+          name: "T49方阵",
           x: "1000",
           y: "5",
           type: 3,
         },
         {
-          name: "57方阵",
+          name: "T57方阵",
           x: "1020",
           y: "35",
           type: 3,
         },
         {
-          name: "59方阵",
+          name: "T59方阵",
           x: "985",
           y: "70",
           type: 3,
         },
         {
-          name: "58方阵",
+          name: "T58方阵",
           x: "940",
           y: "10",
           type: 3,
         },
         {
-          name: "62方阵",
+          name: "T62方阵",
           x: "930",
           y: "85",
           type: 3,
         },
         {
-          name: "12方阵",
+          name: "T12方阵",
           x: "660",
           y: "165",
           type: 3,
         },
         {
-          name: "14方阵",
+          name: "T14方阵",
           x: "680",
           y: "210",
           type: 3,
         },
         {
-          name: "17方阵",
+          name: "T17方阵",
           x: "690",
           y: "270",
           type: 3,
         },
         {
-          name: "16方阵",
+          name: "T16方阵",
           x: "645",
           y: "245",
           type: 3,
         },
         {
-          name: "13方阵",
+          name: "T13方阵",
           x: "625",
           y: "180",
           type: 3,
         },
         {
-          name: "15方阵",
+          name: "T15方阵",
           x: "590",
           y: "220",
           type: 3,
         },
         {
-          name: "19方阵",
+          name: "T19方阵",
           x: "600",
           y: "280",
           type: 3,
         },
         {
-          name: "18方阵",
+          name: "T18方阵",
           x: "560",
           y: "245",
           type: 3,
         },
         {
-          name: "21方阵",
+          name: "T21方阵",
           x: "565",
           y: "305",
           type: 3,
         },
         {
-          name: "23方阵",
+          name: "T23方阵",
           x: "545",
           y: "345",
           type: 3,
         },
         {
-          name: "20方阵",
+          name: "T20方阵",
           x: "520",
           y: "275",
           type: 3,
         },
         {
-          name: "22方阵",
+          name: "T22方阵",
           x: "485",
           y: "310",
           type: 3,
         },
         {
-          name: "24方阵",
+          name: "T24方阵",
           x: "445",
           y: "350",
           type: 3,
         },
         {
-          name: "25方阵",
+          name: "T25方阵",
           x: "400",
           y: "300",
           type: 3,
         },
         {
-          name: "26方阵",
+          name: "T26方阵",
           x: "350",
           y: "320",
           type: 3,
         },
         {
-          name: "27方阵",
+          name: "T27方阵",
           x: "300",
           y: "345",
           type: 3,
         },
         {
-          name: "7方阵",
+          name: "T07方阵",
           x: "1265",
           y: "375",
           type: 3,
         },
         {
-          name: "3方阵",
+          name: "T03方阵",
           x: "1230",
           y: "320",
           type: 3,
         },
         {
-          name: "6方阵",
+          name: "T06方阵",
           x: "1200",
           y: "360",
           type: 3,
         },
         {
-          name: "2方阵",
+          name: "T02方阵",
           x: "1165",
           y: "280",
           type: 3,
         },
         {
-          name: "1方阵",
+          name: "T01方阵",
           x: "1150",
           y: "230",
           type: 3,
         },
         {
-          name: "5方阵",
+          name: "T05方阵",
           x: "1140",
           y: "335",
           type: 3,
         },
         {
-          name: "4方阵",
+          name: "T04方阵",
           x: "1065",
           y: "300",
           type: 3,
         },
         {
-          name: "31方阵",
+          name: "T31方阵",
           x: "1640",
           y: "610",
           type: 3,
         },
         {
-          name: "35方阵",
+          name: "T35方阵",
           x: "1630",
           y: "660",
           type: 3,
         },
         {
-          name: "28方阵",
+          name: "T28方阵",
           x: "1625",
           y: "560",
           type: 3,
         },
         {
-          name: "30方阵",
+          name: "T30方阵",
           x: "1560",
           y: "580",
           type: 3,
         },
         {
-          name: "34方阵",
+          name: "T34方阵",
           x: "1540",
           y: "630",
           type: 3,
         },
         {
-          name: "29方阵",
+          name: "T29方阵",
           x: "1480",
           y: "550",
           type: 3,
         },
         {
-          name: "36方阵",
+          name: "T36方阵",
           x: "1470",
           y: "625",
           type: 3,
         },
         {
-          name: "33方阵",
+          name: "T33方阵",
           x: "1450",
           y: "600",
           type: 3,
         },
         {
-          name: "32方阵",
+          name: "T32方阵",
           x: "1405",
           y: "600",
           type: 3,
         },
         {
-          name: "37方阵",
+          name: "T37方阵",
           x: "1370",
           y: "630",
           type: 3,
         },
         {
-          name: "38方阵",
+          name: "T38方阵",
           x: "1050",
           y: "800",
           type: 3,
         },
         {
-          name: "39方阵",
+          name: "T39方阵",
           x: "1000",
           y: "850",
           type: 3,

src/views/stateMonitor/zhzb/zhzb.vue

@@ -321,31 +321,31 @@ export default {
           },
           {
             name: "日发电量",
-            valueUnit: null,
+            valueUnit: "万kWh",
             uniformCode: "RFDL",
             width: "150",
           },
           {
             name: "月发电量",
-            valueUnit: null,
+            valueUnit: "万kWh",
             uniformCode: "YFDL",
             width: "150",
           },
           {
             name: "年发电量",
-            valueUnit: null,
+            valueUnit: "万kWh",
             uniformCode: "NFDL",
             width: "150",
           },
           {
             name: "实时总功率",
-            valueUnit: null,
+            valueUnit: "MW",
             uniformCode: "SSZGL",
             width: "150",
           },
           {
             name: "实时平均光照度",
-            valueUnit: null,
+            valueUnit: "W/m²",
             uniformCode: "SSPJGZD",
             width: "150",
           },