ReliabilitySimulation.git

parent: 404bd17f | 补丁 | 提交 | ignore whitespace

wente

2024-03-29 533b5fddca83120f95a1561160f675132e960b74

新增加载中等待样式

6个文件已修改

	web/package-lock.json	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/package.json	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/public/index.html	35 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/src/router.js	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/src/router/router.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/vue.config.js	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 web/package-lock.json

@@ -4524,6 +4524,16 @@
      "dev": true,
      "optional": true
    },
    "bindings": {
      "version": "1.5.0",
      "resolved": "https://registry.npmmirror.com/bindings/-/bindings-1.5.0.tgz",
      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
      "dev": true,
      "optional": true,
      "requires": {
        "file-uri-to-path": "1.0.0"
      }
    },
    "bl": {
      "version": "4.1.0",
      "resolved": "https://registry.npmmirror.com/bl/-/bl-4.1.0.tgz",
@@ -9000,6 +9010,13 @@
      "version": "2.0.5",
      "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz",
      "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
    },
    "file-uri-to-path": {
      "version": "1.0.0",
      "resolved": "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
      "dev": true,
      "optional": true
    },
    "filesize": {
      "version": "2.0.4",
@@ -14297,6 +14314,11 @@
        "gauge": "~2.7.3",
        "set-blocking": "~2.0.0"
      }
    },
    "nprogress": {
      "version": "0.2.0",
      "resolved": "https://registry.npmmirror.com/nprogress/-/nprogress-0.2.0.tgz",
      "integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA=="
    },
    "nth-check": {
      "version": "1.0.2",
@@ -20437,6 +20459,7 @@
          "dev": true,
          "optional": true,
          "requires": {
            "bindings": "^1.5.0",
            "nan": "^2.12.1"
          }
        },
@@ -20792,6 +20815,7 @@
          "dev": true,
          "optional": true,
          "requires": {
            "bindings": "^1.5.0",
            "nan": "^2.12.1"
          }
        },

 web/package.json

@@ -46,6 +46,7 @@
    "luckyexcel": "^1.0.1",
    "mockjs": "^1.1.0",
    "node-sass": "^4.14.1",
    "nprogress": "^0.2.0",
    "qs": "^6.7.0",
    "quill": "^1.3.6",
    "sass-loader": "^7.1.0",

 web/public/index.html

@@ -12,7 +12,7 @@
  <!--  <script src="./excelData/luckysheet.umd.js"></script>-->
  <!--   站点配置-->
  <style>
    /* html,
     html,
     body,
     #app {
         height: 100%;
@@ -168,13 +168,13 @@
         transition: all 0.3s 1s ease-out;
     }

     !*.no-js #loader-wrapper {*!
     !*    display: none;*!
     !*}*!
     /*.no-js #loader-wrapper {*/
     /*    display: none;*/
     /*}*/

     !*.no-js h1 {*!
     !*    color: #222222;*!
     !*}*!
     /*.no-js h1 {*/
     /*    color: #222222;*/
     /*}*/

     #loader-wrapper .load_title {
         font-family: 'Open Sans';
@@ -195,7 +195,7 @@
         font-size: 13px;
         color: #FFF;
         opacity: 0.5;
     }*/
     }
  </style>
    <script>
    window.SITE_CONFIG = {};
@@ -233,12 +233,7 @@

  </script>
</head>
<body style='width:100%;height:100%;margin:0;padding:0;
  background-attachment:fixed;
  background-position: center center;
  background-repeat: no-repeat;
  background-image: url("./loading2.gif");
  background-color:#7071c3' class="zt">
<body class="zt">
<!--<div style='display: none;position:absolute;width:100%;height:100%;text-align:center;background:#000;z-index:100'-->
<!--     id="onload">-->
<!--  &lt;!&ndash;  <a href="IE11-Windows6.1-x64-zh-cn.rar" id="ref"   style='display: none;font-size: 50px; text-decoration:none;'>点击下载IE11升级包</a>&ndash;&gt;-->
@@ -246,12 +241,12 @@
<!--  <a href="Firefox.zip" id="ref2" style="display: none; font-size: 50px; text-decoration:none">点击下载火狐浏览器</a>-->
<!--</div>-->
<div id="app">
  <!--    <div id="loader-wrapper">-->
  <!--        <div id="loader"></div>-->
  <!--        <div class="loader-section section-left"></div>-->
  <!--        <div class="loader-section section-right"></div>-->
  <!--        <div class="load_title">正在加载系统资源，请耐心等待</div>-->
  <!--    </div>-->
      <div id="loader-wrapper">
          <div id="loader"></div>
          <div class="loader-section section-left"></div>
          <div class="loader-section section-right"></div>
          <div class="load_title">正在加载系统资源，请耐心等待</div>
      </div>
