Răsfoiți Sursa

修复场景bug

yukai 2 ani în urmă
părinte
comite
e5ae41a859

+ 1 - 1
src/views/iot/scene/manage/component/actionType/deviceOut.vue

@@ -27,7 +27,7 @@
   </el-form-item>
 
   <el-form-item label="功能调用" prop="type" class="form-item" v-if="fromData.executeAction == 'functionCall'">
-    <el-select v-model="fromData.functionCall.functionName" filterable placeholder="请选择触发类型" @change="saveData">
+    <el-select v-model="fromData.functionCall.functionName" filterable placeholder="请选择功能调用" @change="saveData">
       <el-option v-for="it in functionCallList" :key="it.key" :label="it.name" :value="it.key">
         <span style="float: left">{{ it.name }}</span>
         <span style="float: right; font-size: 13px">{{ it.key }}</span>

+ 1 - 1
src/views/iot/scene/manage/component/actionType/sendNotice.vue

@@ -111,7 +111,7 @@ onMounted(() => {
       fromData.value.notice = { ...props.data.notice }
       let infoc = props.data;
       seletChange(infoc.notice.types);
-      getTemplist(infoc.notice.notice);
+      getTemplist(infoc.notice.name);
     }
 });
 </script>

+ 7 - 0
src/views/iot/scene/manage/component/sceneItem.vue

@@ -47,6 +47,11 @@
             <el-button type="success" @click="showCron()" style="margin-left: 5px;">设置</el-button>
 
           </div>
+
+
+
+
+
         </el-form-item>
       </div>
       <div class="title flex">
@@ -76,6 +81,8 @@ const scene_type = proxy.useDict('scene_type');
 const emit = defineEmits(['addScenesDetail','delScenesDetail','editScenesDetail']);
 const dialogVisible = ref();
 const deviceListData = ref<testIValueType[]>([]);
+const functionCallList = ref<testIValueType[]>([]);
+const propertyCallList = ref<testIValueType[]>([]);
 const columnList = ref([]);
 let product_key = "";
 interface IConditionItem {

+ 1 - 1
src/views/iot/scene/manage/detail.vue

@@ -144,7 +144,7 @@ export default defineComponent({
 		const getOneDetail = () => {
 
 			const id = route.params && route.params.id;
-			if(state.detail.sceneType==='device'){
+			if(state.detail.sceneType=='device'){
 				api.manage.getOneDetail({ "sceneId": id, 'group': 'definition' }).then((res: any) => {
 					if (!res) {
 						addScenesDetail('definition');