Skip to content

B
bi
Commit b7b5ca5b authored by 莫坚培's avatar 莫坚培
Browse files
Options

fix: 修复历史数据不显示的bug&铲掉一些屎

parent b24159bb
Show whitespace changes
Inline Side-by-side
Showing with 102 additions and 63 deletions
config/config.json
View file @ b7b5ca5b
{"apiUrl":"https://slmapi.shengyc.com","baseUrl":"https://slm.shengyc.com","domain":"shengyc.com","name":"正式环境"}
\ No newline at end of file
{"apiUrl":"https://api.sycdev.com","baseUrl":"https://slm.sycdev.com","domain":"sycdev.com","name":"测试环境"}
\ No newline at end of file
js/dashboard.js
View file @ b7b5ca5b
......@@ -24,6 +24,16 @@ var Controls = {}
var Common = {}
var time = 5000
let replaceConfigDetailsMap = {
customerid: 'customerId',
cusvariabletype: 'cusVariableType',
customername: 'customerName',
equipmentcode: 'equipmentCode',
equipmentname: 'equipmentName',
equipmentid: 'equipmentId',
vartype: 'varType'
}
let requestLoopTimer = null // 轮询定时器
let requestLoopDataPool = [] // 各个组件实时刷新的请求数据，放到一个集合里，原来的多个组件请求合并成一个请求发送
let requestLoopStopFlag = false // requestLoopDataPool请求中标志，正在请求时不进行下一波轮询，前一波请求完成才执行下一波
......@@ -146,7 +156,7 @@ function searchvarible() {
endTime: new Date(varendtime).getTime(),
startTime: new Date(varstarttime).getTime(),
variableSearchList: [{
deviceId: searchdata.CheckData.equipmentId ? searchdata.CheckData.equipmentId : searchdata.CheckData.equipmentid,
deviceId: searchdata.CheckData.equipmentId,
variableId: searchdata.CheckData.id,
variableName: searchdata.CheckData.name
}]
......@@ -198,12 +208,12 @@ function searchvarible() {
if (res.data.data.length !== 0) {
option.xAxis.data = res.data.data.x;
option.series[0].data = res.data.data[searchdata.CheckData.equipmentId ? searchdata.CheckData.equipmentId : searchdata.CheckData.equipmentid + ',' + searchdata.CheckData.name]
option.series[0].data = res.data.data[searchdata.CheckData.equipmentId + ',' + searchdata.CheckData.name]
for (let i = 0; i < res.data.data.x.length; i++) {
html += ` <tr>
<td style="padding-left:10px" class="table-checkbox">${i+1}</td>
<td style="text-align:center">${res.data.data.x[i]}</td>
<td style="text-align:center">${res.data.data[searchdata.CheckData.equipmentId ? searchdata.CheckData.equipmentId : searchdata.CheckData.equipmentid+','+searchdata.CheckData.name][i]}</td>
<td style="text-align:center">${res.data.data[searchdata.CheckData.equipmentId +','+searchdata.CheckData.name][i]}</td>
</tr>`
}
......@@ -328,15 +338,17 @@ function nodeCLick(e, treeId, treeNode, type) {
return
}
if (res.data.data.configDetails) {
Controls = JSON.parse(res.data.data.configDetails)
let configDetails = res.data.data.configDetails
configDetails = configDetails.replace(/customerid|cusvariabletype|customername|equipmentcode|equipmentname|equipmentid|vartype/g, str => {
return replaceConfigDetailsMap[str]
})
Controls = JSON.parse(configDetails)
} else {
$("#right-wrap").empty()
appTips.tipsMsg('无数据')
return
}
Controls = JSON.parse(res.data.data.configDetails)
if (Controls.ControlList.lenght !== 0) {
Controls.ControlList.forEach(item => {
item.PropertyList.TrueWidth = item.PropertyList.Width
......@@ -945,7 +957,7 @@ function startRequestLoop() {
return
}
// 每一轮都把标记清除
// 每一轮都把标记清除，缓存清除
requestLoopVaribleCache = {}
Object.values(Controls.dataPoolMap).forEach(item => {
item.isSameGroupCount = 0
......@@ -1074,7 +1086,7 @@ function loopRenderBarchart(poolData, resData, resCode) {
let left = poolData.option.DrawContent.LeftMargin
variablesList.forEach((k, ki) => {
let dataList = resValue[`${k.CheckData.equipmentId || k.CheckData.equipmentid},${k.CheckData.name}`]
let dataList = resValue[`${k.CheckData.equipmentId},${k.CheckData.name}`]
dataList = dataList.map(i => {
if (i) {
......@@ -1167,7 +1179,7 @@ function loopRenderLinechart(poolData, resData, resCode) {
let variablesList = poolData.option.Variables
let left = poolData.option.DrawContent.LeftMargin
variablesList.forEach((k, ki) => {
let dataList = resValue[`${k.CheckData.equipmentId || k.CheckData.equipmentid},${k.CheckData.name}`]
let dataList = resValue[`${k.CheckData.equipmentId},${k.CheckData.name}`]
dataList = dataList.map(item1 => {
if (item1) {
if (left <= getTextWidth(String(item1 * 100), 16)) {
......@@ -1223,7 +1235,7 @@ function handleRequestDataLineAndBar(label, item, index) {
limit: lineAndBarItem.DataCount,
variableSearchList: list.map(lItem => {
return {
deviceId: lItem.CheckData.equipmentId || lItem.CheckData.equipmentid,
deviceId: lItem.CheckData.equipmentId,
variableId: lItem.CheckData.id,
variableName: lItem.CheckData.name
}
......@@ -1259,9 +1271,9 @@ function loopRenderDashboardchart(poolData, resData, resCode) {
let variableInfo = poolData.option.Variable
if (resValue) {
let value = resValue[variableInfo.CheckData.equipmentId || variableInfo.CheckData.equipmenid][variableInfo.CheckData.name]
let value = resValue[variableInfo.CheckData.equipmentId][variableInfo.CheckData.name]
// 取对应变量缓存过的值
let cacheKey = `${variableInfo.CheckData.equipmentId || variableInfo.CheckData.equipmentid}-${variableInfo.CheckData.id}`
let cacheKey = `${variableInfo.CheckData.equipmentId}-${variableInfo.CheckData.id}`
if(requestLoopVaribleCache[cacheKey] === undefined) {
requestLoopVaribleCache[cacheKey] = value
} else {
......@@ -1290,7 +1302,7 @@ function handleRequestDataDashboard(item, index) {
urlType: 'pieChartOrPanel',
assemblyKey: `${index}-${item.Name}`,
pieChartOrPanel: [{
deviceId: VariableCheckDataObj.equipmentId || VariableCheckDataObj.equipmentid,
deviceId: VariableCheckDataObj.equipmentId,
variableId: VariableCheckDataObj.id,
variableCode: VariableCheckDataObj.name
}]
......@@ -1325,10 +1337,10 @@ function loopRenderPiechart(poolData, resData, resCode) {
if (resValue) {
let variablesList = poolData.option.Variables
variablesList.forEach((vItem, vIndex) => {
let value = resValue[vItem.CheckData.equipmentId || vItem.CheckData.equipmentid][vItem.CheckData.name]
let value = resValue[vItem.CheckData.equipmentId][vItem.CheckData.name]
value && (value = value.toFixed(vItem.d || 0))
// 取对应变量缓存过的值
let cacheKey = `${vItem.CheckData.equipmentId || vItem.CheckData.equipmentid}-${vItem.CheckData.id}`
let cacheKey = `${vItem.CheckData.equipmentId}-${vItem.CheckData.id}`
if(requestLoopVaribleCache[cacheKey] === undefined) {
requestLoopVaribleCache[cacheKey] = value
} else {
......@@ -1363,7 +1375,7 @@ function handleRequestDataPie(item, index) {
let pieChartOrPanel = list.map(variableItem => {
let vc = variableItem.CheckData
return {
deviceId: vc.equipmentId || vc.equipmentid,
deviceId: vc.equipmentId,
variableId: vc.id,
variableCode: vc.name
}
......@@ -1408,7 +1420,7 @@ function loopRenderImage(poolData, resData, label) {
}
// 取对应变量缓存过的值
let cacheKey = `${dlItem.CheckData.equipmentId || dlItem.CheckData.equipmentid}-${dlItem.CheckData.id}`
let cacheKey = `${dlItem.CheckData.equipmentId}-${dlItem.CheckData.id}`
if (requestLoopVaribleCache[cacheKey] === undefined) {
requestLoopVaribleCache[cacheKey] = itemValue
} else {
......@@ -1477,7 +1489,7 @@ function loopRenderLamp(poolData, resData, label) {
}
// 取对应变量缓存过的值
let cacheKey = `${dlItem.CheckData.equipmentId || dlItem.CheckData.equipmentid}-${dlItem.CheckData.id}`
let cacheKey = `${dlItem.CheckData.equipmentId}-${dlItem.CheckData.id}`
if (requestLoopVaribleCache[cacheKey] === undefined) {
requestLoopVaribleCache[cacheKey] = itemValue
} else {
......@@ -1532,7 +1544,7 @@ function handleRequestDataDataList(item, index) {
urlType: 'status',
assemblyKey: `${index}-${dlIndex}-${dlItem.CheckData.name}`,
statusDataDTO: {
deviceId: dlItem.CheckData.equipmentId || dlItem.CheckData.equipmentid,
deviceId: dlItem.CheckData.equipmentId,
variableId: dlItem.CheckData.id,
variableCode: dlItem.CheckData.name
}
......@@ -1552,7 +1564,7 @@ function loopRenderDatatextblock(poolData, resData, label) {
}
// 取对应变量缓存过的值
let cacheKey = `${poolData.CheckData.equipmentId || poolData.CheckData.equipmentid}-${poolData.CheckData.id}`
let cacheKey = `${poolData.CheckData.equipmentId}-${poolData.CheckData.id}`
if(requestLoopVaribleCache[cacheKey] === undefined) {
requestLoopVaribleCache[cacheKey] = resDataValue
} else {
......@@ -1601,7 +1613,7 @@ function handleRequestDataText(item, index) {
urlType: 'status',
assemblyKey: `${index}-${item.CheckData.name}`,
statusDataDTO: {
deviceId: item.CheckData.equipmentId || item.CheckData.equipmentid,
deviceId: item.CheckData.equipmentId,
variableId: item.CheckData.id,
variableCode: item.CheckData.name
}
......@@ -1810,14 +1822,17 @@ function jumpLinkFun(index) {
}
if (res.data.data.configDetails) {
Controls = JSON.parse(res.data.data.configDetails)
let configDetails = res.data.data.configDetails
configDetails = configDetails.replace(/customerid|cusvariabletype|customername|equipmentcode|equipmentname|equipmentid|vartype/g, str => {
return replaceConfigDetailsMap[str]
})
Controls = JSON.parse(configDetails)
} else {
$("#right-wrap").empty()
appTips.tipsMsg('无数据')
return
}
Controls = JSON.parse(res.data.data.configDetails)
Common = {
Name: Controls.Name,
Position: Controls.Position,
......@@ -2021,7 +2036,7 @@ async function renderCommonlamp(index) {
for (let i = 0; i < item.DataList.length; i++) {
if (item.DataList[i].variable !== '选择') {
if (item.DataList[i].CheckData) {
await request.get(`/bi/${appId}/variables/${item.DataList[i].CheckData.equipmentId ? item.DataList[i].CheckData.equipmentId : tem.DataList[i].CheckData.equipmentid}/${item.DataList[i].CheckData.id}/${item.DataList[i].CheckData.name}/status`).then(res => {
await request.get(`/bi/${appId}/variables/${item.DataList[i].CheckData.equipmentId}/${item.DataList[i].CheckData.id}/${item.DataList[i].CheckData.name}/status`).then(res => {
// res.data.data[item.DataList[i].CheckData.id]= 0
let Data = res.data.data[item.DataList[i].CheckData.name]
if (JSON.stringify(res.data.data) !== "{}") {
......@@ -2105,7 +2120,7 @@ async function renderEllipselamp(index) {
for (let i = 0; i < item.DataList.length; i++) {
if (item.DataList[i].variable !== '选择') {
if (item.DataList[i].CheckData) {
await request.get(`/bi/${appId}/variables/${item.DataList[i].CheckData.equipmentId ? item.DataList[i].CheckData.equipmentId : item.DataList[i].CheckData.equipmentid}/${item.DataList[i].CheckData.id}/${item.DataList[i].CheckData.name}/status`).then(res => {
await request.get(`/bi/${appId}/variables/${item.DataList[i].CheckData.equipmentId}/${item.DataList[i].CheckData.id}/${item.DataList[i].CheckData.name}/status`).then(res => {
// res.data.data[item.DataList[i].CheckData.name] = 2
if (res.data.data) {
let Data = res.data.data[item.DataList[i].CheckData.name]
......@@ -2191,7 +2206,7 @@ async function renderDynamicText(index) {
for (let i = 0; i < item.DataList.length; i++) {
if (item.DataList[i].variable !== '选择') {
if (item.DataList[i].CheckData) {
await request.get(`/bi/${appId}/variables/${item.DataList[i].CheckData.equipmentId ? item.DataList[i].CheckData.equipmentId: item.DataList[i].CheckData.equipmentid}/${item.DataList[i].CheckData.id}/${item.DataList[i].CheckData.name}/status`).then(res => {
await request.get(`/bi/${appId}/variables/${item.DataList[i].CheckData.equipmentId}/${item.DataList[i].CheckData.id}/${item.DataList[i].CheckData.name}/status`).then(res => {
// res.data.data[item.DataList[i].CheckData.id]= 0
let Data = res.data.data[item.DataList[i].CheckData.name]
if (JSON.stringify(res.data.data) !== "{}") {
......@@ -2272,7 +2287,7 @@ async function renderImage(index) {
for (let i = 0; i < item.DataList.length; i++) {
if (item.DataList[i].variable !== '选择') {
if (item.DataList[i].CheckData) {
await request.get(`/bi/${appId}/variables/${item.DataList[i].CheckData.equipmentId ? item.DataList[i].CheckData.equipmentId : item.DataList[i].CheckData.equipmentid}/${item.DataList[i].CheckData.id}/${item.DataList[i].CheckData.name}/status`).then(res => {
await request.get(`/bi/${appId}/variables/${item.DataList[i].CheckData.equipmentId}/${item.DataList[i].CheckData.id}/${item.DataList[i].CheckData.name}/status`).then(res => {
if (res.data.data) {
let Data = res.data.data[item.DataList[i].CheckData.name]
if (JSON.stringify(res.data.data) !== "{}") {
......@@ -2550,7 +2565,7 @@ function renderLineChart(item) {
let seriesName = []
c.option.Variables.forEach(d => {
variableSearchList.push({
deviceId: d.CheckData.equipmentId ? d.CheckData.equipmentId : d.CheckData.equipmentid,
deviceId: d.CheckData.equipmentId,
variableId: d.CheckData.id,
variableName: d.CheckData.name
})
......@@ -2648,7 +2663,7 @@ function renderLineChart(item) {
let y = res.data.data.y
res.data.data.x.forEach((kk, i) => {
c.option.Variables.forEach(d => {
let name = d.CheckData.equipmentId ? d.CheckData.equipmentId : d.CheckData.equipmentid + ',' + d.CheckData.name
let name = d.CheckData.equipmentId + ',' + d.CheckData.name
if (name == kk) {
keys.push(d.DimensionName)
if (y[i]) {
......@@ -3009,7 +3024,7 @@ function renderBarChart(item) {
let seriesName = []
c.option.Variables.forEach(d => {
variableSearchList.push({
deviceId: d.CheckData.equipmentId ? d.CheckData.equipmentId : d.CheckData.equipmentid ,
deviceId: d.CheckData.equipmentId,
variableId: d.CheckData.id,
variableName: d.CheckData.name,
})
......@@ -3108,7 +3123,7 @@ function renderBarChart(item) {
res.data.data.x.forEach((rx, i) => {
// keys.push(rx.split(',')[1])
c.option.Variables.forEach(d => {
let name = d.CheckData.equipmentId ?d.CheckData.equipmentId: d.CheckData.equipmentid + ',' + d.CheckData.name
let name = d.CheckData.equipmentId + ',' + d.CheckData.name
if (name == rx) {
keys.push(d.DimensionName)
if (y[i]) {
......@@ -3312,7 +3327,7 @@ function renderDashChart(item) {
let variableSearchList = []
if (Controls.Data.DashBoardChartItemList[cIndex].option.Variable.CheckData) {
variableSearchList = [{
deviceId: Controls.Data.DashBoardChartItemList[cIndex].option.Variable.CheckData.equipmentId ? Controls.Data.DashBoardChartItemList[cIndex].option.Variable.CheckData.equipmentId : Controls.Data.DashBoardChartItemList[cIndex].option.Variable.CheckData.equipmentid,
deviceId: Controls.Data.DashBoardChartItemList[cIndex].option.Variable.CheckData.equipmentId,
variableId: Controls.Data.DashBoardChartItemList[cIndex].option.Variable.CheckData.id,
variableName: Controls.Data.DashBoardChartItemList[cIndex].option.Variable.CheckData.name
}]
......@@ -3428,7 +3443,7 @@ function renderDashChart(item) {
let dashData = res.data.data
dashData.x.forEach((item, index) => {
// variableSearchList.forEach((k, ki) => {
let name = d.CheckData.equipmentId ? d.CheckData.equipmentId: d.CheckData.equipmentid + ',' + d.CheckData.name
let name = d.CheckData.equipmentId + ',' + d.CheckData.name
if (item == name)
serireData.push({
value: dashData.y[index] ? Number(dashData.y[index]).toFixed(d.d ? d.d : 0) : 0,
......@@ -3611,7 +3626,7 @@ function renderPieChart(item) {
let d = list[i]
if (d.CheckData) {
variableSearchList.push({
deviceId: d.CheckData.equipmentId ? d.CheckData.equipmentId : d.CheckData.equipmentid,
deviceId: d.CheckData.equipmentId,
variableId: d.CheckData.id,
variableName: d.CheckData.name
})
......@@ -3736,9 +3751,11 @@ function renderPieChart(item) {
if (res.data.data && res.data.data.x) {
res.data.data.x.forEach((xf, xfi) => {
Controls.Data.PieChartItemList[cIndex].option.Variables.forEach((d, dIndex) => {
let name = d.CheckData.equipmentId ? d.CheckData.equipmentId : d.CheckData.equipmentid + ',' + d.CheckData.name
let name = `${d.CheckData.equipmentId},${d.CheckData.name}`
if (name == xf) {
serireData.push({
// value: xfi % 2 > 0 ? xfi : -xfi,
value: res.data.data.y[xfi] === null ? 0 : Number(res.data.data.y[xfi]).toFixed(d.d ? d.d : 0),
name: d.DimensionName,
label: a.series[0].data[0].label,
......@@ -3751,6 +3768,7 @@ function renderPieChart(item) {
})
})
console.log(titleData, serireData);
a.legend[0].data = titleData
a.series[0].data = serireData
}
......@@ -4060,7 +4078,7 @@ function dblOpen(index, i, prop) {
endTime: new Date(varendtime).getTime(),
startTime: new Date(varstarttime).getTime(),
variableSearchList: [{
deviceId: index.CheckData.equipmentId ? index.CheckData.equipmentId : index.CheckData.equipmentid,
deviceId: index.CheckData.equipmentId,
variableId: index.CheckData.id,
variableName: index.CheckData.name
}]
......@@ -4110,14 +4128,14 @@ function dblOpen(index, i, prop) {
let html = ''
if (res.data.data.length !== 0) {
option.xAxis.data = res.data.data.x;
option.series[0].data = res.data.data[searchdata.CheckData.equipmentId ? searchdata.CheckData.equipmentId : searchdata.CheckData.equipmentid + ',' + searchdata.CheckData.name]
option.series[0].data = res.data.data[searchdata.CheckData.equipmentId + ',' + searchdata.CheckData.name]
for (let i = 0; i < res.data.data.x.length; i++) {
html += ` <tr>
<td style="padding-left:10px" class="table-checkbox">${i+1}</td>
<td style="text-align:center">${res.data.data.x[i]}</td>
<td style="text-align:center">${res.data.data[index.CheckData.equipmentId ? index.CheckData.equipmentId : index.CheckData.equipmentid +','+index.CheckData.name][i]}</td>
<td style="text-align:center">${res.data.data[index.CheckData.equipmentId +','+index.CheckData.name][i]}</td>
</tr>`
}
......
js/rightData.js
View file @ b7b5ca5b
......@@ -620,35 +620,35 @@ function addIframeField(newField, elem) {
function addIframeAttr(newCheck, elem) {
newCheck.forEach(item => {
// $("#data-line").contents().find(".newAdd").on('click','', {data: item}, $("#data-line").contents().find(".newAdd").click())
$(`#${elem}`).contents().find(".newAdd").attr("data-cusVariableType", item.cusVariableType)
$(`#${elem}`).contents().find(".newAdd").attr("data-customerId", item.customerId)
$(`#${elem}`).contents().find(".newAdd").attr("data-customerName", item.customerName)
$(`#${elem}`).contents().find(".newAdd").attr("data-cus-variable-type", item.cusVariableType)
$(`#${elem}`).contents().find(".newAdd").attr("data-customer-id", item.customerId)
$(`#${elem}`).contents().find(".newAdd").attr("data-customer-name", item.customerName)
$(`#${elem}`).contents().find(".newAdd").attr("data-desc", item.desc)
$(`#${elem}`).contents().find(".newAdd").attr("data-equipmentCode", item.equipmentCode)
$(`#${elem}`).contents().find(".newAdd").attr("data-equipmentId", item.equipmentId)
$(`#${elem}`).contents().find(".newAdd").attr("data-equipmentName", item.equipmentName)
$(`#${elem}`).contents().find(".newAdd").attr("data-equipment-code", item.equipmentCode)
$(`#${elem}`).contents().find(".newAdd").attr("data-equipment-id", item.equipmentId)
$(`#${elem}`).contents().find(".newAdd").attr("data-equipment-name", item.equipmentName)
$(`#${elem}`).contents().find(".newAdd").attr("data-from", item.from)
$(`#${elem}`).contents().find(".newAdd").attr("data-id", item.id)
$(`#${elem}`).contents().find(".newAdd").attr("data-name", item.name)
$(`#${elem}`).contents().find(".newAdd").attr("data-type", item.type)
$(`#${elem}`).contents().find(".newAdd").attr("data-unit", item.unit)
$(`#${elem}`).contents().find(".newAdd").attr("data-varType", item.varType)
$(`#${elem}`).contents().find(".newAdd").attr("data-var-type", item.varType)
$(`#${elem}`).contents().find(".newAdd").click()
})
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-cusVariableType")
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-customerId")
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-customerName")
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-cus-variable-type")
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-customer-id")
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-customer-name")
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-desc")
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-equipmentCode")
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-equipmentId")
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-equipmentName")
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-equipment-code")
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-equipment-id")
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-equipment-name")
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-from")
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-id")
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-name")
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-type")
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-unit")
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-varType")
$(`#${elem}`).contents().find(".newAdd").removeAttr("data-var-type")
}
// 打开添加条件弹窗
......
js/tokenSetting.js
View file @ b7b5ca5b
......@@ -3,7 +3,7 @@
* @description: 文件描述
* @Date: 2021-09-16 18:33:55
* @LastEditors: 莫靓仔
* @LastEditTime: 2021-09-30 17:26:44
* @LastEditTime: 2021-10-13 09:31:58
*/
let setObj = {
// 厂家大佬
......@@ -14,7 +14,7 @@ let setObj = {
},
// test-123
set2: {
devToken: '5b0784dd-ad5b-43ec-a851-053763233c91',
devToken: '2eddd39b-695e-4b8f-9abe-a65ca4bbaab3',
devAppId: 'TEST123_o582',
devTenantId: 'TEST123_o582'
},
......@@ -38,7 +38,7 @@ let setObj = {
}
}
let defaultObj = 'set5'
let defaultObj = 'set2'
window.devToken = setObj[defaultObj].devToken
window.devAppId = setObj[defaultObj].devAppId
window.devTenantId = setObj[defaultObj].devTenantId
js/topNav.js
View file @ b7b5ca5b
let replaceConfigDetailsMap = {
customerid: 'customerId',
cusvariabletype: 'cusVariableType',
customername: 'customerName',
equipmentcode: 'equipmentCode',
equipmentname: 'equipmentName',
equipmentid: 'equipmentId',
vartype: 'varType'
}
/* 顶部导航栏事件 */
// 预览功能
function preview() {
......@@ -303,6 +313,9 @@ function save() {
})
}
configDetails = JSON.stringify(Controls)
configDetails = configDetails.replace(/customerid|cusvariabletype|customername|equipmentcode|equipmentname|equipmentid|vartype/g, str => {
return replaceConfigDetailsMap[str]
})
let postData = {
assemblys,
configDetails,
......@@ -402,6 +415,9 @@ function saveAs() {
})
})
configDetails = JSON.stringify(Controls)
configDetails = configDetails.replace(/customerid|cusvariabletype|customername|equipmentcode|equipmentname|equipmentid|vartype/g, str => {
return replaceConfigDetailsMap[str]
})
let postData = {
assemblys,
configDetails,
......@@ -497,6 +513,10 @@ function savePublish() {
})
})
configDetails = JSON.stringify(Controls)
configDetails = configDetails.replace(/customerid|cusvariabletype|customername|equipmentcode|equipmentname|equipmentid|vartype/g, str => {
return replaceConfigDetailsMap[str]
})
console.log('Controls', Controls);
let postData = {
assemblys,
configDetails,
......
js/treeConfig.js
View file @ b7b5ca5b
......@@ -15,7 +15,7 @@ var panelId = "" // panelId写死，后面需修改为动态获取
panelId = getParams('panelId', window.location.href)
// 21302abdb343edf09f84b6f9d900537c
// panelId = panelId ? panelId : '1cff8876dc96a8adac114ecbe1bd9652'
panelId = panelId ? panelId : '1c792524337704365227fa09db2ac5e1'
panelId = panelId ? panelId : '11667dfb200c3e0209953a2497328fad'
// 复用树
var reuseData=[
// { id:1, pId:0, name:"文件 1", open:true},
......
js/varEcharts.js
View file @ b7b5ca5b
......@@ -2,8 +2,8 @@
* @Description: 这是图表 表格选择（组件）
* @Date: 2021-03-10 14:52:54
* @Author: Tao
* @LastEditors: Tao
* @LastEditTime: 2021-04-02 14:25:57
* @LastEditors: 莫靓仔
* @LastEditTime: 2021-10-13 14:41:45
*/
//折线图改变
function LineEchartsFun2(BarChartData) {
......@@ -1495,6 +1495,7 @@ function varEchartsFun(data, type, refresh) {
$('.newAdd').unbind()
$('.newAdd').on('click', function () {
let dataObj = JSON.parse(JSON.stringify($('.newAdd')[0].dataset))
console.log('dataObj', dataObj);
if (defaultVar.length == 10) {
return
}
......
utils/request_browserify.js
View file @ b7b5ca5b
(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
module.exports={"apiUrl":"https://slmapi.shengyc.com","baseUrl":"https://slm.shengyc.com","domain":"shengyc.com","name":"正式环境"}
module.exports={"apiUrl":"https://api.sycdev.com","baseUrl":"https://slm.sycdev.com","domain":"sycdev.com","name":"测试环境"}
},{}],2:[function(require,module,exports){
// // 配置axios
let configInfo = require('../config/config.json')
......
webpack.config.js
View file @ b7b5ca5b
......@@ -3,7 +3,7 @@
* @description: 本地run的webpack配置
* @Date: 2021-08-19 17:10:54
* @LastEditors: 莫靓仔
* @LastEditTime: 2021-09-28 13:44:20
* @LastEditTime: 2021-10-13 09:30:21
*/
const path = require('path')
// const webpack = require('webpack')
......@@ -31,7 +31,7 @@ module.exports = {
// hot: true,
// 端口号
port: 8002,
host: '192.168.1.119', // 本机ip
host: '192.168.1.113', // 本机ip
// 是否压缩
compress: true,
// 当前目录
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment