Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

src/hooks/setting/index.ts

@@ -19,7 +19,6 @@ const getUrl = () => {
       })
         .then((response) => response.json())
         .then((data) => {
-          debugger;
           if (data.result) {
             title = data.result['systemTitle'] ? data.result['systemTitle'] : '';
             logoUrl = data.result['logoIcon'] ? data.result['logoIcon'] : '';
@@ -41,7 +40,6 @@ const getUrl = () => {
 };
 
 export async function getRemoteSetting(){
-  debugger
   if (!title) {
     try {
       await getUrl();

src/router/routes/index.ts

@@ -22,7 +22,6 @@ Object.keys(modules).forEach((key) => {
 await getRemoteSetting();
 const glob = useGlobSetting();
 export const asyncRoutes = [PAGE_NOT_FOUND_ROUTE, QIANKUN_ROUTE, ...routeModuleList];
-debugger
 export const RootRoute: AppRouteRecordRaw = {
   path: '/',
   name: 'Root',

src/views/vent/home/colliery/components/fan-monitor.vue

@@ -266,15 +266,15 @@
                 position: 'middle',
                 formatter: '{b}',
               },
-              data: [
-                {
-                  name: '目标值',
-                  yAxis: 40, //res.targetTwo,
-                  lineStyle: {
-                    color: 'rgba(0, 119, 233,.8)',
-                  },
-                },
-              ],
+              // data: [
+              //   {
+              //     name: '目标值',
+              //     yAxis: 40, //res.targetTwo,
+              //     lineStyle: {
+              //       color: 'rgba(0, 119, 233,.8)',
+              //     },
+              //   },
+              // ],
             },
           },
         ],

src/views/vent/home/colliery/index.vue

@@ -40,7 +40,7 @@
               </div>
             </div>
             <div class="three-modal" id="modalBox">
-              <div class="btn-icon"></div>
+              <div class="btn-icon" @click="goModalDetail"></div>
               <!-- <iframe
                 id="iframe"
                 ref="iframe"
@@ -93,7 +93,9 @@ import { useRouter } from 'vue-router';
 // import { Modal } from 'ant-design-vue';
 // import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import moment from 'moment';
+import { getActions } from '/@/qiankun/state';
 
+const actions = getActions();
 let timer: NodeJS.Timeout | null = null;
 let fanLocalList = reactive<any[]>([]); //局部风机数据
 let mainList = ref<any[]>([]); //主通风机数据
@@ -236,6 +238,11 @@ let nowTime = computed(() => {
 let timeDate = computed(() => {
   return moment().format('HH:MM:SS');
 });
+
+function goModalDetail() {
+  actions.setGlobalState({ pageObj: { pageType: 'model3D' } });
+}
+
 onMounted(() => {
   getList();
   changeModalBox();
@@ -436,14 +443,14 @@ onMounted(() => {
           position: relative;
 
           .btn-icon {
-            width: 34px;
-            height: 34px;
-            background: url('../../../../assets/assets/image/home/tobig.png') center no-repeat;
+            width: 40px;
+            height: 40px;
+            background: url('/@/assets/images/vent/home/tosmall.png') no-repeat center;
             background-size: 100% 100%;
             position: absolute;
             z-index: 99999;
-            bottom: 0;
-            right: 0;
+            bottom: 30px;
+            right: 30px;
           }
         }
       }