Merge branch 'master' into guangyin
commit
193d453f22
|
@ -18,7 +18,7 @@
|
||||||
"echarts-wordcloud": "^2.1.0",
|
"echarts-wordcloud": "^2.1.0",
|
||||||
"element-ui": "^2.15.13",
|
"element-ui": "^2.15.13",
|
||||||
"file-saver": "^2.0.5",
|
"file-saver": "^2.0.5",
|
||||||
"hbt-common": "0.0.5",
|
"hbt-common": "0.0.6",
|
||||||
"jquery": "^3.6.4",
|
"jquery": "^3.6.4",
|
||||||
"layui-layer": "^1.0.9",
|
"layui-layer": "^1.0.9",
|
||||||
"mockjs": "^1.1.0",
|
"mockjs": "^1.1.0",
|
||||||
|
|
|
@ -4,8 +4,8 @@ import router from './router'
|
||||||
import store from './store'
|
import store from './store'
|
||||||
import ElementUI from 'element-ui';
|
import ElementUI from 'element-ui';
|
||||||
import 'element-ui/lib/theme-chalk/index.css';
|
import 'element-ui/lib/theme-chalk/index.css';
|
||||||
import SvgComponent from "hbt-common/components/svg.component.vue"
|
import SvgComponent from "hbt-common/components/common/svg.component.vue"
|
||||||
import EchartsComponent from "hbt-common/components/echarts.component.vue"
|
import EchartsComponent from "hbt-common/components/common/echarts.component.vue"
|
||||||
import "@/assets/common/icons";
|
import "@/assets/common/icons";
|
||||||
import 'animate.css';
|
import 'animate.css';
|
||||||
import Mock from "mockjs"
|
import Mock from "mockjs"
|
||||||
|
|
|
@ -6,7 +6,7 @@ interface ActionResult<T> {
|
||||||
/**
|
/**
|
||||||
* message: 错误消息
|
* message: 错误消息
|
||||||
*/
|
*/
|
||||||
message: string;
|
msg: string;
|
||||||
/**
|
/**
|
||||||
* data: 数据
|
* data: 数据
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -9,7 +9,7 @@ export default class PlayerUtils{
|
||||||
const player = new acapi.DigitalTwinPlayer(process.env.VUE_APP_PALYER_URL,{
|
const player = new acapi.DigitalTwinPlayer(process.env.VUE_APP_PALYER_URL,{
|
||||||
domId,
|
domId,
|
||||||
iid,
|
iid,
|
||||||
// reset:true,
|
reset:true,
|
||||||
apiOptions:{
|
apiOptions:{
|
||||||
onReady: this.onReady,
|
onReady: this.onReady,
|
||||||
onLog: this.onLog, //可选参数,日志输出回调函数
|
onLog: this.onLog, //可选参数,日志输出回调函数
|
||||||
|
|
Loading…
Reference in New Issue