flx：冲突

src/store/index.js

@@ -85,6 +85,30 @@ export default new Vuex.Store({
         // tag: 部署河南项目时，需要打开这两行代码
 
 
+    // BASEURL: baseUrl
+    //   ? baseUrl
+    //   : window.location.protocol + "//" + window.location.host + "/", //正式环境
+    // UPLOADURL:
+    //   window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
+    // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
+    // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
+    // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
+    // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
+    // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
+    //---------------------------------------------------------------------------------------------
+    // BASEURL: baseUrl
+    //   ? baseUrl
+    //   : window.location.protocol + "//" + window.location.host + "/api/", //金林湾部署地址
+    // UPLOADURL:
+    //   window.location.protocol +
+    //   "//" +
+    //   window.location.host +
+    //   "/api/upload/image", //金林湾部署地址
+    // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //金林湾部署地址
+    // FILEURL: 'http://182.90.224.237:7000/image/', // UPLOADURL: 'http://182.90.224.237:7000/upload/image',
+    // tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/',
+    /* 2022-05-16 */
+    // tag: 部署河南项目时，需要打开这两行代码
 
         // UPLOADURL: 'http://139.9.66.234:6324/upload/image',
         // FILEURL: 'http://139.9.66.234:6324/image/',

src/views/projectFront/laborManage/safeWorkManage/safeWorkAlarmRecord.vue

@@ -210,6 +210,7 @@ export default {
         { name: "每个项目自检任务", value: 2 },
         { name: "一个月内缺勤超过", value: 3 },
         { name: "一个月内迟到超过", value: 4 },
+        { name: "同一企业同一隐患连续检查到(x)次", value: 5 },
       ],
       timeRange: [],
       searchForm: {