</div>
</body>
</html>

 web/src/router.js

@@ -2,6 +2,8 @@
import Router from 'vue-router'
import {beforeEach, pageRoutes, setConfig} from './router/router'
import store from '../packages/store'
import nProgress from 'nprogress'
import 'nprogress/nprogress.css'

Vue.use(Router)

@@ -69,6 +71,7 @@
setConfig(router, moduleRoutes, (url) => import(`./views/modules/${url}`))

router.beforeEach((to, from, next) => {
    nProgress.start()
  if(to.name == 'sys-sysPage-digitalData-home'
    || to.name == 'sys-sysPage-replace-home'
    || to.name == 'sys-sysPage-equipment-home'
@@ -87,6 +90,10 @@
  }
  beforeEach(to, from, next)
})
 //全局后置守卫
router.afterEach((to, from)=>{
    nProgress.done()  //进度条结束
})
// router.beforeEach((to, from, next) => {
//   store.state.showHeader = to.name !== 'sys-sysPage-digitalData-home'
//   beforeEach(to, from, next)

 web/src/router/router.js

@@ -96,7 +96,6 @@
  console.log(pageRoutes, 'beforeEach pageRoutes')
  console.log(window.SITE_CONFIG['menuList'], 'beforeEach window.SITE_CONFIG[\'menuList\'] ')
*/

  if (to.name == 'home' || to.name == 'single' || window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] || fnCurrentRouteIsPageRoute(to, pageRoutes)) {
    return next()
  }
@@ -157,6 +156,7 @@
  console.log(window.SITE_CONFIG['menuList'], '3window.SITE_CONFIG[\'menuList\']')
}


