flx：修改特殊作业时间问题 app下载命名规范问题 安全履职修改为查所有子账号
This commit is contained in:
parent
cea8ecc1e6
commit
e6a5c74ff3
@ -55,20 +55,20 @@ export default new Vuex.Store({
|
||||
// UPLOADURL:'http://192.168.34.221:9111/upload/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", //罗峰工作流地址(本地)
|
||||
WORKFLOWURL: "http://192.168.34.175:88/#/workspace/forms", //罗峰工作流地址(本地)
|
||||
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
|
||||
// FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
|
||||
// UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试
|
||||
// FILEURL:'http://42.180.188.17:11211/image/',//测试
|
||||
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/", //正式环境
|
||||
UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试
|
||||
FILEURL: 'http://42.180.188.17:11211/image/', //测试
|
||||
// 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", //鞍钢测试平台工作流地址
|
||||
// WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
|
||||
//---------------------------------------------------------------------------------------------
|
||||
// BASEURL: baseUrl
|
||||
// ? baseUrl
|
||||
|
||||
@ -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;
|
||||
|
||||
});
|
||||
|
||||
@ -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: {
|
||||
@ -1171,7 +1180,38 @@ export default {
|
||||
this.getProjectSetting();
|
||||
this.getConfig();
|
||||
},
|
||||
mounted() {
|
||||
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) {
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -550,8 +550,8 @@ export default {
|
||||
...res.result,
|
||||
// xzGasAnalyzeList: res.result.xzGasAnalyzeList,
|
||||
hotWorkExecutionTime: [
|
||||
res.result.hotWorkExecutionBeginTime,
|
||||
res.result.hotWorkExecutionEndTime,
|
||||
res.result.hotWorkExecutionBeginTime ? res.result.hotWorkExecutionBeginTime : '',
|
||||
res.result.hotWorkExecutionEndTime ? res.result.hotWorkExecutionEndTime : '',
|
||||
],
|
||||
firemanAndCertificateNo: val.firemanAndCertificateNo,
|
||||
};
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user