Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev

src/assets/i18n/langs/cn/messageCenter.js

@@ -10,58 +10,58 @@ export default {
     content: '内容',
     sendTime: '发送时间',
     noMsg: '暂无消息',
-    options:[{
+    options: [{
         label: "高空火警",
         value: "8"
-      },{
+    }, {
         label: "考勤提醒",
         value: "1"
-      },{
+    }, {
         label: "防疫人员通知",
         value: "2"
-      },{
+    }, {
         label: "防疫车辆通知",
         value: "3"
-      },{
+    }, {
         label: "访客通知",
         value: "16"
-      },{
+    }, {
         label: "混凝土监测",
         value: "4"
-      },{
+    }, {
         label: "卸料平台",
         value: "5"
-      },{
+    }, {
         label: "配电箱",
         value: "6"
-      },{
+    }, {
         label: "扬尘",
         value: "7"
-      },{
+    }, {
         label: "标养室",
         value: "9"
-      },{
+    }, {
         label: "安全检查",
         value: "10"
-      },{
+    }, {
         label: "质量检查",
         value: "11"
-      },{
+    }, {
         label: "塔吊",
         value: "12"
-      },{
+    }, {
         label: "升降机",
         value: "13"
-      },{
+    }, {
         label: "电表",
         value: "14"
-      },{
+    }, {
         label: "水表",
         value: "15"
     }],
     msgCenter: '消息中心',
     hint: '提示',
-    hintContent: '此操作将永久删除该文件, 是否继续?',
+    hintContent: '此操作将永久删除该消息, 是否继续?',
     confirm: '确定',
     cancel: '取消',
     removeSuccess: '删除成功！',

src/assets/i18n/langs/cn/quality.js

@@ -2,11 +2,11 @@ export default {
     checkPoint: '检查部位',
     regionName: '区域名称',
     coding: '编码',
-    unit:'单位',
+    unit: '单位',
     rectificationPeople: '责任人',
     rectificationWork: '整改单位',
-    personLiable:'责任人',
+    personLiable: '责任人',
-    personWork:'责任单位',
+    personWork: '责任单位',
     notifier: '通知人',
     explain: '说明',
     operation: '操作',
@@ -32,7 +32,7 @@ export default {
     hint: '提示',
     confirm: '确定',
     cancel: '取消',
-    detail:'详情',
+    detail: '详情',
     successfullyDelete: '删除成功',
     stop: '停',
     click: '点击',
@@ -94,7 +94,7 @@ export default {
     completed: '已完成',
     unfinished: '未完成',
     uploadPictures: '上传图片',
-    uploadHint: '支持格式jpg,jepg,png，最多上传10张照片',
+    uploadHint: '支持格式jpg,jepg,png，最多上传5张照片',
     uploadAttachment: '上传附件',
     uploadHint2: '只能上传MP3/MP4文件',
     classification: '排查分类',
@@ -150,5 +150,5 @@ export default {
             { required: true, message: "请选择检查时间", trigger: "change" },
         ],
     },
-    failToUpload:'上传失败',
+    failToUpload: '上传失败',
 }

src/store/index.js

@@ -52,8 +52,8 @@ export default new Vuex.Store({
         // FILEURL:'http://182.90.224.237:51234/image/',
         // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
         // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
-        // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
+        // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
-        // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
+        // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
         // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
         // WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
         // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程

src/views/jxjadmin/operateManage.vue

@@ -221,7 +221,9 @@ export default {
         let arr = []
         arr = JSON.parse(val)
         arr.forEach(element => {
-          let url = this.$http.defaults.baseURL + 'xmgl/upload/getRenameFile?fileUrl=' + element.url + '&fileName=' + element.name
+          const fileName = element.name.substring(0,element.name.lastIndexOf("."));
+          let url = this.$http.defaults.baseURL + 'xmgl/upload/getRenameFile?fileUrl=' + element.url + '&fileName=' + fileName
+          // console.log(url, fileName);
           window.location.href = url;
 
         });

src/views/message.vue

@@ -318,6 +318,8 @@ export default {
     margin-right: 10px;
   }
   .msgBox {
+    height: 100%;
+    overflow-y: scroll;
     .title {
       font-size: 15px;
     }

src/views/messageV2.vue

@@ -283,7 +283,7 @@ export default {
   display: flex;
   align-items: center;
   height: 200px;
-  padding: 0 20px;
+  
   margin-bottom: 20px;
   position: relative;
   .el-icon-close {
@@ -309,6 +309,9 @@ export default {
     margin-right: 10px;
   }
   .msgBox {
+    max-height: calc(100% - 40px);
+    overflow-y: auto;
+    padding: 0 20px;
     .title {
       font-size: 15px;
     }
@@ -334,4 +337,33 @@ export default {
     color: #000;
   }
 }
+
+// 美化滚动条
+.msgBox::-webkit-scrollbar {
+  width: 5px;
+  height: 5px;
+}
+
+.msgBox::-webkit-scrollbar-track {
+  width: 6px;
+  background: rgba(#101F1C, 0.1);
+  -webkit-border-radius: 2em;
+  -moz-border-radius: 2em;
+  border-radius: 2em;
+}
+
+.msgBox::-webkit-scrollbar-thumb {
+  background-color: rgba(144,147,153,.5);
+  background-clip: padding-box;
+  min-height: 28px;
+  -webkit-border-radius: 2em;
+  -moz-border-radius: 2em;
+  border-radius: 2em;
+  transition: background-color .3s;
+  cursor: pointer;
+}
+
+.msgBox::-webkit-scrollbar-thumb:hover {
+  background-color: rgba(144,147,153,.3);
+}
 </style>

src/views/projectFront/emergencyDisposal/emergencyPush.vue

@@ -6,7 +6,7 @@
                     <el-form-item label="企业">
                         <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择企业">
                             <el-option :label="item.enterpriseName" :value="item.id"
-                                v-for="(item, index) in responsibilityList" :key="index">
+                                v-for="(item, index) in responsibilityList2" :key="index">
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -168,6 +168,7 @@ export default {
             formLabelWidthDetail: "270px",
             detailData: {},
             responsibilityList: [],
+            responsibilityList2: [],
             planDate: "",
             pickerOptions: {
                 disabledDate(time) {
@@ -317,7 +318,7 @@ export default {
             }).then((res) => {
                 if (res.result) {
                     console.log(res.result, 1)
-                    this.responsibilityList = res.result;
+                    this.responsibilityList2 = res.result;
                 }
             })
         },

src/views/projectFront/laborManage/personAuditAg.vue

@@ -41,9 +41,9 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <!-- <el-form-item label="身份证号">
+          <el-form-item label="身份证号">
             <el-input placeholder="请输入" v-model="tableParameter.idCard"></el-input>
-          </el-form-item> -->
+          </el-form-item>
           <el-form-item>
             <el-button
               type="primary"
@@ -61,6 +61,7 @@
                 tableParameter.workerName = '';
                 tableParameter.enterpriseId = '';
                 tableParameter.isExamPass = '';
+                tableParameter.idCard = '';
                 getInfoList(2);
               "
               plain

src/views/projectFront/laborManage/rosterNew.vue

@@ -1025,6 +1025,15 @@ import {
 } from "@/assets/js/api/project.js";
 import { selectUserDevAuthorityByUserIdApi } from "@/assets/js/api/configManage";
 import comboForm from "./components/comboForm/comboForm.vue";
+import mqtt from "mqtt";
+var client = null;
+const options = {
+  connectTimeout: 40000,
+  clientId: "mqttjs_" + Math.random().toString(16).substr(2, 8),
+  username: "root",
+  password: "123456",
+  clean: true,
+};
 export default {
   name: "temporary",
   components: {
@@ -1133,6 +1142,8 @@ export default {
       },
       whoId: "",
       isIscDevice: false,
+      topicName: "topic",
+      userId: "",
     };
   },
   computed: {
@@ -1171,7 +1182,40 @@ export default {
     this.getProjectSetting();
     this.getConfig();
   },
+  mounted() {
+    this.userId = this.$store.state.userInfo.userId;
+    this.topicName = this.$store.state.userInfo.scope;
+    client = mqtt.connect(mqttUrl, options);
+    this.mqttMSG();
+  },
   methods: {
+     // 监听mqtt下发信息然后刷新列表
+     mqttMSG() {
+      // mqtt连接   +"/#"  +workerId
+      client.on("connect", (e) => {
+        // console.log('连接成功:', this.topicName + this.userId)
+        client.subscribe(this.topicName + this.userId, { qos: 0 }, (error) => {
+          if (!error) {
+            // console.log('订阅成功12345')
+          } else {
+            console.log("订阅失败");
+          }
+        });
+      });
+      // 接收消息处理
+      client.on("message", (topic, message) => {
+        console.log(message);
+        this.getInfoList();
+      });
+      // 断开发起重连
+      // client.on("reconnect", (error) => {
+      //   console.log("正在重连:", error);
+      // });
+      // 链接异常处理
+      client.on("error", (error) => {
+        console.log("连接失败:", error);
+      });
+    },
     // 批量删除
     // onBatchDeletion(){
     //   if (this.multipleSelection.length == 0) {

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

@@ -378,7 +378,7 @@ export default {
       let that = this;
       let reqeustData = {
         projectSn: this.$store.state.projectSn,
-        enterpriseId,
+        enterpriseId: "",
       };
       getProjectChilderSystemUserListApi(reqeustData).then((res) => {
         that.personList = res.result;

src/views/projectFront/projectSummary/extendInfo.vue

@@ -234,6 +234,7 @@
               clearable
               value-format="yyyy-MM-dd"
               format="yyyy-MM-dd"
+              style="width: 100%"
               @input="getContractTime"
             >
             </el-date-picker>
@@ -251,6 +252,7 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               clearable
+              style="width: 100%"
               value-format="yyyy-MM-dd"
               format="yyyy-MM-dd"
               @input="getRealTime"

src/views/projectFront/quality/inspectionLedger.vue

@@ -883,8 +883,8 @@
                   :before-upload="(file) => beforeUpload(file, 1)"
                   name="files"
                   :file-list="fileList1"
-                  :limit="5"
                 >
+                <!-- :limit="5" -->
                   <i class="el-icon-plus"></i>
                 </el-upload>
                 <!--                支持格式-->
@@ -1190,12 +1190,14 @@
                   :on-remove="
                     (file, fileList) => handleRemove(file, fileList, 3)
                   "
+                  :before-upload="(file) => beforeUpload(file, 1)"
                   :on-preview="(file) => handlePreview(file, 3)"
-                  :limit="5"
+                  
                   :file-list="fileList3"
                   accept="image/jpeg,image/jpg,image/png"
                   name="files"
                 >
+                <!-- :limit="5" -->
                   <i class="el-icon-plus"></i>
                 </el-upload>
                 <span>{{ $t("message.quality.uploadHint") }}</span>
@@ -1873,7 +1875,7 @@
                 <el-col :span="12">
                   <div class="grid-content">
                     <span class="label">现场照片：</span>
-                    <span class="value" style="cursor: pointer">
+                    <span  style="cursor: pointer;float: left;width: calc(80% - 80px);margin-left: 10px;">
                       <el-image
                         v-for="(item, index) in parseImage2(
                           detailData.imageUrl
@@ -2077,6 +2079,7 @@
                           :disabled="type == 'detail'"
                           :action="uploadUrl"
                           list-type="picture-card"
+                          :before-upload="(file) => beforeUpload(file, 5)"
                           :on-success="(file) => handleSuccess(file, 5)"
                           :on-error="(file) => handleError(file, 5)"
                           :on-remove="
@@ -2087,8 +2090,9 @@
                           :file-list="fileListRectification"
                           accept="image/jpeg,image/jpg,image/png"
                           required
-                          :limit="5"
+                          
                         >
+                        <!-- :limit="5" -->
                           <i class="el-icon-plus"></i>
                         </el-upload>
                       </span>
@@ -3380,6 +3384,14 @@ export default {
     },
 
     beforeUpload(file, type) {
+      if (type == 1 || type == 3 || type == 5) {
+        // console.log(this.fileList1.length)
+        if(this.fileList1.length >= 5 || this.fileList3.length >= 5 || this.fileListRectification .length >= 5){
+          this.$message.warning("最多只能上传5张图片");
+          return false;
+        }
+        return true
+      }
       if (type == 2 || type == 4) {
         const fileType = file.type;
         const fileTypeList = ["audio/mp3", "video/mp4"];
@@ -3399,12 +3411,13 @@ export default {
           name: file.data[0].filename,
           url: this.fileUrl + file.data[0].imageUrl,
         };
-        if (this.fileList1.length >= 4) {
+        // if (this.fileList1.length >= 5) {
-          this.$message.warning("最多只能上传5张图片");
+        //   this.$message.warning("最多只能上传5张图片");
-          return false;
+        //   return false;
-        } else {
+        // } else {
-          this.fileList1.push(data);
+         
-        }
+        // }
+        this.fileList1.push(data);
       } else if (type == 2) {
         let data = {
           name: file.data[0].fileInfo.originalFilename,
@@ -3417,12 +3430,13 @@ export default {
           name: file.data[0].filename,
           url: this.fileUrl + file.data[0].imageUrl,
         };
-        if (this.fileList3.length >= 4) {
+        // if (this.fileList3.length >= 4) {
-          this.$message.warning("最多只能上传5张图片");
+        //   this.$message.warning("最多只能上传5张图片");
-          return false;
+        //   return false;
-        } else {
+        // } else {
-          this.fileList3.push(data);
+         
-        }
+        // }
+        this.fileList3.push(data);
       } else if (type == 4) {
         let data = {
           name: file.data[0].fileInfo.originalFilename,

src/views/projectFront/safeSame/inspectionLedger.vue

@@ -873,8 +873,9 @@
                   :before-upload="(file) => beforeUpload(file, 1)"
                   name="files"
                   :file-list="fileList1"
-                  :limit="5"
+                  
                 >
+                <!-- :limit="5" -->
                   <i class="el-icon-plus"></i>
                 </el-upload>
                 <!--                支持格式-->
@@ -1177,11 +1178,12 @@
                     (file, fileList) => handleRemove(file, fileList, 3)
                   "
                   :on-preview="(file) => handlePreview(file, 3)"
-                  :limit="5"
+                 
                   :file-list="fileList3"
                   accept="image/jpeg,image/jpg,image/png"
                   name="files"
                 >
+                <!-- :limit="5" -->
                   <i class="el-icon-plus"></i>
                 </el-upload>
                 <span>{{ $t("message.quality.uploadHint") }}</span>
@@ -1858,7 +1860,7 @@
                 <el-col :span="12">
                   <div class="grid-content">
                     <span class="label">现场照片：</span>
-                    <span class="value" style="cursor: pointer;">
+                    <span  style="cursor: pointer;float: left;width: calc(80% - 80px);margin-left: 10px;">
                       <el-image
                         v-for="(item, index) in parseImage2(
                           detailData.imageUrl
@@ -2062,13 +2064,15 @@
                           :on-remove="
                             (file, fileList) => handleRemove(file, fileList, 5)
                           "
+                          :before-upload="(file) => beforeUpload(file, 5)"
                           :on-preview="(file) => handlePreview(file, 5)"
                           name="files"
                           :file-list="fileListRectification"
                           accept="image/jpeg,image/jpg,image/png"
                           required
-                          :limit="5"
+                          
                         >
+                        <!-- :limit="5" -->
                           <i class="el-icon-plus"></i>
                         </el-upload>
                       </span>
@@ -3339,6 +3343,14 @@ export default {
     },
 
     beforeUpload(file, type) {
+      if (type == 1 || type == 3 || type == 5) {
+        // console.log(this.fileList1.length)
+        if(this.fileList1.length >= 5 || this.fileList3.length >= 5 || this.fileListRectification .length >= 5){
+          this.$message.warning("最多只能上传5张图片");
+          return false;
+        }
+        return true
+      }
       if (type == 2 || type == 4) {
         const fileType = file.type;
         const fileTypeList = ["audio/mp3", "video/mp4"];
@@ -3358,12 +3370,13 @@ export default {
           name: file.data[0].filename,
           url: this.fileUrl + file.data[0].imageUrl,
         };
-        if (this.fileList1.length >= 4) {
+        // if (this.fileList1.length >= 4) {
-          this.$message.warning("最多只能上传5张图片");
+        //   this.$message.warning("最多只能上传5张图片");
-          return false;
+        //   return false;
-        } else {
+        // } else {
-          this.fileList1.push(data);
+         
-        }
+        // }
+        this.fileList1.push(data);
       } else if (type == 2) {
         let data = {
           name: file.data[0].fileInfo.originalFilename,
@@ -3376,12 +3389,13 @@ export default {
           name: file.data[0].filename,
           url: this.fileUrl + file.data[0].imageUrl,
         };
-        if (this.fileList3.length >= 4) {
+        // if (this.fileList3.length >= 4) {
-          this.$message.warning("最多只能上传5张图片");
+        //   this.$message.warning("最多只能上传5张图片");
-          return false;
+        //   return false;
-        } else {
+        // } else {
-          this.fileList3.push(data);
+          
-        }
+        // }
+        this.fileList3.push(data);
       } else if (type == 4) {
         let data = {
           name: file.data[0].fileInfo.originalFilename,

src/views/projectFront/specialWork/confinedSpaceWork.vue

@@ -1093,7 +1093,10 @@ export default {
                         ...val,
                         ...res.result,
                         // xzGasAnalyzeList: res.result.xzGasAnalyzeList,
-                        hotWorkExecutionTime: [res.result.workExecutionBeginTime, res.result.workExecutionEndTime]
+                        hotWorkExecutionTime: [
+                            res.result.workExecutionBeginTime ? res.result.workExecutionBeginTime : '', 
+                            res.result.workExecutionEndTime ? res.result.workExecutionEndTime : ''
+                        ]
                     };
                     if (this.workDetail.fieldWorkingEnvironment) {
                         this.workDetail.fieldWorkingEnvironment = JSON.parse(this.workDetail.fieldWorkingEnvironment)

src/views/projectFront/specialWork/disconnectionWork.vue

@@ -835,7 +835,10 @@ export default {
                         ...val,
                         ...res.result,
                         // xzGasAnalyzeList: res.result.xzGasAnalyzeList,
-                        hotWorkExecutionTime: [res.result.workExecutionBeginTime, res.result.workExecutionEndTime]
+                        hotWorkExecutionTime: [
+                            res.result.workExecutionBeginTime ? res.result.workExecutionBeginTime : '', 
+                            res.result.workExecutionEndTime ? res.result.workExecutionEndTime : ''
+                        ]
                     };
                     if (this.workDetail.fieldWorkingEnvironment) {
                         this.workDetail.fieldWorkingEnvironment = JSON.parse(this.workDetail.fieldWorkingEnvironment)

src/views/projectFront/specialWork/fireWork.vue

@@ -550,8 +550,8 @@ export default {
             ...res.result,
             // xzGasAnalyzeList: res.result.xzGasAnalyzeList,
             hotWorkExecutionTime: [
-              res.result.hotWorkExecutionBeginTime,
+              res.result.hotWorkExecutionBeginTime ? res.result.hotWorkExecutionBeginTime : '',
-              res.result.hotWorkExecutionEndTime,
+              res.result.hotWorkExecutionEndTime ? res.result.hotWorkExecutionEndTime : '',
             ],
             firemanAndCertificateNo: val.firemanAndCertificateNo,
           };

src/views/projectFront/specialWork/riggingOutWork.vue

@@ -839,7 +839,10 @@ export default {
                         ...val,
                         ...res.result,
                         // xzGasAnalyzeList: res.result.xzGasAnalyzeList,
-                        hotWorkExecutionTime: [res.result.workExecutionBeginTime, res.result.workExecutionEndTime]
+                        hotWorkExecutionTime:[
+                            res.result.workExecutionBeginTime ? res.result.workExecutionBeginTime : '', 
+                            res.result.workExecutionEndTime ? res.result.workExecutionEndTime : ''
+                        ]
                     };
                     if (this.workDetail.fieldWorkingEnvironment) {
                         this.workDetail.fieldWorkingEnvironment = JSON.parse(this.workDetail.fieldWorkingEnvironment)

src/views/projectFront/specialWork/startBuildingWork.vue

@@ -835,7 +835,10 @@ export default {
                         ...val,
                         ...res.result,
                         // xzGasAnalyzeList: res.result.xzGasAnalyzeList,
-                        hotWorkExecutionTime: [res.result.workExecutionBeginTime, res.result.workExecutionEndTime]
+                        hotWorkExecutionTime:[
+                            res.result.workExecutionBeginTime ? res.result.workExecutionBeginTime : '', 
+                            res.result.workExecutionEndTime ? res.result.workExecutionEndTime : ''
+                        ]
                     };
                     if (this.workDetail.fieldWorkingEnvironment) {
                         this.workDetail.fieldWorkingEnvironment = JSON.parse(this.workDetail.fieldWorkingEnvironment)

src/views/projectFront/specialWork/temporaryPowerWork.vue

@@ -826,7 +826,10 @@ export default {
                         ...val,
                         ...res.result,
                         // xzGasAnalyzeList: res.result.xzGasAnalyzeList,
-                        hotWorkExecutionTime: [res.result.workExecutionBeginTime, res.result.workExecutionEndTime]
+                        hotWorkExecutionTime: [
+                            res.result.workExecutionBeginTime ? res.result.workExecutionBeginTime : '', 
+                            res.result.workExecutionEndTime ? res.result.workExecutionEndTime : ''
+                        ]
                     };
                     if (this.workDetail.fieldWorkingEnvironment) {
                         this.workDetail.fieldWorkingEnvironment = JSON.parse(this.workDetail.fieldWorkingEnvironment)

src/views/projectFront/specialWork/towerOverWork.vue

@@ -770,7 +770,10 @@ export default {
                         ...val,
                         ...res.result,
                         // xzGasAnalyzeList: res.result.xzGasAnalyzeList,
-                        hotWorkExecutionTime: [res.result.workExecutionBeginTime, res.result.workExecutionEndTime]
+                        hotWorkExecutionTime: [
+                            res.result.workExecutionBeginTime ? res.result.workExecutionBeginTime : '', 
+                            res.result.workExecutionEndTime ? res.result.workExecutionEndTime : ''
+                        ]
                     };
                     if (this.workDetail.fieldWorkingEnvironment) {
                         this.workDetail.fieldWorkingEnvironment = JSON.parse(this.workDetail.fieldWorkingEnvironment)