Browse Source

物模型数据重组,bug调整

yukai 3 năm trước cách đây
mục cha
commit
62c0df2985

+ 3 - 0
src/api/device/index.ts

@@ -39,15 +39,18 @@ export default {
 
     function: (params: object) => get('/product/tsl/function/list', params),
     functionadd: (data: object) => post('/product/tsl/function/add', data),
+    functionedit: (data: object) => put('/product/tsl/function/edit', data),
     functiondel: (productId: number,key:string) => del('/product/tsl/function/del', { productId,key }),
 
 
     event: (params: object) => get('/product/tsl/event/list', params),
     eventadd: (data: object) => post('/product/tsl/event/add', data),
+    eventedit: (data: object) => put('/product/tsl/event/edit', data),
     eventdel: (productId: number,key:string) => del('/product/tsl/event/del', { productId,key }),
 
     tag: (params: object) => get('/product/tsl/tag/list', params),
     tagadd: (data: object) => post('/product/tsl/tag/add', data),
+    tagedit: (data: object) => put('/product/tsl/tag/edit', data),
     tagdel: (productId: number,key:string) => del('/product/tsl/tag/del', { productId,key }),
   },
   

+ 4 - 2
src/views/device/product/component/editAttr.vue

@@ -235,6 +235,7 @@ export default defineComponent({
 			jsondata: [],
 
 			ruleForm: {
+				id:0,
 				productId:0,
 				name: '',
 				key: '',
@@ -272,10 +273,11 @@ export default defineComponent({
 						datat[index]['options'] = item;
 					}
 				});
-				console.log(datat);
+				console.log(row);
+				console.log(productId);
 				state.typeData = datat || [];
 			});
