Changpeng Duan 5 lat temu
rodzic
commit
c7377e426c
3 zmienionych plików z 19 dodań i 17 usunięć
  1. 14 14
      src/components/BigRader.vue
  2. 1 1
      src/components/HistoryRecord.vue
  3. 4 2
      src/views/Equip.vue

+ 14 - 14
src/components/BigRader.vue

@@ -2,9 +2,9 @@
     <div class="BigRader">
         <div class="circle">
             <div class="zoom1 bn "></div>
-            <div class="zoom2  top"></div>
+            <div class="zoom2 dn top"></div>
             <div class="zoom3 bn top1"></div>
-            <div class="zoom31 bn top2"></div>
+            <div class="zoom31 cn top2"></div>
             <div class="zoom4 cn top3"></div>
             <div class="zoom5  dn top4"></div>
             <div class="zoom51 an top5"></div>
@@ -325,13 +325,13 @@
 
         -webkit-transform: rotate(360deg);
 
-        animation: rotation 11s linear infinite;
+        animation: rotation 22s linear infinite;
 
-        -moz-animation: rotation 11s linear infinite;
+        -moz-animation: rotation 22s linear infinite;
 
-        -webkit-animation: rotation 11s linear infinite;
+        -webkit-animation: rotation 22s linear infinite;
 
-        -o-animation: rotation 11s linear infinite;
+        -o-animation: rotation 22s linear infinite;
 
     }
 
@@ -339,13 +339,13 @@
 
         -webkit-transform: rotate(360deg);
 
-        animation: rotation 22s linear infinite;
+        animation: rotation 33s linear infinite;
 
-        -moz-animation: rotation 22s linear infinite;
+        -moz-animation: rotation 33s linear infinite;
 
-        -webkit-animation: rotation 22s linear infinite;
+        -webkit-animation: rotation 33s linear infinite;
 
-        -o-animation: rotation 22s linear infinite;
+        -o-animation: rotation 33s linear infinite;
 
     }
 
@@ -354,13 +354,13 @@
 
         -webkit-transform: rotate(-360deg);
 
-        animation: rotation2 16s linear infinite;
+        animation: rotation2 33s linear infinite;
 
-        -moz-animation: rotation2 16s linear infinite;
+        -moz-animation: rotation2 33s linear infinite;
 
-        -webkit-animation: rotation2 16s linear infinite;
+        -webkit-animation: rotation2 33s linear infinite;
 
-        -o-animation: rotation2 16s linear infinite;
+        -o-animation: rotation2 33s linear infinite;
 
     }
 

+ 1 - 1
src/components/HistoryRecord.vue

@@ -6,7 +6,7 @@
             <div class="image-border image-border3"></div>
             <div class="image-border image-border4"></div>
             <div class="other-people-title">
-                历史监测详情
+                实时监测详情
             </div>
             <el-table
                     :data="tableData"

+ 4 - 2
src/views/Equip.vue

@@ -427,7 +427,6 @@
                         } else {
                             if (json.Rs) {
                                 that.dialog.regionIdRoomOptions = json.Rs;
-
                                 that.dialog.regionId = json.Rs[0].Id;
                             } else {
                                 that.dialog.regionIdRoomOptions = [];
@@ -783,6 +782,7 @@
                     coordsType: 1,//坐标状态 0:禁用, 1:启用, 9:删除,没有就传0
                     coordsID: that.dialog.CoordsId,
                 };
+
                 let postdata = qs.stringify(param);
                 DetectorEdit(postdata).then(res => {
                     let json = res;
@@ -887,8 +887,10 @@
             selectRegionLabel(id) {
                 let that = this;
                 let selectedWorkName = {};
-                selectedWorkName = this.dialog.regionIdRoomOptions.filter(item => {
+                // selectedWorkName = that.dialog.regionIdRoomOptions.filter(item => {
+                selectedWorkName = that.dialog.regionlevelOneIdOptions.filter(item => {
                     if (item.Id === id) {
+                        console.log(item.Name);
                         that.dialog.location = item.Name;
                     }
                 });