From 913425b0011d3ab9d8f7c83fa4c4f1c5686d44f0 Mon Sep 17 00:00:00 2001
From: xiepeng <xiepeng@zcloudchina.com>
Date: Wed, 22 May 2024 18:12:27 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/application/safetymeeting/safetymeeting-detail.vue | 3 ++-
 pages/basics/basic-info/components/baseInfo.vue          | 9 ++++-----
 pages/basics/basic-info/user-info.vue                    | 1 +
 pages/login/register/baseInfo.vue                        | 6 +++---
 pages/news/news-list-detail.vue                          | 3 ++-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pages/application/safetymeeting/safetymeeting-detail.vue b/pages/application/safetymeeting/safetymeeting-detail.vue
index 3d4a6e3..2ccfafc 100644
--- a/pages/application/safetymeeting/safetymeeting-detail.vue
+++ b/pages/application/safetymeeting/safetymeeting-detail.vue
@@ -37,7 +37,7 @@
 
 
           <view class="message-warp" v-if="pd.VIDEO_SIGN_ROUTE">
-            <video :src="pd.VIDEO_SIGN_ROUTE" controls="true"></video>
+            <video :src="baseImgPath + pd.VIDEO_SIGN_ROUTE" controls="true"></video>
           </view>
 
 
@@ -183,6 +183,7 @@
 						if (res.data != null) {
 							uni.hideLoading();
               _this.pd = res.data.pd;
+              console.log(_this.pd)
 						} else {
 							uni.showToast({
 								title: res.data.message,
diff --git a/pages/basics/basic-info/components/baseInfo.vue b/pages/basics/basic-info/components/baseInfo.vue
index bec4ab5..76f2f8b 100644
--- a/pages/basics/basic-info/components/baseInfo.vue
+++ b/pages/basics/basic-info/components/baseInfo.vue
@@ -28,7 +28,7 @@
               :multiple="true"
               :list="dictData.PERSONNEL_TYPE.list"
               :show-search="false"
-              v-model="formData.PERSONNEL_TYPE_NAME"
+              v-model="formData.PERSONNEL_TYPE"
               label-key="NAME"
               value-key="DICTIONARIES_ID"
               placeholder="请选择人员类型"
@@ -47,7 +47,7 @@
           </picker>
         </view>-->
         <view class="cu-form-group margin-top">
-          <view class="title is-required">文化程度</view>
+          <view class="title">文化程度</view>
           <view v-if="forbidEdit" style="color: #cccccc">{{formData.DEGREE_OF_EDUCATION_NAME}}</view>
           <picker v-else @change="pickerChangeData($event,'DEGREE_OF_EDUCATION')" :value="dictData.DEGREE_OF_EDUCATION.index" :range="dictData.DEGREE_OF_EDUCATION.list" range-key="NAME">
             <view class="picker">
@@ -56,7 +56,7 @@
           </picker>
         </view>
         <view class="cu-form-group margin-top-xs">
-          <view class="title is-required">政治面貌</view>
+          <view class="title">政治面貌</view>
           <view v-if="forbidEdit" style="color: #cccccc">{{formData.POLITICAL_OUTLOOK_NAME}}</view>
           <picker v-else @change="pickerChangeData($event,'POLITICAL_OUTLOOK')" :value="dictData.POLITICAL_OUTLOOK.index" :range="dictData.POLITICAL_OUTLOOK.list" range-key="NAME">
             <view class="picker">
@@ -65,7 +65,7 @@
           </picker>
         </view>
         <view class="cu-form-group margin-top-xs">
-          <view class="title is-required">参加工作日期</view>
+          <view class="title">参加工作日期</view>
           <view v-if="forbidEdit" style="color: #cccccc">{{formData.WORKING_DATE}}</view>
           <picker v-else mode="date" @change="changeDate($event,'WORKING_DATE')" :value="formData.WORKING_DATE" :end="limitData.WORKING_DATE.end">
             <view class="picker">
@@ -300,7 +300,6 @@ import ZqsSelect from "../../../../components/zqs-select/zqs-select.vue";
         }
         return true;
       },
-
 		}
 	}
 </script>
