diff --git a/.env.ccprod b/.env.ccprod
index 01065ed9..41d3826f 100644
--- a/.env.ccprod
+++ b/.env.ccprod
@@ -33,6 +33,11 @@ VUE_APP_THEME_CLASS = 'theme-grey-red'
# 智慧用电管理系统/开发环境
VUE_APP_BASE_API = '/prod-api'
+#平台大屏地址
+VUE_APP_BIGSCREEN_PLATFORM_URL = 'http://goview.drgyen.cn/#/chart/preview/202409060982078'
+#项目大屏地址
+VUE_APP_BIGSCREEN_PROJECT_URL = ''
+
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.development b/.env.development
index 964dd1f3..b043f3a8 100644
--- a/.env.development
+++ b/.env.development
@@ -28,6 +28,11 @@ VUE_APP_THEME_CLASS = 'theme-green'
# 智慧用电管理系统/开发环境
VUE_APP_BASE_API = '/dev-api'
+#平台大屏地址
+VUE_APP_BIGSCREEN_PLATFORM_URL = 'http://goview.drgyen.cn/#/chart/preview/202409060982078'
+#项目大屏地址
+VUE_APP_BIGSCREEN_PROJECT_URL = ''
+
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.dr b/.env.dr
index b7cc0f5d..2078210a 100644
--- a/.env.dr
+++ b/.env.dr
@@ -32,6 +32,11 @@ VUE_APP_THEME_CLASS = 'theme-blue-black'
# 智慧用电管理系统/开发环境
VUE_APP_BASE_API = '/dev-api'
+#平台大屏地址
+VUE_APP_BIGSCREEN_PLATFORM_URL = 'http://goview.drgyen.cn/#/chart/preview/202409060982078'
+#项目大屏地址
+VUE_APP_BIGSCREEN_PROJECT_URL = ''
+
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.drgy b/.env.drgy
index 0b4640ef..c45e46d2 100644
--- a/.env.drgy
+++ b/.env.drgy
@@ -32,6 +32,11 @@ VUE_APP_THEME_CLASS = 'theme-blue-white'
# 智慧用电管理系统/开发环境
VUE_APP_BASE_API = '/dev-api'
+#平台大屏地址
+VUE_APP_BIGSCREEN_PLATFORM_URL = 'http://goview.drgyen.cn/#/chart/preview/202409060982078'
+#项目大屏地址
+VUE_APP_BIGSCREEN_PROJECT_URL = ''
+
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.drgyprod b/.env.drgyprod
index 688cc476..c627e385 100644
--- a/.env.drgyprod
+++ b/.env.drgyprod
@@ -33,6 +33,11 @@ VUE_APP_THEME_CLASS = 'theme-green'
# 智慧用电管理系统/开发环境
VUE_APP_BASE_API = '/prod-api'
+#平台大屏地址
+VUE_APP_BIGSCREEN_PLATFORM_URL = 'http://goview.drgyen.cn/#/chart/preview/202409060982078'
+#项目大屏地址
+VUE_APP_BIGSCREEN_PROJECT_URL = ''
+
# 前端端口
diff --git a/.env.drprod b/.env.drprod
index 47d23726..d68f466d 100644
--- a/.env.drprod
+++ b/.env.drprod
@@ -33,6 +33,11 @@ VUE_APP_THEME_CLASS = 'theme-blue-black'
# 智慧用电管理系统/开发环境
VUE_APP_BASE_API = '/prod-api'
+#平台大屏地址
+VUE_APP_BIGSCREEN_PLATFORM_URL = 'http://goview.drgyen.cn/#/chart/preview/202409060982078'
+#项目大屏地址
+VUE_APP_BIGSCREEN_PROJECT_URL = ''
+
# 前端端口
port= 9988
diff --git a/package.json b/package.json
index 3e21b3b9..a5af1a73 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
"js-beautify": "1.13.0",
"js-cookie": "2.2.1",
"js-md5": "^0.7.3",
+ "jsbarcode": "^3.11.6",
"jsencrypt": "3.0.0-rc.1",
"moment": "^2.29.4",
"nprogress": "0.2.0",
diff --git a/src/router/index.js b/src/router/index.js
index 06a6d701..6e6c116a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -76,7 +76,7 @@ export const constantRoutes = [
children: [
{
path: '/index',
- component: (resolve) => require(['@/views/bigScreen/v3/index'], resolve),
+ component: (resolve) => require(['@/views/bigScreenIframe/index'], resolve),
name: 'BigScreen',
meta: {
title: '监控大屏', icon: 'dashboard', noCache: true, affix: true
diff --git a/src/store/modules/attribute.js b/src/store/modules/attribute.js
index e428358a..494c7ed2 100644
--- a/src/store/modules/attribute.js
+++ b/src/store/modules/attribute.js
@@ -59,6 +59,9 @@ const attribute = {
resolve(state.groupList)
})
},
+ setAttribute({ commit, state }, data){
+ commit('SET_ATTRIBUTE_LIST', data)
+ },
// 初始化 属性和分组数据
InitAttributeAndGroup({ commit, state }, data) {
commit('SET_ATTRIBUTE_LIST', data.attrList)
diff --git a/src/views/bigScreenIframe/index.vue b/src/views/bigScreenIframe/index.vue
new file mode 100644
index 00000000..c375e8c5
--- /dev/null
+++ b/src/views/bigScreenIframe/index.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue
index be5cd709..dc3fedfe 100644
--- a/src/views/iot/device/index.vue
+++ b/src/views/iot/device/index.vue
@@ -2,23 +2,23 @@
@@ -27,8 +27,8 @@
@@ -37,8 +37,8 @@
@@ -47,15 +47,15 @@
@@ -63,24 +63,24 @@
搜索
@@ -93,21 +93,21 @@
新增
导出
@@ -125,20 +125,30 @@
@sort-change="sortChange"
>
-
-
-
+
+
+
+
+
+
+
+
+
- 在线
离线
脱线
- 未激活
详情
修改
解绑
删除
@@ -234,21 +245,21 @@
@@ -337,19 +348,19 @@
*注意:锁定即参数不可修改;未锁则可以修改。
@@ -379,20 +390,23 @@
-
- 返回列表
+
+
+
+
@@ -413,6 +427,7 @@ import ParamWrap from "@/components/ParamWrap/deviceParam";
import GatewayDetail from "@/views/profile/DeviceDetailsView/index";
import EDialogTableInput from "@/components/EDialogTableInput";
import DialogTemplate from "@/components/DialogTemplate";
+import JsBarcode from "jsbarcode"
const deviceStatusOpt = {
ONLINE: "在线",
@@ -634,6 +649,8 @@ export default {
selectModelTable,
selectDeviceTable,
lineTypeOpt,
+ imgModelShow:false,
+ qrCodeUrl:'',
sourceId: "",
componectVal: "",
// 遮罩层
@@ -720,6 +737,10 @@ export default {
this.form.parentId = e.deviceId;
this.form.parentName = e.deviceName;
},
+ lookQrCode(url){
+ this.qrCodeUrl = url;
+ this.imgModelShow = true;
+ },
// 字典状态字典翻译
statusFormat(row, column) {
return this.selectDictLabel(this.deviceTagList, row.deviceTag);
@@ -789,6 +810,19 @@ export default {
this.deviceList = response.rows;
this.total = response.total;
this.loading = false;
+ this.$nextTick(() => {
+ this.deviceList.forEach((item,index) => {
+ JsBarcode(this.$refs["qrCodeDiv" + item.deviceKey], item.deviceKey, {
+ format: "CODE128", //条形码的格式
+ width: 2, //线宽
+ height: 65, //条码高度
+ lineColor: "#000", //线条颜色
+ displayValue: true, //是否显示文字
+ margin: 3 //设置条形码周围的空白区域
+ });
+ this.deviceList[index].qrCodeUrl=this.$refs["qrCodeDiv" + item.deviceKey].src;
+ })
+ })
});
},
// 取消按钮
diff --git a/src/views/iot/model/index.vue b/src/views/iot/model/index.vue
index e0b2da0f..45933a56 100644
--- a/src/views/iot/model/index.vue
+++ b/src/views/iot/model/index.vue
@@ -1,17 +1,17 @@
@@ -19,8 +19,8 @@
@@ -29,24 +29,24 @@
搜索
@@ -59,12 +59,12 @@
新增
@@ -81,41 +81,41 @@
@sort-change="sortChange"
>
-
+
-
+
{{ scope.row.prodSecret }}
@@ -125,8 +125,8 @@
@@ -136,47 +136,47 @@
- 启用
- 禁用
+ 禁用
修改
删除
@@ -185,9 +185,9 @@
@@ -213,15 +213,15 @@
@@ -230,9 +230,9 @@
- 选择型号系列
+ 选择型号系列
@@ -280,23 +280,23 @@
-
+
*注意:锁定即参数不可修改;未锁则可以修改。
@@ -311,28 +311,28 @@
@@ -354,32 +354,32 @@
{
AttributeViewShow = false;
}
"
- :visible="AttributeViewShow"
- width="750px"
>
-
确 定
a.sort - b.sort);
}
let groupList = [];
@@ -1024,6 +1025,7 @@ export default {
v["sourceId"] = this.form.prodKey;
return v;
});
+ groupList.sort((a, b) => a.sort - b.sort);
}
console.log(groupList, attrList);
this.form.prodJson = JSON.stringify(attrList) || null;
diff --git a/src/views/iot/modelScries/index.vue b/src/views/iot/modelScries/index.vue
index 9aa5c515..0a2d7389 100644
--- a/src/views/iot/modelScries/index.vue
+++ b/src/views/iot/modelScries/index.vue
@@ -1,11 +1,11 @@
-
+
@@ -14,15 +14,15 @@
- 搜索
+ 搜索
重置
@@ -30,76 +30,76 @@
新增
修改
删除
导出
-
+
@@ -109,64 +109,64 @@
- 启用
- 禁用
+ 禁用
修改
删除
-
+
-
-
+
+
@@ -177,9 +177,9 @@
@@ -191,10 +191,10 @@
>
@@ -203,23 +203,23 @@
-
+
*注意:锁定即参数不可修改;未锁则可以修改。
@@ -245,32 +245,32 @@
{
AttributeViewShow = false;
}
"
- :visible="AttributeViewShow"
- width="750px"
>
- 确 定
a.sort - b.sort);
}
let groupList = [];
@@ -519,6 +520,7 @@ export default {
v["sourceId"] = this.form.prodKey;
return v;
});
+ groupList.sort((a, b) => a.sort - b.sort);
}
this.form.prodJson = JSON.stringify(attrList) || null;
this.form.remark = JSON.stringify(groupList) || null;
@@ -529,7 +531,7 @@ export default {
} catch (error) {
this.form.paramJson = "";
}
-
+
if (this.form.seriesId != null) {
updateModelSeries(this.form).then((response) => {
this.msgSuccess("修改成功");
diff --git a/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue b/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue
index 4d3c0b51..80f6a9f8 100644
--- a/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue
+++ b/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue
@@ -57,9 +57,9 @@
@@ -75,10 +75,6 @@
分闸
合闸
diff --git a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue
index 7179dd55..d0cfedc7 100644
--- a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue
+++ b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue
@@ -1,19 +1,19 @@
@@ -39,14 +39,14 @@
@@ -66,9 +66,9 @@
-