Merge branch 'web-v2' into nhkd-web

src/views/emergencyManagement/plan/index.vue

@@ -126,8 +126,8 @@ export default {
   name: "Plan",
   data() {
     const exportconstvalidateContacts  = (rule, value, callback) => {
-      if(!/^[\u0391-\uFFE50-9]+$/.test(value)) {
-        callback(new Error("只可输入中文与数字"));
+      if(!/^[\u0391-\uFFE5_a-zA-Z0-9]+$/.test(value)) {
+        callback(new Error("只可输入中文/英文与数字"));
       } else {
         callback()
       }

src/views/emergencyManagement/plan/newAddPlan.vue

@@ -204,8 +204,8 @@
     },
     data() {
       const exportconstvalidateContacts  = (rule, value, callback) => {
-        if(!/^[\u0391-\uFFE50-9]+$/.test(value)) {
-          callback(new Error("只可输入中文与数字"));
+        if(!/^[\u0391-\uFFE5_a-zA-Z0-9]+$/.test(value)) {
+          callback(new Error("只可输入中文/英文与数字"));
         } else {
           callback()
         }

src/views/oneKeyOutfire/planExecuteRecord/planExecuteRecordDetail.vue

@@ -49,8 +49,8 @@
 
                 <p v-if="(item.riskStatus==1||item.riskStatus==2)">{{item.riskPlanLevelName}}: {{item.riskPlanName}}</p>
                 <p v-if="(item.riskStatus!=1&& item.riskStatus!=2)">{{item.riskPlanName}}</p>
-                <p>{{item.sensorJsonName}}：<i>{{item.sensorJsonValue}}</i></p>
-                <p>时间：<i>{{item.createTime}}</i></p>
+                <p class="sensor_val">{{item.sensorJsonName}}：<i class="color: #FF3131;">{{item.sensorJsonValue}}</i></p>
+                <p class="sensor_timer">时间：<i>{{item.createTime}}</i></p>
 
                 <p v-if="index2 !=planAxis.length-1" :class="(item.riskStatus==1||item.riskStatus==2)?'ledgement':'ledgement_tow'"></p>
               </li>
@@ -301,18 +301,30 @@ export default {
             >p:nth-of-type(1){
 
             }
-            >p:nth-of-type(2){
+            .sensor_val{
               color: #666666;
               >i{
                 color: #FF3131;
               }
             }
-            >p:nth-of-type(3){
+            .sensor_timer{
               color: #666666;
               >i{
                 color: #333333;
               }
             }
+            //>p:nth-of-type(2){
+            //  color: #666666;
+            //  >i{
+            //    color: #FF3131;
+            //  }
+            //}
+            //>p:nth-of-type(3){
+            //  color: #666666;
+            //  >i{
+            //    color: #333333;
+            //  }
+            //}
           }
           /*横线*/
           .ledgement{
@@ -331,9 +343,9 @@ export default {
             left:0;
             top:-48%;
           }
-          >li:nth-child(2n){
-            margin-top:160px;
-          }
+          //>li:nth-child(2n){
+          //  margin-top:160px;
+          //}
           /*点*/
           .dot{
             content: "";
@@ -419,7 +431,7 @@ export default {
             position: absolute;
             left:20%;
             margin-left:-64px;
-            top:-44px;
+            bottom:-44px;
             z-index: 1;
           }