diff --git a/.env.development b/.env.development index ea88cf7..7f71848 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 智慧幼儿体质评估与促进系统 ENV = 'development' # 智慧幼儿体质评估与促进系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.16.81:8081' +VUE_APP_BASE_API = 'https://kindergarten.xinelu.cn' #'/dev-api' # 路由懒加载 diff --git a/public/favicon.ico b/public/favicon.ico index e263760..9c8e497 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/index.html b/public/index.html index 925455c..8741b21 100644 --- a/public/index.html +++ b/public/index.html @@ -1,208 +1,213 @@ - + + - - <%= webpackConfig.name %> + + + + + <%= webpackConfig.name %> + - + - #loader-wrapper { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - z-index: 999999; - } - - #loader { - display: block; - position: relative; - left: 50%; - top: 50%; - width: 150px; - height: 150px; - margin: -75px 0 0 -75px; - border-radius: 50%; - border: 3px solid transparent; - border-top-color: #FFF; - -webkit-animation: spin 2s linear infinite; - -ms-animation: spin 2s linear infinite; - -moz-animation: spin 2s linear infinite; - -o-animation: spin 2s linear infinite; - animation: spin 2s linear infinite; - z-index: 1001; - } - - #loader:before { - content: ""; - position: absolute; - top: 5px; - left: 5px; - right: 5px; - bottom: 5px; - border-radius: 50%; - border: 3px solid transparent; - border-top-color: #FFF; - -webkit-animation: spin 3s linear infinite; - -moz-animation: spin 3s linear infinite; - -o-animation: spin 3s linear infinite; - -ms-animation: spin 3s linear infinite; - animation: spin 3s linear infinite; - } - - #loader:after { - content: ""; - position: absolute; - top: 15px; - left: 15px; - right: 15px; - bottom: 15px; - border-radius: 50%; - border: 3px solid transparent; - border-top-color: #FFF; - -moz-animation: spin 1.5s linear infinite; - -o-animation: spin 1.5s linear infinite; - -ms-animation: spin 1.5s linear infinite; - -webkit-animation: spin 1.5s linear infinite; - animation: spin 1.5s linear infinite; - } - - - @-webkit-keyframes spin { - 0% { - -webkit-transform: rotate(0deg); - -ms-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(360deg); - -ms-transform: rotate(360deg); - transform: rotate(360deg); - } - } - - @keyframes spin { - 0% { - -webkit-transform: rotate(0deg); - -ms-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(360deg); - -ms-transform: rotate(360deg); - transform: rotate(360deg); - } - } - - - #loader-wrapper .loader-section { - position: fixed; - top: 0; - width: 51%; - height: 100%; - background: #7171C6; - z-index: 1000; - -webkit-transform: translateX(0); - -ms-transform: translateX(0); - transform: translateX(0); - } - - #loader-wrapper .loader-section.section-left { - left: 0; - } - - #loader-wrapper .loader-section.section-right { - right: 0; - } - - - .loaded #loader-wrapper .loader-section.section-left { - -webkit-transform: translateX(-100%); - -ms-transform: translateX(-100%); - transform: translateX(-100%); - -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); - transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); - } - - .loaded #loader-wrapper .loader-section.section-right { - -webkit-transform: translateX(100%); - -ms-transform: translateX(100%); - transform: translateX(100%); - -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); - transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); - } - - .loaded #loader { - opacity: 0; - -webkit-transition: all 0.3s ease-out; - transition: all 0.3s ease-out; - } - - .loaded #loader-wrapper { - visibility: hidden; - -webkit-transform: translateY(-100%); - -ms-transform: translateY(-100%); - transform: translateY(-100%); - -webkit-transition: all 0.3s 1s ease-out; - transition: all 0.3s 1s ease-out; - } - - .no-js #loader-wrapper { - display: none; - } - - .no-js h1 { - color: #222222; - } - - #loader-wrapper .load_title { - font-family: 'Open Sans'; - color: #FFF; - font-size: 19px; - width: 100%; - text-align: center; - z-index: 9999999999999; - position: absolute; - top: 60%; - opacity: 1; - line-height: 30px; - } - - #loader-wrapper .load_title span { - font-weight: normal; - font-style: italic; - font-size: 13px; - color: #FFF; - opacity: 0.5; - } - - - +
-
-
-
-
-
正在加载系统资源，请耐心等待
+
+
+
+
+
正在加载系统资源，请耐心等待
-
- - +
+ + + \ No newline at end of file diff --git a/src/layout/index.vue b/src/layout/index.vue index 85ebde8..fea38a6 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -72,8 +72,8 @@ export default { return variables; }, }, - created(){ - this.info() + created() { + this.info(); }, watch: { $route(to, from) { @@ -86,9 +86,10 @@ export default { }, }, methods: { - info(){ - console.log(this.$router.path) - if (this.$router.path != "/index") { + info() { + console.log(this.$router.path); + console.log(this.$route.path); + if (this.$route.path != "/index") { this.show = false; } else { this.show = true; diff --git a/src/settings.js b/src/settings.js index 6a0b09f..8150697 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,44 +1,44 @@ module.exports = { - /** - * 侧边栏主题 深色主题theme-dark，浅色主题theme-light - */ - sideTheme: 'theme-dark', + /** + * 侧边栏主题 深色主题theme-dark，浅色主题theme-light + */ + sideTheme: 'theme-dark', - /** - * 是否系统布局配置 - */ - showSettings: false, + /** + * 是否系统布局配置 + */ + showSettings: false, - /** - * 是否显示顶部导航 - */ - topNav: false, + /** + * 是否显示顶部导航 + */ + topNav: false, - /** - * 是否显示 tagsView - */ - tagsView: true, + /** + * 是否显示 tagsView + */ + tagsView: true, - /** - * 是否固定头部 - */ - fixedHeader: false, + /** + * 是否固定头部 + */ + fixedHeader: false, - /** - * 是否显示logo - */ - sidebarLogo: true, + /** + * 是否显示logo + */ + sidebarLogo: true, - /** - * 是否显示动态标题 - */ - dynamicTitle: false, + /** + * 是否显示动态标题 + */ + dynamicTitle: false, - /** - * @type {string | array} 'production' | ['production', 'development'] - * @description Need show err logs component. - * The default is only used in the production env - * If you want to also use it in dev, you can pass ['production', 'development'] - */ - errorLog: 'production' -} + /** + * @type {string | array} 'production' | ['production', 'development'] + * @description Need show err logs component. + * The default is only used in the production env + * If you want to also use it in dev, you can pass ['production', 'development'] + */ + errorLog: 'production' +} \ No newline at end of file diff --git a/src/views/system/info/index.vue b/src/views/system/info/index.vue index 51b9c55..99a89c0 100644 --- a/src/views/system/info/index.vue +++ b/src/views/system/info/index.vue @@ -175,11 +175,7 @@ v-model="form.parentId" /> - + - - - - - - { this.citylist = res.data; }); diff --git a/src/views/system/studentInfo/index.vue b/src/views/system/studentInfo/index.vue index 5d9e32f..adf0415 100644 --- a/src/views/system/studentInfo/index.vue +++ b/src/views/system/studentInfo/index.vue @@ -55,11 +55,11 @@ > - + @@ -211,7 +211,7 @@ { if (!value) { + console.log(value); callback(); } else { if (!this.checkSpecialKey(value)) { callback(new Error("不能含有特殊字符！！")); + } else { + callback(); } } }; @@ -1031,7 +1034,7 @@ export default { // /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/; // const card = reg.test(value); // if (!card) { - // callback(new Error("身份证号格式有误！")); + // callback(new Error("证件编号格式有误！")); // } else { // callback(); // } diff --git a/src/views/system/testItemScore/index.vue b/src/views/system/testItemScore/index.vue index 807cece..6fca54d 100644 --- a/src/views/system/testItemScore/index.vue +++ b/src/views/system/testItemScore/index.vue @@ -24,14 +24,6 @@ @keyup.enter.native="handleQuery" /> - - - { + if (e.itemCode == "W001") { + e.itemFraction = ""; + e.itemScore = ""; + } + }); + } } if (item.itemScore == "") { this.form.itemScoreList.forEach((e) => { @@ -1402,7 +1403,16 @@ export default { }, oninputscore(item) { if (item.itemCode == "H001") { + console.log(item); this.Height = item.itemScore; + if (item.itemScore == "") { + this.form.itemScoreList.forEach((e) => { + if (e.itemCode == "W001") { + e.itemFraction = ""; + e.itemScore = ""; + } + }); + } } if (item.itemScore == "") { this.form.itemScoreList.forEach((e) => { diff --git a/src/views/system/testItems/index.vue b/src/views/system/testItems/index.vue index e5a7940..4bd5fa5 100644 --- a/src/views/system/testItems/index.vue +++ b/src/views/system/testItems/index.vue @@ -37,14 +37,6 @@ @keyup.enter.native="handleQuery" /> - - -