sunran 3 yıl önce
ebeveyn
işleme
78f58ea6fe

+ 4 - 3
src/views/weibao/components/newsInformation.vue

@@ -6,9 +6,9 @@
       </div>
       <div class="text">
         <p class="title">{{item.title}}</p>
-        <p class="mes">发布单位:{{item.publish}}</p>
+        <p class="mes">发布单位{{item.publish}}</p>
         <!-- <p class="mes">帮扶地址:滨州传媒网</p> -->
-        <p class="date">发布日期:{{item.createdDate}}</p>
+        <p class="date">发布日期{{item.createdDate}}</p>
       </div>
     </div>
   </div>
@@ -43,7 +43,8 @@ export default {
       text-overflow: ellipsis;
       font-size: 30px;
     }
-    .mes {
+    .mes,
+    .date {
       font-size: 26px;
     }
     p {

+ 4 - 3
src/views/weibao/components/noticeAnnouncement.vue

@@ -2,8 +2,8 @@
   <div class="box">
     <div class="list" v-for="item in noticeList" :key="item.id" @click="$router.push({path:'/text',query:{id:item.id,title:'通知公告'}})">
       <p class="title">{{item.title}}</p>
-      <p class="mes">发布单位:{{item.publish}}</p>
-      <p class="date">发布日期:{{item.createdDate}}</p>
+      <p class="mes">发布单位{{item.publish}}</p>
+      <p class="date">发布日期{{item.createdDate}}</p>
     </div>
   </div>
 </template>
@@ -29,7 +29,8 @@ p {
   .title {
     font-size: 30px;
   }
-  .mes {
+  .mes,
+  .date {
     font-size: 26px;
   }
 }

+ 4 - 3
src/views/weibao/components/policyDocument.vue

@@ -2,8 +2,8 @@
   <div class="box">
     <div class="list" v-for="item in policyList" :key="item.id" @click="$router.push({path:'/text',query:{id:item.id,title:'政策文件'}})">
       <p class="title">{{item.title}}</p>
-      <p class="mes">发布单位:{{item.publish}}</p>
-      <p class="date">发布日期:{{item.createdDate}}</p>
+      <p class="mes">发布单位{{item.publish}}</p>
+      <p class="date">发布日期{{item.createdDate}}</p>
     </div>
   </div>
 </template>
@@ -28,7 +28,8 @@ p {
   .title {
     font-size: 30px;
   }
-  .mes {
+  .mes,
+  .date {
     font-size: 26px;
   }
 }

+ 4 - 2
src/views/weibao/views/consultation/index.vue

@@ -28,7 +28,7 @@
       <van-list v-model="loading" :immediate-check="false" :finished="finished" finished-text="没有更多了" @load="onLoad">
         <div class="list" v-for="item in historyList" :key="item.id" @click="$router.push({path:'/consultation/details',query:{id:item.id}})">
           <div class="img">
-            <van-image fit="scale-down" :src="getpics(item.pics)" alt="" />
+            <van-image fit="cover" :src="getpics(item.pics)" alt="" />
           </div>
           <div class="text">
             <p class="title">会商议题:{{item.name}}</p>
@@ -65,7 +65,7 @@ export default {
       historyList: [],
     }
   },
-  created() {
+  activated() {
     this.consultationPage()
   },
   methods: {
@@ -117,10 +117,12 @@ export default {
   z-index: 9999;
 }
 .casebox {
+  padding: 0 30px;
   height: calc(100vh - 220px);
   overflow: auto;
 }
 .casebox2 {
+  padding: 0 30px;
   height: calc(100vh - 92px);
   overflow: auto;
 }

+ 25 - 0
src/views/weibao/views/loveHelp/details.vue

@@ -45,6 +45,11 @@
               <van-field v-model="form.helpChildren" :rules="[{ required: true}]" placeholder="请输入帮扶对象" :disabled="id!=undefined" />
             </div>
             <van-popup position="bottom" v-model="serviceTargetShow">
+              <div class="field">
+                <div v-for="(item,index) in serviceTarget" :key="index">{{item}}
+                  <van-icon name="clear" color="#999" @click="clearserviceTarget(index)" />
+                </div>
+              </div>
               <van-search placeholder="请输入姓名查询" @input="listChildInfoByName" v-model="positionSearch" />
               <van-picker cancel-button-text='取消' value-key="title" show-toolbar :columns="childList" @confirm="onConfirmPicker" @cancel="serviceTargetShow = false">
                 <template #option="item">
@@ -158,6 +163,13 @@ export default {
     }
   },
   methods: {
+    clearserviceTarget(index) {
+      if (!this.form.serviceTarget) return
+      var serviceTarget = this.form.serviceTarget.split(',')
+      serviceTarget.splice(index, 1)
+      this.serviceTarget.splice(index, 1)
+      this.form.serviceTarget = serviceTarget.join(',')
+    },
     clickdateshow() {
       if (this.id) return
       this.dateshow = !this.dateshow
@@ -291,6 +303,19 @@ export default {
 .message {
   padding: 0 30px;
 }
+.field {
+  padding: 0 30px;
+  display: flex;
+  margin-top: 16px;
+  div {
+    margin: 0 10px;
+    font-size: 26px;
+    padding: 10px;
+    line-height: normal;
+    background-color: #eee;
+    border-radius: 40px;
+  }
+}
 .topBox {
   padding: 24px 0;
   border-bottom: 1px solid #eee;

+ 12 - 5
src/views/weibao/views/loveHelp/index.vue

@@ -14,13 +14,13 @@
     <van-list v-model="loading" :finished="finished" :immediate-check="false" finished-text="没有更多了" @load="onLoad">
       <div class="list" v-for="item in dataList" :key="item.id" @click="$router.push({path:'/loveHelp/details',query:{id:item.id,orgId:item.orgId}})">
         <div class="img">
-          <van-image fit="scale-down" :src="getpics(item.pics)" alt="" />
+          <van-image fit="cover" :src="getpics(item.pics)" alt="" />
         </div>
         <div class="text">
           <p class="title">{{item.name}}</p>
-          <p class="mes">活动日期:{{item.workDate}}</p>
-          <p class="date">主办单位:{{item.orgName}}</p>
-          <p class="date">活动地址:{{item.address}}</p>
+          <p class="mes">活动日期{{item.workDate}}</p>
+          <p class="date">主办单位{{item.orgName}}</p>
+          <p class="date address">活动地址:{{item.address}}</p>
         </div>
       </div>
     </van-list>
@@ -89,6 +89,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.address {
+  width: 100%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 p {
   margin: 0;
   margin-top: 16px;
@@ -124,7 +130,8 @@ p {
       text-overflow: ellipsis;
       font-size: 30px;
     }
-    .mes {
+    .mes,
+    .date {
       font-size: 26px;
     }
     p {

+ 1 - 16
src/views/weibao/views/reporting/index.vue

@@ -60,7 +60,7 @@ export default {
       historyList: [],
     }
   },
-  created() {
+  activated() {
     this.mandatoryPage()
   },
   methods: {
@@ -87,21 +87,6 @@ export default {
         this.loading = false
       }
     },
-    getpics(item) {
-      console.log(item)
-      if (!item) return
-      var url = ''
-      var arr = item.split(',')
-      arr.forEach((item, index) => {
-        if (item.indexOf('.jpg') || item.indexOf('.png')) {
-          url = arr[index]
-          console.log(url, 'url')
-          return
-        }
-      })
-      console.log(url, 'url')
-      return url
-    },
   },
 }
 </script>

+ 7 - 1
src/views/weibao/views/specialServices/details.vue

@@ -53,7 +53,7 @@
               <video v-else @click="showvideoplay=true,videourl=item" style="object-fit:cover;" :src="item" poster='../../assets/video.png'></video>
             </div>
           </div>
-          <van-image-preview v-model="show" :images="appendFile.filter(item => item.indexOf('mp4')<0)"></van-image-preview>
+          <van-image-preview v-model="show" :images="filterimg()"></van-image-preview>
         </div>
         <van-dialog style="width:100%;border-radius:0;height:200px" v-model="showvideoplay" :show-cancel-button="false" :show-confirm-button="false" closeOnClickOverlay>
           <video controls preload="auto" style="width:100%;height:200px;object-fit: contain;" :src="videourl" v-if="videourl"></video>
@@ -76,6 +76,7 @@ export default {
       },
       positionSearch: '',
       id: '',
+      videourl: '',
       address: '',
     }
   },
@@ -94,6 +95,11 @@ export default {
       if (!res.data.multiMediaUrl) return
       this.appendFile = this.form.multiMediaUrl.split(',')
     },
+    filterimg() {
+      var img = this.appendFile.filter((item) => item.indexOf('mp4') < 0)
+      console.log(img, 'img')
+      return img
+    },
   },
 }
 </script>

+ 1 - 1
src/views/weibao/views/specialServices/index.vue

@@ -46,7 +46,7 @@ export default {
       historyList: [],
     }
   },
-  created() {
+  activated() {
     this.pageAppProject()
     this.pageProjectHistory()
   },

+ 39 - 5
src/views/weibao/views/specialServices/startServiceplay.vue

@@ -17,9 +17,14 @@
         <van-row class="cell">
           <van-col span="6">服务对象:</van-col>
           <van-col span="18">
-            <!-- <div class="serviceTarget" @click="serviceTargetPopup">{{form.serviceTarget?form.serviceTarget:'请选择'}}</div> -->
+            <!-- <div class="serviceTarget" @click="serviceTargetPopup">{{form.serviceTarget}}</div> -->
             <van-field @click="serviceTargetPopup" :rules="[{ required: true}]" type="textarea" v-model="form.serviceTarget" placeholder="请输入服务对象" disabled />
             <van-popup position="bottom" v-model="serviceTargetShow">
+              <div class="field">
+                <div v-for="(item,index) in serviceTarget" :key="index">{{item}}
+                  <van-icon name="clear" color="#999" @click="clearserviceTarget(index)" />
+                </div>
+              </div>
               <van-search placeholder="请输入姓名查询" @input="listChildInfoByName" v-model="positionSearch" />
               <van-picker cancel-button-text='取消' value-key="title" show-toolbar :columns="childList" @confirm="onConfirmPicker" @cancel="serviceTargetShow = false">
                 <template #option="item">
@@ -44,7 +49,7 @@
         <van-row class="cell">
           <van-col span="6">选择街道:</van-col>
           <van-col span="18" @click="streetshowPopup">
-            <van-field v-model="form.streetName" :rules="[{ required: true}]" placeholder="请选择街道" />
+            <van-field v-model="form.streetName" :rules="[{ required: true}]" placeholder="请选择街道" disabled />
             <!-- {{form.streetName?form.streetName:'请选择'}} -->
           </van-col>
           <van-popup v-model="streetShow" position="bottom" :style="{ height: '50%' }">
@@ -61,13 +66,13 @@
           <van-col span="6">服务人员:</van-col>
           <van-col span="18">
             <van-field v-model="form.serviceStaff" :rules="[{ required: true}]" @click="serviceShow=true" placeholder="请选择服务人员" disabled />
-            <van-popup v-model="serviceShow" position="bottom" :style="{ height: '30%' }">
+            <van-popup v-model="serviceShow" position="bottom" :style="{ height: '50%' }">
               <div class="popup">
                 <div class="btn">
                   <div @click="serviceShow=false" class="cancle">取消</div>
                   <div @click="serviceConfirm" class="confirm">确定</div>
                 </div>
-                <van-checkbox-group v-model="result">
+                <van-checkbox-group class="group" v-model="result">
                   <van-cell-group>
                     <van-cell v-for="(item,index) in employeeList" clickable :key="index" :title="item.name" @click="toggle(item,index)">
                       <template #right-icon>
@@ -128,6 +133,7 @@ export default {
       multiMediaUrl: [],
       form: {
         fileList: [],
+        serviceTarget: '123',
       },
       streetList: '',
       servicetTime: new Date(),
@@ -147,11 +153,18 @@ export default {
   },
   created() {
     this.dataInfo = this.$route.query.item
-    this.form = { fileList: [], ...this.dataInfo }
+    this.form = { serviceTarget: '', fileList: [], ...this.dataInfo }
     this.getStreetList()
     this.getEmployeeList()
   },
   methods: {
+    clearserviceTarget(index) {
+      if (!this.form.serviceTarget) return
+      var serviceTarget = this.form.serviceTarget.split(',')
+      serviceTarget.splice(index, 1)
+      this.serviceTarget.splice(index, 1)
+      this.form.serviceTarget = serviceTarget.join(',')
+    },
     async getEmployeeList() {
       const res = await getEmployeeList()
       this.employeeList = res.data
@@ -282,6 +295,19 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.field {
+  padding: 0 30px;
+  display: flex;
+  margin-top: 16px;
+  div {
+    margin: 0 10px;
+    font-size: 26px;
+    padding: 10px;
+    line-height: normal;
+    background-color: #eee;
+    border-radius: 40px;
+  }
+}
 .tx {
   width: 160px;
   height: 160px;
@@ -389,11 +415,19 @@ export default {
 }
 .popup {
   padding: 0 30px;
+  overflow: hidden;
+  height: 100%;
   .btn {
     padding: 16px 0;
     display: flex;
+    height: 80px;
     justify-content: space-between;
   }
+  .group {
+    margin-top: 30px;
+    height: calc(100% - 180px);
+    overflow: auto;
+  }
   .cancle {
     font-size: 26px;
     font-weight: bold;