Hwf hai 6 meses
pai
achega
783ce5e532

+ 36 - 17
src/views/emergencyCommandMap/RightSection/RenWuGengXin.vue

@@ -5,64 +5,71 @@
         <el-form ref="taskFormRef" :model="newTask" :rules="rules">
           <el-row :gutter="20">
             <el-col :span="24">
-              <el-form-item label="任务描述:" label-width="300px" >
+              <el-form-item label="任务描述:" label-width="300px">
                 <div class="display-field">{{ newTask.task_description }}</div>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="任务类型:" label-width="300px" >
+              <el-form-item label="任务类型:" label-width="300px">
                 <div class="display-field">{{ get_task_type_text(newTask.task_type) }}</div>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="登记人:" label-width="300px" >
+              <el-form-item label="登记人:" label-width="300px">
                 <div class="display-field">{{ newTask.registrar }}</div>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="执行人:" label-width="300px" >
+              <el-form-item label="执行人:" label-width="300px">
                 <div class="display-field">{{ newTask.executor }}</div>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="执行单位:" label-width="300px" >
+              <el-form-item label="执行单位:" label-width="300px">
                 <div class="display-field">{{ newTask.unit_name }}</div>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="联系电话:" label-width="300px" >
+              <el-form-item label="联系电话:" label-width="300px">
                 <div class="display-field">{{ newTask.contact_phone }}</div>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="完成时限:" label-width="300px" >
+              <el-form-item label="完成时限:" label-width="300px">
                 <div class="display-field">{{ newTask.expire_time }}</div>
               </el-form-item>
             </el-col>
-            <!--
             <el-col :span="24">
-              <el-form-item label="图片:">
-                <div class="display-field">{{ newTask.complete_time }}</div>
+              <el-form-item label="图片:" label-width="300px">
+                <el-image
+                  v-for="(item, index) in newTask.imgList"
+                  :key="index"
+                  class="custom-image"
+                  :src="baseUrl + downLoadApi + item.url"
+                  :preview-teleported="true"
+                  fit="cover"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="文件:">
-                <div class="display-field">{{ newTask.complete_time }}</div>
+              <el-form-item label="文件:" label-width="300px">
+                <a v-for="(item, index) in newTask.fileList" :key="index" :href="baseUrl + downLoadApi + item.url" target="_blank">
+                  <el-text type="primary">{{ item.name }}</el-text>
+                </a>
               </el-form-item>
             </el-col>
-            -->
             <el-col :span="24">
-              <el-form-item label="反馈人:" label-width="300px" >
+              <el-form-item label="反馈人:" label-width="300px">
                 <div class="display-field">{{ newTask.registrar }}</div>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="反馈内容:" label-width="300px"  prop="feedback_content">
+              <el-form-item label="反馈内容:" label-width="300px" prop="feedback_content">
                 <el-input v-model="newTask.feedback_content" class="custom-input2" clearable placeholder="请输入反馈内容"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="完成进度:" label-width="300px"  prop="processing_status">
+              <el-form-item label="完成进度:" label-width="300px" prop="processing_status">
                 <el-select
                   v-model="newTask.processing_status"
                   class="custom-select"
@@ -108,6 +115,8 @@ const props = defineProps({
 });
 
 const taskFormRef = ref();
+const baseUrl = import.meta.env.VITE_APP_BASE_API;
+const downLoadApi = import.meta.env.VITE_APP_BASE_DOWNLOAD_API;
 const emit = defineEmits(['update:modelValue', 'update-success']);
 const newTask = reactive({ ...props.task });
 const units = ref(['待处理', '已完成']);
@@ -187,7 +196,17 @@ watch(
 .custom-select {
   //width: 500px !important; // 使用 !important 强制覆盖默认样式
 }
-
+.custom-image {
+  width: 300px;
+  height: 300px;
+  margin-left: 20px;
+  &:first-child {
+    margin-left: 0;
+  }
+}
+.el-text {
+  font-size: 28px;
+}
 .dialog-body {
   padding: 20px;
 }

+ 8 - 0
src/views/emergencyCommandMap/RightSection/RightTop.vue

@@ -32,6 +32,7 @@
                 -->
               </div>
               <div class="box-content">{{ notification.content }}</div>
+              <div v-if="!!notification.comment" class="box-content2">领导批示:{{ notification.comment }}</div>
             </div>
           </div>
         </div>
@@ -262,6 +263,13 @@ watch(
           line-height: 1.5;
           margin-top: 10px;
         }
+        .box-content2 {
+          color: #ff4d4f;
+          width: 100%;
+          font-size: 38px;
+          line-height: 1.5;
+          margin-top: 10px;
+        }
       }
     }
   }

+ 3 - 3
src/views/emergencyCommandMap/RightSection/TaskDelivery.vue

@@ -15,7 +15,7 @@
               <div class="common-btn-primary2" @click="handleShowApprove(task)">领导批示</div>
             </div>
             <p class="task-description">{{ task.content }}</p>
-            <p class="task-text">{{ task.comment }}</p>
+            <p v-if="!!task.comment" class="task-text">领导批示:{{ task.comment }}</p>
             <div v-if="task.show" class="form-box">
               <el-input v-model="task.content2" class="custom-input" placeholder="请输入领导审批意见" />
               <div class="form-footer">
@@ -131,7 +131,8 @@ const handleSubmit = (item) => {
     align-items: center;
   }
   .task-text {
-    color: red;
+    color: #ff4d4f;
+    font-size: 38px;
   }
   .form-box {
     .form-footer {
@@ -153,7 +154,6 @@ const handleSubmit = (item) => {
   word-break: break-all;
   white-space: pre-wrap;
 }
-
 .dialog-footer {
   display: flex;
   justify-content: flex-end;