zhouna 5 роки тому
батько
коміт
4c2f59c8ab

+ 15 - 1
src/css/indexVert.less

@@ -270,18 +270,32 @@
     height: 40px;
     width: 100%;
     line-height: 40px;
-    text-align: center;
     position: fixed;
     bottom: 0;
     background-color: #ececec;
     left: 0;
     z-index: 98;
+    .version-tip{
+        margin-left: 20px;
+        font-size: 12px;
+        padding-right: 34px;
+        i{
+            cursor: pointer;
+            color:#267FD7;
+            font-size: 12px;
+        }
+        &.new-icon{
+            background: url(../images/new.png) 100% 0px no-repeat;
+        }
+    }
     .logo {
         float: left;
+        font-size: 12px;
         margin-left: 15px;
     }
     .disclaimerInfo {
         float: right;
+        font-size: 12px;
         margin-right: 15px;
     }
 }

+ 1 - 0
src/html/index.html

@@ -21,6 +21,7 @@
       </div>
       <div class="disclaimer clearfix">
         <span class="logo">&copy 朗通医疗</span>
+        <span class="version-tip">版本号:<i></i></span>
         <span class="disclaimerInfo">免责声明</span>
       </div>
   </div>

Різницю між файлами не показано, бо вона завелика
+ 71 - 0
src/html/version.html


BIN
src/images/new.png


BIN
src/images/newv.png


+ 27 - 3
src/js/index.js

@@ -234,7 +234,31 @@ function moreInfo() {
   })
 }
 
+function getVersion() {
+  post(config.getVersion, '').then((res) => {
+    const data = res.data.data;
+    const name = data.name;
+    const ver = localStorage.getItem('versionTime');
+    const time = data.refreshTime;
+    if(!ver||ver===time+"=new"||time!==ver.replace("=new","")){       //判断版本是否更新
+      $(".version-tip").addClass('new-icon');
+      localStorage.setItem('versionTime',time+"=new");     //保存版本更新时间
+    }else{
+      $(".version-tip").removeClass('new-icon');
+    }
+    $(".version-tip i").html(name);
+  })
+}
 
-$(".disclaimerInfo").on("click", function(){
-  openNewWin("disclaimer.html")
-})
+$(function(){
+  getVersion();   //获取版本信息
+  $(".disclaimerInfo").on("click", function(){
+    openNewWin("disclaimer.html")
+  });
+  $(".version-tip i").on("click", function(){
+    const ver = localStorage.getItem('versionTime');
+    $(".version-tip").removeClass('new-icon');
+    localStorage.setItem('versionTime',ver.replace("=new",""));
+    openNewWin("version.html");
+  });
+});

+ 2 - 1
src/js/promise.js

@@ -31,7 +31,8 @@ const config = {
   pushScale: '/api/data/push/pushScale',
   pushTreatment: '/api/data/push/pushTreatment',
   getSysSetInfoDatas: '/api/data/sysSet/getSysSetInfoDatas',
-  getMr: '/api/data/mr/getMr'
+  getMr: '/api/data/mr/getMr',
+  getVersion:'/api/data/versionInfo/getVersionInfoAlls',
 }
 const imageUrlPrefix = 'http://192.168.2.121:82';
 // const getUrlArgObject = function(parm) {  

+ 20 - 0
src/js/version.js

@@ -0,0 +1,20 @@
+const {post, config} = require('./promise.js');
+const $ = require("jquery");
+
+$(function(){
+  function getVersion() {
+    post(config.getVersion, '').then((res) => {
+      const data = res.data.data;
+      const dtl = data.detail;
+      const time = data.refreshTime.substr(0,10);
+      let dom = '';
+      $("h1 span").html(data.name);
+      $("h1 i").html(time);
+      for(let i=0;i<dtl.length;i++){
+        dom += '<p>'+dtl[i].title+'</p><p>'+dtl[i].description+'</p>';
+      }
+      $(".content").html(dom);
+    })
+  }
+  getVersion();
+})

+ 15 - 1
webpack.config.js

@@ -4,13 +4,14 @@ const CleanWebpackPlugin = require('clean-webpack-plugin') // 清空打包目录
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const webpack = require('webpack');
-const proxyHost = "http://192.168.2.241:5050";
+const proxyHost = "http://192.168.2.236:5050";
 module.exports = {
   entry: {
     index: path.resolve(__dirname, 'src/js', 'index.js'),
     page: path.resolve(__dirname, 'src', 'page.js'),
     information: path.resolve(__dirname, 'src/js', 'information.js'),
     disclaimer: path.resolve(__dirname, 'src/js', 'disclaimer.js'),
+    version: path.resolve(__dirname, 'src/js', 'version.js'),
     scale: path.resolve(__dirname, 'src/js', 'scale.js'),
     illness: path.resolve(__dirname, 'src/js', 'illness.js'),
     treatplan: path.resolve(__dirname, 'src/js', 'treatplan.js'),
@@ -118,6 +119,19 @@ module.exports = {
         collapseWhitespace: true //删除空白符与换行符
       }
     }),
+    new HtmlWebpackPlugin({
+      title: '版本信息',
+      template: path.resolve(__dirname, 'src/html', 'version.html'),
+      filename: 'version.html',
+      chunks: ['vendor', 'common', 'version'],
+      inject: true,
+      hash: true, //防止缓存
+      minify: {
+        removeAttributeQuotes: true, //压缩 去掉引号
+        removeComments: true, //移除HTML中的注释
+        collapseWhitespace: true //删除空白符与换行符
+      }
+    }),
     new HtmlWebpackPlugin({
       title: 'scale',
       template: path.resolve(__dirname, 'src/html', 'scale.html'),