Merge remote-tracking branch 'origin/v0.1.1_alarm' into v0.1.1_alarm

src/components/imgCom/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <van-image :width="width" :height="height" :src="this_window + src" @click="onClickShow(src)" />
-    <van-overlay :show="show" @click="onClickHide">
+    <van-image :width="width" :height="height" :src="this_window + src" @click.stop="onClickShow(src)" />    
+    <van-overlay :show="show"  @click.stop="onClickHide">
       <div class="imgsty">
         <van-swipe ref="swipe" v-show="list && list.length > 0">
           <van-swipe-item v-for="item in list" :key="item"
@@ -13,8 +13,13 @@
   </div>
 </template>
 <script>
+import { number } from 'echarts/lib/export'
 export default {
   props: {
+    zIndex: {
+      type: Number,
+      default: 1
+    },
     width: {
       type: String,
       default: '100'
@@ -69,5 +74,11 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-
+ .imgsty {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    background-color: #fff;
+  }
 </style>

src/router/router.config.js

@@ -342,13 +342,13 @@ export let routers = [
         path: '/educationStatistics',
         name: 'educationStatistics',
         component: () => import('@/views/menu/educationStatistics/index'),
-        meta: { title: '培训情况表', keepAlive: false }
+        meta: { title: '培训情况表', keepAlive: false,hideTabBar: true,deep: 2}
       },
       {
         path: '/drillStatistics',
         name: 'drillStatistics',
         component: () => import('@/views/menu/drillStatistics/index'),
-        meta: { title: '演练情况表', keepAlive: false }
+        meta: { title: '演练情况表', keepAlive: false,hideTabBar: true,deep: 2 }
       },
       {
         path: '/securityCheckRegister',

src/views/menu/resumption/detail.vue

@@ -528,7 +528,17 @@
       },
       preViewNFC(i) {
         this.preViewImages.images = this.currentImgNFC.map(v => imgUrl(v.img))
-        this.preViewImages.startPosition = i
+        this.preViewImages.startPosition = 0
+        // console.log("preViewNFC1",i,this.preViewImages.images)
+        // if(i>this.preViewImages.images.length)
+        // {
+        //   this.preViewImages.startPosition = 0
+        // }
+        // else
+        // {
+        //   this.preViewImages.startPosition = i
+        // }
+        console.log("preViewNFC2",i,this.preViewImages)
         ImagePreview(this.preViewImages)
       },
       clickWarnImage(arr, i) {

src/views/menu/training/components/personnelSignature.vue

@@ -161,7 +161,7 @@
         </van-row>
         <!-- <div class="label">缺席人员</div>
         <div>{{ qsUserList }}</div> -->
-      </div>
+      </div>    
       <div class="mainItem">
         <van-row>
           <van-col :span="8" class="label">
@@ -174,6 +174,7 @@
               v-for="item in imgList"
               :key="item"
               :height="'100'"
+              :zIndex="10000"
               :src="item"
             ></imgCom>
           </van-col>
@@ -193,22 +194,12 @@
                 :list="signUserListMap"
                 :key="item.userId"
                 :height="'100'"
+                :zIndex="1"
                 :src="item.signImage"
               ></imgCom>
             </template>
           </van-col>
         </van-row>
-        <!-- <div class="label labelPeople">参与人员签名图片</div>
-        <template v-for="item in signUserList">
-          <imgCom
-            :width="'100'"
-            v-if="item.signImage"
-            :list="signUserListMap"
-            :key="item.userId"
-            :height="'100'"
-            :src="item.signImage"
-          ></imgCom>
-        </template> -->
       </div>
     </div>
     <van-row v-if="this.$route.params.id.split('_')[1] === 'edit'">
@@ -455,7 +446,7 @@ export default {
     background-color: #fff;
     padding: 10px;
     flex-flow: wrap;
-    opacity: 0.9;
+    // opacity: 0.9;
   }
   .tagCls {
     margin-top: 10px;

src/views/menu/visitRegister/add.vue

@@ -64,7 +64,7 @@
             <van-cell
               title="有效天数"
               :required="visitType == 2">
-              <van-stepper :disabled="visitType == 3" @change="effectiveDaysChangedHandler" integer :min="1" :max="356" v-model="formData.effectiveDays" step="1" />
+              <van-stepper :disabled="visitType == 3" @change="effectiveDaysChangedHandler" integer :min="1" v-model="formData.effectiveDays" step="1" />
             </van-cell>
 <!--            <select-cell-->
 <!--              :required="visitType == 2"-->

src/views/tokenlogin.vue

@@ -25,6 +25,7 @@ export default {
   computed: {
     ...mapGetters(['userName'])
   },
+  inject:["initWebSocket"],
   mounted() {
     this.loading = true
     let { query } = this.$route;
@@ -44,6 +45,8 @@ export default {
             console.log(res, 'res')
             sessionStorage.setItem('access_token',res.data.access_token);
             this.$router.replace('/home');
+            //初始化websocket
+            this.initWebSocket();
           })
           .catch(e => {
             this.type = 'error'