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

config/config.json

-{"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/rightData.js

@@ -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

@@ -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

+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

@@ -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

@@ -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

 (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

@@ -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,
         // 当前目录