app下载页

shanXiPlatform/src/api/app-versions/index.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request1'
+//获取全都版本信息
+export function getAllVersions() {
+  return request({
+    url: `/version_info.json`,
+    method: 'get',
+  })
+}

shanXiPlatform/src/components/Navebarright/index.vue

@@ -37,7 +37,7 @@
             <div class="arrow"></div>
             <img
               class="img-app"
-              src="http://101.36.160.140:21021/apk/qrcode.png"
+              src="@/assets/images/QRcode.png"
               width="120px"
               height="120px"
             />
@@ -200,8 +200,8 @@ export default {
        if (
         this.$route.path .indexOf("/inform/unreadinform") != -1 ||
         this.$route.path .indexOf("/daiban/pending")  != -1 ||
-        this.$route.path .indexOf("/reservesManagement/mechanicalVentilation")!= -1 
-        
+        this.$route.path .indexOf("/reservesManagement/mechanicalVentilation")!= -1
+
       ) {
         this.$router.go(0)
       }

shanXiPlatform/src/permission.js

@@ -8,7 +8,7 @@ import getPageTitle from '@/utils/get-page-title'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-const whiteList = ['/login', 'auth-redirect'] // no redirect whitelist
+const whiteList = ['/qrcode','/login', 'auth-redirect'] // no redirect whitelist
 
 router.beforeEach(async(to, from, next) => {
   if(to.meta.navigation){
@@ -21,7 +21,7 @@ router.beforeEach(async(to, from, next) => {
       type:'changeIsnavigation',
       isnavigation: false
     })
-  }     
+  }
   if(to.path == '/home' || to.path == '/home/'){
     store.commit({
       type:'changeIsShowWeather',
@@ -54,8 +54,8 @@ router.beforeEach(async(to, from, next) => {
       type:'changeIstable',
       istable: false
     })
-  }     
-  
+  }
+
   // start progress bar
   NProgress.start()
 

shanXiPlatform/src/router/index.js

@@ -73,6 +73,13 @@ export const constantRoutes = [
     // meta: { keepAlive: false } //不缓存页面
   },
   {
+    path: '/qrcode',
+    component: () => import('@/views/qrcode/index'),
+    // name: 'qrcode',
+    hidden: true,
+    // meta: { title: 'App下载', icon: 'dashboard', affix: false, noCache: true, navigation: false }
+  },
+  {
     path: '/login',
     component: () => import('@/views/login/index'),
     hidden: true,
@@ -1211,13 +1218,7 @@ export const constantRoutes = [
         meta: { title: '组织树', icon: 'dashboard', affix: false, noCache: true, navigation: true },
         children: []
       },
-      {
-        path: '/qrcode',
-        component: () => import('@/views/qrcode/index'),
-        name: 'qrcode',
-        hidden: true,
-        meta: { title: 'App下载', icon: 'dashboard', affix: false, noCache: true, navigation: true }
-      },
+
       //   系统管理/器材库
       {
         path: 'equipmentWarehouse',

shanXiPlatform/src/utils/request.js

@@ -14,6 +14,15 @@ const service = axios.create({
   // withCredentials: true, // send cookies when cross-domain requests
   timeout: 5000 // request timeout
 })
+const service1 = axios.create({
+  // baseURL: process.env.VUE_APP_BASE_API,
+  // this is app download baseURL
+  baseURL: '/apk',
+
+  // url = base url + request url
+  // withCredentials: true, // send cookies when cross-domain requests
+  timeout: 5000 // request timeout
+})
 
 // request interceptor
 service.interceptors.request.use(
@@ -83,7 +92,7 @@ service.interceptors.response.use(
     //     duration: 5 * 1000
     //   })
     //   return Promise.reject(new Error(res.message || 'Error')) // 返回错误，可以如下面所示，给一个弹框提示错误之后，在返回
-    // } 
+    // }
     // else {
     //   return res;
     // }
@@ -143,13 +152,13 @@ service.interceptors.response.use(
     // }
 
     if (error.response.status == 401 && store.state.isAuthority) {
-     
+
       store.state.isAuthority = false;
-    
+
       MessageBox.alert('身份失效，请重新登录', '确认退出', {
         confirmButtonText: '确定',
         callback:()=>{
-          
+
           store.dispatch('user/resetToken')
           .then(() => {
             location.reload()
@@ -168,3 +177,4 @@ service.interceptors.response.use(
 )
 
 export default service
+

shanXiPlatform/src/utils/request1.js

@@ -0,0 +1,173 @@
+import axios from 'axios'
+import { MessageBox, Message } from 'element-ui'
+import store from '@/store'
+import { getToken } from '@/utils/auth'
+import { closenewWebSocket, newWebSocket } from '@/api/sendMessageSocket'
+
+
+// create an axios instance
+
+const service1 = axios.create({
+  // baseURL: process.env.VUE_APP_BASE_API,
+  // this is app download baseURL
+  baseURL: '/apk',
+
+  // url = base url + request url
+  // withCredentials: true, // send cookies when cross-domain requests
+  timeout: 5000 // request timeout
+})
+
+// request interceptor
+service1.interceptors.request.use(
+  config => {
+    // do something before request is sent
+
+    if (getToken()) {
+      // let each request carry token
+      // ['X-Token'] is a custom headers key
+      // please modify it according to the actual situation
+      //  config.headers['Authorization'] = getToken()
+
+      // let token_type = JSON.parse(getToken()).token_type
+      // let access_token = JSON.parse(getToken()).access_token
+      // config.headers['Authorization'] = token_type + ' ' + access_token
+      config.headers['Authorization'] = getToken()
+    }
+    return config
+  },
+  error => {
+    // do something with request error
+    // console.log(error) // for debug
+    return Promise.reject(error)
+  }
+)
+
+// response interceptor
+service1.interceptors.response.use(
+  /**
+   * If you want to get http information such as headers or status
+   * Please return  response => response
+  */
+
+  /**
+   * Determine the request status by custom code
+   * Here is just an example
+   * You can also judge the status by HTTP Status Code
+   */
+  response => {
+    const res = response.data //
+
+    // console.log(response, "response..........")
+
+    // 走框架接口，会先在这里拿到服务器返回的数据，如果出现请求超时，或者token获取，或者一些公共错误，可以在这里判断拦截，然后在返回
+    // if (res.code == 401 && store.state.isAuthority) {
+    //   // if (response.code == 401) {
+    //   console.log(res.code, "res.code.......")
+    //   store.state.isAuthority = false;
+
+    //   // to re-login
+    //   MessageBox.confirm('身份失效，请重新登录', '确认退出', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning'
+    //   }).then(() => {
+    //     store.dispatch('user/resetToken').then(() => {
+    //       location.reload()
+    //     })
+    //   })
+    //   return Promise.reject(new Error(res.message || 'Error')) // 返回错误，可以如下面所示，给一个弹框提示错误之后，在返回
+
+    // }
+    // else if(res.code == 501 && store.state.isAuthority){
+    //   Message({
+    //     message: res.message || 'Error',
+    //     type: 'error',
+    //     duration: 5 * 1000
+    //   })
+    //   return Promise.reject(new Error(res.message || 'Error')) // 返回错误，可以如下面所示，给一个弹框提示错误之后，在返回
+    // }
+    // else {
+    //   return res;
+    // }
+
+    // 走框架接口，会先在这里拿到服务器返回的数据，如果出现请求超时，或者token获取，或者一些公共错误，可以在这里判断拦截，然后在返回
+
+
+
+    // if the custom code is not 20000, it is judged as an error.
+    // if (res.code !== 20000) {
+    //   Message({
+    //     message: res.message || 'Error',
+    //     type: 'error',
+    //     duration: 5 * 1000
+    //   })
+
+    // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
+    if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
+      // to re-login
+      MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', {
+        confirmButtonText: 'Re-Login',
+        cancelButtonText: 'Cancel',
+        type: 'warning'
+      }).then(() => {
+        store.dispatch('user/resetToken').then(() => {
+          location.reload()
+        })
+      })
+      // }
+      return Promise.reject(new Error(res.message || 'Error'))
+    } else {
+      return res
+    }
+  },
+  error => {
+    // console.log(JSON.stringify(error), "mmmmm")
+
+    // Message({
+    //   message: error.message,
+    //   type: 'error',
+    //   duration: 5 * 1000
+    // })
+    // return Promise.reject(error)
+
+    // if (error.response.status == 401&& store.state.isAuthority) {
+    //   store.state.isAuthority = false;
+    //   MessageBox.confirm('身份失效，请重新登录', '确认退出', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning'
+    //   }).then(() => {
+    //     store.dispatch('user/resetToken').then(() => {
+    //       location.reload()
+    //     })
+    //     closenewWebSocket(JSON.parse(getUser()).uid)
+    //   })
+    // }
+
+    if (error.response.status == 401 && store.state.isAuthority) {
+
+      store.state.isAuthority = false;
+
+      MessageBox.alert('身份失效，请重新登录', '确认退出', {
+        confirmButtonText: '确定',
+        callback:()=>{
+
+          store.dispatch('user/resetToken')
+          .then(() => {
+            location.reload()
+          })
+          closenewWebSocket(JSON.parse(getUser()).uid)
+          console.log("我到这儿le.....s")
+        }
+
+      })
+    }else if (error.response.status == 666 && store.state.isAuthority) {
+      this.$message.error('服务器神游中!');
+    } else if (error.response.status == 504 && store.state.isAuthority) {
+      this.$message.error('请求超时，请稍后再试');
+    }
+  }
+)
+
+export default service1
+

shanXiPlatform/src/views/qrcode/index.vue

@@ -1,44 +1,66 @@
+
 <template>
   <div class="content">
     <div class="view row">
       <div class="app-logo">
-        <img src="@/assets/images/logon.jpg" alt="管理云平台">
+        <img src="@/assets/images/logon.jpg" alt="管理云平台" />
       </div>
       <div class="app-name">
         <h2>
-          <i class="fa fa-android" aria-hidden = 'true'></i>
+          <i class="fa fa-android" aria-hidden="true"></i>
           管理云平台
         </h2>
       </div>
       <div class="app-text">
         <ul class="breadcrumb">
-          <li>版本：1.19（build 19)</li>
+          <li > 版本：{{version.versionName}}（build {{version.versionCode}})</li>
           <li>大小：8.7M</li>
-          <li>更新时间：2021-01-14</li>
+          <li>更新时间：{{version.time}}</li>
         </ul>
       </div>
     </div>
-    <div class="view row" >
+    <div class="view row">
       <div class="install-btn">
-        <div class="spinner">
-          <a id="down_load" class="btn-u btn-u-lg" href="javascript:void(0);">安装</a>
+        <div class="spinner" >
+          <!-- <p>{{key }} {{value}}</p> -->
+          <!-- <p>{{version[fileName]}}</p> -->
+          <!-- <span>{{version.fileName}}</span> -->
+          <a id="down_load" @click="handleDown" class="btn-u btn-u-lg" :href="[url + version.fileName]"
+            >安装</a
+          >
         </div>
       </div>
     </div>
     <div class="row update-explain">
       <div class="tag-box">
         <h2 class="content-title">更新说明</h2>
-        <div class="update-description"> Uploaded by jenkins upload-pgyer plugin</div>
+        <div class="update-description">
+          {{version.content}}
+        </div>
       </div>
     </div>
     <div class="row ">
       <div class="versions">
         <div class="tag-box">
-          <h2 class="content-title">历史版本</h2>
-          <el-table>
-
+          <h2 class="content-title">历史版本 <span>选择历史版本下载</span></h2>
+          <el-table :data="version_info" fit stripe @row-click='handleClick' >
+            <el-table-column prop="versionName" label="版本" >
+              <template slot-scope="scope">
+                <div class="versionDiv">
+                  <!-- <span class="li-new"></span> -->
+                    {{scope.row.versionName }}(bulid {{ scope.row.versionCode}})
+                </div >
+              </template>
+            </el-table-column>
+            <el-table-column prop="time" label="更新日期"> </el-table-column>
+            <el-table-column class="update-content" prop="content" label="更新内容" >
+              <template slot-scope="scope">
+                <div class="content-version" >
+                    {{scope.row.content }}
+                </div >
+              </template>
+            </el-table-column>
           </el-table>
-
         </div>
       </div>
     </div>
@@ -46,66 +68,103 @@
 </template>
 
 <script>
+import { getAllVersions } from "@/api/app-versions/index"
 export default {
+  data() {
+    return {
+      version_info: [],
+      version:'',
+      url:'http://101.36.160.140:21021/apk/'
+    }
+  },
+  mounted() {
+    this.getVersions()
+  },
+  methods: {
+    //获取全部版本信息
+    getVersions() {
+      getAllVersions()
+        .then(res => {
+          console.log(res, "res...")
+          this.version_info = res.info
+          this.version = res.info[0]
+          console.log(this.version,'this.version...')
+        })
+        .catch(err => {
+          console.log(err, "err info")
+        })
+    },
+    handleClick(row){
+      console.log('row:',row)
+      this.version = row
+    },
+    handleDown(){
 
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
-  .content {
-    width: 75%;
-    margin: 0 auto;
-    // background-color: aqua;
-    height: 100vh;
-    overflow-y: scroll;
-    padding-top: 40px;
-    padding-bottom: 40px;
-    .view {
-      padding-top: 26px;
-    }
-    .row {
+
+
+.content {
+  // width: 75%;
+  margin: 0 auto;
+  // background-color: aqua;
+  // height: 100vh;
+  // overflow-y: scroll;
+  padding-top: 40px;
+  padding-bottom: 40px;
+  // 目前支持大部分手机端，ipad需要进行特别设置高度
+   height: calc(100vh - 100px);
+  overflow: auto;
+  .view {
+    padding-top: 26px;
+  }
+  .row {
     margin-left: -15px;
-    margin-right:-15px;
+    margin-right: -15px;
     .app-logo {
       text-align: center;
       margin-bottom: 30px;
-  }
+    }
     .app-name {
-    text-align: center;
-    padding-top: 10px;
-    h2{
-      color: #333;
-      font-size: 24px;
-      margin-bottom: -5px;
-      font-weight: 400;
-      text-shadow: none;
-      margin-top: 5px;
+      text-align: center;
+      padding-top: 10px;
+      h2 {
+        color: #333;
+        font-size: 24px;
+        margin-bottom: -5px;
+        font-weight: 400;
+        text-shadow: none;
+        margin-top: 5px;
+      }
     }
-  }
     .app-text {
-    text-align: center;
-    color: #788090;
-    box-sizing: border-box;
-    ul.breadcrumb {
-      padding: 0;
-    }
-    .breadcrumb {
-      top: 10px;
-      position: relative;
-      margin-bottom: 20px;
-      list-style: none;
-      li:not(:last-child) {
-        border-right: 1px solid #DEE2EC;
-        padding-right: 10px;
-        margin-right: 5px;
+      text-align: center;
+      color: #788090;
+      box-sizing: border-box;
+      ul.breadcrumb {
+        padding: 0;
       }
-      li {
-        display: inline-block;
-        color: #788090;
-        padding: 0 5px;
+      .breadcrumb {
+        top: 10px;
+        position: relative;
+        margin-bottom: 20px;
+        list-style: none;
+        li:not(:last-child) {
+          border-right: 1px solid #dee2ec;
+          padding-right: 10px;
+          margin-right: 5px;
+        }
+        li {
+          display: inline-block;
+          color: #788090;
+          padding: 0 5px;
+        }
       }
     }
-  }
     .install-btn {
       text-align: center;
       margin-bottom: 20px;
@@ -113,32 +172,33 @@ export default {
         height: 45px;
 
         #down_load {
-          background-color: #037D41;
+          background-color: #037d41;
           line-height: initial;
           border: 1px solid transparent;
         }
-        .btn-u-lg, a.btn-u-lg {
+        .btn-u-lg,
+        a.btn-u-lg {
           font-size: 18px;
           padding: 8px 60px;
           border-radius: 30px;
         }
         .btn-u {
-          background-color: #037D41;
+          background-color: #037d41;
           cursor: pointer;
           padding: 4px 13px;
           position: relative;
         }
-        .btn-u, .btn-u:hover {
+        .btn-u,
+        .btn-u:hover {
           color: #fff;
           text-decoration: none;
         }
       }
     }
-
   }
   .update-explain {
     padding: 0 15px;
-    .tag-box{
+    .tag-box {
       padding: 20px;
       background: #fff;
       margin-bottom: 40px;
@@ -147,7 +207,7 @@ export default {
         line-height: 25px;
         text-shadow: none;
         font-weight: 400;
-        margin-top:5px;
+        margin-top: 5px;
         color: #585f69;
       }
       .update-description {
@@ -156,9 +216,12 @@ export default {
       }
     }
   }
+  .tags-view-container #tag_right {
+    width: 25%;
+  }
   .versions {
     padding: 0 15px;
-    .tag-box{
+    .tag-box {
       padding: 20px;
       background: #fff;
       margin-bottom: 40px;
@@ -167,13 +230,45 @@ export default {
         line-height: 25px;
         text-shadow: none;
         font-weight: 400;
-        margin-top:5px;
+        margin-top: 5px;
         color: #585f69;
       }
+    }
   }
+}
+.content-title {
+  span  {
+    font-size: 10px;
+    font-weight: 400;
   }
-
-  }
-
-
+}
+.content-version{
+  // width: 180px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  //  -webkit-line-clamp: 1;
+  // 多行文本溢出
+  display: -webkit-box;
+  display: -moz-box;
+  // display: -webkit-flex;
+  // display: -moz-flex;
+  // display: flex;
+-webkit-box-orient: vertical;
+-webkit-line-clamp: 2;
+overflow: hidden;
+}
+.versionDiv {
+  position: relative;
+}
+.li-new {
+  position: absolute;
+  top: 0;
+  left: 5%;
+  font-size: 13px;
+  // background: url("/@/assets/images/new.png") center no-repeat;
+  height: 100%;
+  width: 30px;
+  background-size: 100%;
+}
 </style>

shanXiPlatform/vue.config.js

@@ -29,7 +29,7 @@ module.exports = {
   assetsDir: 'static',
   // lintOnSave: process.env.NODE_ENV === 'development',
 
-  
+
   // 取消 ESLint 校验
 
   lintOnSave:false,
@@ -42,25 +42,37 @@ module.exports = {
         target: 'http://101.36.160.140:21021',  //这里后台的地址模拟的;应该填写你们真实的后台接口
         // target:'http://172.16.0.02:9601',
         changOrigin: true,  //允许跨域
-       
+
+        pathRewrite: {
+          /* 重写路径，当我们在浏览器中看到请求的地址为：http://localhost:8080/api/core/getData/userInfo 时
+            实际上访问的地址是：http://121.121.67.254:8185/core/getData/userInfo,因为重写了 /api
+           */
+          '^/': ''
+        }
+      },
+      '/apk': {
+        target: 'http://101.36.160.140:21021',  //这里后台的地址模拟的;应该填写你们真实的后台接口
+        // target:'http://172.16.0.02:9601',
+        changOrigin: true,  //允许跨域
+
         pathRewrite: {
           /* 重写路径，当我们在浏览器中看到请求的地址为：http://localhost:8080/api/core/getData/userInfo 时
             实际上访问的地址是：http://121.121.67.254:8185/core/getData/userInfo,因为重写了 /api
            */
-          '^/': '' 
+          '^/apk': ''
         }
       },
       '/webs': {
         target: 'http://139.159.183.224:19999',  //这里后台的地址模拟的;应该填写你们真实的后台接口
         // target:'http://172.16.0.02:9601',
-        
+
         changOrigin: true,  //允许跨域
-       
+
         pathRewrite: {
           /* 重写路径，当我们在浏览器中看到请求的地址为：http://localhost:8080/api/core/getData/userInfo 时
             实际上访问的地址是：http://121.121.67.254:8185/core/getData/userInfo,因为重写了 /api
            */
-          '^/webs': '' 
+          '^/webs': ''
         }
       },
 
@@ -72,10 +84,10 @@ module.exports = {
 
 
 
-   
 
 
-   
+
+
     port: port,
     open: true,
     overlay: {