From 97363057f08e455692d79992b515c9095b5b78ba Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Thu, 21 Dec 2023 09:49:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=89=A9=E6=A8=A1=E5=9E=8B=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E7=B1=BB=E5=9E=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/images/marker.png                      | Bin 0 -> 1814 bytes
 .../device/DashBoard/components/Amap.vue      |   7 +++--
 .../components/Metadata/Import/index.vue      |  25 ++++++++++++++----
 .../components/Metadata/Import/valideta.ts    |  25 +++++++++---------
 .../Save/components/ShakeLimit/index.vue      |   2 +-
 .../Save/components/Terms/ParamsItem.vue      |  14 +++++++---
 6 files changed, 48 insertions(+), 25 deletions(-)
 create mode 100644 public/images/marker.png

diff --git a/public/images/marker.png b/public/images/marker.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce9a7b19cabf83940bbf3814becff0876a1ff0b5
GIT binary patch
literal 1814
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
Ef)(Lp)c^nh

literal 0
HcmV?d00001

diff --git a/src/views/device/DashBoard/components/Amap.vue b/src/views/device/DashBoard/components/Amap.vue
index 820a1d52..592bec13 100644
--- a/src/views/device/DashBoard/components/Amap.vue
+++ b/src/views/device/DashBoard/components/Amap.vue
@@ -20,11 +20,9 @@
                     },
                 }"
                 :icon="{
-                    image: 'https://a.amap.com/jsapi_demos/static/images/poi-marker.png',
+                    image: '/images/marker.png',
                     anchor: 'bottom-center',
                     size: [25, 34],
-                    clipOrigin: [459, 92],
-                    clipSize: [50, 68],
                 }"
                 ></el-amap-label-marker
             >
@@ -35,6 +33,7 @@
 <script lang="ts" setup>
 import AmapComponent from '@/components/AMapComponent/index.vue';
 import { getGo } from '@/api/device/dashboard';
