From af4592841b4d8b6c0cdcef4418f1017c520a0292 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 22 七月 2024 20:14:43 +0800
Subject: [PATCH] 设备数采配置 调整

---
 src/components/tool/formula.vue                                       |   39 +++++++++++++++++++
 src/components/view/a6-device-management.vue                          |   28 --------------
 src/components/do/b6-device-management/b6-data-acquisition-config.vue |    9 +++-
 3 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/src/components/do/b6-device-management/b6-data-acquisition-config.vue b/src/components/do/b6-device-management/b6-data-acquisition-config.vue
index d0e0a6a..bb598d9 100644
--- a/src/components/do/b6-device-management/b6-data-acquisition-config.vue
+++ b/src/components/do/b6-device-management/b6-data-acquisition-config.vue
@@ -83,6 +83,7 @@
         </div>
         <div class="fomItem2">
           <el-form-item class="fomItemInput1" label="鍏紡:">
+            <!-- <formula :returnFormula="evalResult"/> -->
             <el-input type="textarea" autosi:autosize="{ minRows: 2, maxRows: 4}"ze placeholder="璇疯緭鍏ュ唴瀹�" v-model="configForm.formula" @change="evalResult"> </el-input>
           </el-form-item>
         </div>
@@ -132,10 +133,13 @@
 </template>
 
 <script>
+import formula from '../../tool/formula.vue'
 export default {
   name: "dataAcquisitionConfig",
   // import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
-  components: {},
+  components: {
+    formula
+  },
   props: {
     deviceId: {
       type: Number,
@@ -449,7 +453,8 @@
         id: ''
       });
     },
-    evalResult () {
+    evalResult (val) {
+      this.configForm.formula = val
       // 鏍规嵁鍏紡璁$畻鍑虹粨鏋�
     },
     sizeChange(val) {
diff --git a/src/components/tool/formula.vue b/src/components/tool/formula.vue
new file mode 100644
index 0000000..da586a8
--- /dev/null
+++ b/src/components/tool/formula.vue
@@ -0,0 +1,39 @@
+<template>
+  <div>
+    <el-input
+      type="textarea"
+      :autosize="{ minRows: 2, maxRows: 4 }"
+      placeholder="璇疯緭鍏ュ唴瀹�"
+      v-model="formula"
+      @change="evalResult"
+      @input="inputValue"
+    >
+    </el-input>
+  </div>
+</template>
+
+<script>
+export default {
+    props: {
+        returnFormula: {
+            type: Function,
+            default: () => {return Function}
+        }
+    },
+  data() {
+    return {
+        formula: ""
+    };
+  },
+  methods: {
+    // 鍥炴樉
+    evalResult() {
+        this.returnFormula(this.formula)
+    },
+    inputValue(val) {
+        let lastChar2 = val.slice(-1);
+        
+    }
+  }
+};
+</script>
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 0388057..04f59c8 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -225,20 +225,6 @@
 								</el-upload>
 							</div>
 						</el-form-item>
-		<el-form-item label="妫�娴嬬殑鏂囦欢绫诲瀷:">
-            <el-select :disabled="isUp" v-model="formData.fileType" placeholder="璇烽�夋嫨鏂囦欢绫诲瀷" clearable>
-              <el-option v-for="item in fileTypeOptions"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="閲囬泦鍦板潃:" clearable>
-            <el-input :disabled="isUp" v-model="formData.collectUrl"></el-input>
-          </el-form-item>
-          <el-form-item label="鍌ㄥ瓨鍦板潃:">
-            <el-input :disabled="isUp" v-model="formData.storageUrl"></el-input>
-          </el-form-item>
 					</el-form>
 				</el-col>
 			</el-row>
@@ -382,20 +368,6 @@
 								</el-upload>
 							</div>
 						</el-form-item>
-						<el-form-item label="妫�娴嬬殑鏂囦欢绫诲瀷:">
-            <el-select v-model="formData.fileType" placeholder="璇烽�夋嫨鏂囦欢绫诲瀷" clearable>
-              <el-option v-for="item in fileTypeOptions"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="閲囬泦鍦板潃:" clearable>
-            <el-input v-model="formData.collectUrl"></el-input>
-          </el-form-item>
-          <el-form-item label="鍌ㄥ瓨鍦板潃:">
-            <el-input v-model="formData.storageUrl"></el-input>
-          </el-form-item>
 					</el-form>
 				</el-col>
 			</el-row>

--
Gitblit v1.9.3