Merge pull request '关联设备进出方向' (#89) from lukeyan into master

Reviewed-on: #89

src/api/closeLoopDispose/index.js

@@ -24,11 +24,35 @@ export function get_backlog(data) {
         data
     })
 }
-// 待办任务查询 
+// 待办任务公司树查询 
 export function get_backlog_company_tree(params) {
     return request({
-        url: 'closedloopdisposal/workflow/dept/list',
+        url: '/closedloopdisposal/workflow/dept/list',
         method: 'get',
         params
     })
+}
+// 审批流程 
+export function get_backlog_approve(data) {
+    return request({
+        url: '/workflow/external/task/approve',
+        method: 'post',
+        data
+    })
+}
+// 已办任务查询 
+export function get_complete(data) {
+    return request({
+        url: '/workflow/external/finishedList',
+        method: 'post',
+        data
+    })
+}
+// 抄送我的查询 
+export function get_copy(data) {
+    return request({
+        url: '/workflow/external/copyList',
+        method: 'post',
+        data
+    })
 }

src/views/closeLoopDispose/components/backlogDetail.vue

@@ -6,6 +6,7 @@
         <BacklogDetailForm
           ref="backlogDetailForm"
           :backlog_detail="backlog_detail"
+          @back_home_page="back_home_page"
         ></BacklogDetailForm>
       </el-tab-pane>
       <el-tab-pane label="流程图" name="second">
@@ -39,6 +40,11 @@ export default {
       activeName: "first",
     };
   },
+  methods:{
+    back_home_page() {
+      this.$emit('back_home_page')
+    },
+  }
 };
 </script>
 <style lang="less" scoped>

src/views/closeLoopDispose/components/backlogDetailDialog.vue

@@ -28,6 +28,7 @@
           show-checkbox
           node-key="id"
           :default-expand-all="defaultExpandAll"
+          :default-checked-keys="default_keys"
           @check="handle_check"
         >
           <span
@@ -61,12 +62,19 @@ export default {
       },
       defaultExpandAll: true, // 控制公司树默认展开
       company_list: [],