+import { getImage } from '@/utils/comm';
 let point = ref();
 const getMapData = async () => {
     const res = await getGo({
@@ -47,4 +46,4 @@ const getMapData = async () => {
 getMapData();
 </script>
 <style scoped>
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/device/components/Metadata/Import/index.vue b/src/views/device/components/Metadata/Import/index.vue
index 361167c5..0a2f08dd 100644
--- a/src/views/device/components/Metadata/Import/index.vue
+++ b/src/views/device/components/Metadata/Import/index.vue
@@ -70,12 +70,13 @@
                 v-if="type === 'device' || formModel.type === 'import'"
             >
                 <j-select v-model:value="formModel.metadata">
-                    <j-select-option value="jetlinks"
+                    <!-- <j-select-option value="jetlinks"
                         >Jetlinks物模型</j-select-option
                     >
                     <j-select-option value="alink"
                         >阿里云物模型TSL</j-select-option
-                    >
+                    > -->
+                    <j-select-option v-for="i in codecs" :value="i.id">{{ i.name }}</j-select-option>
                 </j-select>
             </j-form-item>
             <j-form-item
@@ -177,6 +178,7 @@
     </j-modal>
 </template>
 <script setup lang="ts" name="Import">
+import { getCodecs } from '@/api/device/product';
 import { saveMetadata } from '@/api/device/instance';
 import {
     queryNoPagingPost,
@@ -214,7 +216,7 @@ interface Emits {
 const props = defineProps<Props>();
 const emits = defineEmits<Emits>();
 const loading = ref(false);
-
+const codecs = ref<any>([])
 const _visible = computed({
     get: () => {
         return props.visible;
@@ -300,7 +302,7 @@ const requiredCheck = (data:any) =>{
                     check = true
                     return
                 }else{
-                    check = testType(item,index)
+                    check = testType(item.valueType,index)
                 }
                 if(!item?.expands?.source){
                     onlyMessage(`属性定义第${index + 1}个数组中缺失expands.source属性`,'error');
@@ -414,7 +416,7 @@ const requiredCheck = (data:any) =>{
                     check = true
                     return
             }else{
-                testType(item?.valueType?.type,index)
+                testType(item?.valueType,index)
             }
             if(!item?.expands?.type){
                     onlyMessage(`标签定义第${index + 1}个数组中缺失expands.type属性`,'error');
@@ -595,6 +597,12 @@ const metadataStore = useMetadataStore();
 
 const handleImport = async () => {
     formRef.value.validate().then(async (data: any) => {
+        let check 
+        if((props.type === 'device' || formModel.type === 'import') &&
+                    formModel.metadataType === 'script'){
+                        check =  formModel.metadata === 'jetlinks' ? requiredCheck(JSON.parse(formModel.import)) : aliCheck(JSON.parse(formModel.import))
+                    }
+       if(!check){
         const { id } = route.params || {};
         if (data.metadata === 'alink') {
             try {
@@ -723,9 +731,16 @@ const handleImport = async () => {
                 );
             }
         }
+       }
     });
 };
 
+onMounted(async()=>{
+    const res = await getCodecs()
+  if (res.status === 200) {
+    codecs.value = [{ id: 'jetlinks', name: '标准物模型' }].concat(res.result)
+  }
+})
 // const showProduct = computed(() => formModel.type === 'copy')
 </script>
 <style scoped lang="less">
diff --git a/src/views/device/components/Metadata/Import/valideta.ts b/src/views/device/components/Metadata/Import/valideta.ts
index df2d5841..d95e6f73 100644
--- a/src/views/device/components/Metadata/Import/valideta.ts
+++ b/src/views/device/components/Metadata/Import/valideta.ts
@@ -4,15 +4,16 @@ export const testProperties = (data:any) =>{
 }
 
 export const testType = (data:any,index:number,isArray?:boolean,isObject?:boolean)=>{
-    if(data.valueType.type === 'boolean'){
-        if(!data?.valueType?.trueText || !data?.valueType?.trueValue || !data?.valueType?.falseText || !data?.valueType?.falseValue){
+    console.log(data,index)
+    if(data.type === 'boolean'){
+        if(!data?.trueText || !data?.trueValue || !data?.falseText || !data?.falseValue){
             onlyMessage(`方法定义inputs第${index+1}个数组ValueType中缺失必填属性`,'error')
             return true
         }
     }
-    if(data.valueType.type === 'enum' && !isObject){
-        if(data.valueType?.elements?.length > 0){
-            data.valueType.elements.forEach((a:any,b:number)=>{
+    if(data.type === 'enum' && !isObject){
+        if(data?.elements?.length > 0){
+            data.elements.forEach((a:any,b:number)=>{
                 if(!a.value || !a.text){
                     onlyMessage(`方法定义inputs第${index+1}个数组ValueType中elements缺失必填属性`,'error')
                     return true
@@ -23,23 +24,23 @@ export const testType = (data:any,index:number,isArray?:boolean,isObject?:boolea
             return true
         }
     }
-    if(data.valueType.type === 'array' && !isArray && !isObject){
-        if(data.valueType?.elementType){
-            testType(data.valueType.elementType,index,true)
+    if(data.type === 'array' && !isArray && !isObject){
+        if(data?.elementType){
+            testType(data.elementType,index,true)
         }else{
             onlyMessage(`方法定义inputs第${index+1}个数组ValueType中缺失elementType属性`,'error')
             return true
         }
     }
-    if(data.valueType.type === 'file' && !isArray && !isObject){
-        if(!data.valueType?.fileType){
+    if(data.type === 'file' && !isArray && !isObject){
+        if(!data?.fileType){
             onlyMessage(`方法定义inputs第${index+1}个数组ValueType中缺失fileType属性`,'error')
             return true
         }
     }
-    if(data.valueType.type === 'object' && !isArray  && !isObject){
+    if(data.type === 'object' && !isArray  && !isObject){
         if(data?.valueType?.properties?.length > 0){
-          return  testObject(data.valueType.properties,index)
+          return  testObject(data.properties,index)
         }else{
             onlyMessage(`方法定义inputs第${index+1}个数组ValueType中缺失properties属性`,'error')
             return true
diff --git a/src/views/rule-engine/Scene/Save/components/ShakeLimit/index.vue b/src/views/rule-engine/Scene/Save/components/ShakeLimit/index.vue
index 70ce365e..0f4956bf 100644
--- a/src/views/rule-engine/Scene/Save/components/ShakeLimit/index.vue
+++ b/src/views/rule-engine/Scene/Save/components/ShakeLimit/index.vue
@@ -7,7 +7,7 @@
             style="margin-right: 12px"
         />
         <template v-if="shakeLimit.enabled">
-            <j-input-number :min="1" :max="100" :precision="0" size="small" v-model:value="shakeLimit.time" style="width: 38px" />
+            <j-input-number :min="1"  :precision="0" size="small" v-model:value="shakeLimit.time" style="width: 38px" />
             <span>秒内发送</span>
             <j-input-number :min="1" :max="100" :precision="0" size="small" v-model:value="shakeLimit.threshold" style="width: 38px" />
             <span>次及以上时，处理</span>
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
index 38a46a6c..269d4be1 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
+++ b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
@@ -36,6 +36,7 @@
         v-model:value='paramsValue.termType'
         @select='termsTypeSelect'
       />
+     <div v-if="!['notnull','isnull'].includes(paramsValue.termType)">
       <DoubleParamsDropdown
         v-if='showDouble'
         icon='icon-canshu'
@@ -59,6 +60,7 @@
         v-model:source='paramsValue.value.source'
         @select='valueSelect'
       />
+     </div>
       <j-popconfirm title='确认删除？' @confirm='onDelete' :overlayStyle='{minWidth: "180px"}'>
         <div v-show='showDelete' class='button-delete'> <AIcon type='CloseOutlined' /></div>
       </j-popconfirm>
@@ -82,12 +84,12 @@ import { ContextKey, arrayParamsKey, timeTypeKeys } from './util'
 import { useSceneStore } from 'store/scene'
 import { storeToRefs } from 'pinia';
 import { Form } from 'jetlinks-ui-components'
-import {indexOf, isArray, isObject, isString, pick , cloneDeep } from 'lodash-es'
+import {indexOf, isArray, isObject, isString, pick} from 'lodash-es'
+import {cloneDeep} from "lodash";
 
 const sceneStore = useSceneStore()
 const { data: formModel } = storeToRefs(sceneStore)
 const formItemContext = Form.useInjectFormItemContext();
-
 type Emit = {
   (e: 'update:value', data: TermsType): void
 }
@@ -328,15 +330,21 @@ const termsTypeSelect = (e: { key: string, name: string }) => {
         newValue.value = undefined
     }
   }
+  if(
+    ['isnull','notull'].includes(e.key)
+  ){
+    newValue.value.value = 1
+  }
   paramsValue.value = newValue
 
   emit('update:value', { ...paramsValue })
   formItemContext.onFieldChange()
   formModel.value.options!.when[props.branchName].terms[props.whenName].terms[props.termsName][1] = e.name
-
+  
 }
 
 const valueSelect = (v: any, label: string, labelObj: Record<number, any>, option: any) => {
+  console.log(labelObj,option,paramsValue.value,'____123')
   if (paramsValue.value?.source === 'metric') {
     paramsValue.value.metric = option?.id
   }