Merge remote-tracking branch 'origin/V0.0.4' into V0.0.4

package-lock.json

@@ -2094,6 +2094,49 @@
         "webpack-merge": "^5.7.3",
         "webpack-virtual-modules": "^0.4.2",
         "whatwg-fetch": "^3.6.2"
+      },
+      "dependencies": {
+        "@vue/vue-loader-v15": {
+          "version": "npm:vue-loader@15.11.1",
+          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.11.1.tgz",
+          "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
+          "dev": true,
+          "requires": {
+            "@vue/component-compiler-utils": "^3.1.0",
+            "hash-sum": "^1.0.2",
+            "loader-utils": "^1.1.0",
+            "vue-hot-reload-api": "^2.3.0",
+            "vue-style-loader": "^4.1.0"
+          },
+          "dependencies": {
+            "hash-sum": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
+              "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+              "dev": true
+            }
+          }
+        },
+        "json5": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.2",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz",
+          "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        }
       }
     },
     "@vue/cli-shared-utils": {
@@ -2258,47 +2301,6 @@
         }
       }
     },
-    "@vue/vue-loader-v15": {
-      "version": "npm:vue-loader@15.11.1",
-      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.11.1.tgz",
-      "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
-      "dev": true,
-      "requires": {
-        "@vue/component-compiler-utils": "^3.1.0",
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.1.0",
-        "vue-hot-reload-api": "^2.3.0",
-        "vue-style-loader": "^4.1.0"
-      },
-      "dependencies": {
-        "hash-sum": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
-          "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-          "dev": true
-        },
-        "json5": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
-          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.4.2",
-          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz",
-          "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
-        }
-      }
-    },
     "@vue/web-component-wrapper": {
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",

src/views/home/works.vue

@@ -11,8 +11,10 @@
         :key="i.taskType"
         :badge="i.nums"
       >
+     
+      <template v-for="item in workList" >
         <!-- 列表 -->
-        <div class="cellMargin" v-for="item in workList" :key="item.taskType">
+        <div class="cellMargin"  v-if="item.taskType==i.taskType" :key="item.taskType">
           <!-- 标题区域 -->
           <!-- lz -->
           <van-cell
@@ -20,7 +22,7 @@
             is-link
             :to="{ path: worksLink(3, item.taskType) }"
             :id="worksLink(1, item.taskType)"
-            v-if="item.taskType==i.taskType"
+            
           >
             <!-- 使用 title 插槽来自定义标题 -->
             <template #title>
@@ -64,6 +66,8 @@
             </van-cell-group>
           </div>
         </div>
+      </template>
+        
       </van-tab>
     </van-tabs>
 
@@ -359,8 +363,9 @@ export default {
 }
 .cellMargin {
   margin: 20px;
-  border-radius: 10px;
-  box-shadow: 0 1px 8px #ccc;
+  margin-top:0px;
+  // border-radius: 10px;
+  box-shadow: 0 1px 4px #ccc;
   overflow: hidden;
 }
 .marginCls {

src/views/menu/drillStatistics/index.vue

@@ -124,7 +124,7 @@ export default {
       // yearColumns: [],
       showDate: false, //月份显示隐藏
       fieldValue: '', //状态名称
-      statusValue: ' ', //状态值
+      statusValue: '', //状态值
       taskList: [], //状态数组
       columnsList: [], //状态数组
       currentDate: newDateMonth(), //年份
@@ -208,6 +208,7 @@ export default {
       this.getDataList()
     },
     getDataList() {
+      if (!this.statusValue) return
       let data = {
         planId: this.statusValue || '',
         orgId: this.cascaderValue || '',
@@ -278,14 +279,14 @@ export default {
       this.showDate = false
       this.getDataList()
     },
-     //年份选中触发
-     onEndDateConfirm(val) {
-      if(this.newDate(val + '')<this.currentDate){
+    //年份选中触发
+    onEndDateConfirm(val) {
+      if (this.newDate(val + '') < this.currentDate) {
         return Toast('结束月份不能小于开始月份')
       }
       this.endDate = this.newDate(val + '')
-      
-      console.log(this.endDate);
+
+      console.log(this.endDate)
       this.endShowDate = false
       this.getDataList()
     },

src/views/menu/educationStatistics/index.vue

@@ -100,6 +100,7 @@ export default {
       })
     },
     getDataList() {
+      if(!this.query.planId)return
       let data = {
         ...this.query
       }