+      default_keys: [], // 控制选中部门二次打开回显展示
     };
   },
   methods: {
     open() {
       this.visible = true;
       this.handle_click();
+      console.log("this.company_list", this.company_list);
+      // 非首次打开弹窗时保持上次选中部门的回显
+      if (this.company_list != []) {
+        this.default_keys = this.company_list.map((item) => item.id);
+        console.log('this.default_keys',this.default_keys);
+      }
     },
     handle_click() {
       let param = {
@@ -78,13 +86,13 @@ export default {
     },
     handle_check(data, checkedData) {
       console.log("data", data);
-      console.log("checkedData", checkedData); 
-      this.company_list = checkedData.checkedNodes // 获取选中公司的数组
+      console.log("checkedData", checkedData);
+      this.company_list = checkedData.checkedNodes; // 获取选中公司的数组
     },
     // 确定关闭弹窗
     enter() {
-       this.$emit('push_data',this.company_list)
-       this.visible = false; 
+      this.$emit("push_data", this.company_list);
+      this.visible = false;
     },
     close() {
       this.visible = false;

src/views/closeLoopDispose/components/backlogDetailForm.vue

@@ -85,8 +85,8 @@
             </div>
           </el-form-item>
           <el-form-item>
-            <el-button>处置完成</el-button>
-            <el-button class="dispose_lose">处置失败</el-button>
+            <el-button @click="dispose_complete">处置完成</el-button>
+            <el-button class="dispose_lose" @click="dispose_fail">处置失败</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -96,8 +96,8 @@
       <div class="backlog_idea_body">
         <!-- 遍历展示人员信息 -->
         <div
-          v-for="item in backlog_list"
-          :key="item.id"
+          v-for="item in opinion_list"
+          :key="item.taskDefKey"
           class="backlog_idea_person"
         >
           <div class="backlog_idea_person_img">
@@ -107,31 +107,31 @@
               </div>
             </el-image>
             <div class="backlog_idea_person_information">
-              <div class="backlog_idea_person_name">{{ item.name }}</div>
-              <div class="backlog_idea_person_team">{{ item.team }}</div>
+              <div class="backlog_idea_person_name">{{ item.assigneeName }}</div>
+              <div class="backlog_idea_person_team">{{ item.candidate }}</div>
             </div>
           </div>
           <div class="backlog_idea_person_text">
             <!-- 第一行，处理意见 -->
             <div class="dispose_idea">
               <div class="backlog_text">处理意见:</div>
-              <div class="backlog_value">{{ item.backlog_value }}</div>
+              <div class="backlog_value">{{ item.comment }}</div>
             </div>
             <!-- 第二行，附件 按需显示或者隐藏 -->
-            <div v-if="attachment_show" class="attachment">
-              <div class="backlog_text">附件:</div>
+            <!-- <div v-if="attachment_show" class="attachment">
+              <div class="backlog_text">附件:</div> -->
               <!-- 此处后面会改为下载图片链接 -->
-              <div class="backlog_value">{{ item.attachment_value }}</div>
-            </div>
+              <!-- <div class="backlog_value">{{ item.attachment_value }}</div>
+            </div> -->
             <!-- 第三行，抄送人 -->
             <div class="send_person">
               <div class="backlog_text">抄送人:</div>
-              <div class="backlog_value">{{ item.send_person }}</div>
+              <div class="backlog_value">{{ item.assigneeName }}</div>
             </div>
             <!-- 第四行，时间 -->
             <div class="backlog_time">
               <div class="backlog_text">时间:</div>
-              <div class="backlog_value">{{ item.backlog_time }}</div>
+              <div class="backlog_value">{{ item.createTime }}</div>
             </div>
           </div>
         </div>
@@ -146,6 +146,7 @@
   <script>
 import BacklogDetailDialog from "./backlogDetailDialog";
 import { get_my_course_record } from "@/api/closeLoopDispose";
+import { get_backlog_approve } from "@/api/closeLoopDispose";
 export default {
   name: "BacklogDetailForm",
   components: {
@@ -208,10 +209,9 @@ export default {
         { label: "驳回", value: "3" },
         { label: "处置中", value: "4" },
       ],
-      tags: [
-        
-      ],
+      tags: [],
       process_status: "", // 流程状态展示
+      opinion_list: [], // 流转意见
     };
   },
   created() {
@@ -227,6 +227,7 @@ export default {
       this.process_status = this.status_list.find(
         (item) => item.value == this.basic_message.alarmStatus
       ).label;
+      this.opinion_list = res.data.doneTaskVoList; // 流转意见
     });
   },
   methods: {
@@ -236,10 +237,40 @@ export default {
     // 树中选中单位的数据
     push_data(val) {
       console.log("dalog", val);
-      this.tags = val
+      this.tags = val;
       // let list = val.map((item) => item.name);
       // this.form.section = list.slice(0, 3).toString();
     },
+    // 处置通过
+    dispose_complete() {
+      let param = {
+        procInsId: this.backlog_detail.procInsId,
+        taskId: this.backlog_detail.taskId,
+        comment:this.form.suggest,
+        approveType:'2',
+        copyDeptIds: this.tags.map(item =>item.id)
+      };
+      get_backlog_approve(param).then(res=>{
+        console.log('res_approve',res);
+        this.$message.success('处置通过')
+        this.$emit('back_home_page') // 回归首页
+      });
+    },
+    // 处置失败
+    dispose_fail() {
+      let param = {
+        procInsId: this.backlog_detail.procInsId,
+        taskId: this.backlog_detail.taskId,
+        comment:this.form.suggest,
+        approveType:'3',
+        copyDeptIds: this.tags.map(item =>item.id)
+      };
+      get_backlog_approve(param).then(res=>{
+        console.log('res_approve',res);
+        this.$message.warning('处置失败')
+        this.$emit('back_home_page') // 回归首页
+      });
+    }
   },
 };
 </script>

src/views/closeLoopDispose/components/complete.vue

@@ -51,11 +51,11 @@
           </el-table-column>
           <el-table-column prop="createTime" label="创建时间" width="240">
           </el-table-column>
-          <el-table-column prop="course_type" label="流程类型" width="200">
+          <el-table-column prop="processType" label="流程类型" width="160">
           </el-table-column>
-          <el-table-column prop="build_person" label="创建者" width="200">
+          <el-table-column prop="startUserName" label="创建者" width="200">
           </el-table-column>
-          <el-table-column prop="build_unit" label="创建单位" width="200">
+          <el-table-column prop="startDeptName" label="创建单位" width="220">
           </el-table-column>
           <el-table-column prop="course_status" label="流程状态" width="200">
             <template slot-scope="scope">
@@ -98,6 +98,7 @@
   </div>
 </template>
 <script>
+import { get_complete } from "@/api/closeLoopDispose";
 export default {
   name: "Complete",
   data() {
@@ -151,6 +152,9 @@ export default {
       total: 0,
     };
   },
+  created() {
+    this.search_data();
+  },
   methods: {
     change_complete(val) {
       this.search.procStatus = this.complete_list.find(
@@ -162,23 +166,44 @@ export default {
         pageSize: this.pageSize,
         page: this.pageNum,
         startTime:
-          this.search.course_time == null
+          this.search.complete_time == null
             ? ""
-            : this.dateConversion(this.search.course_time[0]),
+            : this.dateConversion(this.search.complete_time[0]),
         endTime:
-          this.search.course_time == null
+          this.search.complete_time == null
             ? ""
-            : this.dateConversion(this.search.course_time[1]),
+            : this.dateConversion(this.search.complete_time[1]),
         searchKey: this.search.word,
         procStatus: this.search.procStatus,
       };
-      console.log(param);
+      get_complete(param).then((res) => {
+        this.table_data = res.rows;
+        this.total = res.total;
+      });
     },
     reset() {
       this.search.procStatus = "0";
       this.search.complete_status = "";
       this.search.complete_time = [this.get_today(), this.get_tomorrow()];
       this.search.word = "";
+      this.search_data();
+    },
+    // 转换时间格式
+    dateConversion(value) {
+      let date = new Date(value);
+      let y = date.getFullYear();
+      let m = date.getMonth() + 1;
+      m = m < 10 ? "0" + m : m;
+      let d = date.getDate();
+      d = d < 10 ? "0" + d : d;
+      let h = date.getHours();
+      h = h < 10 ? "0" + h : h;
+      let M = date.getMinutes();
+      M = M < 10 ? "0" + M : M;
+      let s = date.getSeconds();
+      s = s < 10 ? "0" + s : s;
+      let dateTime = y + "-" + m + "-" + d + " " + h + ":" + M + ":" + s;
+      return dateTime;
     },
     // 获取当前时间
     get_today() {
@@ -235,10 +260,12 @@ export default {
       console.log(`每页 ${val} 条`);
       this.pageNum = 1;
       this.pageSize = val;
+      this.search_data();
     },
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
       this.pageNum = val;
+      this.search_data();
     },
   },
 };

src/views/closeLoopDispose/components/completeDetail.vue

@@ -3,33 +3,43 @@
   <div>
     <el-tabs v-model="activeName">
       <el-tab-pane label="表单信息" name="first">
-        <CompleteDetailForm :complete_detail="complete_detail" ref="completeDetailForm"></CompleteDetailForm>
+        <CompleteDetailForm
+          :complete_detail="complete_detail"
+          ref="completeDetailForm"
+        ></CompleteDetailForm>
       </el-tab-pane>
       <el-tab-pane label="流程图" name="second">
-        
+        <CompleteDetailPicture ref="copyDetailPicture"></CompleteDetailPicture>
       </el-tab-pane>
       <el-tab-pane label="流转记录" name="third">
-        
+        <CompleteDetailRecords
+          :complete_detail="complete_detail"
+          ref="completeDetailRecords"
+        ></CompleteDetailRecords>
       </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 <script>
-import CompleteDetailForm from "./completeDetailForm"
+import CompleteDetailForm from "./completeDetailForm";
+import CompleteDetailPicture from "./completeDetailPicture";
+import CompleteDetailRecords from "./completeDetailRecords";
 export default {
   name: "CompleteDetail",
-  components:{
+  components: {
     CompleteDetailForm,
+    CompleteDetailPicture,
+    CompleteDetailRecords,
   },
-  props:{
-    complete_detail:{}, // -> 从complete传过来的单条表格详情数据
+  props: {
+    complete_detail: {}, // -> 从complete传过来的单条表格详情数据
   },
   data() {
     return {
       activeName: "first",
     };
   },
-  methods:{},
+  methods: {},
 };
 </script>
 <style lang="less" scoped>

src/views/closeLoopDispose/components/completeDetailForm.vue

@@ -33,7 +33,24 @@
         <!-- 此列为数据展示 -->
         <div class="basic_message_value_two">
           <div class="basic_message_value_tag">
-            {{ this.basic_message.companyName }}
+            <div class="basic_message_value_company">
+              {{ this.basic_message.companyName }}
+            </div>
+            <div class="basic_message_value_list">
+              <div
+                :class="{
+                  shewei: val == '剧毒' || val == '易制毒',
+                  zhongdian: val == '消防重点' || val == '所管消防',
+                  zhibao: val == '放射源' || val == '易制爆',
+                  zhian:
+                    val == '治安重点' || val == '创安单位' || val == '外资合资',
+                }"
+                v-for="(val, index) in this.basic_message.companyTypeList"
+                :key="index"
+              >
+                {{ val }}
+              </div>
+            </div>
           </div>
           <div class="basic_message_value">
             {{ this.process_status }}
@@ -49,8 +66,8 @@
       <div class="complete_idea_body">
         <!-- 遍历展示人员信息 -->
         <div
-          v-for="item in complete_list"
-          :key="item.id"
+          v-for="item in opinion_list"
+          :key="item.taskDefKey"
           class="complete_idea_person"
         >
           <div class="complete_idea_person_img">
@@ -60,31 +77,31 @@
               </div>
             </el-image>
             <div class="complete_idea_person_information">
-              <div class="complete_idea_person_name">{{ item.name }}</div>
-              <div class="complete_idea_person_team">{{ item.team }}</div>
+              <div class="complete_idea_person_name">{{ item.assigneeName }}</div>
+              <div class="complete_idea_person_team">{{ item.candidate }}</div>
             </div>
           </div>
           <div class="complete_idea_person_text">
             <!-- 第一行，处理意见 -->
             <div class="dispose_idea">
               <div class="complete_text">处理意见:</div>
-              <div class="complete_value">{{ item.complete_value }}</div>
+              <div class="complete_value">{{ item.comment }}</div>
             </div>
             <!-- 第二行，附件 按需显示或者隐藏 -->
-            <div v-if="attachment_show" class="attachment">
-              <div class="complete_text">附件:</div>
+            <!-- <div v-if="attachment_show" class="attachment"> -->
+              <!-- <div class="complete_text">附件:</div> -->
               <!-- 此处后面会改为下载图片链接 -->
-              <div class="complete_value">{{ item.attachment_value }}</div>
-            </div>
+              <!-- <div class="complete_value">{{ item.attachment_value }}</div> -->
+            <!-- </div> -->
             <!-- 第三行，抄送人 -->
             <div class="complete_person">
               <div class="complete_text">抄送人:</div>
-              <div class="complete_value">{{ item.complete_person }}</div>
+              <div class="complete_value">{{ item.assigneeName }}</div>
             </div>
             <!-- 第四行，时间 -->
             <div class="complete_time">
               <div class="complete_text">时间:</div>
-              <div class="complete_value">{{ item.complete_time }}</div>
+              <div class="complete_value">{{ item.createTime }}</div>
             </div>
           </div>
         </div>
@@ -93,7 +110,7 @@
   </div>
 </template>
 <script>
-// import { get_my_complete_record } from "@/api/closeLoopDispose";
+import { get_my_course_record } from "@/api/closeLoopDispose";
 export default {
   name: "CompleteDetailForm",
   props: {
@@ -103,53 +120,13 @@ export default {
     return {
       attachment_show: true, // 附件 按需显示或者隐藏
       basic_message: {},
-      complete_list: [
-        {
-          id: "1",
-          personUrl: "../../../assets/companyFile/avatar.png",
-          name: "吴沁",
-          team: "技侦大队",
-          complete_value:
-            "2022年8月20日0时32分,我队接到预警称浙江浙江鑫甬生物化工股份有限公司存在运输车辆频繁违章情况。接报后值班民警于立即到达现场,经现场了解到:危化品运输车(浙B2M50R)为外来租赁货车,司机王某(身份证号:42109119880717****)疑似前科重点人员。目前司机已经带回所以便进一步调查。2022年8月20日0时32分,我队接到预警称浙江浙江鑫甬生物化工股份有限公司存在运输车辆频繁违章情况。接报后值班民警于立即到达现场,经现场了解到:危化品运输车(浙B2M50R)为外来租赁货车,司机王某(身份证号:42109119880717****)疑似前科重点人员。目前司机已经带回所以便进一步调查。",
-          attachment_value: "20220820现场处置照片.jpg",
-          complete_person: "蔡坤、黄毅、李丹丹、张强强",
-          complete_time: "2022-11-13  12:10:08",
-        },
-        {
-          id: "2",
-          personUrl: "../../../assets/companyFile/avatar.png",
-          name: "吴沁",
-          team: "技侦大队",
-          complete_value:
-            "2022年8月26日12时许,经过分析,我队决定对浙江浙江鑫甬生物化工股份有限公司的外来租赁危化品运输车(浙B2M50R)司机王某(身份证号:42109119880717****）做出吊销货车驾照处罚，立即执行。",
-        },
-        {
-          id: "3",
-          personUrl: "../../../assets/companyFile/avatar.png",
-          name: "吴沁",
-          team: "技侦大队",
-          complete_value:
-            "2022年8月26日12时许,经过分析,我队决定对浙江浙江鑫甬生物化工股份有限公司的外来租赁危化品运输车(浙B2M50R)司机王某(身份证号:42109119880717****）做出吊销货车驾照处罚，立即执行。",
-        },
-        {
-          id: "4",
-          personUrl: "../../../assets/companyFile/avatar.png",
-          name: "吴沁",
-          team: "技侦大队",
-          complete_value:
-            "2022年8月20日0时32分,我队接到预警称浙江浙江鑫甬生物化工股份有限公司存在运输车辆频繁违章情况。接报后值班民警于立即到达现场,经现场了解到:危化品运输车(浙B2M50R)为外来租赁货车,司机王某(身份证号:42109119880717****)疑似前科重点人员。目前司机已经带回所以便进一步调查。2022年8月20日0时32分,我队接到预警称浙江浙江鑫甬生物化工股份有限公司存在运输车辆频繁违章情况。接报后值班民警于立即到达现场,经现场了解到:危化品运输车(浙B2M50R)为外来租赁货车,司机王某(身份证号:42109119880717****)疑似前科重点人员。目前司机已经带回所以便进一步调查。",
-          attachment_value: "20220820现场处置照片.jpg",
-          complete_person: "蔡坤、黄毅、李丹丹、张强强",
-          complete_time: "2022-11-13  12:10:08",
-        },
-      ],
       status_list: [
         { label: "待审核", value: "1" },
         { label: "通过", value: "2" },
         { label: "驳回", value: "3" },
         { label: "处置中", value: "4" },
       ],
-      process_status:'', // 流程状态展示
+      process_status: "", // 流程状态展示
     };
   },
   created() {
@@ -160,11 +137,11 @@ export default {
       procInsId: this.complete_detail.procInsId,
       taskId: this.complete_detail.taskId,
     };
-    // get_my_complete_record(param).then((res) => {
-    //   this.basic_message = res.data;
-    //   this.process_status = this.status_list.find(item=>item.value === this.basic_message.alarmStatus).label
-    // });
-    console.log(param);
+    get_my_course_record(param).then((res) => {
+      this.basic_message = res.data;
+      this.process_status = this.status_list.find(item=>item.value == this.basic_message.alarmStatus).label
+      this.opinion_list = res.data.doneTaskVoList; // 流转意见
+    });
   },
   methods: {},
 };
@@ -232,7 +209,86 @@ export default {
         width: 52vw;
         height: 4vh;
         line-height: 4vh;
-        color: #409eff;
+        display: flex;
+        .basic_message_value_company {
+          color: #409eff;
+        }
+        .basic_message_value_list {
+          display: flex;
+          .shewei {
+            height: 26px;
+            line-height: 26px;
+            width: 60px;
+            margin-top: 9px;
+            margin-left: 5px;
+            background: url("~@/assets/companyFile/编组 11991.png") no-repeat;
+            padding: 1px 5px;
+            font-size: 14px;
+            color: #b5ebff;
+            letter-spacing: 0.44px;
+            font-weight: 400;
+            background-size: 100% 100%;
+            margin-right: 5px;
+            margin-bottom: 5px;
+            text-align: center;
+          }
+
+          .zhongdian {
+            height: 26px;
+            line-height: 26px;
+            width: 80px;
+            margin-top: 9px;
+            margin-left: 5px;
+            background: url("~@/assets/companyFile/编组 11222221.png") no-repeat;
+            padding: 1px 5px;
+            font-size: 14px;
+            color: #e3deff;
+            letter-spacing: 0.44px;
+            font-weight: 400;
+            background-size: 100% 100%;
+            margin-right: 5px;
+            margin-bottom: 5px;
+            text-align: center;
+          }
+
+          .zhibao {
+            height: 26px;
+            line-height: 26px;
+            width: 60px;
+            margin-top: 9px;
+            margin-left: 5px;
+            background: url("~@/assets/companyFile/编组 11991备份 10.png")
+              no-repeat;
+            padding: 1px 5px;
+            font-size: 14px;
+            color: #e3deff;
+            letter-spacing: 0.44px;
+            font-weight: 400;
+            background-size: 100% 100%;
+            margin-right: 5px;
+            margin-bottom: 5px;
+            text-align: center;
+          }
+
+          .zhian {
+            height: 26px;
+            line-height: 26px;
+            width: 80px;
+            margin-top: 9px;
+            margin-left: 5px;
+            background: url("~@/assets/companyFile/编组 11991备份 21.png")
+              no-repeat;
+            padding: 1px 5px;
+            font-size: 14px;
+            color: #e3deff;
+            letter-spacing: 0.44px;
+            font-weight: 400;
+            background-size: 100% 100%;
+            margin-right: 5px;
+            margin-bottom: 5px;
+            text-align: center;
+          }
+        }
       }
       .basic_message_value {
         width: 52vw;

src/views/closeLoopDispose/components/completeDetailRecords.vue

@@ -63,7 +63,7 @@
   </div>
 </template>
 <script>
-// import { get_my_course_record } from "@/api/closeLoopDispose";
+import { get_my_course_record } from "@/api/closeLoopDispose";
 export default {
   name: "CompleteDetailRecords",
   props: {
@@ -72,30 +72,6 @@ export default {
   data() {
     return {
       record_list: [
-        // {
-        //   id: "1",
-        //   name: "卫健部门",
-        //   opeartion_num: "2",
-        //   have_opeartion_num: "1",
-        //   not_opeartion_num: "1",
-        //   table_list: [
-        //     {
-        //       change: "吴沁",
-        //       under_change: "治安大队",
-        //       type: "已操作",
-        //       load_time: "2023-06-06 12:53:30",
-        //       time: "2023-06-06 12:53:30",
-        //       use_time: "2秒",
-        //     },
-        //   ],
-        // },
-        // {
-        //   id: "2",
-        // },
-        // {
-        //   id: "3",
-        //   name: "发布人",
-        // },
       ],
       src: require("../../../assets/companyFile/loadtrue.png"),
       icon_show: true, // 控制图标显示隐藏
@@ -110,20 +86,10 @@ export default {
       procInsId: this.complete_detail.procInsId,
       taskId: this.complete_detail.taskId,
     };
-    console.log(param);
-    // get_my_course_record(param).then((res) => {
-    //   this.record_list = res.data.wfDetailVo.recordList;
-    //   console.log("this.record_list", this.record_list);
-    //   // for(let i = 0; i < this.record_list.length;i++) {
-    //   //   if ( i + 1 == this.record_list.length )  {
-    //   //     this.step_line_show = false
-    //   //   } else {
-    //   //     this.step_line_show = true
-    //   //   }
-    //   //   console.log('i + 1', i + 1);
-    //   //   console.log('this.record_list', this.record_list.length);
-    //   // }
-    // });
+    get_my_course_record(param).then((res) => {
+      this.record_list = res.data.wfDetailVo.recordList;
+      console.log("this.record_list", this.record_list);
+    });
   },
   methods: {
     // 表头样式

src/views/closeLoopDispose/components/copy.vue

@@ -47,13 +47,13 @@
           :header-cell-style="table_header"
           :cell-style="{ background: 'revert', 'text-align': 'center' }"
         >
-          <el-table-column prop="procDefName" label="流程名称" width="420">
+          <el-table-column prop="processName" label="流程名称" width="420">
           </el-table-column>
           <el-table-column prop="createTime" label="创建时间" width="240">
           </el-table-column>
           <el-table-column prop="course_type" label="流程类型" width="200">
           </el-table-column>
-          <el-table-column prop="build_person" label="创建者" width="200">
+          <el-table-column prop="originatorName" label="创建者" width="200">
           </el-table-column>
           <el-table-column prop="build_unit" label="创建单位" width="200">
           </el-table-column>
@@ -97,8 +97,9 @@
   </div>
 </template>
 <script>
+import { get_copy } from "@/api/closeLoopDispose";
 export default {
-  name: "Complete",
+  name: "Copy",
   data() {
     return {
       search: {
@@ -150,6 +151,9 @@ export default {
       total: 0,
     };
   },
+  created() {
+    this.search_data();
+  },
   methods: {
     change_copy(val) {
       this.search.procStatus = this.copy_list.find(
@@ -161,23 +165,27 @@ export default {
         pageSize: this.pageSize,
         page: this.pageNum,
         startTime:
-          this.search.course_time == null
+          this.search.copy_time == null
             ? ""
-            : this.dateConversion(this.search.course_time[0]),
+            : this.dateConversion(this.search.copy_time[0]),
         endTime:
-          this.search.course_time == null
+          this.search.copy_time == null
             ? ""
-            : this.dateConversion(this.search.course_time[1]),
+            : this.dateConversion(this.search.copy_time[1]),
         searchKey: this.search.word,
         procStatus: this.search.procStatus,
       };
-      console.log(param);
+      get_copy(param).then((res) => {
+        this.table_data = res.rows;
+        this.total = res.total;
+      });
     },
     reset() {
       this.search.procStatus = "0";
       this.search.copy_status = "";
       this.search.copy_time = [this.get_today(), this.get_tomorrow()];
       this.search.word = "";
+      this.search_data();
     },
     // 获取当前时间
     get_today() {
@@ -203,6 +211,22 @@ export default {
         y + "-" + m + "-" + d + " " + "00" + ":" + "00" + ":" + "00";
       return dateTime;
     },
+    dateConversion(value) {
+      let date = new Date(value);
+      let y = date.getFullYear();
+      let m = date.getMonth() + 1;
+      m = m < 10 ? "0" + m : m;
+      let d = date.getDate();
+      d = d < 10 ? "0" + d : d;
+      let h = date.getHours();
+      h = h < 10 ? "0" + h : h;
+      let M = date.getMinutes();
+      M = M < 10 ? "0" + M : M;
+      let s = date.getSeconds();
+      s = s < 10 ? "0" + s : s;
+      let dateTime = y + "-" + m + "-" + d + " " + h + ":" + M + ":" + s;
+      return dateTime;
+    },
     // 处置点击跳转
     check_details(val) {
       this.$emit("change_copy_detail", val); // 通知跳转
@@ -234,10 +258,12 @@ export default {
       console.log(`每页 ${val} 条`);
       this.pageNum = 1;
       this.pageSize = val;
+      this.search_data();
     },
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
       this.pageNum = val;
+      this.search_data();
     },
   },
 };

src/views/closeLoopDispose/components/copyDetailForm.vue

@@ -133,9 +133,9 @@ export default {
   created() {
     console.log("copy_detail11", this.copy_detail); // -> 从copy传过来的单条表格详情数据
     let param = {
-      definitionId: this.copy_detail.procDefId,
-      deployId: this.copy_detail.deployId,
-      procInsId: this.copy_detail.procInsId,
+      definitionId: this.copy_detail.processId,
+      deployId: this.copy_detail.deploymentId,
+      procInsId: this.copy_detail.instanceId,
       taskId: this.copy_detail.taskId,
     };
     get_my_course_record(param).then((res) => {
@@ -362,7 +362,7 @@ export default {
   margin-left: 1vw;
   display: flex;
   .course_idea_person_img {
-    width: 10vw;
+    width: 15vw;
     height: 7vh;
     margin-left: 1.5vw;
     // border: 0.1px solid #3f5564;

src/views/closeLoopDispose/components/copyDetailRecords.vue

@@ -105,9 +105,9 @@ export default {
   created() {
     console.log("copy_detail2", this.copy_detail);
     let param = {
-      definitionId: this.copy_detail.procDefId,
-      deployId: this.copy_detail.deployId,
-      procInsId: this.copy_detail.procInsId,
+      definitionId: this.copy_detail.processId,
+      deployId: this.copy_detail.deploymentId,
+      procInsId: this.copy_detail.instanceId,
       taskId: this.copy_detail.taskId,
     };
     get_my_course_record(param).then((res) => {

src/views/closeLoopDispose/components/myCourse.vue

@@ -190,7 +190,7 @@ export default {
     // 详情点击跳转
     check_details(val) {
       console.log('12344',val);
-      this.$emit("change_to_detail", val); // 通知跳转
+      this.$emit("change_complete_detail", val); // 通知跳转
     },
     // 转换时间格式
     dateConversion(value) {

src/views/closeLoopDispose/index.vue

@@ -45,6 +45,7 @@
     <BacklogDetail
       :backlog_detail="backlog_detail"
       ref="backlogDetail"
+      @back_home_page="back_home_page"
       v-else-if="is_flag === '2'"
     ></BacklogDetail>
     <!-- 已办流程详情tab页 -->

src/views/systemManagement/correlationEquipment/components/equipmentTable.vue

@@ -248,7 +248,7 @@ export default {
         { prop: "deviceName", label: "设备名称", width: "270" },
         { prop: "devicePerceptionSubTypeCn", label: "设备类型" },
         { prop: "deviceIp", label: "设备IP" },
-        { prop: "orientationCn", label: "进出方向" },
+        { prop: "directionCn", label: "进出方向" },
       ],
       handle_video: "", // 选中视频表格数据
       handle_perception: "", // 选中智能表格数据