bug修复

src/assets/css/index.scss

@@ -14,7 +14,7 @@ body .app {
 
 }
 pre{
-  margin:0px;
+  margin:0;
   word-wrap: break-word;
   white-space: break-spaces;
   font-size: inherit;
@@ -64,3 +64,9 @@ pre{
   position: absolute;
   left: -14px;
 }
+
+.text-style{
+  word-break: break-word;
+  white-space: pre-wrap;
+  text-align: justify;
+}

src/components/HoursCell/index.vue

@@ -13,6 +13,7 @@
         v-model="selected"
         type="time"
         :columns="columns"
+        :formatter="formatter"
         @cancel="cancelPicker"
         @confirm="pickerConfirm"
       />
@@ -75,6 +76,15 @@ export default {
     }
   },
   methods:{
+    formatter(type, val) {
+      if (type === 'hour') {
+        return val + '时';
+      }
+      if (type === 'minute') {
+        return val + '分';
+      }
+      return val;
+    },
     cancelPicker(){
       this.showPicker = false;
     },

src/components/dateCell/index.vue

@@ -15,6 +15,7 @@
         v-model="selected"
         :type="dateType"
         :columns="columns"
+        :formatter="formatter"
         @cancel="cancelPicker"
         @confirm="pickerConfirm"
         confirm-button-text="确定"

src/config/env.development.js

@@ -1,8 +1,8 @@
 /** 本地开发环境*/
 module.exports = {
   title: 'soc-app-dev',
-  baseUrl: 'http://10.87.10.55:8080', // 本地图片地址
-  baseApi: '/dev', // 本地api请求地址,注意：如果你使用了代理，请设置成'/'
+  baseUrl: 'http://10.87.21.107:8080', // 本地图片地址
+  baseApi: '/test', // 本地api请求地址,注意：如果你使用了代理，请设置成'/'
   APPID: 'xxx',
   APPSECRET: 'xxx',
   $cdn: 'https://www.sunniejs.cn/static'  //静态资源

src/views/menu/message/index.vue

@@ -20,7 +20,7 @@
             </template>
             <template #label>
               <div class="cell-label">
-                <p >{{v.content}}</p>
+                <p class="text-style">{{v.content}}</p>
               </div>
               <p class="cell-time">{{v.publishTime}}</p>
             </template>
@@ -289,9 +289,6 @@ export default {
     overflow: auto;
     >p{
       text-indent: 2em;
-      word-break: break-word;
-      white-space: pre-wrap;
-      text-align: justify;
       width: 100%;
       color: #777;
     }

src/views/menu/problemItem/detail.vue

@@ -6,6 +6,13 @@
       <div class="card" v-if="taskInfo">
         <van-panel :title="taskInfo.srcTaskName">
           <div class="panel-box">
+            <van-cell title="问题状态">
+              <div slot="label">
+                <span :style="{color:getState(getDictLabel(taskInfo.reformStatus,'question_reform_status'))}">
+                  {{getDictLabel(taskInfo.reformStatus,'question_reform_status')}}
+                </span>
+              </div>
+            </van-cell>
             <van-cell title="隐患所在机构" :label="taskInfo.orgName" />
             <van-cell title="检查项" :label="taskInfo.checkItem" />
             <van-cell title="检查内容" :label="taskInfo.checkContent" />
@@ -50,7 +57,11 @@
           <div class="panel-box">
             <van-cell title="整改日期" :label="formatDate(taskInfo.reform.reformDate,'YYYY-MM-DD')"></van-cell>
 <!--            <van-cell title="审核结果" :label="taskInfo.reform.executeStatus === 0 ? '已整改' : '未整改'"></van-cell>-->
-            <van-cell title="整改描述" :label="taskInfo.reform.description"></van-cell>
+            <van-cell title="整改描述">
+              <template #label>
+                <p class="text-style">{{taskInfo.reform.description}}</p>
+              </template>
+            </van-cell>
             <van-cell title="上传信息" v-if="taskInfo.reform.images">
               <div slot="label" v-if="taskInfo.reform.images && taskInfo.reform.images.length > 0">
                 <div class="nfc-img van-hairline--surround" v-for="(v,i) in taskInfo.reform.images" :key="v" @click="clickImage(taskInfo.reform.images,i)">
@@ -198,7 +209,7 @@ export default {
       },
       type:null,
       preViewImages:{},
-      dicts:['resumption_status','rectification_deadline'],
+      dicts:['resumption_status','question_reform_status','rectification_deadline'],
     }
   },
   mounted() {
@@ -210,6 +221,16 @@ export default {
   },
   methods:{
     formatDate,
+    getState(state){
+      switch (state){
+        case '待整改':
+          return '#008cd6';
+        case '已整改':
+          return '#009240';
+        case '已逾期':
+          return '#D7000F';
+      }
+    },
     //图片预览
     clickImage(arr,i){
       this.preViewImages.images = arr.map(v=>imgUrl(v));

src/views/menu/problemItem/index.vue

@@ -66,8 +66,13 @@
               <van-cell :border="false">
                 <template #default>
                   <div class="info-box">
-                    <div class="info-desc">隐患描述：<span>{{v.questionDesc}}</span></div>
-                    <div class="info-item">发现日期：<span>{{v.submitTime}}</span></div>
+                    <div class="info-desc">问题状态:
+                      <span :style="{color:getState(getDictLabel(v.reformStatus,'question_reform_status'))}">
+                        {{getDictLabel(v.reformStatus,'question_reform_status')}}
+                      </span>
+                    </div>
+                    <div class="info-desc">隐患描述: <span>{{v.questionDesc}}</span></div>
+                    <div class="info-item">发现日期: <span>{{v.submitTime}}</span></div>
                   </div>
                 </template>
               </van-cell>
@@ -144,6 +149,16 @@ export default {
     ...mapGetters(['orgId','id','dictionary']),
   },
   methods: {
+    getState(state){
+      switch (state){
+        case '待整改':
+          return '#008cd6';
+        case '已整改':
+          return '#009240';
+        case '已逾期':
+          return '#D7000F';
+      }
+    },
     refreshData(){
       this.pullup = true;
       this.query.pageNum = 1;

src/views/menu/resumption/detail.vue

@@ -192,7 +192,6 @@
                   :placeholder="enable ? '请输入情况描述' : ''"
                 />
                 <van-field
-                  :required="enable"
                   :readonly="!enable"
                   rows="1"
                   name="uploader"
@@ -747,7 +746,7 @@ export default {
             let item = this.checks[i];
             if(point.resValue === 0){
               this.checks[i].points[j].rectificationDeadline = null;
-              this.checks[i].points[j].imgs = [];
+              //this.checks[i].points[j].imgs = [];
               this.checks[i].points[j].resRemark = null;
             }
             if (point.dataStatus === 1) {

src/views/menu/safetyBook/detail.vue

@@ -14,7 +14,6 @@
       </van-cell-group>
       <div class="book-list">
         <div class="card" v-for="(v,i) in bookList" :key="v.id">
-          <van-cell  title="签署人" :value="v.userName"></van-cell>
           <van-cell  title="签署时间" :value="dayjs(v.time).format('YYYY-MM-DD')"></van-cell>
           <van-cell v-if="v.files && v.files.length > 0"  title="签署文件" >
             <template #label>

src/views/menu/securityCheckRegister/detail.vue

@@ -61,8 +61,12 @@
                       <span>{{ img.checkName }}</span>
                     </div>
                   </van-cell>
-                  <van-cell  title="情况描述" :label="item.remark"></van-cell>
-                  <van-cell title="整改期限" :border="false" :value="item.rectificationDeadline"></van-cell>
+                  <van-cell  title="情况描述">
+                    <template #label>
+                      <p class="text-style">{{item.remark}}</p>
+                    </template>
+                  </van-cell>
+                  <van-cell  title="整改期限" :border="false" :value="item.rectificationDeadline"></van-cell>
 <!--                  <select-cell-->
 <!--                    required-->
 <!--                    :disabled="!enable"-->

src/views/menu/visitRecord/add.vue

@@ -27,11 +27,11 @@
               :data-list="userList"
               required>
             </select-cell>
+            <van-cell title="证件类型" :value="getDictLabel(selectedUser.idType,'letter_id_type')"></van-cell>
+            <van-cell title="证件号码" :value="selectedUser.idCard"></van-cell>
             <van-cell title="介绍信类型" :value="getDictLabel(selectedUser.type,'out_in_type')"></van-cell>
             <van-cell title="来访事由" :value="selectedUser.reasons"></van-cell>
             <van-cell title="来访单位" :value="selectedUser.companyName"></van-cell>
-            <van-cell title="证件类型" :value="selectedUser.idType"></van-cell>
-            <van-cell title="证件号码" :value="selectedUser.idCard"></van-cell>
             <div class="upload-box"  v-if="selectedUser.imgFile && selectedUser.imgFile.length > 0">
               <span>证件图片</span>
               <van-cell>
@@ -111,7 +111,7 @@ export default {
         accompanyingPerson:null,
         checkImage:null,
       },
-      dicts:['out_in_approve_status','out_in_type']
+      dicts:['out_in_approve_status','letter_id_type','out_in_type']
     }
   },
   computed:{

src/views/menu/visitRegister/add.vue

@@ -94,7 +94,7 @@
            <div class="card-cell-box">
             <van-cell title="来访单位" :value="v.companyName"></van-cell>
             <van-cell title="来访人员" :value="v.userName"></van-cell>
-             <van-cell title="证件类型" :value="getDictLabel(v.idType,'letter_id_type')"></van-cell>
+            <van-cell title="证件类型" :value="getDictLabel(v.idType,'letter_id_type')"></van-cell>
             <van-cell title="证件号码" :value="v.idCard"></van-cell>
            </div>
           </div>