From 3a4b3edae5fd9a0339913151c48382b07065f6b6 Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Wed, 22 May 2024 16:22:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E8=81=94?=
 =?UTF-8?q?=E8=B0=83=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA/=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=B1=95=E7=A4=BA=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/jointDebugList/detail.vue             | 12 ++++++++++++
 .../components/jointDebugList/index.vue              |  6 +++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue
index b527d408..dbff8b1a 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue
@@ -7,6 +7,18 @@
             <el-descriptions-item label="调试原因">
                 {{ detailData.reason}}
             </el-descriptions-item>
+            <el-descriptions-item label="监测点编号">
+                {{ detailData.lineId }}
+            </el-descriptions-item>
+            <el-descriptions-item label="监测终端编码">
+                {{ detailData.monitoringTerminalCode }}
+            </el-descriptions-item>
+            <el-descriptions-item label="监测终端名称">
+                {{ detailData.monitoringTerminalName}}
+            </el-descriptions-item>
+            <el-descriptions-item label="电网侧变电站">
+                {{ detailData.powerSubstationName }}
+            </el-descriptions-item>
         </el-descriptions>
     </div>
 </template>
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
index c8dbc8f5..ea5f9f00 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
@@ -71,6 +71,10 @@ const tableStore = new TableStore({
             }
         },
         { field: 'reason', title: '调试原因', minWidth: 170 },
+        { field: 'lineId', title: '监测点编号', minWidth: 170 },
+        { field: 'monitoringTerminalCode', title: '监测终端编码', minWidth: 170 },
+        { field: 'monitoringTerminalName', title: '监测终端名称', minWidth: 170 },
+        { field: 'powerSubstationName', title: '电网侧变电站', minWidth: 170 },
         {
             title: '操作',
             minWidth: 150,
@@ -93,7 +97,7 @@ const tableStore = new TableStore({
                 {
                     name: 'productSetting',
                     title: '申请联调',
-                    type: 'success',
+                    type: 'primary',
                     icon: 'el-icon-add',
                     render: 'basicButton',
                     click: row => {

From b49d6defcc238c0ef2f5bccb57dee9ea7ef52d4d Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Wed, 22 May 2024 16:25:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=B5=E8=83=BD=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98-=E7=94=A8=E6=88=B7=E6=8A=95=E8=AF=89?=
 =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/process-boot/electricitymanagement.ts |  11 +-
 .../components1/complaints.vue                |  81 ++++---
 .../components1/form/complaintsForm.vue       | 202 +++++++++++++-----
 .../pqs/supervise/electricalEnergy/index.vue  |   6 +-
 4 files changed, 207 insertions(+), 93 deletions(-)

diff --git a/src/api/process-boot/electricitymanagement.ts b/src/api/process-boot/electricitymanagement.ts
index f1a9f277..a7120555 100644
--- a/src/api/process-boot/electricitymanagement.ts
+++ b/src/api/process-boot/electricitymanagement.ts
@@ -198,4 +198,13 @@ export function handleWarningAlarmFlag(data) {
         method: 'POST',
         data
     })
-}
\ No newline at end of file
+}
+
+//提交用户投诉新增表单
+export function addComplaintsData(data) {
+    return createAxios({
+        url: '/supervision-boot/SupervisionUserComplaint/add',
+        method: 'POST',
+        data
+    })
+}
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue b/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue
index 275fc818..d042e1b3 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue
@@ -1,4 +1,5 @@
 <template>
+    <!-- 用户投诉 -->
     <!-- 2 有新增 发起 预警单 -->
 
     <TableHeader area datePicker ref="TableHeaderRef">
@@ -8,7 +9,7 @@
     </TableHeader>
     <Table ref="tableRef" />
     <!-- 新增 -->
-    <complaintsForm ref="formRef" />
+    <complaintsForm ref="formRef" @onSubmit="tableStore.index()"/>
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide, nextTick } from 'vue'
@@ -27,7 +28,7 @@ const formRef = ref()
 const TableHeaderRef = ref()
 
 const tableStore = new TableStore({
-    url: '/supervision-boot/generalSurvey/getSurvey',
+    url: '/supervision-boot/SupervisionUserComplaint/list',
     publicHeight: 65,
     method: 'POST',
     column: [
@@ -41,47 +42,57 @@ const tableStore = new TableStore({
             }
         },
         { field: 'userName', title: '用户名称' },
-        { field: 'userId', title: '用户编号' },
-        { field: 'complaintContent', title: '投诉内容' },
-        { field: 'complaintTime', title: '投诉时间' },
-
+        { field: 'userNumber', title: '用户编号' },
+        // { field: 'userCategory', title: '用户类别' },
+        { field: 'complaintText', title: '投诉内容' },
+        { field: 'steadyIndicator', title: '稳态指标' },
+        { field: 'transientIndicators', title: '暂态指标' },
+        { field: 'monitorName', title: '监测点名称' },
+        { field: 'monitorNumber', title: '监测点编号' },
         {
-            title: '操作',
-            width: '180',
-            align: 'center',
-            render: 'buttons',
+            field:'status',
+            title: '是否实现监测',
+            formatter: (row: any) => {
+                return row.cellvalue=='0'?'否':'是'
+            }
+        },
+        // {
+        //     title: '操作',
+        //     width: '180',
+        //     align: 'center',
+        //     render: 'buttons',
 
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '发起预警单',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'primary',
-                        title: '请确认发起发起预警单!'
-                    },
-                    click: row => {}
-                }
-            ]
-        }
+        //     buttons: [
+        //         {
+        //             name: 'edit',
+        //             title: '发起预警单',
+        //             type: 'primary',
+        //             icon: 'el-icon-Open',
+        //             render: 'confirmButton',
+        //             popconfirm: {
+        //                 confirmButtonText: '确认',
+        //                 cancelButtonText: '取消',
+        //                 confirmButtonType: 'primary',
+        //                 title: '请确认发起发起预警单!'
+        //             },
+        //             click: row => {}
+        //         }
+        //     ]
+        // }
     ],
     beforeSearchFun: () => {
         tableStore.table.params.orgNo = tableStore.table.params.deptIndex
         tableStore.table.params.currentPage = tableStore.table.params.pageNum
     },
     loadCallback: () => {
-        tableStore.table.data = [
-            {
-                userName: '东润开阳堡光伏电站用户',
-                userId: '8115771123274',
-                complaintContent: '装置频繁重启',
-                complaintTime: '2024-05-16'
-            }
-        ]
+        // tableStore.table.data = [
+        //     {
+        //         userName: '东润开阳堡光伏电站用户',
+        //         userId: '8115771123274',
+        //         complaintContent: '装置频繁重启',
+        //         complaintTime: '2024-05-16'
+        //     }
+        // ]
     }
 })
 
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue b/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue
index 857eb708..fa5c9a64 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue
@@ -1,45 +1,119 @@
 <template>
