fix: 修改agjt劳务管理和视频监控bug
This commit is contained in:
parent
4cb5fc9250
commit
c4e54711fc
@ -434,7 +434,7 @@ const getEnterpriseInfoList = async () => {
|
||||
const res: any = await getEnterpriseInfoApi({
|
||||
projectSn: store.sn,
|
||||
pageNo: 1,
|
||||
pageSize: 10
|
||||
pageSize: 999
|
||||
});
|
||||
if(res.result.total !== '0'){
|
||||
console.log("获取劳务班组公司数据1", res);
|
||||
|
||||
@ -257,11 +257,28 @@ function initOption() {
|
||||
var dataValue = data.value.find(function (item) {
|
||||
return item.name === name;
|
||||
});
|
||||
if (dataValue) {
|
||||
return name + " " + dataValue.value;
|
||||
} else {
|
||||
return name;
|
||||
let tip1 = "";
|
||||
let tip = "";
|
||||
let le = name.length //图例文本的长度
|
||||
if(le > 14){ //几个字换行大于几就可以了
|
||||
let l = Math.ceil(le/14) //有些不能整除,会有余数,向上取整
|
||||
for(let i = 1;i <= l;i++){ //循环
|
||||
if(i < l){ //最后一段字符不能有\n
|
||||
tip1 += name.slice(i*14-14,i*14)+'\n'; //字符串拼接
|
||||
}else if(i === l){ //最后一段字符不一定够9个
|
||||
tip = tip1 + name.slice((l-1)*14,le) //最后的拼接在最后
|
||||
}
|
||||
}
|
||||
return tip + " " + dataValue.value;
|
||||
}else{
|
||||
tip = name //前面定义了tip为空,这里要重新赋值,不然会替换为空
|
||||
return tip + " " + dataValue.value;
|
||||
}
|
||||
// if (dataValue) {
|
||||
// return name + " " + dataValue.value;
|
||||
// } else {
|
||||
// return name;
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -106,10 +106,18 @@ const goToSafeHelmet = async () => {
|
||||
};
|
||||
|
||||
let objData = ref({
|
||||
appkey: "24017757", //海康提供的appkey
|
||||
ip: "182.101.141.23", //海康提供的ip
|
||||
secret: "VJz0FbzmE6drPQ7egsBi", //海康提供的secret
|
||||
port: 18443,
|
||||
// appkey: "24017757", //海康提供的appkey
|
||||
appkey: "23071374", //anjt的appkey
|
||||
// appkey: "", //anjt的appkey
|
||||
// ip: "182.101.141.23", //海康提供的ip
|
||||
ip: "10.168.1.100", //anjt的ip
|
||||
// ip: "", //anjt的ip
|
||||
// secret: "VJz0FbzmE6drPQ7egsBi", //海康提供的secret
|
||||
secret: "skaSIHSYPRIynnxz7o57", //anjt的secret
|
||||
// secret: "", //anjt的secret
|
||||
// port: 18443,
|
||||
port: 443,//anjt的端口
|
||||
// port: '',//anjt的端口
|
||||
playMode: 0, // 0 预览 1回放
|
||||
layout: "1x1" //页面展示的模块数【16】
|
||||
});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user