Inicio Explorar Axuda
Rexistro Iniciar sesión
wangcong
/
visualization-design
1
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

feat:IOT

ananzhusen hai 3 meses
pai
4ed936db61
achega
5b946a4fb1
Modificáronse 4 ficheiros con 81 adicións e 35 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 1 0
      index.html
  2. 14 3
      src/views/components/DataSource.vue
  3. 33 5
      src/views/components/Graphics.vue
  4. 33 27
      src/views/components/PenDatas.vue

+ 1 - 0
index.html
Ver ficheiro 

@@ -37,6 +37,7 @@
 
       //其他 88
 
       //所有 1450
 
       globalThis.globalStates = false;
 
+      // globalThis.uiVersion = 'v20250208';
 
     </script>
 
   </head>
 
   <body>

+ 14 - 3
src/views/components/DataSource.vue
Ver ficheiro 

@@ -867,7 +867,6 @@ import {
 
   getMqttUrl,
 
   doSqlCode,
 
 } from '@/services/iot';
 
-import { tree } from '@2d-components/domForm';
 
 
 const props = defineProps<{
 
   group: string;
 
@@ -935,7 +934,10 @@ onMounted(() => {
 
   data.networks = meta2d.store.data.networks || [];
 
   data.dataset = (meta2d.store.data as any).dataset || {};
 
   if( data.networks?.length&&data.dataset?.devices){
 
-    data.networks[0].children = deepClone(data.dataset.devices);
 
+    if(!data.networks[0].children?.length){
 
+      data.dataset.devices.forEach((item)=>item.value = item.id);
 
+      data.networks[0].children = deepClone(data.dataset.devices);
 
+    }
 
   }
 
   data.socketCbJs = meta2d.store.data.socketCbJs || '';
 
   // data.dataMocks = meta2d.store.data.dataMocks || [];
 
@@ -1005,6 +1007,7 @@ const onOkIot = () => {
 
 
 const onShowIot = async () => {
 
   await getIotTree();
 
+  getCheckedIots();
 
   iotDialog.value.show = true;
 
 };
 
 
@@ -1045,6 +1048,14 @@ const getIotTree = async () => {
 
   // },3000);
 
 };
 
 
+const getCheckedIots = ()=>{
 
+  let arr = [];
 
+  meta2d.store.data?.iot?.tree.forEach((item)=>{
 
+    arr.push(...item.children?.map((_item)=>_item.value));
 
+  });
 
+  checkedIots.value = arr;
 
+}
 
+
 
 const iotSearch = ref('');
 
 const iotFilter = ref(null);
 
 const onSearchIot = () => {
 
@@ -2439,7 +2450,7 @@ const deleteMock = (index: number) => {
 
   .t-tree__item[data-level='1'] {
 
     padding: 0 0 0 16px;
 
     .t-checkbox__label {
 
-      max-width: 50px;
 
+      /* max-width: 50px; */
 
       overflow: hidden;
 
       white-space: nowrap;
 
       text-overflow: ellipsis;

+ 33 - 5
src/views/components/Graphics.vue
Ver ficheiro 

@@ -43,8 +43,10 @@
 
           </template>

         </div>

       </div>

-      <!-- <Data v-if="activeAssets === 'data'"  :group="activedGroup" /> -->

-      <DataSource v-if="activeAssets === 'data'"  :group="activedGroup" />

+      <template v-if="activeAssets === 'data'">

+        <Data v-if="old"  :group="activedGroup" />

+        <DataSource v-else  :group="activedGroup" />

+      </template>

       <Structure v-else-if="activeAssets === 'structure'" :group="activedGroup"/>

       <template v-else>

       <div class="list" :class="groupType ? 'two-columns' : ''">

@@ -444,7 +446,7 @@ import {
 
   WifiIcon

 } from 'tdesign-icons-vue-next';

 import { getNetJsDiagram } from '@/services/material';

-// import Data from './Data.vue';

+import Data from './Data.vue';

 import DataSource from './DataSource.vue';

 import Structure from './Structure.vue';

 import { useDot } from '@/services/common';

@@ -567,6 +569,25 @@ const dataGroups = [
 
   //   key: '',

   // }

 ];

+

+const old_dataGroups = [

+  {

+    icon: 'data',

+    name: '数据源',

+    key: '',

+  },

+  {

+    icon: 'install',

+    name: '属性',

+    key: '',

+  },

+  {

+    icon: 'code',

+    name: '解析',

+    key: 'chart',

+  },

+];

+

 const structureGroups = [

   {

     icon: 'layers',

@@ -628,8 +649,13 @@ const assetsChange = (value) => {
 
     groups = userGroups;

     activedGroup.value = userLastName;

   }else if(value === 'data'){

-    groups = dataGroups;

-    activedGroup.value = '数据';

+    if(old){

+      groups=old_dataGroups;

+      activedGroup.value = '数据源';

+    }else{

+      groups = dataGroups;

+      activedGroup.value = '数据';

+    }

   }else if(value === 'structure'){

     groups = structureGroups;

     activedGroup.value = '图层';

@@ -2437,6 +2463,8 @@ const popupProps = ref({
 
   overlayClassName:'',

 });

 

+const old = globalThis.uiVersion === 'v20250208';

+

 onUnmounted(() => {

   document.removeEventListener('dragstart', dragstart);

   document.removeEventListener('dragend', dragend);

+ 33 - 27
src/views/components/PenDatas.vue
Ver ficheiro 

@@ -544,32 +544,33 @@
 
       </div>

       <div class="label gray" v-else>无</div>

     </div>

-    <div class="input-search mb-8 mt-8" style="padding:0px;">

-      <div class="btn" style="left:10px">

-        <img style="margin-top: 7px" src="/img/icon_search_gray.svg" />

+    <template v-if="!old">

+      <div class="input-search mb-8 mt-8" style="padding:0px;">

+        <div class="btn" style="left:10px">

+          <img style="margin-top: 7px" src="/img/icon_search_gray.svg" />

+        </div>

+        <t-input

+          style="height: 32px;"

+          v-model="bindSearch"

+          @change="onSearchBind"

+          @enter="onSearchBind"

+          placeholder="搜索绑定变量"

+        />

       </div>

-      <t-input

-        style="height: 32px;"

-        v-model="bindSearch"

-        @change="onSearchBind"

-        @enter="onSearchBind"

-        placeholder="搜索绑定变量"

+      <t-tree 

+        style="height:420px;overflow:auto; scrollbar-width: thin;" 

+        v-model="dataBindDialog.selectedIds" 

+        :activeMultiple="false" 

+        :data="bindTreeData"

+        :expand-level="1"

+        :checkable="true" 

+        :checkStrictly="false" 

+        allow-fold-node-on-filter

+        :filter="bindFilter"

+        @change="doBind"

       />

-    </div>

-    <t-tree 

-      style="height:420px;overflow:auto; scrollbar-width: thin;" 

-      v-model="dataBindDialog.selectedIds" 

-      :activeMultiple="false" 

-      :data="bindTreeData"

-      :expand-level="1"

-      :checkable="true" 

-      :checkStrictly="false" 

-      allow-fold-node-on-filter

-      :filter="bindFilter"

-      @change="doBind"

-    />

-

-    <!-- 

+    </template>

+    <template v-else>

         <div class="form-item flex middle mt-8">

           <t-input

             style="width:250px;"

@@ -599,7 +600,7 @@
 
           :max-height="270"

         >

         </t-table>

-      -->

+     </template>

   </t-dialog>

   <t-dialog

     v-if="dataMockDialog.show"

@@ -1293,10 +1294,13 @@ const onBind = (item: any) => {
 
     dataBindDialog.selectedIds.push(item.bind.id);

   }

   dataBindDialog.show = true;

-  // getDataset();

+  if(old){

+    getDataset();

+  }else{

   // getIotTree();

   // getSqlTree();

-  getBindTreeData();

+    getBindTreeData();

+  }

 };

 

 const bindTreeData = ref<any>([]);

@@ -2346,6 +2350,8 @@ onMounted(() => {
 
    getPenData({});

 });

 

+const old = globalThis.uiVersion === 'v20250208';

+

 onUnmounted(() => {

   meta2d.off('click',getPenData);

   watcher();