-    <el-dialog draggable v-model="dialogVisible" :title="title" style="width: 1100px" :before-close="handleClose">
-        <el-form :model="userAdddata" :inline="true" ref="userAddRef" :rules="rules">
-            <el-form-item label="用户名称:" prop="userName">
-                <el-input v-model="userAdddata.userName" clearable placeholder="请输入用户名称"></el-input>
-            </el-form-item>
-            <el-form-item label="用户编号:" prop="userNo">
-                <el-input v-model="userAdddata.userNo" clearable placeholder="请输入用户编号"></el-input>
-            </el-form-item>
+    <el-dialog draggable v-model="dialogVisible" :title="title" style="width: 55%" :before-close="handleClose">
+        <el-form
+            :model="form"
+            ref="formRef"
+            :rules="rules"
+            label-width="140px"
+            label-position="right"
+            :scroll-to-error="true"
+        >
+            <el-row>
+                <el-col :span="12">
+                    <el-form-item label="用户名称:" style="margin-top: 10px" prop="userName">
+                        <el-input
+                            v-model="form.userName"
+                            clearable
+                            style="width: 100%"
+                            placeholder="请输入用户名称"
+                        ></el-input>
+                    </el-form-item>
+                </el-col>
+                <!-- <el-col :span="12">
+                    <el-form-item label="用户类别:" style="margin-top: 10px" prop="userCategory">
+                        <el-select
+                            v-model="form.userCategory"
+                            clearable
+                            style="width: 100%"
+                            placeholder="请选择用户类别"
+                        >
+                            <el-option
+                                v-for="item in monitorTypeList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col> -->
+                <el-col :span="12">
+                    <el-form-item label="用户编号:" style="margin-top: 10px" prop="userNumber">
+                        <el-input
+                            v-model="form.userNumber"
+                            clearable
+                            style="width: 100%"
+                            placeholder="请输入用户编号"
+                        ></el-input>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="12">
+                    <el-form-item label="是否实现监测:" style="margin-top: 10px" prop="status">
+                        <el-radio-group v-model="form.status">
+                            <el-radio value="0">否</el-radio>
+                            <el-radio value="1">是</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                </el-col>
+                <el-col v-if="form.status == '1'" :span="12">
+                    <el-form-item label="监测点名称:" style="margin-top: 10px" prop="monitorName">
+                        <el-input
+                            v-model="form.monitorName"
+                            clearable
+                            style="width: 100%"
+                            placeholder="请输入监测点名称"
+                        ></el-input>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row v-if="form.status == '1'">
+                <el-col :span="12">
+                    <el-form-item label="监测点编号:" style="margin-top: 10px" prop="monitorNumber">
+                        <el-input
+                            v-model="form.monitorNumber"
+                            clearable
+                            style="width: 100%"
+                            placeholder="请输入监测点编号"
+                        ></el-input>
+                    </el-form-item>
+                </el-col>
+            </el-row>
 
