Browse Source

bug修复

凉纪 1 year ago
parent
commit
79578ab7b1
3 changed files with 32 additions and 30 deletions
  1. 3 0
      src/views/menu/message/index.vue
  2. 20 20
      src/views/menu/problemItem/detail.vue
  3. 9 10
      vue.config.js

+ 3 - 0
src/views/menu/message/index.vue

@@ -289,6 +289,9 @@ export default {
     overflow: auto;
     >p{
       text-indent: 2em;
+      word-break: break-word;
+      white-space: pre-wrap;
+      text-align: justify;
       width: 100%;
       color: #777;
     }

+ 20 - 20
src/views/menu/problemItem/detail.vue

@@ -7,19 +7,19 @@
         <van-panel :title="taskInfo.srcTaskName">
           <div class="panel-box">
             <van-cell title="问题状态">
-              <div slot="label">
+              <div slot="right-icon">
                 <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="隐患所在机构" :value="taskInfo.orgName" />
+            <van-cell title="检查项" :value="taskInfo.checkItem" />
             <van-cell title="检查内容" :label="taskInfo.checkContent" />
             <van-cell title="隐患描述" :label="taskInfo.questionDesc" />
-            <van-cell title="发现日期" :label="taskInfo.submitTime" />
-            <van-cell title="提出人" :label="taskInfo.submitorName" />
-            <van-cell title="整改期限" :label="formatDate(taskInfo.reformDeadline,'YYYY-MM-DD')" />
+            <van-cell title="发现日期" :value="taskInfo.submitTime" />
+            <van-cell title="提出人" :value="taskInfo.submitorName" />
+            <van-cell title="整改期限" :value="formatDate(taskInfo.reformDeadline,'YYYY-MM-DD')" />
             <van-cell title="隐患图片" v-if="taskInfo.images && taskInfo.images.length > 0" :border="false" >
               <div slot="label">
                 <div class="nfc-img" v-for="(v,i) in taskInfo.images" :key="v" @click="clickImage(taskInfo.images,i)">
@@ -33,19 +33,19 @@
 
 
       <div class="card" v-if="taskInfo.confirm" >
-        <van-panel title="处理">
+        <van-panel title="处理情况">
           <div class="panel-box">
-            <van-cell title="处理意见" :label="taskInfo.confirm.executeStatus === 0 ? '确认' : '提出异议'"></van-cell>
+            <van-cell title="处理意见" :value="taskInfo.confirm.executeStatus === 0 ? '确认' : '提出异议'"></van-cell>
             <van-cell v-show="taskInfo.confirm.executeStatus===1" title="异议内容" :label="taskInfo.confirm.description"></van-cell>
-            <van-cell title="异议人" :label="taskInfo.confirm.executorName"></van-cell>
+            <van-cell title="异议人" :value="taskInfo.confirm.executorName"></van-cell>
           </div>
         </van-panel>
       </div>
 
       <div class="card" v-if="taskInfo.confirmDissent" >
-        <van-panel title="审批">
+        <van-panel title="审批情况">
           <div class="panel-box">
-            <van-cell title="审核结果" :label="taskInfo.confirmDissent.executeStatus === 0 ? '同意' : '不同意'"></van-cell>
+            <van-cell title="审核结果" :value="taskInfo.confirmDissent.executeStatus === 0 ? '同意' : '不同意'"></van-cell>
 <!--            <van-cell title="审核人" :label="taskInfo.confirmDissent.executorName"></van-cell>-->
             <van-cell v-show="taskInfo.confirmDissent.executeStatus===1" title="原因" :label="taskInfo.confirmDissent.description"></van-cell>
           </div>
@@ -53,9 +53,9 @@
       </div>
 
       <div class="card" v-if="taskInfo.reform" >
-        <van-panel title="整改">
+        <van-panel title="整改情况">
           <div class="panel-box">
-            <van-cell title="整改日期" :label="formatDate(taskInfo.reform.reformDate,'YYYY-MM-DD')"></van-cell>
+            <van-cell title="整改日期" :value="formatDate(taskInfo.reform.reformDate,'YYYY-MM-DD')"></van-cell>
 <!--            <van-cell title="审核结果" :label="taskInfo.reform.executeStatus === 0 ? '已整改' : '未整改'"></van-cell>-->
             <van-cell title="整改描述">
               <template #label>
@@ -147,9 +147,9 @@
       </div>
 
       <div class="card" v-if="type === 'reform'">
-        <van-panel title="整改">
+        <van-panel title="整改情况">
           <div class="panel-box">
-            <date-cell required :max-date="maxDate" title="整改日期" v-model="reformData.reformDate" dateType="date" />
+            <date-cell required :max-date="maxDate" is-row title="整改日期" v-model="reformData.reformDate" dateType="date" />
             <van-field
               required
               v-model="reformData.description"
@@ -323,11 +323,11 @@ export default {
 </script>
 
 <style lang="scss">
-//.question-edit{
-//  .van-panel__header{
-//    color:red
-//  }
-//}
+.question-edit{
+  .panel-box{
+
+  }
+}
 
 </style>
 <style lang="scss" scoped>

+ 9 - 10
vue.config.js

@@ -52,14 +52,6 @@ module.exports = defineConfig({
     },
     /*本地开发请求代理*/
     proxy: {
-      '/online': {
-        target: "http://47.92.229.224:8080",
-          // ws:true,
-          changOrigin:true,
-          pathRewrite:{
-          '^/online':'/'
-        }
-      },
       //配置跨域
       '/luojun': {
           target: "http://10.87.10.49:8080",
@@ -117,12 +109,19 @@ module.exports = defineConfig({
           '^/zl':'/'
         }
       },
-      '/dev': {
-        // target: "http://10.87.21.107:8080",
+      '/online': {
         target: "http://47.92.229.224:8080",
         // ws:true,
         changOrigin:true,
         pathRewrite:{
+          '^/online':'/'
+        }
+      },
+      '/dev': {
+        target: "http://10.87.21.103:8080",
+        // ws:true,
+        changOrigin:true,
+        pathRewrite:{
           '^/dev':'/'
         }
       },