Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_app into V0.0.4

src/views/menu/monitoringCall/components/taskInfo.vue

@@ -49,18 +49,18 @@
                     label=""
                     type="textarea"
                     maxlength="200"
-                    placeholder="请输入情况描述"
+                    placeholder="请输入异常描述"
                     show-word-limit
-                    :rules="[{ required: true, message: '情况描述不能为空' }]"
+                    :rules="[{ required: true, message: '异常描述不能为空' }]"
                 /></van-col>
               </van-row>
             </div>
             <!-- 文字描述弹框 -->
             <van-dialog v-model="showDialog" title="提示">
-             <div class="showtext">
-              <!-- {{ showText }} -->
-              <div v-for="item in showText" :key="item">{{ item }}</div>
-             </div> 
+             <div class="showtext" >
+               {{ showText }}
+              <!--<div v-for="item in showText" :key="item">{{ item }}</div>-->
+             </div>
             </van-dialog>
             <!-- 底部按钮 -->
             <div>
@@ -90,7 +90,7 @@ export default {
 
   data() {
     return {
-      showText:[],
+      showText:'',
       showDialog: false,
       taskId: '', //任务ID
       show: false,
@@ -243,27 +243,30 @@ export default {
       }
       // text='1.挖掘第哦啊uiOS多i,2.是多久啊了多久哦'
       this.showDialog = true
-      this.showText = text.split(',')
+      // this.showText = text.split(',')
+      this.showText = text;
     }
   }
 }
 </script>
 <style lang="scss" scoped>
 .mainItem {
-  height: 750px;
+  height: 95%;
   overflow: scroll;
 }
 .rowItem {
   margin-bottom: 30px;
 }
 .block {
-  width: 85vw;
-  height: 142vw;
+  width: 90vw;
+  height: 98%;
   background-color: #fff;
   margin: auto;
   position: absolute;
-  top: 7%;
-  left: 10%;
+  top: 1%;
+  bottom: 1%;
+  left: 5%;
+  right: 5%;
   padding: 20px;
 }
 .textTitle {
@@ -281,6 +284,7 @@ export default {
   color: black;
 }
 .mainBox {
+  height: 80vh;
   .titleList {
     background-color: #e8e8e8;
     margin-top: 20px;
@@ -314,10 +318,12 @@ export default {
 }
 .showtext{
   text-align: left;
-  color: black;
-  padding-left: 50px;
+  color: #0e0e0e;
+  padding-left: 20px;
+  padding-right: 15px;
   margin-top: 50px;
   margin-bottom: 50px;
+  white-space: pre-wrap;
 }
 
 </style>

src/views/menu/resumption/detail.vue

@@ -174,6 +174,20 @@
                 </template>
               </van-cell>
               <van-cell-group v-show="point.resValue">
+
+                <van-field
+                  :rules="[{ required: enable, message: '请输入情况描述' },{validator, message: '输入长度200字符以内'}]"
+                  :required="enable"
+                  v-model="point.resRemark"
+                  :readonly="!enable"
+                  rows="1"
+                  name="resRemark"
+                  autosize
+                  autofocus="true"
+                  label="情况描述"
+                  type="textarea"
+                  :placeholder="enable ? '请输入情况描述' : ''"
+                />
                 <div class="upload-box">
                   <uploader :maxCount="5" v-if="enable" v-model="point.imgs" />
                   <van-cell v-else>
@@ -188,19 +202,6 @@
                     </div>
                   </van-cell>
                 </div>
-                <van-field
-                  :rules="[{ required: enable, message: '请输入情况描述' },{validator, message: '输入长度200字符以内'}]"
-                  :required="enable"
-                  v-model="point.resRemark"
-                  :readonly="!enable"
-                  rows="1"
-                  name="resRemark"
-                  autosize
-                  autofocus="true"
-                  label="情况描述"
-                  type="textarea"
-                  :placeholder="enable ? '请输入情况描述' : ''"
-                />
                 <select-cell
                   :required="enable"
                   :disabled="!enable"

src/views/menu/resumption/list.vue

@@ -8,7 +8,7 @@
         <div class="list-item">
           <p>每日履职</p>
           <van-tabs>
-            <van-tab title="待完成" :badge="dayList.unfinished.length">
+            <van-tab title="待完成" :badge="dayList.unfinished.length === 0 ? false :dayList.unfinished.length">
               <Empty v-if="!dayList.unfinished.length"/>
               <div class="list-container" v-else>
                   <van-cell
@@ -27,7 +27,7 @@
                   </van-cell>
               </div>
             </van-tab>
-            <van-tab title="未完成" :badge="dayList.proceed.length">
+            <van-tab title="未完成" :badge="dayList.proceed.length=== 0 ? false :dayList.proceed.length">
               <Empty v-if="!dayList.proceed.length"/>
               <div class="list-container" v-else>
                   <van-cell
@@ -44,7 +44,7 @@
                   </van-cell>
               </div>
             </van-tab>
-            <van-tab title="已完成" :badge="dayList.finished.length">
+            <van-tab title="已完成" :badge="dayList.finished.length=== 0 ? false :dayList.finished.length">
               <Empty v-if="!dayList.finished.length"/>
               <div class="list-container" v-else>
                   <van-cell
@@ -68,7 +68,7 @@
         <div class="list-item">
           <p>周期履职</p>
           <van-tabs >
-            <van-tab title="待完成" :badge="otherList.unfinished.length">
+            <van-tab title="待完成" :badge="otherList.unfinished.length=== 0 ? false :otherList.unfinished.length">
               <Empty v-if="!otherList.unfinished.length"/>
               <div class="list-container" v-else>
                   <van-cell
@@ -87,7 +87,7 @@
                   </van-cell>
               </div>
             </van-tab>
-            <van-tab title="未完成" :badge="otherList.proceed.length">
+            <van-tab title="未完成" :badge="otherList.proceed.length=== 0 ? false :otherList.proceed.length">
               <Empty v-if="!otherList.proceed.length"/>
               <div class="list-container" v-else>
                   <van-cell
@@ -104,7 +104,7 @@
                   </van-cell>
               </div>
             </van-tab>
-            <van-tab title="已完成" :badge="otherList.finished.length">
+            <van-tab title="已完成" :badge="otherList.finished.length=== 0 ? false :otherList.finished.length">
               <Empty v-if="!otherList.finished.length"/>
               <div class="list-container" v-else>
                   <van-cell