Merge remote-tracking branch 'origin/dev'

2022-10-14 17:52:26 +08:00 · 2022-10-14 17:52:26 +08:00 · 01e2e8e53b
commit 01e2e8e53b
parent 05259e9c65 40ebd304a3
9 changed files with 273 additions and 283 deletions
--- 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'

 # 路由懒加载
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/index.html
+++ b/public/index.html
@ -1,208 +1,213 @@
 <!DOCTYPE html>
 <html>
-  <head>
+
+<head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="renderer" content="webkit">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= webpackConfig.name %></title>
+    <!-- <link rel="icon" href="<%= BASE_URL %>favicon.ico"> -->
+    <!-- <link href="../src/assets/logo/logo.png"> -->
+
+    <title>
+        <%= webpackConfig.name %>
+    </title>
    <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
-	  <style>
-    html,
-    body,
-    #app {
-      height: 100%;
-      margin: 0px;
-      padding: 0px;
-    }
-    .chromeframe {
-      margin: 0.2em 0;
-      background: #ccc;
-      color: #000;
-      padding: 0.2em 0;
-    }
+    <style>
+        html,
+        body,
+        #app {
+            height: 100%;
+            margin: 0px;
+            padding: 0px;
+        }
+        
+        .chromeframe {
+            margin: 0.2em 0;
+            background: #ccc;
+            color: #000;
+            padding: 0.2em 0;
+        }
+        
+        #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;
+        }
+    </style>
+</head>

-    #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;
-    }
-  </style>
-  </head>
-  <body>
+<body>
    <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 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>
+    </div>
+</body>
+
+</html>
--- 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;
--- 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'
+}
--- a/src/views/system/info/index.vue
+++ b/src/views/system/info/index.vue
@ -175,11 +175,7 @@
            v-model="form.parentId"
          />
        </el-form-item>
-        <el-form-item
-          label="所属区域"
-          prop="areaId"
-          v-if="List.length != 0 && form.parentId != 0"
-        >
+        <el-form-item label="所属区域" prop="areaId">
          <el-select
            v-model="value"
            placeholder="请选择省"
@ -224,23 +220,6 @@
          </el-select>
        </el-form-item>

-        <el-form-item label="所属区域" prop="areaId" v-else>
-          <el-select
-            v-model="form.areaName"
-            placeholder="请选择省"
-            style="width: 380px"
-            disabled
-          >
-            <el-option
-              v-for="item in provincelist"
-              :key="item.areaId"
-              :label="item.name"
-              :value="item.areaId"
-              @click.native="province(item)"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
        <el-form-item label="组织名称" prop="organizeName">
          <el-input
            v-model="form.organizeName"
@ -416,7 +395,7 @@ export default {
    province(item) {
      this.value1 = "";
      this.value2 = "";
-      this.form.areaId = "";
+      this.form.areaId = item.id;
      getSubordinateInfo(item.id).then((res) => {
        this.citylist = res.data;
      });
--- a/src/views/system/studentInfo/index.vue
+++ b/src/views/system/studentInfo/index.vue
@ -55,11 +55,11 @@
        >
        </el-date-picker>
      </el-form-item>
-      <el-form-item label="身份证号" prop="cardNumber">
+      <el-form-item label="证件编号" prop="cardNumber">
        <el-input
          v-model="queryParams.cardNumber"
          maxlength="18"
-          placeholder="请输入身份证号"
+          placeholder="请输入证件编号"
          clearable
          @keyup.enter.native="handleQuery"
        />
@ -211,7 +211,7 @@
        </template>
      </el-table-column>
      <el-table-column
-        label="身份证号"
+        label="证件编号"
        align="center"
        prop="cardNumber"
        width="180"
@ -1015,10 +1015,13 @@ export default {
    //验证身份证
    var isCardId = (rule, value, callback) => {
      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();
    //     }
--- a/src/views/system/testItemScore/index.vue
+++ b/src/views/system/testItemScore/index.vue
@ -24,14 +24,6 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-      <el-form-item label="项目名称" prop="itemName">
-        <el-input
-          v-model="queryParams.itemName"
-          placeholder="请输入项目名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
      <el-form-item label="批次名称" prop="batchCode">
        <el-input
          v-model="queryParams.batchName"
@ -1356,7 +1348,16 @@ export default {
  methods: {
    oninputscore2(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) => {
@ -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) => {
--- a/src/views/system/testItems/index.vue
+++ b/src/views/system/testItems/index.vue
@ -37,14 +37,6 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-      <el-form-item label="排序" prop="sorting">
-        <el-input
-          v-model="queryParams.sorting"
-          placeholder="请输入排序"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
      <el-form-item>
        <el-button
          type="primary"