巡点检计划详情和工单详情修改、bug修复

src/views/maintenance/components/redeployOther.vue

@@ -203,6 +203,8 @@
             this.visible = false;
             this.$emit('refresh');
             this.btnLoading = false;
+          }).catch(() => {
+            this.btnLoading = false;
           });
         } else {
           return this.$message.warning('请选择转派人员');

src/views/maintenance/patrol/plan/details.vue

@@ -34,16 +34,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="部门">
+                <el-form-item label="指定执行人">
                   <span v-if="infoData.executor && infoData.executor.length">
-                    {{ infoData.executor[0].deptName }}
-                  </span>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="人员">
-                  <span v-if="infoData.executor && infoData.executor.length">
-                    {{ infoData.executor.map((i) => i.name).join(',') }}
+                    {{ infoData.executor.map((i) => `${i.groupName}-${i.name}`).join(',') }}
                   </span>
                 </el-form-item>
               </el-col>

src/views/maintenance/patrol/workOrder/details.vue

@@ -12,48 +12,58 @@
                   query: { title: '工单' }
                 })
               "
-              >返回</el-button
+            >
+              返回</el-button
             >
           </HeaderTitle>
           <el-row>
             <el-col :span="24">
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="计划单号">
                   <span> {{ infoData.planCode }} </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="来源计划配置单号">
                   <span> {{ infoData.planConfigCode }} </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="名称">
                   <span> {{ infoData.planName }} </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="部门">
-                  <span>
-                    {{ infoData.executeGroupName }}
+              <el-col :span="8">
+                <el-form-item label="指定执行人">
+                  <span v-if="infoData.assignUser">
+                    {{
+                      infoData.assignUser
+                        .map((i) => {
+                          return `${i.groupName}-${i.userName}`;
+                        })
+                        .join(',')
+                    }}
                   </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="人员">
-                  <span>
-                    {{ infoData.executeUserName }}
+              <el-col :span="8">
+                <el-form-item label="实际执行人">
+                  <span v-if="infoData.executeUserName">
+                    {{ infoData.executeGroupName }}-{{
+                      infoData.executeUserName
+                    }}
                   </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+
+              <el-col :span="8">
                 <el-form-item label="计划完成时长">
                   <span v-if="infoData.duration >= 0"
                     >{{ infoData.duration }}分钟</span
                   >
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="周期">
                   <span v-if="infoData.ruleInfo">
                     {{ infoData.ruleInfo.cycleValue
@@ -63,40 +73,55 @@
                   </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="设备分类">
                   <span> {{ infoData.categoryLevelName }} </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="规则名称">
                   <span>
                     {{ infoData.ruleName }}
                   </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="创建部门">
                   <span> {{ infoData.createGroupName }} </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="创建人">
                   <span> {{ infoData.createUserName }} </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="创建时间">
                   <span> {{ infoData.createTime }} </span>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="实际开始时间">
+                  <span> {{ infoData.acceptTime }} </span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="实际完成时间">
+                  <span> {{ infoData.finishTime }} </span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="报工时间">
+                  <span> {{ infoData.reportTime }} </span>
+                </el-form-item>
+              </el-col>
               <el-col :span="24">
                 <el-form-item label="备注">
                   <span> {{ infoData.remark }} </span>
                 </el-form-item>
               </el-col>
             </el-col>
-            <!-- <el-col :span="12">
+            <!-- <el-col :span="8">
               <img :src="data.imageUrl" alt="" />
             </el-col> -->
           </el-row>
@@ -426,9 +451,9 @@
           .then((data) => {
             data.deviceList.forEach((item) => {
               item.workItems.forEach((val) => {
-                val.photoList.map(url=>{
-                  return window.location.origin+url
-                })
+                val.photoList.map((url) => {
+                  return window.location.origin + url;
+                });
               });
             });
             this.infoData = data;

vue.config.js

@@ -35,7 +35,8 @@ module.exports = {
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.139:18086', // 粟
         // target: 'http://192.168.1.132:18086', // 徐
-        target: 'http://192.168.1.125:18086', //本
+        // target: 'http://192.168.1.125:18086', //本
+        target: 'http://192.168.1.116:18086', // 赵沙金
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''