-            <el-form-item label="投诉内容:" style="margin-top: 10px" prop="complaintContent">
+            <el-form-item label="投诉内容:" style="margin-top: 10px" prop="complaintText">
                 <el-input
                     type="textarea"
-                    style="width: 400px"
                     :autosize="{ minRows: 2, maxRows: 4 }"
                     placeholder="请输入内容"
-                    v-model="userAdddata.complaintContent"
+                    v-model="form.complaintText"
                 ></el-input>
             </el-form-item>
-            <br />
-            <el-form-item label="投诉时间:" style="margin-top: 10px" prop="complaintTime">
-                <el-date-picker
-                    v-model="userAdddata.complaintTime"
-                    type="date"
-                    placeholder="选择日期"
-                    value-format="YYYY-MM-DD"
-                ></el-date-picker>
-            </el-form-item>
-
-            <el-form-item label="稳态指标:" prop="steadyState">
-                <el-checkbox-group v-model="userAdddata.steadyState">
-                    <el-checkbox v-for="(item, ind) in steadyStateList" :key="ind" :label="item.code">
-                        {{ item.name }}
-                    </el-checkbox>
+            <el-form-item label="稳态指标:" style="margin-top: 10px" prop="steadyIndicator">
+                <el-checkbox-group v-model="form.steadyIndicator">
+                    <div style="width: 100%; display: flex; flex-wrap: wrap; justify-content: flex-start">
+                        <el-checkbox
+                            style="flex: none; width: 120px"
+                            v-for="(item, ind) in steadyStateList"
+                            :key="ind"
+                            :label="item.name"
+                        >
+                            {{ item.name }}
+                        </el-checkbox>
+                    </div>
                 </el-checkbox-group>
             </el-form-item>
-            <br />
-            <el-form-item label="暂态指标:" prop="transientIndicators">
-                <el-checkbox-group v-model="userAdddata.transientIndicators">
-                    <el-checkbox v-for="(item, ind) in transientIndicatorsList" :key="ind" :label="item.code">
-                        {{ item.name }}
-                    </el-checkbox>
+            <el-form-item label="暂态指标:" style="margin-top: 10px" prop="transientIndicators">
+                <el-checkbox-group v-model="form.transientIndicators">
+                    <div style="width: 100%; display: flex; flex-wrap: wrap; justify-content: flex-start">
+                        <el-checkbox
+                            style="flex: none; width: 120px"
+                            v-for="(item, ind) in transientIndicatorsList"
+                            :key="ind"
+                            :label="item.name"
+                        >
+                            {{ item.name }}
+                        </el-checkbox>
+                    </div>
                 </el-checkbox-group>
             </el-form-item>
         </el-form>
@@ -52,38 +126,55 @@
     </el-dialog>
 </template>
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref,defineEmits } from 'vue'
 import { useDictData } from '@/stores/dictData'
-const emit = defineEmits(['onsubmit'])
+import { addComplaintsData } from '@/api/process-boot/electricitymanagement'
+const emits = defineEmits(['onSubmit'])
 const dictData = useDictData()
 const dialogVisible = ref(false)
 const title: any = ref('')
 const steadyStateList = dictData.getBasicData('Steady_Indicator')
 const transientIndicatorsList = dictData.getBasicData('Transient_Indicators')
