flx:暂存四色图

src/assets/js/api/quality.js

@@ -402,4 +402,10 @@ export const addFourColorDrawPaperApi = data => post('/xmgl/fourColorDrawPaper/a
 // 编辑四色图图纸信息
 export const editFourColorDrawPaperApi = data => post('/xmgl/fourColorDrawPaper/edit', data);
 // 删除四色图图纸信息
-export const deleteFourColorDrawPaperApi = data => post('/xmgl/fourColorDrawPaper/delete', data);
+export const deleteFourColorDrawPaperApi = data => post('/xmgl/fourColorDrawPaper/delete', data);
+// 保存全部四色图图纸图画信息
+export const saveAllFourColorDrawApi = data => post('/xmgl/fourColorDraw/saveAll', data);
+// 通过id查询四色图图纸图画信息
+export const getFourColorDrawByIdApi = data => get('/xmgl/fourColorDraw/queryById', data);
+// 列表查询四色图图纸图画信息
+export const getFourColorDrawListApi = data => get('/xmgl/fourColorDraw/list', data);

src/components/videoModule/isc_plugin/video_isc_plugin.js

@@ -206,6 +206,7 @@ export function InitObjPlugin(appkey, secret, ip, port, type, videoData, layout)
           }, 10);
         }
         oWebControl.JS_CreateWnd("playWnd", width, height, {
+          bEmbed: false,
           cbSetDocTitle: function (uuid) {
             oWebControl._pendBg = false;
             window.parent.postMessage({

src/components/videoModule/playBack/back.js

@@ -206,6 +206,7 @@ export function InitObjPlugin(appkey, secret, ip, port, type, videoData, layout)
           }, 10);
         }
         oWebControl.JS_CreateWnd("playWnd", width, height, {
+          bEmbed: false,
           cbSetDocTitle: function (uuid) {
             oWebControl._pendBg = false;
             window.parent.postMessage({

src/components/videoModule/playBack/playBack.vue

@@ -166,7 +166,7 @@ export default {
                   // 设置消息回调
                   cbIntegrationCallBack: this.cbIntegrationCallBack() // 封装的推送消息方法
                 });
-                this.oWebControl.JS_CreateWnd("playWnds",this.width, this.height).then(() => {
+                this.oWebControl.JS_CreateWnd("playWnds",this.width, this.height, { bEmbed: false }).then(() => {
                   //JS_CreateWnd创建视频播放窗口，宽高可设定
                   this.init(); // 创建播放实例成功后初始化
                 });

src/views/companyAdmin/qualityAndSafety/components/myPictode.vue

@@ -1077,13 +1077,13 @@ export default {
       background-image: url("~@/assets/images/riskRankingControl/fabric_icon2_active.png");
     }
     .el-radio-button:nth-child(3).is-active .el-radio-button__inner {
-      background-image: url("~@/assets/images/riskRankingControl/fabric_icon6_active.png");
+      background-image: url("~@/assets/images/riskRankingControl/fabric_icon9_active.png");
     }
     .el-radio-button:nth-child(4).is-active .el-radio-button__inner {
       background-image: url("~@/assets/images/riskRankingControl/fabric_icon4_active.png");
     }
     .el-radio-button:nth-child(5).is-active .el-radio-button__inner {
-      background-image: url("~@/assets/images/riskRankingControl/fabric_icon7_active.png");
+      background-image: url("~@/assets/images/riskRankingControl/fabric_icon8_active.png");
     }
 
     .el-radio-button:nth-child(1) .el-radio-button__inner {
@@ -1097,14 +1097,14 @@ export default {
     }
 
     .el-radio-button:nth-child(3) .el-radio-button__inner {
-      background-image: url("~@/assets/images/riskRankingControl/fabric_icon6.png");
+      background-image: url("~@/assets/images/riskRankingControl/fabric_icon9.png");
     }
     .el-radio-button:nth-child(4) .el-radio-button__inner {
       background-image: url("~@/assets/images/riskRankingControl/fabric_icon4.png");
     }
     .el-radio-button:nth-child(5) .el-radio-button__inner {
       border-radius: 0 0 3px 3px;
-      background-image: url("~@/assets/images/riskRankingControl/fabric_icon7.png");
+      background-image: url("~@/assets/images/riskRankingControl/fabric_icon8.png");
     }
   }
 }

src/views/projectFront/replayVideoManage/components/playBack/back.js

@@ -206,6 +206,7 @@ export function InitObjPlugin(appkey, secret, ip, port, type, videoData, layout)
           }, 10);
         }
         oWebControl.JS_CreateWnd("playWnd", width, height, {
+          bEmbed: false,
           cbSetDocTitle: function (uuid) {
             oWebControl._pendBg = false;
             window.parent.postMessage({

src/views/projectFront/replayVideoManage/components/playBack/playBack.vue

@@ -143,7 +143,7 @@ export default {
                   // 设置消息回调
                   cbIntegrationCallBack: this.cbIntegrationCallBack() // 封装的推送消息方法
                 });
-                this.oWebControl.JS_CreateWnd("playWnds",this.width, this.height).then(() => {
+                this.oWebControl.JS_CreateWnd("playWnds",this.width, this.height, { bEmbed: false }).then(() => {
                   //JS_CreateWnd创建视频播放窗口，宽高可设定
                   this.init(); // 创建播放实例成功后初始化
                 });

src/views/projectFront/safeManage/v2/riskRankingComponents/fourColorMap.vue

@@ -5,12 +5,18 @@
       <el-button @click="drawer = true" size="medium" type="primary" plain
         >风险四色图设置<i class="el-icon-setting el-icon--right"></i
       ></el-button>
-      <el-select size="medium" filterable v-model="searchInfo.value" placeholder="请选择">
+      <el-select
+        size="medium"
+        filterable
+        v-model="fourColorDrawPaperId"
+        @change="drawPaperChange"
+        placeholder="请选择"
+      >
         <el-option
-          v-for="item in options"
+          v-for="item in tableData"
-          :key="item.value"
+          :key="item.id"
-          :label="item.label"
+          :label="item.fileName"
-          :value="item.value"
+          :value="item.id"
         >
         </el-option>
       </el-select>
@@ -25,20 +31,19 @@
       ref="canvasfabric"
       :canvasWidth="width"
       :canvasHeight="height"
+      :drawer="drawer"
+      :dataInfo="fourColorDrawPaperInfo"
+      @update="getWorkTicketList"
+      @drawerChange="onDrawerChange"
     ></MyPictode>
   </div>
 </template>
 <script>
 import MyFabric from "./components/myfabric.vue";
 import MyPictode from "./components/myPictode.vue";
-import {
+import { getFourColorDrawPaperListApi } from "@/assets/js/api/quality.js";
-  deleteBatchRiskListMonthlyApi,
-  getRiskListMonthlyPageApi,
-  deleteRiskListMonthlyApi,
-  addRiskListMonthlyApi,
-  editRiskListMonthlyApi,
-} from "@/assets/js/api/quality.js";
 import dayjs from "dayjs";
+import { isJSON } from "@/util/nowDate";
 export default {
   components: {
     MyFabric,
@@ -62,12 +67,61 @@ export default {
           label: "双皮奶",
         },
       ],
+      tableData: [],
+      fourColorDrawPaperId: "",
+      fourColorDrawPaperInfo: {},
+      drawer: true,
     };
   },
   created() {
     this.projectSn = this.$store.state.projectSn;
+    this.getWorkTicketList();
+  },
+  mounted() {
+    this.$nextTick(() => {
+      const mypictode = document.querySelector(".mypictode");
+      console.log(mypictode.offsetWidth, mypictode.offsetHeight);
+      this.width = mypictode.offsetWidth;
+      this.height = mypictode.offsetHeight;
+    })
+  },
+  methods: {
+    onDrawerChange(val) {
+      this.drawer = val;
+    },
+    drawPaperChange() {
+      const find = this.tableData.find((item) => item.id == this.fourColorDrawPaperId);
+      if (find) {
+        this.fourColorDrawPaperInfo = find;
+      }
+    },
+    // 获取列表信息
+    getWorkTicketList() {
+      let data = {
+        projectSn: this.projectSn,
+      };
+      getFourColorDrawPaperListApi(data).then((res) => {
+        console.log("我是111", res);
+        if (res.code == 200) {
+          this.tableData = res.result.map((item) => {
+            return {
+              ...item,
+              fileUrl:
+                isJSON(item.fileUrl) &&
+                JSON.parse(item.fileUrl) instanceof Array
+                  ? JSON.parse(item.fileUrl)
+                  : [],
+            };
+          });
+          const find = this.tableData.find((item) => item.isShow == 1);
+          if (find) {
+            this.fourColorDrawPaperId = find.id;
+            this.fourColorDrawPaperInfo = find;
+          }
+        }
+      });
+    },
   },
-  methods: {},
 };
 </script>
 <style lang="less" scoped>
@@ -79,6 +133,10 @@ export default {
     padding: 20px;
     display: flex;
     justify-content: space-between;
+    position: absolute;
+    width: calc(100% - 40px);
+    top: 0;
+    z-index: 10;
     .el-select {
       width: 320px;
     }
@@ -93,5 +151,9 @@ export default {
 }
 .el-button--primary.is-plain {
   background-color: #ffffff;
+  color: #5181F6;
+}
+.el-button--primary.is-plain:hover {
+  color: #5181F6;
 }
 </style>

src/views/projectFront/safeManage/v2/riskRankingControl.vue

@@ -39,11 +39,11 @@
         @openHandelDetail="openHandelDetail"
         style="width: 100%; height: calc(100% - 49px)"
       ></ExecuteCheck>
-      <!-- <FourColorMap
+      <FourColorMap
         v-if="activeIndex == '5'"
         @openHandelDetail="openHandelDetail"
         style="width: 100%; height: calc(100% - 49px)"
-      ></FourColorMap> -->
+      ></FourColorMap>
       <DataCentre
         v-if="activeIndex == '6'"
         @openHandelDetail="openHandelDetail"
@@ -88,6 +88,15 @@ export default {
       },
     };
   },
+  // created() {
+  //   const find = this.$store.state.menuList.find(item => item.path == "/project/safeSame/inspectionLedger");
+  //   if(find) {
+  //     const findAction = ['inspectionLedger_rectificationRecord', 'inspectionLedger_myToDoList', 'inspectionLedger_pendingReview', 'inspectionLedger_myHiddenTrouble', 'inspectionLedger_hazardousWorkDistribution', 'inspectionLedger_hiddenDangerAnalysis'];
+  //     const findIndex = findAction.findIndex(item => find.actionList.some(i => i.actionCode == item));
+  //     this.activeIndex = `${findIndex + 1}`;
+  //     console.log(447788, find.actionList, findIndex)
+  //   }
+  // },
   methods: {
     handleSelect(key, keyPath) {
       // console.log(key, keyPath);

src/views/projectFront/safeSame/hiddenDangerManage.vue

@@ -115,6 +115,15 @@ export default {
       activeIndex: "1",
     };
   },
+  created() {
+    const find = this.$store.state.menuList.find(item => item.path == "/project/safeSame/inspectionLedger");
+    if(find) {
+      const findAction = ['inspectionLedger_rectificationRecord', 'inspectionLedger_myToDoList', 'inspectionLedger_pendingReview', 'inspectionLedger_myHiddenTrouble', 'inspectionLedger_hazardousWorkDistribution', 'inspectionLedger_hiddenDangerAnalysis'];
+      const findIndex = findAction.findIndex(item => find.actionList.some(i => i.actionCode == item));
+      this.activeIndex = `${findIndex + 1}`;
+      console.log(447788, find.actionList, findIndex)
+    }
+  },
   methods: {
     handleSelect(key, keyPath) {
       // console.log(key, keyPath);

src/views/projectFront/safeSame/hiddenDangerModule/myToDoList.vue

@@ -2767,11 +2767,11 @@ export default {
             };
             // 移交
             if(param.status == 2) {
-              data.changeId = this.dealForm.changeId;
+              param.changeId = this.dealForm.changeId;
             } else if(param.status == 3) {
-              data.reviewIds = this.dealForm.changeId ? this.dealForm.changeId.join(",") : [];
+              param.reviewIds = this.dealForm.changeId ? this.dealForm.changeId.join(",") : [];
             } else if(param.status == 4) {
-              data.verifyManIds = this.dealForm.changeId ? this.dealForm.changeId.join(",") : [];
+              param.verifyManIds = this.dealForm.changeId ? this.dealForm.changeId.join(",") : [];
             }
             const objFn = {
               2: updateChangeIdXzSecurityQualityInspectionRecordApi,