1.治理设备界面添加数据类型筛选条件2.一次值二次值修改3.方案数据按钮修改

src/views/govern/device/control/detail.vue

@@ -13,11 +13,21 @@
                     <DatePicker ref="datePickerRef"></DatePicker>
                 </el-form-item>
                 <el-form-item label="值类型">
-                    <el-select v-model="form.dataLevel">
+                    <el-select v-model="form.dataLevel" :disabled="props.dataLevel == 'Primary'">
                         <el-option value="Primary" label="一次值"></el-option>
                         <el-option value="Secondary" label="二次值"></el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item label="数据类型" label-width="80px">
+                    <el-select v-model="form.statMethod" placeholder="请选择值类型">
+                        <el-option
+                            v-for="item in typeOptions"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item>
                     <el-button type="primary" icon="el-icon-Search" @click="init">查询</el-button>
                 </el-form-item>
@@ -36,11 +46,15 @@ import MyEchart from '@/components/echarts/MyEchart.vue'
 
 interface Props {
     detail: anyObj
+    dataLevel: string
 }
 
 const props = withDefaults(defineProps<Props>(), {
     detail: () => {
         return {}
+    },
+    dataLevel: () => {
+        return ''
     }
 })
 const datePickerRef = ref()
@@ -54,26 +68,52 @@ const form: any = reactive({
     remark: '',
     routeName: '',
     sort: 100,
-    type: 0,
-    dataLevel: ''
+    dataLevel: '',
+    statMethod: 'avg'
 })
+const typeOptions = [
+    {
+        name: '平均值',
+        id: 'avg'
+    },
+    {
+        name: '最大值',
+        id: 'max'
+    },
+    {
+        name: '最小值',
+        id: 'min'
+    },
+    {
+        name: 'CP95值',
+        id: 'cp95'
+    }
+]
 const echartsData = ref<any>(null)
 const dialogVisible = ref(false)
 const loading = ref(true)
 onMounted(() => {
-    form.dataLevel = props.detail.dataLevel
+    if (props.dataLevel == 'Secondary') {
+        form.dataLevel = 'Primary'
+    }else{
+        form.dataLevel=props.dataLevel
+    }
     init()
 })
 const init = () => {
     echartsData.value = null
     loading.value = true
+    console.log(props.detail.children, 'props.detail.children')
+    let statisticalParams = props.detail.children
+    statisticalParams[0].statMethod = form.statMethod
     getDeviceDataTrend({
         devId: props.detail.devId,
         endTime: datePickerRef.value.timeValue[1],
         lineId: props.detail.lineId,
         startTime: datePickerRef.value.timeValue[0],
-        statisticalParams: props.detail.children,
-        dataLevel: form.dataLevel
+        statisticalParams: statisticalParams,
+        dataLevel: form.dataLevel,
+        statMethod: form.statMethod
     }).then(res => {
         if (res.data.length && res.data[0].length) {
             let arr: any[] = []