Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

packages/work/AppAssessment/components/Statistics.vue

@@ -41,14 +41,17 @@
           </template>
           <template #content>
             <div class="progress-wrapper">
-              <div class="progress">
+              <!--  -->
+              <div class="progress" v-if="logList.length"> 
                 <div class="item" v-for="(item, index) in logList" :key="index">
                   <h2>{{ item.createUserName }}</h2>
                   <el-progress :percentage="item.finishRate"></el-progress>
                 </div>
               </div>
+              <AiEmpty v-else></AiEmpty>
             </div>
           </template>
+          
         </ai-card>
       </div>
       <ai-card title="帮扶走访情况">
@@ -283,6 +286,10 @@
 
 <style lang="scss" scoped>
   .AppAssessment {
+    ::v-deep .ai-empty {
+      margin-bottom: 0;
+      font-size: 12px;
+    }
     .info {
       display: flex;
       justify-content: space-between;

packages/work/AppRiskWarning/components/Add.vue

@@ -80,9 +80,11 @@
       const validatorPhone = function (rule, value, callback) {
         if (value === '') {
           callback(new Error('请输入联系方式'))
-        } else if (!/^1\d{10}$/.test(value)) {
-          callback(new Error('手机号格式错误'))
-        } else {
+        } 
+        // else if (!/^1\d{10}$/.test(value)) {
+        //   callback(new Error('手机号格式错误'))
+        // } 
+        else {
           callback()
         }
       }