-
+	
 			if (row.valueType) {	
 				state.ruleForm = row;
 

+ 298 - 82
src/views/device/product/component/editEvent.vue

@@ -9,9 +9,8 @@
 					<el-input v-model="ruleForm.name" placeholder="请输入事件定义名称" />
 				</el-form-item>
 
-        
-				<el-form-item label="事件级别" prop="level">
-					<el-radio-group v-model="ruleForm.level" model-value="0">
+                <el-form-item label="事件级别" prop="level">
+					<el-radio-group v-model="ruleForm.level" >
 						<el-radio label="0">普通</el-radio>
 
 						<el-radio label="1">警告</el-radio>
@@ -19,42 +18,152 @@
 					</el-radio-group>
 				</el-form-item>
 
-				<el-form-item label="输出参数" prop="type">
-					<el-select v-model="valueType.type" placeholder="请选择输出参数" @change="seletChange">
+				<el-form-item label="输出参数" prop="type" required>
+					<el-select v-model="valueType.type" placeholder="请选择数据类型" @change="seletChange">
 						<el-option-group v-for="group in typeData" :key="group.label" :label="group.label">
 							<el-option v-for="item in group.options" :key="item.type" :label="item.title" :value="item.type" />
 						</el-option-group>
 					</el-select>
 				</el-form-item>
 
-        <!--根据数据类型输出不同表单-->
+				<!--根据数据类型输出不同表单-->
 
-             <el-form-item label="精度" prop="maxLength1" v-if="type=='float' || type=='double'">
-                <el-input v-model="valueType.maxLength1" placeholder="请输入精度" />
-              </el-form-item>
-
-            	<el-form-item label="单位" prop="maxLength" v-if="type=='int' || type=='long' || type=='float'  || type=='double'">
-                <el-input v-model="valueType.maxLength" placeholder="请输入单位" />
-              </el-form-item>
+				<el-form-item label="精度" prop="decimals" v-if="type == 'float' || type == 'double'">
+					<el-input v-model="valueType.decimals" placeholder="请输入精度" />
+				</el-form-item>
 
-              <el-form-item label="最大长度" prop="maxLength" v-if="type=='string'">
-                <el-input v-model="valueType.maxLength" placeholder="请输入最大长度" />
-              </el-form-item>
+				<el-form-item label="单位" prop="unit" v-if="type == 'int' || type == 'long' || type == 'float' || type == 'double'">
+					<el-input v-model="valueType.unit" placeholder="请输入单位" />
+				</el-form-item>
 
-               <el-form-item label="时间格式" prop="maxLength" v-if="type=='date'">
-                <el-input v-model="valueType.maxLength" placeholder="请输入时间格式" />
-              </el-form-item>
-             
+				<el-form-item label="最大长度" prop="maxLength" v-if="type == 'string'">
+					<el-input v-model="valueType.maxLength" placeholder="请输入最大长度" />
+				</el-form-item>
 
-        <!--根据数据类型输出不同表单-->
+				<el-form-item label="时间格式" prop="maxLength" v-if="type == 'date'">
+					<el-input v-model="valueType.maxLength" placeholder="请输入时间格式" />
+				</el-form-item>
 
+				<el-form-item label="布尔值" prop="trueText" v-if="type == 'boolean'">
+					<div class="input-box">
+						<el-input v-model="valueType.trueText" placeholder="请输入布尔值" value="是" /><span style="margin: 0px 10px">~</span>
+						<el-input v-model="valueType.trueValue" placeholder="请输入布尔值" value="true" />
+					</div>
 
+					<div class="input-box">
+						<el-input v-model="valueType.falseText" placeholder="请输入布尔值" value="否" /> <span style="margin: 0px 10px">~</span>
+						<el-input v-model="valueType.falseValue" placeholder="请输入布尔值" value="false" />
+					</div>
+				</el-form-item>
 
+				<el-form-item label="枚举项" prop="maxLength" v-if="type == 'enum'">
+					<div class="input-box" v-for="(item, index) in enumdata" :key="index">
+						<el-input v-model="item.text" placeholder="请输入枚举值" /><span style="margin: 0px 10px"
+							><el-icon><Right /></el-icon
+						></span>
+						<el-input v-model="item.value" placeholder="请输入枚举文本" />
+						<div class="input-option">
+							<el-icon @click="addEnum" v-if="index == 0"><Plus /></el-icon>
+							<el-icon @click="delEnum(index)" v-if="index != 0"><Minus /></el-icon>
+						</div>
+					</div>
+				</el-form-item>
 
+				<el-form-item label="JSON对象" prop="maxLength" v-if="type == 'object'">
+					<div v-for="(item, index) in jsondata" :key="index" class="jslist">
+						<div class="jsonlist">
+							<div>参数名称:</div>
+							<div style="width: 60%">{{ item.name }}</div>
+							<div class="jsonoption">
+								<!-- <el-link type="primary">编辑</el-link> -->
+								<el-link type="primary" @click="deljson(index)">删除</el-link>
+							</div>
+						</div>
+					</div>
+
+					<div style="display: block; width: 100%">
+						<div class="input-options" @click="addJson">
+							<el-icon><Plus /></el-icon>
+							<div>添加参数</div>
+						</div>
+					</div>
+				</el-form-item>
 
+				<div v-if="type == 'array'">
+					<el-form-item label="元素类型" prop="types">
+						<el-select v-model="elementType.type" placeholder="请选择元素类型" @change="seletChanges">
+							<el-option-group v-for="group in typeData" :key="group.label" :label="group.label">
+								<el-option v-for="item in group.options" :key="item.type" :label="item.title" :value="item.type" :disabled="item.type == 'array'" />
+							</el-option-group>
+						</el-select>
+					</el-form-item>
+
+					<el-form-item label="精度" prop="decimals" v-if="types == 'float' || types == 'double'">
+						<el-input v-model="elementType.decimals" placeholder="请输入精度" />
+					</el-form-item>
+
+					<el-form-item label="单位" prop="unit" v-if="types == 'int' || types == 'long' || types == 'float' || types == 'double'">
+						<el-input v-model="elementType.unit" placeholder="请输入单位" />
+					</el-form-item>
+
+					<el-form-item label="最大长度" prop="maxLength" v-if="types == 'string'">
+						<el-input v-model="elementType.maxLength" placeholder="请输入最大长度" />
+					</el-form-item>
+
+					<el-form-item label="时间格式" prop="maxLength" v-if="types == 'date'">
+						<el-input v-model="elementType.maxLength" placeholder="请输入时间格式" />
+					</el-form-item>
+
+					<el-form-item label="布尔值" prop="maxLength" v-if="types == 'boolean'">
+						<div class="input-box">
+							<el-input v-model="elementType.trueText" placeholder="请输入布尔值" value="是" /><span style="margin: 0px 10px">~</span>
+							<el-input v-model="elementType.trueValue" placeholder="请输入布尔值" value="true" />
+						</div>
+
+						<div class="input-box">
+							<el-input v-model="elementType.falseText" placeholder="请输入布尔值" value="否" /> <span style="margin: 0px 10px">~</span>
+							<el-input v-model="elementType.falseValue" placeholder="请输入布尔值" value="false" />
+						</div>
+					</el-form-item>
+
+					<el-form-item label="枚举项" prop="maxLength" v-if="types == 'enum'">
+						<div class="input-box" v-for="(item, index) in enumdata" :key="index">
+							<el-input v-model="item.text" placeholder="请输入枚举值" /><span style="margin: 0px 10px"
+								><el-icon><Right /></el-icon
+							></span>
+							<el-input v-model="item.value" placeholder="请输入枚举文本" />
+							<div class="input-option">
+								<el-icon @click="addEnum" v-if="index == 0"><Plus /></el-icon>
+								<el-icon @click="delEnum(index)" v-if="index != 0"><Minus /></el-icon>
+							</div>
+						</div>
+					</el-form-item>
+				</div>
 
+				
+				<el-form-item label="JSON对象" prop="maxLength" v-if="types == 'object'">
+					<div v-for="(item, index) in jsondata" :key="index" class="jslist">
+						<div class="jsonlist">
+							<div>参数名称:</div>
+							<div style="width: 60%">{{ item.data.name }}</div>
+							<div class="jsonoption">
+								<el-link type="primary">编辑</el-link>
+								<el-link type="primary">删除</el-link>
+							</div>
+						</div>
+					</div>
+
+					<div style="display: block; width: 100%">
+						<div class="input-options" @click="addJson">
+							<el-icon><Plus /></el-icon>
+							<div>添加参数</div>
+						</div>
+					</div>
+				</el-form-item>
 
+				<!--根据数据类型输出不同表单-->
 
+			
 				<el-form-item label="事件定义描述	" prop="desc">
 					<el-input v-model="ruleForm.desc" type="textarea" placeholder="请输入事件定义描述"></el-input>
 				</el-form-item>
@@ -66,6 +175,7 @@
 				</span>
 			</template>
 		</el-dialog>
+		<EditOption ref="editOptionRef" @typeList="getOptionData" />
 	</div>
 </template>
 
@@ -73,12 +183,18 @@
 import { reactive, toRefs, defineComponent, ref, unref } from 'vue';
 import api from '/@/api/device';
 import uploadVue from '/@/components/upload/index.vue';
+import { Plus, Minus, Right } from '@element-plus/icons-vue';
+import EditOption from './editOption.vue';
+
 import { ElMessage, UploadProps } from 'element-plus';
 
 interface RuleFormState {
 	id: number;
+	productId: number;
+	level: number;
 	name: string;
 	dictType: string;
+	valueType: Object;
 	status: number;
 	desc: string;
 }
@@ -91,44 +207,62 @@ interface DicState {
 
 export default defineComponent({
 	name: 'deviceEditPro',
-	components: { uploadVue },
+	components: { Plus, Minus, Right, EditOption },
 	setup(prop, { emit }) {
 		const formRef = ref<HTMLElement | null>(null);
-
+		const editOptionRef = ref();
 		const state = reactive<DicState>({
 			isShowDialog: false,
 			typeData: [], //
-      type: '',
-       valueType: {
-          type:'',
-          maxLength:'',
+			type: '',
+			types: '',
+			productId:0,
+			valueType: {
+				type: '',
+				maxLength: '',
+				trueText:'是',
+				trueValue:'true',
+				falseText:'否',
+				falseValue:'false',
+			},
+			elementType: {
+				type: '',
+				maxLength: '',
+			},
+			enumdata: [
+				{
+					text: '',
+					value: '',
+				},
+			],
 
-        },
+			jsondata: [],
 
 			ruleForm: {
+				id:0,
+				productId:0,
+                level:0,
 				name: '',
 				key: '',
-				transportProtocol: '',
-				accessMode: '0',
 				status: 1,
-        valueType: {
-          type:'',
-          maxLength:'',
+				valueType: {
+					type: '',
+					maxLength: '',
+				},
 
-        },
-				
 				desc: '',
 			},
 			rules: {
 				name: [{ required: true, message: '事件定义名称不能为空', trigger: 'blur' }],
 				key: [{ required: true, message: '事件定义标识不能为空', trigger: 'blur' }],
-				accessMode: [{ required: true, message: '请选择是否只读', trigger: 'blur' }],
-		
+				level: [{ required: true, message: '请选择事件级别', trigger: 'blur' }],
+				type: [{ required: true, message: '请选择数据类型', trigger: 'blur' }],
+				
 			},
 		});
 
 		// 打开弹窗
-		const openDialog = (row: RuleFormState | null) => {
+		const openDialog = (row: RuleFormState | null,productId:number | null) => {
 			resetForm();
 
 			api.product.getDataType({ status: -1 }).then((res: any) => {
@@ -142,33 +276,72 @@ export default defineComponent({
 						datat[index]['options'] = item;
 					}
 				});
-				console.log(datat);
+				console.log(row);
+				console.log(productId);
 				state.typeData = datat || [];
 			});
-
-			if (row) {
-				// api.dict.getType(row.dictId).then((res:any)=>{
-				//   state.ruleForm = res.data.dictType
-				// }
-				console.log(row);
+			state.ruleForm = row;
+			if (row.valueType) {	
 				state.ruleForm = row;
+
+				state.productId=productId;
+				state.valueType = row.valueType;
+				state.ruleForm.valueType.type = row.valueType.type;
+				state.ruleForm.type = row.valueType.type;
+				state.type = row.valueType.type ;
 			}
 			state.isShowDialog = true;
 		};
 		const resetForm = () => {
 			state.ruleForm = {
-				id: 0,
 				name: '',
-				dictType: '',
+				key: '',
+				accessMode: '0',
 				status: 1,
+				valueType: {
+					type: '',
+					maxLength: '',
+				},
+
 				desc: '',
 			};
 		};
 
-    const seletChange=(val)=>{
-      state.type=val;
-      console.log(val);
-    };
+		const seletChange = (val) => {
+			state.type = val;
+			state.ruleForm.type = val;
+		
+			
+			console.log(val);
+		};
+		const seletChanges = (val) => {
+			console.log(val);
+			state.types = val;
+			console.log(val);
+		};
+
+		const addEnum = () => {
+			state.enumdata.push({
+				text: '',
+				value: '',
+			});
+		};
+		const delEnum = (index) => {
+			state.enumdata.splice(index, 1);
+		};
+
+		const deljson = (index) => {
+			state.jsondata.splice(index, 1);
+		}
+
+		const addJson = () => {
+			editOptionRef.value.openDialog({ product_id: 0, id: 0 });
+		};
+		const getOptionData = (data) => {
+			state.jsondata.push(data);
+
+			console.log(state.jsondata);
+		};
 		// 关闭弹窗
 		const closeDialog = () => {
 			state.isShowDialog = false;
@@ -185,17 +358,44 @@ export default defineComponent({
 				if (valid) {
 					if (state.ruleForm.id !== 0) {
 						//修改
-						api.product.edit(state.ruleForm).then(() => {
+						if (state.type == 'enum') {
+							state.valueType.elements = state.enumdata;
+						}
+
+						if (state.type == 'object') {
+							state.valueType.properties = state.jsondata;
+						}
+
+						if (state.type == 'array') {
+							state.valueType.elementType = state.elementType;
+						}
+
+						console.log(state.valueType);
+
+						state.ruleForm.valueType = state.valueType;
+						state.ruleForm.productId = state.productId
+						api.model.eventedit(state.ruleForm).then(() => {
 							ElMessage.success('事件定义类型修改成功');
 							closeDialog(); // 关闭弹窗
 							emit('typeList');
 						});
 					} else {
 						//添加
-         
-            console.log(state.valueType);
-            state.ruleForm.valueType=state.valueType;
-           console.log(state.ruleForm);
+						if (state.type == 'enum') {
+							state.valueType.elements = state.enumdata;
+						}
+
+						if (state.type == 'object') {
+							state.valueType.properties = state.jsondata;
+						}
+
+						if (state.type == 'array') {
+							state.valueType.elementType = state.elementType;
+						}
+
+						console.log(state.valueType);
+
+						state.ruleForm.valueType = state.valueType;
 						api.model.eventadd(state.ruleForm).then(() => {
 							ElMessage.success('事件定义类型添加成功');
 							closeDialog(); // 关闭弹窗
@@ -207,8 +407,15 @@ export default defineComponent({
 		};
 
 		return {
+			editOptionRef,
+			getOptionData,
 			openDialog,
-      seletChange,
+			deljson,
+			addEnum,
+			delEnum,
+			addJson,
+			seletChange,
+			seletChanges,
 			closeDialog,
 			onCancel,
 			onSubmit,
@@ -218,34 +425,43 @@ export default defineComponent({
 	},
 });
 </script>
-
-<style scoped>
-.avatar-uploader .avatar {
-	width: 178px;
-	height: 178px;
-	display: block;
-}
-</style>
-
 <style>
-.avatar-uploader .el-upload {
-	border: 1px dashed var(--el-border-color);
-	border-radius: 6px;
+.input-box {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	margin-top: 10px;
+}
+.input-option {
+	line-height: 30px;
+	padding-top: 5px;
+	width: 140px;
+}
+.input-option i {
+	margin: 0px 5px;
+	border: 1px solid #c3c3c3;
+	font-size: 16px;
+}
+.input-options {
+	display: flex;
+	align-items: center;
+	color: #409eff;
 	cursor: pointer;
-	position: relative;
-	overflow: hidden;
-	transition: var(--el-transition-duration-fast);
 }
-
-.avatar-uploader .el-upload:hover {
-	border-color: var(--el-color-primary);
+.jslist {
+	width: 100%;
+	border: 1px solid #e8e8e8;
+	padding: 10px;
+	margin-bottom: 10px;
 }
-
-.el-icon.avatar-uploader-icon {
-	font-size: 28px;
-	color: #8c939d;
-	width: 178px;
-	height: 178px;
-	text-align: center;
+.jsonlist {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+}
+.jsonoption {
+}
+.jsonoption a {
+	margin: 0px 10px;
 }
 </style>

+ 430 - 168
src/views/device/product/component/editFun.vue

@@ -1,158 +1,371 @@
 <template>
 	<div class="system-edit-dic-container">
-		<el-dialog :title="(ruleForm.id!==0?'修改':'添加')+'功能定义'" v-model="isShowDialog" width="769px">
+		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '功能定义'" v-model="isShowDialog" width="769px">
 			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="120px">
-        <el-form-item label="功能定义标识" prop="key">
-          <el-input v-model="ruleForm.key" placeholder="请输入功能定义标识" />
-        </el-form-item>
-        <el-form-item label="功能定义名称" prop="name">
-          <el-input v-model="ruleForm.name" placeholder="请输入功能定义名称" />
-        </el-form-item>
-    
-    
-
-
-           
-         <el-form-item label="数据类型" prop="valueType">
-
-             <!--    <el-select v-model="ruleForm.valueType" placeholder="请选择数据类型">
-              <el-option
-                v-for="item in typeData"
-                :key="item.key"
-                :label="item.name"
-                :value="item.key"
-              />
-            </el-select> -->
-
-             <el-select v-model="ruleForm.valueType" placeholder="请选择数据类型">
-              <el-option-group
-                v-for="group in typeData"
-                :key="group"
-                :label="group"
-              >
-                <el-option
-                  v-for="item in group.options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-option-group>
-            </el-select>
-            </el-form-item> 
-
-          
-
-      
-        <el-form-item label="是否只读" prop="accessMode">
-          <el-radio-group v-model="ruleForm.accessMode" model-value="0">
-            <el-radio label="0">读写</el-radio>
-
-            <el-radio label="1">只读</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="功能定义描述	" prop="desc">
-          <el-input v-model="ruleForm.desc" type="textarea" placeholder="请输入功能定义描述"></el-input>
-        </el-form-item>
+				<el-form-item label="功能定义标识" prop="key">
+					<el-input v-model="ruleForm.key" placeholder="请输入功能定义标识" />
+				</el-form-item>
+				<el-form-item label="功能定义名称" prop="name">
+					<el-input v-model="ruleForm.name" placeholder="请输入功能定义名称" />
+				</el-form-item>
+
+        <el-form-item label="输入参数" prop="maxLength">
+					<div v-for="(item, index) in inputsdata" :key="index" class="jslist">
+						<div class="jsonlist">
+							<div>参数名称:</div>
+							<div style="width: 60%">{{ item.name }}</div>
+							<div class="jsonoption">
+								<!-- <el-link type="primary">编辑</el-link> -->
+								<el-link type="primary" @click="deljson(index,'fun')">删除</el-link>
+							</div>
+						</div>
+					</div>
+
+					<div style="display: block; width: 100%">
+						<div class="input-options" @click="addJson('fun')">
+							<el-icon><Plus /></el-icon>
+							<div>添加参数</div>
+						</div>
+					</div>
+				</el-form-item>
+
+
+
+				<el-form-item label="输出参数" prop="type" required>
+					<el-select v-model="valueType.type" placeholder="请选择数据类型" @change="seletChange">
+						<el-option-group v-for="group in typeData" :key="group.label" :label="group.label">
+							<el-option v-for="item in group.options" :key="item.type" :label="item.title" :value="item.type" />
+						</el-option-group>
+					</el-select>
+				</el-form-item>
+
+				<!--根据数据类型输出不同表单-->
+
+				<el-form-item label="精度" prop="decimals" v-if="type == 'float' || type == 'double'">
+					<el-input v-model="valueType.decimals" placeholder="请输入精度" />
+				</el-form-item>
+
+				<el-form-item label="单位" prop="unit" v-if="type == 'int' || type == 'long' || type == 'float' || type == 'double'">
+					<el-input v-model="valueType.unit" placeholder="请输入单位" />
+				</el-form-item>
+
+				<el-form-item label="最大长度" prop="maxLength" v-if="type == 'string'">
+					<el-input v-model="valueType.maxLength" placeholder="请输入最大长度" />
+				</el-form-item>
+
+				<el-form-item label="时间格式" prop="maxLength" v-if="type == 'date'">
+					<el-input v-model="valueType.maxLength" placeholder="请输入时间格式" />
+				</el-form-item>
+
+				<el-form-item label="布尔值" prop="trueText" v-if="type == 'boolean'">
+					<div class="input-box">
+						<el-input v-model="valueType.trueText" placeholder="请输入布尔值" value="是" /><span style="margin: 0px 10px">~</span>
+						<el-input v-model="valueType.trueValue" placeholder="请输入布尔值" value="true" />
+					</div>
+
+					<div class="input-box">
+						<el-input v-model="valueType.falseText" placeholder="请输入布尔值" value="否" /> <span style="margin: 0px 10px">~</span>
+						<el-input v-model="valueType.falseValue" placeholder="请输入布尔值" value="false" />
+					</div>
+				</el-form-item>
+
+				<el-form-item label="枚举项" prop="maxLength" v-if="type == 'enum'">
+					<div class="input-box" v-for="(item, index) in enumdata" :key="index">
+						<el-input v-model="item.text" placeholder="请输入枚举值" /><span style="margin: 0px 10px"
+							><el-icon><Right /></el-icon
+						></span>
+						<el-input v-model="item.value" placeholder="请输入枚举文本" />
+						<div class="input-option">
+							<el-icon @click="addEnum" v-if="index == 0"><Plus /></el-icon>
+							<el-icon @click="delEnum(index)" v-if="index != 0"><Minus /></el-icon>
+						</div>
+					</div>
+				</el-form-item>
+
+				<el-form-item label="JSON对象" prop="maxLength" v-if="type == 'object'">
+					<div v-for="(item, index) in jsondata" :key="index" class="jslist">
+						<div class="jsonlist">
+							<div>参数名称:</div>
+							<div style="width: 60%">{{ item.name }}</div>
+							<div class="jsonoption">
+								<!-- <el-link type="primary">编辑</el-link> -->
+								<el-link type="primary" @click="deljson(index,'fun')">删除</el-link>
+							</div>
+						</div>
+					</div>
+
+					<div style="display: block; width: 100%">
+						<div class="input-options" @click="addJson('json')">
+							<el-icon><Plus /></el-icon>
+							<div>添加参数</div>
+						</div>
+					</div>
+				</el-form-item>
+
+				<div v-if="type == 'array'">
+					<el-form-item label="元素类型" prop="types">
+						<el-select v-model="elementType.type" placeholder="请选择元素类型" @change="seletChanges">
+							<el-option-group v-for="group in typeData" :key="group.label" :label="group.label">
+								<el-option v-for="item in group.options" :key="item.type" :label="item.title" :value="item.type" :disabled="item.type == 'array'" />
+							</el-option-group>
+						</el-select>
+					</el-form-item>
+
+					<el-form-item label="精度" prop="decimals" v-if="types == 'float' || types == 'double'">
+						<el-input v-model="elementType.decimals" placeholder="请输入精度" />
+					</el-form-item>
+
+					<el-form-item label="单位" prop="unit" v-if="types == 'int' || types == 'long' || types == 'float' || types == 'double'">
+						<el-input v-model="elementType.unit" placeholder="请输入单位" />
+					</el-form-item>
+
+					<el-form-item label="最大长度" prop="maxLength" v-if="types == 'string'">
+						<el-input v-model="elementType.maxLength" placeholder="请输入最大长度" />
+					</el-form-item>
+
+					<el-form-item label="时间格式" prop="maxLength" v-if="types == 'date'">
+						<el-input v-model="elementType.maxLength" placeholder="请输入时间格式" />
+					</el-form-item>
+
+					<el-form-item label="布尔值" prop="maxLength" v-if="types == 'boolean'">
+						<div class="input-box">
+							<el-input v-model="elementType.trueText" placeholder="请输入布尔值" value="是" /><span style="margin: 0px 10px">~</span>
+							<el-input v-model="elementType.trueValue" placeholder="请输入布尔值" value="true" />
+						</div>
+
+						<div class="input-box">
+							<el-input v-model="elementType.falseText" placeholder="请输入布尔值" value="否" /> <span style="margin: 0px 10px">~</span>
+							<el-input v-model="elementType.falseValue" placeholder="请输入布尔值" value="false" />
+						</div>
+					</el-form-item>
+
+					<el-form-item label="枚举项" prop="maxLength" v-if="types == 'enum'">
+						<div class="input-box" v-for="(item, index) in enumdata" :key="index">
+							<el-input v-model="item.text" placeholder="请输入枚举值" /><span style="margin: 0px 10px"
+								><el-icon><Right /></el-icon
+							></span>
+							<el-input v-model="item.value" placeholder="请输入枚举文本" />
+							<div class="input-option">
+								<el-icon @click="addEnum" v-if="index == 0"><Plus /></el-icon>
+								<el-icon @click="delEnum(index)" v-if="index != 0"><Minus /></el-icon>
+							</div>
+						</div>
+					</el-form-item>
+				</div>
+
+				
+				<el-form-item label="JSON对象" prop="maxLength" v-if="types == 'object'">
+					<div v-for="(item, index) in jsondata" :key="index" class="jslist">
+						<div class="jsonlist">
+							<div>参数名称:</div>
+							<div style="width: 60%">{{ item.data.name }}</div>
+							<div class="jsonoption">
+								<el-link type="primary">编辑</el-link>
+								<el-link type="primary">删除</el-link>
+							</div>
+						</div>
+					</div>
+
+					<div style="display: block; width: 100%">
+						<div class="input-options" @click="addJson('json')">
+							<el-icon><Plus /></el-icon>
+							<div>添加参数</div>
+						</div>
+					</div>
+				</el-form-item>
+
+				<!--根据数据类型输出不同表单-->
+	
+
+				<el-form-item label="功能定义描述	" prop="desc">
+					<el-input v-model="ruleForm.desc" type="textarea" placeholder="请输入功能定义描述"></el-input>
+				</el-form-item>
 			</el-form>
 			<template #footer>
 				<span class="dialog-footer">
 					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ruleForm.id!==0?'修 改':'添 加'}}</el-button>
+					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
 				</span>
 			</template>
 		</el-dialog>
+		<EditOption ref="editOptionRef" @typeList="getOptionData" />
 	</div>
 </template>
 
 <script lang="ts">
-import { reactive, toRefs, defineComponent,ref, unref } from 'vue';
+import { reactive, toRefs, defineComponent, ref, unref } from 'vue';
 import api from '/@/api/device';
 import uploadVue from '/@/components/upload/index.vue';
-import {ElMessage,UploadProps} from "element-plus";
+import { Plus, Minus, Right } from '@element-plus/icons-vue';
+import EditOption from './editOption.vue';
+
+import { ElMessage, UploadProps } from 'element-plus';
 
 interface RuleFormState {
-  id:number;
-  name:string;
-  dictType:string;
-  status:number;
-  desc:string;
+	id: number;
+	productId: number;
+	name: string;
+	dictType: string;
+	valueType: Object;
+	inputs: Object;
+	output: Object;
+	status: number;
+	desc: string;
 }
 interface DicState {
 	isShowDialog: boolean;
 	ruleForm: RuleFormState;
-  typeData: RuleFormState[];
-  rules:{}
+	typeData: RuleFormState[];
+	rules: {};
 }
 
 export default defineComponent({
 	name: 'deviceEditPro',
-  components: { uploadVue },
-	setup(prop,{emit}) {
-    const formRef = ref<HTMLElement | null>(null);
-    const baseURL:string|undefined|boolean = import.meta.env.VITE_API_URL
-
+	components: { Plus, Minus, Right, EditOption },
+	setup(prop, { emit }) {
+		const formRef = ref<HTMLElement | null>(null);
+		const editOptionRef = ref();
 		const state = reactive<DicState>({
 			isShowDialog: false,
-    	typeData: [], // 
-    	
+			typeData: [], //
+			type: '',
+			types: '',
+			productId:0,
+			valueType: {
+				type: '',
+				maxLength: '',
+				trueText:'是',
+				trueValue:'true',
+				falseText:'否',
+				falseValue:'false',
+			},
+			elementType: {
+				type: '',
+				maxLength: '',
+			},
+			enumdata: [
+				{
+					text: '',
+					value: '',
+				},
+			],
+
+			jsondata: [],
+      inputsdata:[],
 
 			ruleForm: {
-        id:0,
-        name:'',
-        key:'',
-        transportProtocol:'',
-        accessMode:'0',
-        status:1,
-        desc:''
+				productId:0,
+				name: '',
+				key: '',
+        inputs:[],
+        output:[],
+				valueType: {
+					type: '',
+					maxLength: '',
+				},
+
+				desc: '',
+			},
+			rules: {
+				name: [{ required: true, message: '功能定义名称不能为空', trigger: 'blur' }],
+				key: [{ required: true, message: '功能定义标识不能为空', trigger: 'blur' }],
+				type: [{ required: true, message: '请选择数据类型', trigger: 'blur' }],
+				
 			},
-      rules: {
-        name: [
-          { required: true, message: "功能定义名称不能为空", trigger: "blur" }
-        ],
-         key: [
-          { required: true, message: "功能定义标识不能为空", trigger: "blur" }
-        ],
-        accessMode: [{ required: true, message: '功能定义分类不能为空', trigger: 'blur' }],
-        deptId: [{ required: true, message: '所属部门不能为空', trigger: 'blur' }],
-        deviceType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
-      }
 		});
 
 		// 打开弹窗
-		const openDialog = (row: RuleFormState|null) => {
-      resetForm();
-   
-        api.product.getDataType({ status: -1 }).then((res: any) => {
-        
-       
-            // const  datat=Object.values(res.dataType);
-            // datat.forEach((item, index) => {
-
-            // });
-          
-                state.typeData = res.dataType || [];
-           
-         
-        });
-       
-      if (row){
-        // api.dict.getType(row.dictId).then((res:any)=>{
-        //   state.ruleForm = res.data.dictType
-        // }
-        console.log(row);
-        state.ruleForm = row;
-      }
+		const openDialog = (row: RuleFormState | null,productId:number | null) => {
+			resetForm();
+
+			api.product.getDataType({ status: -1 }).then((res: any) => {
+				const datat = Object.values(res.dataType);
+				datat.forEach((item, index) => {
+					if (index == 0) {
+						datat[index]['label'] = '基础类型';
+						datat[index]['options'] = item;
+					} else {
+						datat[index]['label'] = '扩展类型';
+						datat[index]['options'] = item;
+					}
+				});
+				console.log(datat);
+				state.typeData = datat || [];
+			});
+      state.ruleForm = row;
+			if (row.valueType) {	
+				state.ruleForm = row;
+
+				state.productId=productId;
+				state.valueType = row.valueType;
+				state.ruleForm.valueType.type = row.valueType.type;
+				state.ruleForm.type = row.valueType.type;
+				state.type = row.valueType.type ;
+			}
 			state.isShowDialog = true;
 		};
-    const resetForm = ()=>{
-      state.ruleForm = {
-        id:0, 
-        name:'',
-        dictType:'',
-        status:1,
-        desc:''
+		const resetForm = () => {
+			state.ruleForm = {
+				name: '',
+				key: '',
+				status: 1,
+				valueType: {
+					type: '',
+					maxLength: '',
+				},
+
+				desc: '',
+			};
+		};
+
+		const seletChange = (val) => {
+			state.type = val;
+			state.ruleForm.type = val;
+		
+			
+			console.log(val);
+		};
+		const seletChanges = (val) => {
+			console.log(val);
+			state.types = val;
+			console.log(val);
+		};
+
+		const addEnum = () => {
+			state.enumdata.push({
+				text: '',
+				value: '',
+			});
+		};
+		const delEnum = (index) => {
+			state.enumdata.splice(index, 1);
+		};
+
+		const deljson = (index,type) => {
+      if(type=='fun'){
+        state.inputsdata.splice(index, 1);
+      }else{
+        state.jsondata.splice(index, 1);
       }
-    };
+			
+		}
+
+		const addJson = (type) => {
+			editOptionRef.value.openDialog({ product_id: 0, id: 0,type_data:type });
+		};
+		const getOptionData = (data,type_data) => {
+
+      if(type_data=='fun'){
+        	state.inputsdata.push(data);
+      }else{
+        	state.jsondata.push(data);
+      }
+
+		
+
+			console.log(state.jsondata);
+			console.log(type_data);
+		};
 		// 关闭弹窗
 		const closeDialog = () => {
 			state.isShowDialog = false;
@@ -163,70 +376,119 @@ export default defineComponent({
 		};
 		// 新增
 		const onSubmit = () => {
-      const formWrap = unref(formRef) as any;
-      if (!formWrap) return;
-      formWrap.validate((valid: boolean) => {
-        if (valid) {
-          if(state.ruleForm.id!==0){
-            //修改
-            api.product.edit(state.ruleForm).then(()=>{
-              ElMessage.success('功能定义类型修改成功');
-              closeDialog(); // 关闭弹窗
-              emit('typeList')
-            })
-          }else{
-            //添加
-            console.log(state.ruleForm);
-            api.product.add(state.ruleForm).then(()=>{
-              ElMessage.success('功能定义类型添加成功');
-              closeDialog(); // 关闭弹窗
-              emit('typeList')
-            })
-          }
-        }
-      });
-		};
+			const formWrap = unref(formRef) as any;
+			if (!formWrap) return;
+			formWrap.validate((valid: boolean) => {
+				if (valid) {
+					if (state.ruleForm.id !== 0) {
+						//修改
+						if (state.type == 'enum') {
+							state.valueType.elements = state.enumdata;
+						}
+
+						if (state.type == 'object') {
+							state.valueType.properties = state.jsondata;
+						}
+
+						if (state.type == 'array') {
+							state.valueType.elementType = state.elementType;
+						}
 
+						console.log(state.valueType);
+
+					state.ruleForm.inputs = state.inputsdata;
+            state.ruleForm.output =state.valueType; 
+						state.ruleForm.productId = state.productId
+						api.model.functionedit(state.ruleForm).then(() => {
+							ElMessage.success('功能定义类型修改成功');
+							closeDialog(); // 关闭弹窗
+							emit('typeList');
+						});
+					} else {
+						//添加
+						if (state.type == 'enum') {
+							state.valueType.elements = state.enumdata;
+						}
+
+						if (state.type == 'object') {
+							state.valueType.properties = state.jsondata;
+						}
+
+						if (state.type == 'array') {
+							state.valueType.elementType = state.elementType;
+						}
+
+
+
+						state.ruleForm.inputs = state.inputsdata;
+            state.ruleForm.output =state.valueType; 
+
+						api.model.functionadd(state.ruleForm).then(() => {
+							ElMessage.success('功能定义类型添加成功');
+							closeDialog(); // 关闭弹窗
+							emit('typeList');
+						});
+					}
+				}
+			});
+		};
 
 		return {
+			editOptionRef,
+			getOptionData,
 			openDialog,
+			deljson,
+			addEnum,
+			delEnum,
+			addJson,
+			seletChange,
+			seletChanges,
 			closeDialog,
 			onCancel,
 			onSubmit,
-      formRef,
+			formRef,
 			...toRefs(state),
 		};
 	},
 });
 </script>
-
-<style scoped>
-.avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
-
 <style>
-.avatar-uploader .el-upload {
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
+.input-box {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	margin-top: 10px;
 }
-
-.avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
+.input-option {
+	line-height: 30px;
+	padding-top: 5px;
+	width: 140px;
 }
-
-.el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  text-align: center;
+.input-option i {
+	margin: 0px 5px;
+	border: 1px solid #c3c3c3;
+	font-size: 16px;
+}
+.input-options {
+	display: flex;
+	align-items: center;
+	color: #409eff;
+	cursor: pointer;
+}
+.jslist {
+	width: 100%;
+	border: 1px solid #e8e8e8;
+	padding: 10px;
+	margin-bottom: 10px;
+}
+.jsonlist {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+}
+.jsonoption {
+}
+.jsonoption a {
+	margin: 0px 10px;
 }
 </style>

+ 1 - 5
src/views/device/product/component/editOption.vue

@@ -289,14 +289,10 @@ export default defineComponent({
 							state.valueType.elements=state.enumdata;
 						}
 
-					
-
-						
-
 						state.ruleForm.valueType = state.valueType;
 						ElMessage.success('参数类型添加成功');
 							closeDialog(); // 关闭弹窗
-							emit('typeList',state.ruleForm);
+							emit('typeList',state.ruleForm,state.ruleForm.type_data);
 					}
 				}
 			});

+ 294 - 77
src/views/device/product/component/editTab.vue

@@ -9,7 +9,7 @@
 					<el-input v-model="ruleForm.name" placeholder="请输入标签定义名称" />
 				</el-form-item>
 
-				<el-form-item label="数据类型" prop="type">
+				<el-form-item label="数据类型" prop="type" required>
 					<el-select v-model="valueType.type" placeholder="请选择数据类型" @change="seletChange">
 						<el-option-group v-for="group in typeData" :key="group.label" :label="group.label">
 							<el-option v-for="item in group.options" :key="item.type" :label="item.title" :value="item.type" />
@@ -17,36 +17,145 @@
 					</el-select>
 				</el-form-item>
 
-        <!--根据数据类型输出不同表单-->
+				<!--根据数据类型输出不同表单-->
 
-             <el-form-item label="精度" prop="maxLength1" v-if="type=='float' || type=='double'">
-                <el-input v-model="valueType.maxLength1" placeholder="请输入精度" />
-              </el-form-item>
-
-            	<el-form-item label="单位" prop="maxLength" v-if="type=='int' || type=='long' || type=='float'  || type=='double'">
-                <el-input v-model="valueType.maxLength" placeholder="请输入单位" />
-              </el-form-item>
+				<el-form-item label="精度" prop="decimals" v-if="type == 'float' || type == 'double'">
+					<el-input v-model="valueType.decimals" placeholder="请输入精度" />
+				</el-form-item>
 
-              <el-form-item label="最大长度" prop="maxLength" v-if="type=='string'">
-                <el-input v-model="valueType.maxLength" placeholder="请输入最大长度" />
-              </el-form-item>
+				<el-form-item label="单位" prop="unit" v-if="type == 'int' || type == 'long' || type == 'float' || type == 'double'">
+					<el-input v-model="valueType.unit" placeholder="请输入单位" />
+				</el-form-item>
 
-               <el-form-item label="时间格式" prop="maxLength" v-if="type=='date'">
-                <el-input v-model="valueType.maxLength" placeholder="请输入时间格式" />
-              </el-form-item>
-             
+				<el-form-item label="最大长度" prop="maxLength" v-if="type == 'string'">
+					<el-input v-model="valueType.maxLength" placeholder="请输入最大长度" />
+				</el-form-item>
 
-        <!--根据数据类型输出不同表单-->
+				<el-form-item label="时间格式" prop="maxLength" v-if="type == 'date'">
+					<el-input v-model="valueType.maxLength" placeholder="请输入时间格式" />
+				</el-form-item>
 
+				<el-form-item label="布尔值" prop="trueText" v-if="type == 'boolean'">
+					<div class="input-box">
+						<el-input v-model="valueType.trueText" placeholder="请输入布尔值" value="是" /><span style="margin: 0px 10px">~</span>
+						<el-input v-model="valueType.trueValue" placeholder="请输入布尔值" value="true" />
+					</div>
 
+					<div class="input-box">
+						<el-input v-model="valueType.falseText" placeholder="请输入布尔值" value="否" /> <span style="margin: 0px 10px">~</span>
+						<el-input v-model="valueType.falseValue" placeholder="请输入布尔值" value="false" />
+					</div>
+				</el-form-item>
 
+				<el-form-item label="枚举项" prop="maxLength" v-if="type == 'enum'">
+					<div class="input-box" v-for="(item, index) in enumdata" :key="index">
+						<el-input v-model="item.text" placeholder="请输入枚举值" /><span style="margin: 0px 10px"
+							><el-icon><Right /></el-icon
+						></span>
+						<el-input v-model="item.value" placeholder="请输入枚举文本" />
+						<div class="input-option">
+							<el-icon @click="addEnum" v-if="index == 0"><Plus /></el-icon>
+							<el-icon @click="delEnum(index)" v-if="index != 0"><Minus /></el-icon>
+						</div>
+					</div>
+				</el-form-item>
 
+				<el-form-item label="JSON对象" prop="maxLength" v-if="type == 'object'">
+					<div v-for="(item, index) in jsondata" :key="index" class="jslist">
+						<div class="jsonlist">
+							<div>参数名称:</div>
+							<div style="width: 60%">{{ item.name }}</div>
+							<div class="jsonoption">
+								<!-- <el-link type="primary">编辑</el-link> -->
+								<el-link type="primary" @click="deljson(index)">删除</el-link>
+							</div>
+						</div>
+					</div>
+
+					<div style="display: block; width: 100%">
+						<div class="input-options" @click="addJson">
+							<el-icon><Plus /></el-icon>
+							<div>添加参数</div>
+						</div>
+					</div>
+				</el-form-item>
 
+				<div v-if="type == 'array'">
+					<el-form-item label="元素类型" prop="types">
+						<el-select v-model="elementType.type" placeholder="请选择元素类型" @change="seletChanges">
+							<el-option-group v-for="group in typeData" :key="group.label" :label="group.label">
+								<el-option v-for="item in group.options" :key="item.type" :label="item.title" :value="item.type" :disabled="item.type == 'array'" />
+							</el-option-group>
+						</el-select>
+					</el-form-item>
+
+					<el-form-item label="精度" prop="decimals" v-if="types == 'float' || types == 'double'">
+						<el-input v-model="elementType.decimals" placeholder="请输入精度" />
+					</el-form-item>
+
+					<el-form-item label="单位" prop="unit" v-if="types == 'int' || types == 'long' || types == 'float' || types == 'double'">
+						<el-input v-model="elementType.unit" placeholder="请输入单位" />
+					</el-form-item>
+
+					<el-form-item label="最大长度" prop="maxLength" v-if="types == 'string'">
+						<el-input v-model="elementType.maxLength" placeholder="请输入最大长度" />
+					</el-form-item>
+
+					<el-form-item label="时间格式" prop="maxLength" v-if="types == 'date'">
+						<el-input v-model="elementType.maxLength" placeholder="请输入时间格式" />
+					</el-form-item>
+
+					<el-form-item label="布尔值" prop="maxLength" v-if="types == 'boolean'">
+						<div class="input-box">
+							<el-input v-model="elementType.trueText" placeholder="请输入布尔值" value="是" /><span style="margin: 0px 10px">~</span>
+							<el-input v-model="elementType.trueValue" placeholder="请输入布尔值" value="true" />
+						</div>
+
+						<div class="input-box">
+							<el-input v-model="elementType.falseText" placeholder="请输入布尔值" value="否" /> <span style="margin: 0px 10px">~</span>
+							<el-input v-model="elementType.falseValue" placeholder="请输入布尔值" value="false" />
+						</div>
+					</el-form-item>
+
+					<el-form-item label="枚举项" prop="maxLength" v-if="types == 'enum'">
+						<div class="input-box" v-for="(item, index) in enumdata" :key="index">
+							<el-input v-model="item.text" placeholder="请输入枚举值" /><span style="margin: 0px 10px"
+								><el-icon><Right /></el-icon
+							></span>
+							<el-input v-model="item.value" placeholder="请输入枚举文本" />
+							<div class="input-option">
+								<el-icon @click="addEnum" v-if="index == 0"><Plus /></el-icon>
+								<el-icon @click="delEnum(index)" v-if="index != 0"><Minus /></el-icon>
+							</div>
+						</div>
+					</el-form-item>
+				</div>
 
+				
+				<el-form-item label="JSON对象" prop="maxLength" v-if="types == 'object'">
+					<div v-for="(item, index) in jsondata" :key="index" class="jslist">
+						<div class="jsonlist">
+							<div>参数名称:</div>
+							<div style="width: 60%">{{ item.data.name }}</div>
+							<div class="jsonoption">
+								<el-link type="primary">编辑</el-link>
+								<el-link type="primary">删除</el-link>
+							</div>
+						</div>
+					</div>
+
+					<div style="display: block; width: 100%">
+						<div class="input-options" @click="addJson">
+							<el-icon><Plus /></el-icon>
+							<div>添加参数</div>
+						</div>
+					</div>
+				</el-form-item>
 
+				<!--根据数据类型输出不同表单-->
 
 				<el-form-item label="是否只读" prop="accessMode">
-					<el-radio-group v-model="ruleForm.accessMode" model-value="0">
+					<el-radio-group v-model="ruleForm.accessMode" >
 						<el-radio label="0">读写</el-radio>
 
 						<el-radio label="1">只读</el-radio>
@@ -63,6 +172,7 @@
 				</span>
 			</template>
 		</el-dialog>
+		<EditOption ref="editOptionRef" @typeList="getOptionData" />
 	</div>
 </template>
 
@@ -70,12 +180,17 @@
 import { reactive, toRefs, defineComponent, ref, unref } from 'vue';
 import api from '/@/api/device';
 import uploadVue from '/@/components/upload/index.vue';
+import { Plus, Minus, Right } from '@element-plus/icons-vue';
+import EditOption from './editOption.vue';
+
 import { ElMessage, UploadProps } from 'element-plus';
 
 interface RuleFormState {
 	id: number;
+	productId: number;
 	name: string;
 	dictType: string;
+	valueType: Object;
 	status: number;
 	desc: string;
 }
@@ -88,44 +203,63 @@ interface DicState {
 
 export default defineComponent({
 	name: 'deviceEditPro',
-	components: { uploadVue },
+	components: { Plus, Minus, Right, EditOption },
 	setup(prop, { emit }) {
 		const formRef = ref<HTMLElement | null>(null);
-
+		const editOptionRef = ref();
 		const state = reactive<DicState>({
 			isShowDialog: false,
 			typeData: [], //
-      type: '',
-       valueType: {
-          type:'',
-          maxLength:'',
+			type: '',
+			types: '',
+			productId:0,
+			valueType: {
+				type: '',
+				maxLength: '',
+				trueText:'是',
+				trueValue:'true',
+				falseText:'否',
+				falseValue:'false',
+			},
+			elementType: {
+				type: '',
+				maxLength: '',
+			},
+			enumdata: [
+				{
+					text: '',
+					value: '',
+				},
+			],
 
-        },
+			jsondata: [],
 
 			ruleForm: {
+				id:0,
+				productId:0,
 				name: '',
 				key: '',
 				transportProtocol: '',
-				accessMode: '0',
+				accessMode: 0,
 				status: 1,
-        valueType: {
-          type:'',
-          maxLength:'',
+				valueType: {
+					type: '',
+					maxLength: '',
+				},
 
-        },
-				
 				desc: '',
 			},
 			rules: {
 				name: [{ required: true, message: '标签定义名称不能为空', trigger: 'blur' }],
 				key: [{ required: true, message: '标签定义标识不能为空', trigger: 'blur' }],
 				accessMode: [{ required: true, message: '请选择是否只读', trigger: 'blur' }],
-		
+				type: [{ required: true, message: '请选择数据类型', trigger: 'blur' }],
+				
 			},
 		});
 
 		// 打开弹窗
-		const openDialog = (row: RuleFormState | null) => {
+		const openDialog = (row: RuleFormState | null,productId:number | null) => {
 			resetForm();
 
 			api.product.getDataType({ status: -1 }).then((res: any) => {
@@ -139,33 +273,73 @@ export default defineComponent({
 						datat[index]['options'] = item;
 					}
 				});
-				console.log(datat);
+				console.log(row);
+				console.log(productId);
 				state.typeData = datat || [];
 			});
-
-			if (row) {
-				// api.dict.getType(row.dictId).then((res:any)=>{
-				//   state.ruleForm = res.data.dictType
-				// }
-				console.log(row);
+			state.ruleForm = row;
+			if (row.valueType) {	
 				state.ruleForm = row;
+
+				state.productId=productId;
+				state.valueType = row.valueType;
+				state.ruleForm.valueType.type = row.valueType.type;
+				state.ruleForm.type = row.valueType.type;
+				state.type = row.valueType.type ;
 			}
 			state.isShowDialog = true;
 		};
 		const resetForm = () => {
 			state.ruleForm = {
-				id: 0,
 				name: '',
-				dictType: '',
+				key: '',
+				transportProtocol: '',
+				accessMode: '0',
 				status: 1,
+				valueType: {
+					type: '',
+					maxLength: '',
+				},
+
 				desc: '',
 			};
 		};
 
-    const seletChange=(val)=>{
-      state.type=val;
-      console.log(val);
-    };
+		const seletChange = (val) => {
+			state.type = val;
+			state.ruleForm.type = val;
+		
+			
+			console.log(val);
+		};
+		const seletChanges = (val) => {
+			console.log(val);
+			state.types = val;
+			console.log(val);
+		};
+
+		const addEnum = () => {
+			state.enumdata.push({
+				text: '',
+				value: '',
+			});
+		};
+		const delEnum = (index) => {
+			state.enumdata.splice(index, 1);
+		};
+
+		const deljson = (index) => {
+			state.jsondata.splice(index, 1);
+		}
+
+		const addJson = () => {
+			editOptionRef.value.openDialog({ product_id: 0, id: 0 });
+		};
+		const getOptionData = (data) => {
+			state.jsondata.push(data);
+
+			console.log(state.jsondata);
+		};
 		// 关闭弹窗
 		const closeDialog = () => {
 			state.isShowDialog = false;
@@ -182,17 +356,44 @@ export default defineComponent({
 				if (valid) {
 					if (state.ruleForm.id !== 0) {
 						//修改
-						api.product.edit(state.ruleForm).then(() => {
+						if (state.type == 'enum') {
+							state.valueType.elements = state.enumdata;
+						}
+
+						if (state.type == 'object') {
+							state.valueType.properties = state.jsondata;
+						}
+
+						if (state.type == 'array') {
+							state.valueType.elementType = state.elementType;
+						}
+
+						console.log(state.valueType);
+
+						state.ruleForm.valueType = state.valueType;
+						state.ruleForm.productId = state.productId
+						api.model.tagedit(state.ruleForm).then(() => {
 							ElMessage.success('标签定义类型修改成功');
 							closeDialog(); // 关闭弹窗
 							emit('typeList');
 						});
 					} else {
 						//添加
-         
-            console.log(state.valueType);
-            state.ruleForm.valueType=state.valueType;
-           console.log(state.ruleForm);
+						if (state.type == 'enum') {
+							state.valueType.elements = state.enumdata;
+						}
+
+						if (state.type == 'object') {
+							state.valueType.properties = state.jsondata;
+						}
+
+						if (state.type == 'array') {
+							state.valueType.elementType = state.elementType;
+						}
+
+						console.log(state.valueType);
+
+						state.ruleForm.valueType = state.valueType;
 						api.model.tagadd(state.ruleForm).then(() => {
 							ElMessage.success('标签定义类型添加成功');
 							closeDialog(); // 关闭弹窗
@@ -204,8 +405,15 @@ export default defineComponent({
 		};
 
 		return {
+			editOptionRef,
+			getOptionData,
 			openDialog,
-      seletChange,
+			deljson,
+			addEnum,
+			delEnum,
+			addJson,
+			seletChange,
+			seletChanges,
 			closeDialog,
 			onCancel,
 			onSubmit,
@@ -215,34 +423,43 @@ export default defineComponent({
 	},
 });
 </script>
-
-<style scoped>
-.avatar-uploader .avatar {
-	width: 178px;
-	height: 178px;
-	display: block;
-}
-</style>
-
 <style>
-.avatar-uploader .el-upload {
-	border: 1px dashed var(--el-border-color);
-	border-radius: 6px;
+.input-box {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	margin-top: 10px;
+}
+.input-option {
+	line-height: 30px;
+	padding-top: 5px;
+	width: 140px;
+}
+.input-option i {
+	margin: 0px 5px;
+	border: 1px solid #c3c3c3;
+	font-size: 16px;
+}
+.input-options {
+	display: flex;
+	align-items: center;
+	color: #409eff;
 	cursor: pointer;
-	position: relative;
-	overflow: hidden;
-	transition: var(--el-transition-duration-fast);
 }
-
-.avatar-uploader .el-upload:hover {
-	border-color: var(--el-color-primary);
+.jslist {
+	width: 100%;
+	border: 1px solid #e8e8e8;
+	padding: 10px;
+	margin-bottom: 10px;
 }
-
-.el-icon.avatar-uploader-icon {
-	font-size: 28px;
-	color: #8c939d;
-	width: 178px;
-	height: 178px;
-	text-align: center;
+.jsonlist {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+}
+.jsonoption {
+}
+.jsonoption a {
+	margin: 0px 10px;
 }
 </style>