/**
 * 判断当前路由是否为页面路由
 * @param {*} route 当前路由

 web/vue.config.js

@@ -13,6 +13,19 @@
      .test(/\.svg$/)
      .use('svg-sprite-loader')
      .loader('svg-sprite-loader')

    // // 处理其他图片文件（例如 PNG、JPEG），去除哈希值
    // config.module.rule('images')
    //   .test(/\.(png|jpe?g|gif)(\?.*)?$/)
    //   .use('file-loader')
    //   .loader('file-loader')
    //   .tap(options => {
    //     // 修改 file-loader 配置，设置 name 为 '[name].[ext]'
    //     return {
    //       ...options,
    //       name: '[name].[ext]'
    //     }
    //   })
  },
  // 默认打开eslint效验，如果需要关闭，设置成false即可
  lintOnSave: false,

			@@ -4524,6 +4524,16 @@
			"dev": true,
			"optional": true
			},
			"bindings": {
			"version": "1.5.0",
			"resolved": "https://registry.npmmirror.com/bindings/-/bindings-1.5.0.tgz",
			"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
			"dev": true,
			"optional": true,
			"requires": {
			"file-uri-to-path": "1.0.0"
			}
			},
			"bl": {
			"version": "4.1.0",
			"resolved": "https://registry.npmmirror.com/bl/-/bl-4.1.0.tgz",
			@@ -9000,6 +9010,13 @@
			"version": "2.0.5",
			"resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz",
			"integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
			},
			"file-uri-to-path": {
			"version": "1.0.0",
			"resolved": "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
			"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
			"dev": true,
			"optional": true
			},
			"filesize": {
			"version": "2.0.4",
			@@ -14297,6 +14314,11 @@
			"gauge": "~2.7.3",
			"set-blocking": "~2.0.0"
			}
			},
			"nprogress": {
			"version": "0.2.0",
			"resolved": "https://registry.npmmirror.com/nprogress/-/nprogress-0.2.0.tgz",
			"integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA=="
			},
			"nth-check": {
			"version": "1.0.2",
			@@ -20437,6 +20459,7 @@
			"dev": true,
			"optional": true,
			"requires": {
			"bindings": "^1.5.0",
			"nan": "^2.12.1"
			}
			},
			@@ -20792,6 +20815,7 @@
			"dev": true,
			"optional": true,
			"requires": {
			"bindings": "^1.5.0",
			"nan": "^2.12.1"
			}
			},

			@@ -46,6 +46,7 @@
			"luckyexcel": "^1.0.1",
			"mockjs": "^1.1.0",
			"node-sass": "^4.14.1",
			"nprogress": "^0.2.0",
			"qs": "^6.7.0",
			"quill": "^1.3.6",
			"sass-loader": "^7.1.0",

			@@ -12,7 +12,7 @@
			<!-- <script src="./excelData/luckysheet.umd.js"></script>-->
			<!-- 站点配置-->
			<style>
			/* html,
			html,
			body,
			#app {
			height: 100%;
			@@ -168,13 +168,13 @@
			transition: all 0.3s 1s ease-out;
			}

			!.no-js #loader-wrapper {!
			!* display: none;*!
			!}!
			/.no-js #loader-wrapper {/
			/* display: none;*/
			/}/

			!.no-js h1 {!
			!* color: #222222;*!
			!}!
			/.no-js h1 {/
			/* color: #222222;*/
			/}/

			#loader-wrapper .load_title {
			font-family: 'Open Sans';
			@@ -195,7 +195,7 @@
			font-size: 13px;
			color: #FFF;
			opacity: 0.5;
			}*/
			}
			</style>
			<script>
			window.SITE_CONFIG = {};
			@@ -233,12 +233,7 @@

			</script>
			</head>
			<body style='width:100%;height:100%;margin:0;padding:0;
			background-attachment:fixed;
			background-position: center center;
			background-repeat: no-repeat;
			background-image: url("./loading2.gif");
			background-color:#7071c3' class="zt">
			<body class="zt">
			<!--<div style='display: none;position:absolute;width:100%;height:100%;text-align:center;background:#000;z-index:100'-->
			<!-- id="onload">-->
			<!-- <!– <a href="IE11-Windows6.1-x64-zh-cn.rar" id="ref" style='display: none;font-size: 50px; text-decoration:none;'>点击下载IE11升级包</a>–>-->
			@@ -246,12 +241,12 @@
			<!-- <a href="Firefox.zip" id="ref2" style="display: none; font-size: 50px; text-decoration:none">点击下载火狐浏览器</a>-->
			<!--</div>-->
			<div id="app">
			<!-- <div id="loader-wrapper">-->
			<!-- <div id="loader"></div>-->
			<!-- <div class="loader-section section-left"></div>-->
			<!-- <div class="loader-section section-right"></div>-->
			<!-- <div class="load_title">正在加载系统资源，请耐心等待</div>-->
			<!-- </div>-->
			<div id="loader-wrapper">
			<div id="loader"></div>
			<div class="loader-section section-left"></div>
			<div class="loader-section section-right"></div>
			<div class="load_title">正在加载系统资源，请耐心等待</div>
			</div>
			</div>
			</body>
			</html>

			@@ -2,6 +2,8 @@
			import Router from 'vue-router'
			import {beforeEach, pageRoutes, setConfig} from './router/router'
			import store from '../packages/store'
			import nProgress from 'nprogress'
			import 'nprogress/nprogress.css'

			Vue.use(Router)

			@@ -69,6 +71,7 @@
			setConfig(router, moduleRoutes, (url) => import(`./views/modules/${url}`))

			router.beforeEach((to, from, next) => {
			nProgress.start()
			if(to.name == 'sys-sysPage-digitalData-home'
			\|\| to.name == 'sys-sysPage-replace-home'
			\|\| to.name == 'sys-sysPage-equipment-home'
			@@ -87,6 +90,10 @@
			}
			beforeEach(to, from, next)
			})
			//全局后置守卫
			router.afterEach((to, from)=>{
			nProgress.done() //进度条结束
			})
			// router.beforeEach((to, from, next) => {
			// store.state.showHeader = to.name !== 'sys-sysPage-digitalData-home'
			// beforeEach(to, from, next)

			@@ -96,7 +96,6 @@
			console.log(pageRoutes, 'beforeEach pageRoutes')
			console.log(window.SITE_CONFIG['menuList'], 'beforeEach window.SITE_CONFIG[\'menuList\'] ')
			*/

			if (to.name == 'home' \|\| to.name == 'single' \|\| window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] \|\| fnCurrentRouteIsPageRoute(to, pageRoutes)) {
			return next()
			}
			@@ -157,6 +156,7 @@
			console.log(window.SITE_CONFIG['menuList'], '3window.SITE_CONFIG[\'menuList\']')
			}


			/**
			* 判断当前路由是否为页面路由
			* @param {*} route 当前路由

			@@ -13,6 +13,19 @@
			.test(/\.svg$/)
			.use('svg-sprite-loader')
			.loader('svg-sprite-loader')

			// // 处理其他图片文件（例如 PNG、JPEG），去除哈希值
			// config.module.rule('images')
			// .test(/\.(png\|jpe?g\|gif)(\?.*)?$/)
			// .use('file-loader')
			// .loader('file-loader')
			// .tap(options => {
			// // 修改 file-loader 配置，设置 name 为 '[name].[ext]'
			// return {
			// ...options,
			// name: '[name].[ext]'
			// }
			// })
			},
			// 默认打开eslint效验，如果需要关闭，设置成false即可
			lintOnSave: false,