Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs

package.json

@@ -16,6 +16,7 @@
 		"cropperjs": "1.5.12",
 		"crypto-js": "4.1.1",
 		"d3": "^7.6.1",
+		"dagre": "^0.8.5",
 		"dagre-d3": "^0.4.18",
 		"echarts": "5.3.2",
 		"element-plus": "2.2.3",

src/api/model/ecm.js

@@ -90,6 +90,15 @@ export default {
 					data);
 			}
 		},
+		export_excel: {
+			name: "导出",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/ecm/event/export_excel/`,
+					data
+				);
+			}
+		}
 	}
 	,
 	

src/components/scOpl/scFire.vue

@@ -47,6 +47,9 @@
           <span v-for="item in form.measures_checked_" :key="item.id">{{
             item.name
           }}<el-divider direction="vertical"></el-divider></span>
+        </el-descriptions-item>
+		<el-descriptions-item label="监控状态:" span=2>
+          <span v-if="form.mtask_uid">进行中</span>
         </el-descriptions-item>
       </el-descriptions>
 	</el-card>

src/views/ecm/event.vue

@@ -42,7 +42,14 @@
         clearable
       />
       </div>
-      <div class="right-panel"></div>
+      <div class="right-panel">
+        <el-button
+            type="primary"
+            :loading = 'dLoading'
+            icon="el-icon-download"
+            @click="exportList"
+          >下载</el-button>
+      </div>
     </el-header>
     <el-main class="nopadding">
       <scTable
@@ -152,6 +159,7 @@ export default {
   },
   data() {
     return {
+      dLoading: false,
       defaultTime: ['00:00:00', '23:59:59'],
       timeRange: [],
       objCateOptions: {
@@ -237,6 +245,16 @@ export default {
     resetQuery() {
       this.query = {};
     },
+
+    exportList() {
+      this.dLoading = true;
+     this.$API.ecm.event.export_excel
+              .req(this.query)
+              .then(res=>{
+                window.open(res.path, "_blank");
+                this.dLoading = false;
+              }).catch(e=>{this.dLoading = false;})
+    }
   },
 };
 </script>

src/views/opm/opl.vue

@@ -70,8 +70,9 @@
         <el-table-column label="作业负责人" prop="charger"><template #default="scope">
             {{ scope.row.charger_.name }}
           </template></el-table-column>
-        <el-table-column label="作业监护人" prop="monitor"><template #default="scope">
+        <el-table-column label="监控状态" prop="mtask_uid">
-            {{ scope.row.monitor_.name }}
+          <template #default="scope">
+            <span v-if="scope.row.mtask_uid">进行中</span>
           </template></el-table-column>
 
         <el-table-column label="操作" fixed="right" width="100">
@@ -116,7 +117,7 @@ export default {
       state_: {
         10: "创建中",
         20: "审批中",
-        30: "待入厂",
+        30: "待开始",
         40: "进行中",
         50: "已完成",
       },

src/views/wf/dutywork.vue

@@ -51,10 +51,7 @@
         </el-table-column>
         <el-table-column label="可处理人" :show-overflow-tooltip="true">
                      <template #default="scope">
-            <span v-if="scope.row.participant_type==1">
+            <span v-if="scope.row.participant_type==2 || scope.row.participant_type == 1">
-              {{ scope.row.participant_ .name}}
-            </span>
-            <span v-else-if="scope.row.participant_type==2">
               <span v-for="item in scope.row.participant_" :key="item.id">{{ item.name}}/</span>
             </span>
             <span v-else>