diff --git a/pages/basics/basic-info/user-info.vue b/pages/basics/basic-info/user-info.vue
index df3c89d..e35c26a 100644
--- a/pages/basics/basic-info/user-info.vue
+++ b/pages/basics/basic-info/user-info.vue
@@ -243,6 +243,7 @@ import Apply from "./components/apply.vue"
 						if (res.data != null) {
 							uni.hideLoading();
 							_this.form = res.data.pd;
+              _this.form.PERSONNEL_TYPE = _this.form.PERSONNEL_TYPE.length>0 ? _this.form.PERSONNEL_TYPE.split(',') : []
               res.data.certificateList.forEach((item, index) => {
                 if (item.CERTIFICATE_CATEGORY === '1') {
                   _this.form.ID_CARD_FRONT = item.ID_PHOTO_FRONT
diff --git a/pages/login/register/baseInfo.vue b/pages/login/register/baseInfo.vue
index e184941..abc52ef 100644
--- a/pages/login/register/baseInfo.vue
+++ b/pages/login/register/baseInfo.vue
@@ -42,7 +42,7 @@
           </picker>
         </view>-->
         <view class="cu-form-group margin-top">
-          <view class="title is-required">文化程度</view>
+          <view class="title">文化程度</view>
           <picker @change="pickerChangeData($event,'DEGREE_OF_EDUCATION')" :value="dictData.DEGREE_OF_EDUCATION.index" :range="dictData.DEGREE_OF_EDUCATION.list" range-key="NAME">
             <view class="picker">
               {{formData.DEGREE_OF_EDUCATIONNAME?formData.DEGREE_OF_EDUCATIONNAME:'请选择'}}
@@ -50,7 +50,7 @@
           </picker>
         </view>
         <view class="cu-form-group margin-top-xs">
-          <view class="title is-required">政治面貌</view>
+          <view class="title">政治面貌</view>
           <picker @change="pickerChangeData($event,'POLITICAL_OUTLOOK')" :value="dictData.POLITICAL_OUTLOOK.index" :range="dictData.POLITICAL_OUTLOOK.list" range-key="NAME">
             <view class="picker">
               {{formData.POLITICAL_OUTLOOKNAME?formData.POLITICAL_OUTLOOKNAME:'请选择'}}
@@ -58,7 +58,7 @@
           </picker>
         </view>
         <view class="cu-form-group margin-top-xs">
-          <view class="title is-required">参加工作日期</view>
+          <view class="title">参加工作日期</view>
           <picker mode="date" @change="changeDate($event,'WORKING_DATE')" :value="formData.WORKING_DATE" :end="limitData.WORKING_DATE.end">
             <view class="picker">
               {{formData.WORKING_DATE?formData.WORKING_DATE:'请选择'}}
diff --git a/pages/news/news-list-detail.vue b/pages/news/news-list-detail.vue
index 220a29f..90be0b1 100644
--- a/pages/news/news-list-detail.vue
+++ b/pages/news/news-list-detail.vue
@@ -21,7 +21,7 @@
         </view>
 
         <view class="message-warp" v-if="pd.VIDEO_ROUTE">
-          <video :src="pd.VIDEO_ROUTE" controls="true"></video>
+          <video :src="baseImgPath + pd.VIDEO_ROUTE" controls="true"></video>
         </view>
         <view class="message-warp" v-if="pd.ATTACHMENT_ROUTE">
           <view class="cu-item" @click="$noMultipleClicks(goStuToOpen,pd.ATTACHMENT_ROUTE)">
@@ -50,6 +50,7 @@
 	export default {
 		data() {
 			return {
+        baseImgPath: baseImgPath,
         id:'',
 				content:'',
 				pd: {},