-
-const userAdddata = ref({
-    complaintContent: '',
-    complaintTime: '',
-    steadyState: [],
-    userName: '',
-    userNo: '',
-    transientIndicators: []
+const form = ref({
+    complaintText: '', //投诉内容
+    status: '0', //是否实现监测
+    steadyIndicator: [], //稳态指标
+    transientIndicators: [], //暂态指标
+    userName: '', //用户名称
+    userNumber: '', //用户编号
+    userCategory: '', //用户类别
+    monitorName: '', //监测点名称
+    monitorNumber: '' //监测点编号
 })
 const rules = {
-    problemName: [{ required: true, message: '请输入问题名称', trigger: 'blur' }],
     userName: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
-    userNo: [{ required: true, message: '请输入用户编号', trigger: 'blur' }],
-    complaintContent: [{ required: true, message: '请输入投诉内容', trigger: 'blur' }],
-    complaintTime: [{ required: true, message: '请选择时间', trigger: 'change' }],
-    problemSources: [{ required: true, message: '情选择问题来源', trigger: 'change' }],
-    abnormalDevTime: [{ required: true, message: '请选择时间', trigger: 'change' }],
+    userNumber: [{ required: true, message: '请输入用户编号', trigger: 'blur' }],
+    userCategory: [{ required: true, message: '请选择用户类别', trigger: 'change' }],
+    complaintText: [{ required: true, message: '请输入投诉内容', trigger: 'blur' }],
+    status: [{ required: true, message: '请选择是否实现监测', trigger: 'change' }],
     transientIndicators: [{ required: true, message: '请选择暂态指标', trigger: 'change' }],
-    steadyState: [{ required: true, message: '请选择稳态指标', trigger: 'change' }],
-    eventDescription: [{ required: true, message: '请输入设备异常描述', trigger: 'blur' }],
-    abnormalDevName: [{ required: true, message: '请输入问题名称', trigger: 'blur' }]
+    steadyIndicator: [{ required: true, message: '请选择稳态指标', trigger: 'change' }],
+    monitorName: [{ required: true, message: '请输入监测点名称', trigger: 'blur' }],
+    monitorNumber: [{ required: true, message: '请输入监测点编号', trigger: 'blur' }],
 }
+const formRef = ref(null)
 const submit = () => {
-    handleClose()
+    formRef.value.validate(valid => {
+        if (valid) {
+            form.value = {
+                ...form.value,
+                steadyIndicator: form.value.steadyIndicator.join(','),
+                transientIndicators: form.value.transientIndicators.join(',')
+            }
+            addComplaintsData(form.value).then(res => {
+                emits('onSubmit')
+                handleClose()
+            })
+        } else {
+            console.log('表单验证失败')
+            return false
+        }
+    })
 }
 
 const open = (row: any) => {
@@ -98,7 +189,10 @@ const handleClose = () => {
 defineExpose({ open })
 </script>
 <style lang="scss" scoped>
-:deep(.el-upload-list__item) {
-    width: 400px;
+.el-form {
+    width: 96%;
+    margin: 0 auto;
+    height: 400px;
+    margin-top: 20px;
 }
 </style>
diff --git a/src/views/pqs/supervise/electricalEnergy/index.vue b/src/views/pqs/supervise/electricalEnergy/index.vue
index 4077fc63..03a549e3 100644
--- a/src/views/pqs/supervise/electricalEnergy/index.vue
+++ b/src/views/pqs/supervise/electricalEnergy/index.vue
@@ -2,13 +2,13 @@
     <div class="default-main">
         <el-tabs v-model="activeName" type="border-card">
             <el-tab-pane label="在线监测" name="1">
-                <online  v-if="activeName=='1'"/>
+                <online v-if="activeName == '1'" />
             </el-tab-pane>
             <el-tab-pane label="用户投诉" name="2">
-                <complaints   v-if="activeName=='2'"/>
+                <complaints v-if="activeName == '2'" />
             </el-tab-pane>
             <el-tab-pane label="现场测试问题" name="3">
-                <testQuestions  v-if="activeName=='3'"/>
+                <testQuestions v-if="activeName == '3'" />
             </el-tab-pane>
             <!-- <el-tabs v-model="activeName" type="border-card">
             <el-tab-pane label="电能质量问题查询维护" name="1">