diff --git a/src/dgiot/components/DgiotAmis/index.vue b/src/dgiot/components/DgiotAmis/index.vue index 8f63f83f5a..35882f564b 100644 --- a/src/dgiot/components/DgiotAmis/index.vue +++ b/src/dgiot/components/DgiotAmis/index.vue @@ -23,7 +23,7 @@ type: 'page', body: { type: 'tpl', - tpl: 'Hello World!', + tpl: ' ', }, } export default { diff --git a/src/dgiot/components/DgiotAvatar/index.vue b/src/dgiot/components/DgiotAvatar/index.vue index 6f38643e11..3d2175b147 100644 --- a/src/dgiot/components/DgiotAvatar/index.vue +++ b/src/dgiot/components/DgiotAvatar/index.vue @@ -47,7 +47,7 @@ }, async created() {}, mounted() { - console.log('window.name\n', window.name) + // console.log('window.name\n', window.name) // document.getElementsByTagName('link')[0].href = this.avatar }, methods: { diff --git a/src/dgiot/components/DgiotHeader/index.vue b/src/dgiot/components/DgiotHeader/index.vue index 094fdd2e9d..572d19a73d 100644 --- a/src/dgiot/components/DgiotHeader/index.vue +++ b/src/dgiot/components/DgiotHeader/index.vue @@ -172,8 +172,6 @@ '%c option', 'color:#009a61; font-size: 28px; font-weight: 300' ) - - console.log(this.option) console.groupEnd() dgiotlogger.info('MqttConnect', this.option) await this.$dgiotBus.$emit('MqttConnect', this.option) diff --git a/src/dgiot/components/DgiotNav/index.vue b/src/dgiot/components/DgiotNav/index.vue index 48f4621a98..c633c4fa7c 100644 --- a/src/dgiot/components/DgiotNav/index.vue +++ b/src/dgiot/components/DgiotNav/index.vue @@ -170,8 +170,6 @@ '%c option', 'color:#009a61; font-size: 28px; font-weight: 300' ) - - console.log(this.option) console.groupEnd() dgiotlogger.info('MqttConnect', this.option) await this.$dgiotBus.$emit('MqttConnect', this.option) diff --git a/src/i18n/zh.js b/src/i18n/zh.js index 00adb76eb9..53f680c94c 100644 --- a/src/i18n/zh.js +++ b/src/i18n/zh.js @@ -1214,6 +1214,7 @@ export default { 'alert number': '告警编号', 'the starting time': '告警时间', 'Alarm handling': '告警处理', + 'Alarm remark': '备注', 'Alarm status': '告警状态', isprocess: '是否处理', 'Data request successfully': '数据请求成功', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 3a522fd457..993c866121 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -427,9 +427,9 @@ const actions = { }, _userInfo ) - console.log('查看数据', data) + // console.log('查看数据', data) const { sessionToken = '', roles = [], objectId = '' } = data - console.log('不是pc端', isPC()) + // console.log('不是pc端', isPC()) if (!isPC()) { window.jstoken?.setJsToken( window.location.hostname, diff --git a/src/utils/dgiotLog/index.js b/src/utils/dgiotLog/index.js index 8b768d5b7e..f7c14e6926 100644 --- a/src/utils/dgiotLog/index.js +++ b/src/utils/dgiotLog/index.js @@ -140,7 +140,7 @@ function printDgiotlog(option, message) { console[level] || dgiotlog.log, console ) - log.apply(console, logArgs.concat(message)) + // log.apply(console, logArgs.concat(message)) } function time(label, timeFn, dgiotlogOption) { var startTime = Date.now() diff --git a/src/views/CloudFunction/engine/components/DynamicForms.vue b/src/views/CloudFunction/engine/components/DynamicForms.vue index 155391d02e..3b173a0625 100644 --- a/src/views/CloudFunction/engine/components/DynamicForms.vue +++ b/src/views/CloudFunction/engine/components/DynamicForms.vue @@ -477,8 +477,6 @@ dgiotlogger.log('properties', properties) }, async onSubmit() { - console.log(this.ruleContent) - console.log('submit!') const res = await sqlTpl( _.merge(this.ruleContent, { productid: this.$route.query.productid diff --git a/src/views/CloudFunction/lowcode/components/index.vue b/src/views/CloudFunction/lowcode/components/index.vue index 230585183f..a94a9b98fe 100644 --- a/src/views/CloudFunction/lowcode/components/index.vue +++ b/src/views/CloudFunction/lowcode/components/index.vue @@ -62,7 +62,6 @@ const amisEnv = {} const { type, data, objectId, class: _class } = params if (_class == 'Device') { - console.log(data) // const { headers = { store: 'localStorage' } } = data.initApi // 设置amis中的变量参数。 // 目前只设置了parse_objectid @@ -78,7 +77,6 @@ `%c amis env`, 'color:#009a61; font-size: 28px' ) - console.log('amisEnv', amisEnv) console.groupEnd() } this.designLowCode(type, objectId, data) @@ -127,9 +125,6 @@ * @return {Promise} */ async designLowCode(type, objectId, data) { - console.log(type) - console.log(data) - console.log(objectId) this.code = data this.type = type this.objectId = objectId diff --git a/src/views/CloudFunction/topo/VueKonva.vue b/src/views/CloudFunction/topo/VueKonva.vue index fcd607b019..8a184e0528 100644 --- a/src/views/CloudFunction/topo/VueKonva.vue +++ b/src/views/CloudFunction/topo/VueKonva.vue @@ -235,7 +235,6 @@ removeShape(node) { let _this = this const Layer = _this.stage.find('Layer')[0] - console.log('删除的节点', node) var Image = _this.stage.find('Image') var tweens = [] for (var n = 0; n < tweens.length; n++) { @@ -246,8 +245,6 @@ Image.each((shape) => { console.log('图片相关', shape) if (shape.attrs.id == node.attrs.id) { - console.log(shape, 'shape.target 找到了这个node 节点') - console.log(node, 'shape.target 找到了这个node 节点') shape.remove() shape.destroy() node.remove() @@ -449,7 +446,6 @@ // console.log('11111111') await putProduct(productid, params) .then((res) => { - console.log(res, '产品组态更新成功') // this.handleCloseSub() this.$message({ showClose: true, @@ -484,21 +480,16 @@ // this.mqttMsg(payload) let decodeMqtt let updataId = [] - console.log('收到消息', Msg) if (!isBase64(Msg)) { - console.log('非base64数据类型') return } else { decodeMqtt = JSON.parse(Base64.decode(Msg)) - console.log('消息解密消息', decodeMqtt) } - console.log(decodeMqtt.konva) const Shape = decodeMqtt.konva // apply transition to all nodes in the array // Text.each(function (shape) { const Text = _this.stage.find('Text') - console.log(Text) const tweens = [] for (var n = 0; n < tweens.length; n++) { tweens[n].destroy() @@ -507,8 +498,6 @@ Shape.each((i) => { Text.each((shape) => { if (i.id == shape.attrs.id) { - console.log('更新节点', i) - console.log(shape) shape.text(i.text) tweens.push( new Konva.Tween({ @@ -523,14 +512,8 @@ }) }) if (updataId) { - console.log('以下组态id未更新', updataId) } _this.stage.batchDraw() - console.log('konva数据更新成功') - // _this.updataProduct(this.productid) - - - }) // Websocket.add_hook(channeltopic, (Msg) => { @@ -597,9 +580,7 @@ retained: true, qos: 2, } - console.log('sendInfo', sendInfo) if (_this.$refs.topoheader) { - console.log('订阅mqtt') _this.$refs.topoheader.handleCloseSub(sendInfo) } const { @@ -619,13 +600,11 @@ where: { objectId: _this.$route.query.productid }, }) _this.productconfig = results[0] - console.log(_this.productconfig) if (message == 'SUCCESS') { // console.log(this.$refs['edrawer'].$refs, 'edrawer') _this.$refs['operation'] ? (_this.$refs['operation'].productconfig = results[0]) : console.log(' _this.$refs[\'operation\']', _this.$refs['operation']) - console.log(data.Stage.attrs.id) _this.globalStageid = data.Stage.attrs.id _this.createKonva(data, _this.globalStageid, 'create') _this.paramsconfig = { konva: data } @@ -635,7 +614,6 @@ }, // js 绘制 createKonva(data, globalStageid, type) { - console.log('type', type) let Stage let _this = this if (type != 'create') { @@ -643,8 +621,6 @@ } else { Stage = data.Stage } - console.log(data) - console.log(Stage.attrs.height, Stage.attrs.width, '450') Stage.attrs.height = _this.stageConfig.height Stage.attrs.width = _this.stageConfig.width console.log(Stage.attrs.height, Stage.attrs.width, '453') diff --git a/src/views/CloudFunction/topo/components/Amis.vue b/src/views/CloudFunction/topo/components/Amis.vue index 8a9401e524..e1d56adf42 100644 --- a/src/views/CloudFunction/topo/components/Amis.vue +++ b/src/views/CloudFunction/topo/components/Amis.vue @@ -140,7 +140,6 @@ this.nodeAttr.visible = false this.$dgiotBus.$off('nodeInfo') this.$dgiotBus.$on('nodeInfo', (args) => { - console.log(args.attrs.amis_id, 'nodeInfo') if (this.$route.query.deviceid) { localStorage.setItem('parse_objectid', this.$route.query.deviceid) this.quertAmis(args.attrs.amis_id) @@ -173,7 +172,6 @@ this.viewInfo = data }, async bind_amis(args) { - console.log(args.objectId, this.amisNode.node) this.amisNode.node.setAttrs({ fill: 'red', bind_amis: true, @@ -196,7 +194,6 @@ type: 'success', }) this.amisLoading = false - console.log(args, this.amisNode.node) }, async bindAmis(args) { const loading = this.$baseLoading() @@ -212,7 +209,6 @@ type: 'amis', }, }) - console.log(amisDict, args) this.amisDict = amisDict this.amisCount = count this.nodeAttr.visible = false @@ -220,7 +216,6 @@ loading.close() }, async preview_amis(args) { - console.log(args) await this.quertAmis(args.objectId) }, async goDesign() { @@ -248,12 +243,9 @@ this.$dgiotBus.$emit('refresh', this.$route) }, updataForm(from) { - console.log('子组件改变的值') - console.log(from) this.setSizeForm(from) }, addDas() { - console.log(this.sizeForm) this.sizeForm.daslist.push({ addr: '', }) @@ -266,28 +258,20 @@ }, // 提交 submitForm(obj) { - console.log('sizeForm', obj) - console.log('thingType', this.thingType) - console.log('toponobound', this.toponobound) - console.log('topokonvathing', this.topokonvathing) - console.info('如果type是put 走put，否则post') // 判断 里是否有这个identifier if (_.isEmpty(this.topokonvathing) == true) this.thingType = 'post' else this.thingType = 'put' this.toponobound.forEach((item) => { - console.log(obj.identifier, item.identifier, 'identifier') if (obj.identifier == item.identifier) { this.thingType = 'put' } }) - console.log('thingType', this.thingType) let data = { item: obj, productid: this.$route.query.productid, } if (this.thingType == 'post') { postThing(data).then((res) => { - console.log('编辑', res) if (res.code == 200) { this.$message({ showClose: true, @@ -302,7 +286,6 @@ shapeid: this.shapeid, } edit_konva_thing(params).then((res) => { - console.log(res) // this.handleCloseSub() }) this.wmxhandleClose() @@ -317,7 +300,6 @@ }) } else { putThing(data).then((res) => { - console.log('编辑', res) if (res.code == 200) { this.$message({ showClose: true, @@ -332,7 +314,6 @@ shapeid: this.shapeid, } edit_konva_thing(params).then((res) => { - console.log(res) // this.handleCloseSub() }) this.wmxhandleClose() @@ -389,7 +370,6 @@ loading.close() } catch (e) { loading.close() - console.log(e) } }, async bindTopo(args) { @@ -400,7 +380,6 @@ productid: args.id.split('_')[0], text: args.text, } - console.log('args', args) try { // const { thing={},config } = await getProduct(args.id.split('_')[0]) let params = { @@ -425,12 +404,9 @@ return } const { konvathing = {}, nobound = [] } = data - console.log(konvathing, 'konvathing') - console.log(nobound, 'nobound') this.toponobound = nobound this.topokonvathing = konvathing if (Object.values(konvathing).length > 0) { - console.log(`物模型存在这个属性`, konvathing) this.reset(nobound) var obj = {} var daslist = [] diff --git a/src/views/CloudFunction/topo/components/Thing.vue b/src/views/CloudFunction/topo/components/Thing.vue index f7c6f90015..ef9f409ff2 100644 --- a/src/views/CloudFunction/topo/components/Thing.vue +++ b/src/views/CloudFunction/topo/components/Thing.vue @@ -69,7 +69,6 @@ }) this.$dgiotBus.$off('thingType') this.$dgiotBus.$on('thingType', (type) => { - console.log(type, 'type things') this.thingType = type }) this.$baseEventBus.$off( @@ -78,7 +77,6 @@ this.$baseEventBus.$on( this.$dgiotBus.topicKey('dgiot_thing', 'dgiotThing'), (args) => { - console.log('aaaaa', args) if (args) { // 绑定物模型 if (args.type == 'bind_topo') { @@ -110,12 +108,9 @@ this.$dgiotBus.$emit('refresh', this.$route) }, updataForm(from) { - console.log('子组件改变的值') - console.log(from) this.setSizeForm(from) }, addDas() { - console.log(this.sizeForm) this.sizeForm.daslist.push({ addr: '', }) @@ -128,28 +123,20 @@ }, // 提交 submitForm(obj) { - console.log('sizeForm', obj) - console.log('thingType', this.thingType) - console.log('toponobound', this.toponobound) - console.log('topokonvathing', this.topokonvathing) - console.info('如果type是put 走put，否则post') // 判断 里是否有这个identifier if (_.isEmpty(this.topokonvathing) == true) this.thingType = 'post' else this.thingType = 'put' this.toponobound.forEach((item) => { - console.log(obj.identifier, item.identifier, 'identifier') if (obj.identifier == item.identifier) { this.thingType = 'put' } }) - console.log('thingType', this.thingType) let data = { item: obj, productid: this.$route.query.productid, } if (this.thingType == 'post') { postThing(data).then((res) => { - console.log('编辑', res) if (res.code == 200) { this.$message({ type: 'success', @@ -162,7 +149,6 @@ shapeid: this.shapeid, } edit_konva_thing(params).then((res) => { - console.log(res) // this.handleCloseSub() }) this.wmxhandleClose() @@ -177,7 +163,6 @@ }) } else { putThing(data).then((res) => { - console.log('编辑', res) if (res.code == 200) { this.$message({ showClose: true, @@ -192,7 +177,6 @@ shapeid: this.shapeid, } edit_konva_thing(params).then((res) => { - console.log(res) // this.handleCloseSub() }) this.wmxhandleClose() @@ -237,31 +221,6 @@ 'success', 'dgiot-hey-message-success' ) - // const loading = this.$baseLoading() - // try { - // localStorage.setItem('konvaStale', canvas.stage.toJSON()) - // const params = { - // config: _.merge(this.productconfig, { - // konva: { Stage: JSON.parse(canvas.stage.toJSON()) }, - // }), - // } - // this.$message.success(this.$translateTitle('user.update completed')) - // const res = - // this.$route.query.type == 'Evidence' - // ? await putView(this.$route.query.viewid, { - // data: _.merge( - // { - // konva: { Stage: JSON.parse(canvas.stage.toJSON()) }, - // }, - // this.viewInfo - // ), - // }) - // : await putProduct(this.$route.query.productid, params) - // loading.close() - // } catch (e) { - // loading.close() - // console.log(e) - // } }, async bindTopo(args) { const loading = this.$baseLoading() @@ -271,7 +230,6 @@ productid: args.id.split('_')[0], text: args.text, } - console.log('args', args) try { // const { thing={},config } = await getProduct(args.id.split('_')[0]) let params = { @@ -296,12 +254,9 @@ return } const { konvathing = {}, nobound = [] } = data - console.log(konvathing, 'konvathing') - console.log(nobound, 'nobound') this.toponobound = nobound this.topokonvathing = konvathing if (Object.values(konvathing).length > 0) { - console.log(`物模型存在这个属性`, konvathing) this.reset(nobound) var obj = {} var daslist = [] @@ -753,13 +708,11 @@ this.$nextTick(() => { this.$refs['sizeForm'].resource.data.forEach( (resource, index) => { - console.info(resource, '物模型回显事件') // resource[index].arr = [] // resource[index].obj = {} if ( this.$refs['sizeForm'].resource.value === resource.cType ) { - console.info(resource, '物模型回显事件') resource.arr.forEach((i) => { if (i.allowCreate) { this.$refs['sizeForm'].dynamicTable( @@ -769,7 +722,6 @@ ) } }) - console.info(konvathing.dataSource, 'rowData.dataSource') this.$refs['sizeForm'].resource.addchannel = konvathing.dataSource for (var o in konvathing.dataSource) { @@ -777,17 +729,12 @@ if (o === j) resource.obj[o] = rowData.dataSource[j] } } - console.info(resource.obj, 'set resource.obj') } this.$refs['sizeForm'].resource.changeData = konvathing.dataSource - if (resource.cType == konvathing.dataForm.protocol) { - console.log(resource, 'success') - } } ) }) - console.log('refs sizeForm', this.$refs['sizeForm']) // 子组件的实例 }) } else { this.reset(nobound) @@ -798,13 +745,9 @@ } // 显示物模型弹窗 this.thingDialog = true - // this.productconfig = config - // console.log(thing) - // this.thingData = thing loading.close() } catch (e) { loading.close() - console.log(e) } }, reset(nobound) { diff --git a/src/views/CloudFunction/topo/components/TopoAllocation.vue b/src/views/CloudFunction/topo/components/TopoAllocation.vue index 03ad1a3fa8..e93f8e3bfa 100644 --- a/src/views/CloudFunction/topo/components/TopoAllocation.vue +++ b/src/views/CloudFunction/topo/components/TopoAllocation.vue @@ -30,7 +30,6 @@ - diff --git a/src/views/DeviceCloud/manage/iotcard.vue b/src/views/DeviceCloud/manage/iotcard.vue new file mode 100644 index 0000000000..e61fe90033 --- /dev/null +++ b/src/views/DeviceCloud/manage/iotcard.vue @@ -0,0 +1,40 @@ + + + + diff --git a/src/views/DeviceCloud/manage/js/devicesDetailLite.js b/src/views/DeviceCloud/manage/js/devicesDetailLite.js index 60e5faae4e..a8d4e07395 100644 --- a/src/views/DeviceCloud/manage/js/devicesDetailLite.js +++ b/src/views/DeviceCloud/manage/js/devicesDetailLite.js @@ -411,7 +411,6 @@ export default { this.getDeviceInfo(this.$route.query.deviceid) this.setTreeFlag(false) this.params.style = this.chartType[0].type - console.log(' this.params.style', this.params.style) this.subtopic = `$dg/user/realtimecard/${this.$route.query.deviceid}/report` // 设备实时数据topic this.router = this.$dgiotBus.router(location.href + this.$route.fullPath) this.topicKey = this.$dgiotBus.topicKey(this.router, this.subtopic) // dgiot-mqtt topicKey 唯一标识 @@ -442,15 +441,7 @@ export default { */ async subRealtimedata() { try { - // 订阅mqtt - // this.$dgiotBus.$emit('MqttSubscribe', { - // router: this.router, - // topic: this.subtopic, - // qos: 0, - // ttl: 1000 * 60 * 60 * 3, - // }) await this.$subscribe(this.subtopic) - console.log(this.$mqttInfo) // mqtt 消息回调 console.groupCollapsed( `%c mqtt 订阅日志`, @@ -479,7 +470,6 @@ export default { } }) } catch (error) { - console.log(error) this.$baseMessage( this.$translateTitle('alert.Data request error') + `${error}`, 'error', @@ -563,23 +553,12 @@ export default { resultes.topicData = resultes.product.topics ? resultes.product.topics.concat(_toppic) : _toppic - console.log(resultes, 'resultes') this.deviceInfo = resultes - // this.$baseMessage( - // this.$translateTitle('alert.Data request successfully'), - // 'success', - // 'dgiot-hey-message-success' - // ) - // loading.close() this.mapLabel = mapLabel if (this.$refs['map']) this.$refs['map'].baiduCenter = this.mapLabel.position this.bmLabel = true - // this.$refs['map'].label = this.mapLabel - console.info('vm.mapLabel\n', this.mapLabel) - console.info('vm.mapLabel\n', this.$refs['map']) } catch (error) { - console.log(error) this.$baseMessage( this.$translateTitle('alert.Data request error') + `${error}`, 'error', @@ -590,7 +569,6 @@ export default { toggleChart(e) { this.chartKey = moment(new Date()).valueOf() this.loading = false - console.log(e) this.chartExtend = {} this.chartDataZoom = [] let type = ['funnel', 'radar', 'radar'] @@ -640,7 +618,6 @@ export default { charts.forEach((chart) => { chart.$children[0].resize() }) - console.log('重绘完成', charts) } else { charts.$children[0].resize() } @@ -674,16 +651,7 @@ export default { rows: [], } if (this.params.startTime && this.params.endTime) { - // this.$baseColorfullLoading( - // 1, - // this.$translateTitle('home.messag_loding') - // ) let deviceid = this.$route.query.deviceid - // let endTime = moment(this.params.datetimerange[1]).valueOf() - // let startTime = moment(this.params.datetimerange[0]).valueOf() - // console.log('endTime', endTime) - // console.log('startTime', startTime) - // const limit = moment(endTime).diff(moment(startTime), 'days') const { interval, keys, @@ -705,8 +673,6 @@ export default { } await getDabDevice(deviceid, params) .then((res) => { - // this.$baseColorfullLoading().close() - console.log(res, 'res charts') if (res?.chartData) { const { chartData = {} } = res this.chartData = chartData @@ -717,24 +683,16 @@ export default { }, 1000) }) } - console.log('this.chartData', this.chartData) this.loading = false this.dataEmpty = false }) .catch((e) => { - console.log(e) this.loading = false - // this.$baseColorfullLoading().close() }) } else { - // this.$message.error( - // this.$translateTitle('developer.Please select the query Time') - // ) } }, - print(item) { - console.log(item) - }, + print(item) {}, tabHandleClick(tab) { this.$dgiotBus.$emit('MqttUnbscribe', this.topicKey, this.subtopic) switch (tab.name) { @@ -816,7 +774,6 @@ export default { if (this.childrendevices.devicesname != '') { params.where.devaddr = this.childrendevices.devicesname } - console.log('this.params', params) this.$queryDevice(params) .then((res) => { this.childrenDeviceTotal = res.count @@ -837,7 +794,6 @@ export default { } }) .catch((err) => { - console.log(err) this.$baseMessage('请求出错11', err.error, 3000) }) }, @@ -930,7 +886,6 @@ export default { }) }, async deviceToDetail(row) { - console.log('row', row) const query = { deviceid: row.objectId, nodeType: row.nodeType, @@ -942,7 +897,6 @@ export default { this.getDeviceInfo(query.deviceid) this.setTreeFlag(false) this.params.style = this.chartType[0].type - console.log(' this.params.style', this.params.style) this.subtopic = `$dg/user/realtimecard/${this.$route.query.deviceid}/report` // 设备实时数据topic this.router = this.$dgiotBus.router(location.href + this.$route.fullPath) // this.topicKey = this.$dgiotBus.topicKey(this.router, this.subtopic) // dgiot-mqtt topicKey 唯一标识 diff --git a/src/views/DeviceCloud/manage/js/editdevices.js b/src/views/DeviceCloud/manage/js/editdevices.js index ff97dd1603..6328a23c8b 100644 --- a/src/views/DeviceCloud/manage/js/editdevices.js +++ b/src/views/DeviceCloud/manage/js/editdevices.js @@ -501,7 +501,6 @@ export default { addVisitedRoute: 'tabs/addVisitedRoute', }), Unbscribe() { - console.log('Unbscribe all topic') const subtopic = '$dg/user/trace/' + this.deviceInfo.objectId + '/#' const topicKey = this.$dgiotBus.topicKey(this.router, subtopic) this.$dgiotBus.$emit('MqttUnbscribe', topicKey, subtopic) @@ -593,7 +592,6 @@ export default { resultes.topicData = resultes.product.topics ? resultes.product.topics.concat(_toppic) : _toppic - console.log(resultes, 'resultes') this.deviceInfo = resultes // this.$baseMessage( // this.$translateTitle('alert.Data request successfully'), @@ -736,7 +734,6 @@ export default { await getDabDevice(deviceid, params) .then((res) => { // this.$baseColorfullLoading().close() - console.log(res, 'res charts') if (res?.chartData) { const { chartData = {} } = res this.chartData = chartData @@ -747,7 +744,6 @@ export default { }, 1000) }) } - console.log('this.chartData', this.chartData) this.loading = false this.dataEmpty = false }) @@ -983,7 +979,6 @@ export default { }) }, async deviceToDetail(row) { - console.log('row', row) const query = { deviceid: row.objectId, nodeType: row.nodeType, @@ -996,7 +991,6 @@ export default { this.getDeviceInfo(query.deviceid) this.setTreeFlag(false) this.params.style = this.chartType[0].type - console.log(' this.params.style', this.params.style) // | 卡片消息 | $dg/user/realtimecard/{DeviceId}/report|平台|用户| this.subtopic = `$dg/user/realtimecard${this.$route.query.deviceid}/report` // 设备实时数据topic this.router = this.$dgiotBus.router(location.href + this.$route.fullPath) diff --git a/src/views/DeviceCloud/manage/js/proddetail.js b/src/views/DeviceCloud/manage/js/proddetail.js index c0ad4b5466..bfab0cd207 100644 --- a/src/views/DeviceCloud/manage/js/proddetail.js +++ b/src/views/DeviceCloud/manage/js/proddetail.js @@ -924,7 +924,6 @@ export default { }, inputAddress() { const address = this.productdetail.config.addres - console.log(1111111111111111, addres) // https://lbsyun.baidu.com/jsdemo.htm#wAddressParseSingle 根据位置解析 var map = new BMapGL.Map('container') map.centerAndZoom(new BMapGL.Point(116.331398, 39.897445), 12) @@ -943,14 +942,12 @@ export default { }, '北京市' ) - console.log(address) }, mapClick(e) { this.productdetail.config.location = { latitude: e.point.lat, longitude: e.point.lng, } - console.log(e, this.productdetail.config) // this.center.lng = e.point.lng // this.center.lat = e.point.lat // this.addresspointer = @@ -958,7 +955,6 @@ export default { const geocoder = new BMap.Geocoder() // 创建地址解析器的实例 // let Marker = new BMap.Marker() geocoder.getLocation(e.point, (rs) => { - console.log(rs) this.productdetail.config.address = rs.address }) }, @@ -986,7 +982,6 @@ export default { // this.onChildrenDrawerClose() }, editParameters(form, type) { - console.log('thingParameters', form) // 向events 的 outputData 添加 输出参数 this.modules[type].data.output[this.editIndex] = form this.atbas.childrenDrawer = false @@ -1044,7 +1039,6 @@ export default { }, async editEvent(item, index, type) { this.editIndex = index - await console.log('editEvent', item) this.atbas.childrenDrawer = true this.eventForm = item this.eventType = 'edit' @@ -1166,8 +1160,6 @@ export default { }, async submitModules(type, form) { form.data.outputParams = [] - console.log(form.data.output, 'form.data.output') - console.log(form.data, 'form.data') // 计算输出参数 form.data.output.forEach((o, index) => { form.data.outputParams.push({ @@ -1189,7 +1181,6 @@ export default { moduleType: type, updateAt: moment(new Date()).format('x'), } - console.log('_item', _item) window._item = _item await this.submitForm(_item) this.atbas.visible = false @@ -1200,7 +1191,6 @@ export default { dgiotlogger.info('this.modules.data') this.$refs[type].validate(async (valid) => { if (valid) { - await console.log(type, form.data) this.modules.data.events.push(_item) const res = await putProduct(this.productObj.objectId, { thing: this.modules.data, @@ -1403,8 +1393,6 @@ export default { services = [], tags = [], } = this.productObj.thing - console.log(this.tabsChild, e) - console.log(e.name, this.productObj.thing, this.productObj.thing[e.name]) switch (e.name) { case 'properties': this.modules.data.properties = properties || [] @@ -1569,7 +1557,6 @@ export default { obj.value = topics[i] this.topicData.push(obj) } - console.log(this.topicData) }, /** * @description 导出产品 diff --git a/src/views/DeviceCloud/manage/konvadevice.vue b/src/views/DeviceCloud/manage/konvadevice.vue index 343c760be2..d92faff731 100644 --- a/src/views/DeviceCloud/manage/konvadevice.vue +++ b/src/views/DeviceCloud/manage/konvadevice.vue @@ -65,7 +65,6 @@ mounted() { this.vueComponents = [] this.vueFlag = false - console.log('111111111') this.$dgiotBus.$off('vueComponent') this.$dgiotBus.$on('vueComponent', async (list, flag) => { this.vueComponents = list diff --git a/src/views/DeviceCloud/manage/platform_overview.vue b/src/views/DeviceCloud/manage/platform_overview.vue index 0ba6021330..5add93bc55 100644 --- a/src/views/DeviceCloud/manage/platform_overview.vue +++ b/src/views/DeviceCloud/manage/platform_overview.vue @@ -313,83 +313,108 @@ size="mini" @click="toggleFull()" /> - - - - - - - - - + - - - - - - - - - - - - - - - - - -
- + +
+ + + +
+ +
+ + + +

+ {{ $translateTitle('equipment.devicename') }} + ： {{ deviceInfo.name }} +

+

+ {{ $translateTitle('equipment.address') }} + ： {{ deviceInfo.address }} +

+

+ {{ + $translateTitle('zetadevices.devicestatus') + }} + ： + + {{ + deviceInfo.status === 'ONLINE' + ? $translateTitle('zetadevices.online') + : $translateTitle('zetadevices.offline') + }} + +

+

+ + {{ + $translateTitle( + 'product.Device Information' + ) + }} + +

+ + +
+ - - - - - - - - - - - - - - - - - - - - -
@@ -626,7 +651,7 @@ import { postTopic, deleteTopic } from '@/api/Dlink' import icoPath1 from '../../../../public/assets/images/Device/1.png' import icoPath2 from '../../../../public/assets/images/Device/2.png' - // import { queryProduct } from '@/api/Product' + import { queryProduct } from '@/api/Product' import { getDevice } from '@/api/Device' import { mapGetters, mapMutations } from 'vuex' import { getToken } from '@/api/Menu' @@ -916,7 +941,6 @@ p.lng = p.location.longitude p.lat = p.location.latitude }) - console.log(position) return position }, /** @@ -1025,28 +1049,28 @@ return name }, closeInfo(item, index) { - // item.show = false + item.show = false // this.$refs[`bm_info${index}`][0].$children[0].show = false // this.set_tableData(_.merge([], this._tableData)) // this.$forceUpdate() }, async showDeatils(row, index) { - // const loading = this.$baseColorfullLoading(0) - // this.productIco = '' - // this.deviceInfo = await getDevice(row.objectId) - // const { results = [{ icon: '' }] } = await queryProduct({ - // count: 'objectId', - // order: '-updatedAt', - // keys: 'icon', - // where: { - // objectId: this.deviceInfo.product.objectId, - // }, - // }) - // this.productIco = results[0].icon - // row.show = true - // - // // dgiotlog.log(this.productIco, row, row.show, index, this.deviceInfo) - // // 延时加载 + const loading = this.$baseColorfullLoading(0) + this.productIco = '' + this.deviceInfo = await getDevice(row.objectId) + const { results = [{ icon: '' }] } = await queryProduct({ + count: 'objectId', + order: '-updatedAt', + keys: 'icon', + where: { + objectId: this.deviceInfo.product.objectId, + }, + }) + this.productIco = results[0].icon + loading.close() + this.$refs[`bm_info${index}`][0].$children[0].show = true + // dgiotlog.log(this.productIco, row, row.show, index, this.deviceInfo) + // 延时加载 // setTimeout(() => { // loading.close() // dgiotlog.info(this.$refs[`bm_info${index}`]) @@ -1087,19 +1111,9 @@ // }, mqttMsg(e) { let mqttMsg = isBase64(e) ? Base64.decode(e) : e - // // dgiotlog.log(destinationName, mqttMsg, 'mqttMsg') let mqttMsgValue = JSON.parse(mqttMsg).value let key = JSON.parse(mqttMsg).vuekey - console.log(mqttMsg, `收到${key}消息`) - // this.printQueryInfo(mqttMsgValue, mqttMsg) - // this.loadingConfig[`${key}`] = true - // this.$baseNotify( - // '', - // `${this.$translateTitle('websocket.messages')}${key}` - // ) - // // dgiotlog.log(key, mqttMsgValue, JSON.parse(mqttMsg)) - // console.clear() - + //console.log(`收到${key}消息`) switch (key) { case 'app_count': this.app_count = mqttMsgValue.count @@ -1147,12 +1161,8 @@ : item.icon === '1' ? 'blue' : 'red' - // item.iconUrl = require(`@/assets/images/Device/${ - // item.icon - // }.png?${new Date().getTime()}\``) }) - console.error('baiduMap') - console.log(this.tableData) + // console.log('tableData', this.tableData) this.set_tableData(this.tableData) this.$forceUpdate() break @@ -1229,8 +1239,8 @@ this.$dgiotBus.getTopicKeyBypage('dashboard'), (res) => { const { payloadString } = res - console.log('home page topic data', payloadString) - console.log(res) + // console.log('home page topic data', payloadString) + // console.log(res) this.mqttMsg(payloadString) } ) @@ -1336,35 +1346,20 @@ }, goDevice(name) { this.$router.push({ - path: '/dashboard/device', + path: '/dashboard/devicelist', query: { product: name, }, }) - console.log(window.errRoute) - if (window?.errRoute?.name) - this.$router.push({ - path: '/dashboard/devicelist', - query: { - product: name, - }, - }) }, _goDevice(item) { this.$router.push({ - path: 'dashboard/device', + path: '/roles/editdevices', query: { - devicename: item.name, + deviceid: item.objectId, + ischildren: 'false', }, }) - console.log(window.errRoute) - if (window?.errRoute?.name) - this.$router.push({ - path: '/dashboard/devicelist', - query: { - devicename: item.name, - }, - }) }, goLink(type, item) { switch (type) { diff --git a/src/views/DeviceCloud/manage/product.vue b/src/views/DeviceCloud/manage/product.vue index 1b870932eb..ba6b4ba575 100644 --- a/src/views/DeviceCloud/manage/product.vue +++ b/src/views/DeviceCloud/manage/product.vue @@ -1818,8 +1818,6 @@ }) break } - - console.log(product, type) }, handleSizeChange(val) { this.queryForm.limit = val @@ -1904,8 +1902,6 @@ } this.v.name ? (params.where.name = { $regex: this.v.name }) : '' args?.categorys ? (params.where.category = { $in: args.categorys }) : '' - console.log(params) - console.log('params') try { const { results = [], count = 0 } = await queryProductTemplet(params) // loading.close() @@ -1975,7 +1971,6 @@ } }, delRow(index, rows) { - console.log(index, rows) this.dictTempForm.params.splice(index, 1) // this.onJsonSave("dictTempForm"); }, @@ -2237,7 +2232,6 @@ // 选择产品模板 async chooseTemplate(row) { this.selectedRow = row - console.log(row) // const res = await this.getcategoryname(row.category) this.$set( this.form, @@ -2254,7 +2248,6 @@ // try { // const res = await this.getcategoryname(row.category) // }catch (e) { - // console.log(e) // this.$message({ // type:'error', // message:e, @@ -2262,7 +2255,6 @@ // }) // } this.cascaderDrawer = !this.cascaderDrawer - console.log('select', row) }, async getcategoryname(category) { const {name} = await getCategory(category.parent.objectId) @@ -2498,9 +2490,7 @@ if (row.icon) { this.imageUrl = row.icon } - // this.form.relationApp = this.currentDepartment.name - console.log('row', row) dgiotlog.log('form', this.form) }, async categorytree() { @@ -2593,12 +2583,6 @@ setAcl['*'] = { read: true, } - console.clear() - console.log('this.form', this.form) - console.log( - this.form.config.checkList, - 'this.form.config.checkList' - ) const addparams = { productSecret: productSecret, ACL: setAcl, @@ -2612,7 +2596,6 @@ dgiotlog.log('createProduct', params) this.createProduct(params) } else { - console.log('editProduct', initparams) delete initparams.category delete initparams.producttemplet delete initparams.thing // 修改产品时 不修改物模型 diff --git a/src/views/MultiTenant/roles/structure.vue b/src/views/MultiTenant/roles/structure.vue index 6605bfb79c..814e28039c 100644 --- a/src/views/MultiTenant/roles/structure.vue +++ b/src/views/MultiTenant/roles/structure.vue @@ -181,14 +181,6 @@
{{ row.email }}
- - - - - - - - { - // const data = { - // department: this.curDepartmentId, - // username: row.username, - // } const params = { department: this.currentDepartment.objectId, username: row.username, } const res = await EmployeeTurnover(params) - // this.$dgiotBus.$emit('asyncTreeData') if (res) { this.$message({ showClose: true, diff --git a/src/views/MultiTenant/user/login/index.vue b/src/views/MultiTenant/user/login/index.vue index 1968c7c665..d21afc086f 100644 --- a/src/views/MultiTenant/user/login/index.vue +++ b/src/views/MultiTenant/user/login/index.vue @@ -336,7 +336,10 @@ expires: 60 * 1000 * 30, } ) - await this.login({ username: 'feiiplat', password: 'feiiplat' }) + await this.login({ + username: 'yanshizhanghao', + password: 'yanshizhanghao', + }) await this.goHome() } })