修改承载能力评估策略页面 修改 全局样式

src/api/advance-boot/bearingCapacity.ts

@@ -15,7 +15,6 @@ export function addUse(data) {
         method: 'post',
         data
     })
-    
 }
 //承载能力评估用户编辑
 export function updateUse(data) {
@@ -47,6 +46,22 @@ export function queyDetail() {
         method: 'post'
     })
 }
+// 用户新增承载能力评估策略（电弧炉）
+export function adddhl(data) {
+    return createAxios({
+        url: '/advance-boot/carrycapacity/adddhl',
+        method: 'post',
+        data
+    })
+}
+
+//承载能力评估策略初始化查询（电弧炉）
+export function queyDetailDhl() {
+    return createAxios({
+        url: '/advance-boot/carrycapacity/queyDetailDhl',
+        method: 'post'
+    })
+}
 //用户新增承载能力评估策略
 export function addCarryc(data) {
     return createAxios({

src/components/table/header/index.vue

@@ -17,7 +17,7 @@
                 </el-form-item>
                 <slot name="select"></slot>
             </el-form>
-            <template v-if="($slots.select || datePicker) ">
+            <template v-if="$slots.select || datePicker">
                 <el-button type="primary" @click="showSelectChange" v-if="showUnfoldButton">
                     <Icon size="14" name="el-icon-ArrowUp" style="color: #fff" v-if="showSelect" />
                     <Icon size="14" name="el-icon-ArrowDown" style="color: #fff" v-else />
@@ -110,7 +110,6 @@ const handlerHeight = () => {
     ).height as string
 }
 const computedSearchRow = () => {
-
     if (!headerForm.value.$el) return
 
     // 清空headerFormSecond.value.$el下的元素
@@ -135,7 +134,6 @@ const computedSearchRow = () => {
     } else {
         showUnfoldButton.value = false
     }
-
 }
 
 const showSelect = ref(false)
@@ -163,10 +161,13 @@ const setInterval = (val: any) => {
     datePickerRef.value.setInterval(val)
 }
 
-defineExpose({ onComSearch, areaRef, setDatePicker ,setInterval,datePickerRef})
+defineExpose({ onComSearch, areaRef, setDatePicker, setInterval, datePickerRef })
 </script>
 
 <style scoped lang="scss">
+.cn-table-header {
+    border: 1px solid var(--el-border-color);
+}
 .table-header {
     position: relative;
     overflow-x: auto;
@@ -176,7 +177,7 @@ defineExpose({ onComSearch, areaRef, setDatePicker ,setInterval,datePickerRef})
     width: 100%;
     max-width: 100%;
     background-color: var(--ba-bg-color-overlay);
-    border: 1px solid var(--el-border-color);
+
     border-bottom: none;
     padding: 13px 15px;
     font-size: 14px;

src/styles/element.scss

@@ -136,7 +136,40 @@
 
 .el-tabs__content {
     height: calc(100% - 40px);
-    .el-tab-pane{
+    .el-tab-pane {
         height: 100%;
     }
 }
+
+.el-button--primary:focus {
+    color: var(--el-color-white);
+    border-color: var(--el-color-primary);
+    background-color: var(--el-color-primary);
+    outline: 0;
+}
+.el-button--primary:hover {
+    color: var(--el-color-white);
+    border-color: var(--el-color-primary-light-3);
+    background-color: var(--el-color-primary-light-3);
+    outline: 0;
+}
+.el-button.is-plain:focus {
+    color: var(--el-button-text-color);
+    border-color: var(--el-button-border-color);
+}
+.el-button.is-plain:hover {
+    color: var(--el-color-primary);
+    border-color: var(--el-color-primary);
+}
+.el-button.is-link:focus {
+    color: var(--el-button-text-color);
+}
+.el-button.is-link:hover {
+    color: var(--el-button-hover-link-text-color);
+}
+.el-button--primary.is-link:hover,
+.el-button--primary.is-plain:hover,
+.el-button--primary.is-text:hover {
+    color: var(--el-color-primary-light-5);
+    background-color: var(--el-color-primary-light-9) !important;
+}

src/views/pqs/bearingCapacity/evaluationList/components/policy.vue

@@ -10,7 +10,7 @@
             </vxe-colgroup>
             <vxe-column field="comparisonOperators1" title="安全(个)">
                 <template #default="row">
-                    <div @click="cells(row, row.row.comparisonOperators1, row.row.count1)">
+                    <div @click="cells(row, row.row.comparisonOperators1, row.row.count1, 0)">
                         {{ row.row.comparisonOperators1
                         }}{{ row.row.comparisonOperators1 == '/' ? '' : row.row.count1 }}
                     </div>
@@ -18,7 +18,7 @@
             </vxe-column>
             <vxe-column field="comparisonOperators2" title="III级预警(个)">
                 <template #default="row">
-                    <div @click="cells(row, row.row.comparisonOperators2, row.row.count2)">
+                    <div @click="cells(row, row.row.comparisonOperators2, row.row.count2, 0)">
                         {{ row.row.comparisonOperators2
                         }}{{ row.row.comparisonOperators2 == '/' ? '' : row.row.count2 }}
                     </div>
@@ -26,7 +26,7 @@
             </vxe-column>
             <vxe-column field="comparisonOperators3" title="II级预警(个)">
                 <template #default="row">
-                    <div @click="cells(row, row.row.comparisonOperators3, row.row.count3)">
+                    <div @click="cells(row, row.row.comparisonOperators3, row.row.count3, 0)">
                         {{ row.row.comparisonOperators3
                         }}{{ row.row.comparisonOperators3 == '/' ? '' : row.row.count3 }}
                     </div>
@@ -34,7 +34,7 @@
             </vxe-column>
             <vxe-column field="comparisonOperators4" title="I级预警(个)">
                 <template #default="row">
-                    <div @click="cells(row, row.row.comparisonOperators4, row.row.count4)">
+                    <div @click="cells(row, row.row.comparisonOperators4, row.row.count4, 0)">
                         {{ row.row.comparisonOperators4
                         }}{{ row.row.comparisonOperators4 == '/' ? '' : row.row.count4 }}
                     </div>
@@ -47,23 +47,46 @@
                 <vxe-column field="name" width="180" title="结果"></vxe-column>
             </vxe-colgroup>
 
-            <vxe-column field="role" title="THD(%)"></vxe-column>
+            <vxe-column field="comparisonOperators1" title="THD(%)">
+                <template #default="row">
+                    <div @click="cells(row, row.row.comparisonOperators1, row.row.count1, 1)">
+                        {{ row.row.comparisonOperators1
+                        }}{{ row.row.comparisonOperators1 == '/' ? '' : row.row.count1 }}
+                    </div>
+                </template>
+            </vxe-column>
 
-            <vxe-column field="num6" title="2~25次谐波合格个数"></vxe-column>
+            <vxe-column field="comparisonOperators2" title="2~25次谐波合格个数">
-            <vxe-column field="date12" title="畸次谐波合格个数"></vxe-column>
+                <template #default="row">
-            <vxe-column field="date13" title="偶次谐波合格个数"></vxe-column>
+                    <div @click="cells(row, row.row.comparisonOperators2, row.row.count2, 2)">
+                        {{ row.row.comparisonOperators2
+                        }}{{ row.row.comparisonOperators2 == '/' ? '' : row.row.count2 }}
+                    </div>
+                </template>
+            </vxe-column>
+            <vxe-column field="comparisonOperators3" title="畸次谐波合格个数">
+                <template #default="row">
+                    <div @click="cells(row, row.row.comparisonOperators3, row.row.count3, 3)">
+                        {{ row.row.comparisonOperators3
+                        }}{{ row.row.comparisonOperators3 == '/' ? '' : row.row.count3 }}
+                    </div>
+                </template>
+            </vxe-column>
+            <vxe-column field="comparisonOperators4" title="偶次谐波合格个数">
+                <template #default="row">
+                    <div @click="cells(row, row.row.comparisonOperators4, row.row.count4, 4)">
+                        {{ row.row.comparisonOperators4
+                        }}{{ row.row.comparisonOperators4 == '/' ? '' : row.row.count4 }}
+                    </div>
+                </template>
+            </vxe-column>
         </vxe-table>
-
+        <!-- 修改 -->
         <el-dialog v-model="dialogVisible" title="安全等级配置" width="500">
             <el-form :model="form" label-width="auto">
                 <el-form-item label="运算符号：">
                     <el-radio-group v-model="form.comparisonOperators" @change="groupChang">
-                        <el-radio :label="'>'">></el-radio>
+                        <el-radio v-for="item in sign" :label="item.name">{{ item.name }}</el-radio>
-                        <el-radio :label="'<'">&lt;</el-radio>
-                        <el-radio :label="'>='">>=</el-radio>
-                        <el-radio :label="'<='">&lt;=</el-radio>
-                        <el-radio :label="'=='">==</el-radio>
-                        <el-radio :label="'/'">/</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="用户名称：">
@@ -83,7 +106,7 @@
 import { ref, onMounted, provide, reactive } from 'vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { mainHeight } from '@/utils/layout'
-import { queyDetail, addCarryc, restore } from '@/api/advance-boot/bearingCapacity'
+import { queyDetail, addCarryc, restore, queyDetailDhl, adddhl } from '@/api/advance-boot/bearingCapacity'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { VxeTablePropTypes } from 'vxe-table'
 defineOptions({
@@ -96,47 +119,37 @@ const Views = ref(true)
 const xTable = ref()
 const loading = ref(false)
 const photovoltaicData: any = ref([])
-const tableData = ref([
+const sum = ref(0)
-    {
+const tableData: any = ref([])
-        id: 10001,
+const list: any = ref({})
-        name: '安全',
-        role: '0',
-        num6: '0',
-        date12: '0',
-        date13: '0'
-    },
-    {
-        id: 10002,
-        name: 'III级预警',
-        role: '0',
-        num6: '0',
-        date12: '0',
-        date13: '0'
-    },
-    {
-        id: 10003,
-        name: 'II级预警',
-        role: 'Test',
-        date12: '0',
-        num6: '0',
-        date13: '0'
-    },
-    {
-        id: 10004,
-        name: 'I级预警',
-        role: '0',
-        date12: '0',
-        num6: '0',
-        date13: '0'
-    }
-])
 const form: any = ref({
     comparisonOperators: '',
     count: ''
 })
+const sign = ref([
+    {
+        name: '>'
+    },
+    {
+        name: '<'
+    },
+    {
+        name: '>='
+    },
+    {
+        name: '<='
+    },
+    {
+        name: '=='
+    },
+    {
+        name: '/'
+    }
+])
 const dialogVisible = ref(false)
 const disabled = ref(false)
 const info = () => {
+    // 光伏
     queyDetail().then(res => {
         photovoltaicData.value = []
         let title = ['安全', 'III级预警', 'II级预警', 'I级预警']
@@ -157,10 +170,17 @@ const info = () => {
         })
         console.log('🚀 ~ queyDetail ~ photovoltaicData.value:', photovoltaicData.value)
     })
+    // 电弧炉
+    queyDetailDhl().then(res => {
+        tableData.value = res.data
+        tableData.value[0].name = '电弧炉'
+        tableData.value[1].name = '充电桩'
+        tableData.value[2].name = '电气化铁路'
+    })
 }
 
 // <span @click="cells(row,comparisonOperators2,count2)">
-const cells = (row: any, comparisonOperators: any, count: any) => {
+const cells = (row: any, comparisonOperators: any, count: any, num: number) => {
     form.value = {
         comparisonOperators: comparisonOperators,
         count: count,
@@ -168,6 +188,10 @@ const cells = (row: any, comparisonOperators: any, count: any) => {
         id: row.row.id,
         indexResult: row.columnIndex
     }
+    sum.value = num
+    if (num != 0) {
+        list.value = JSON.parse(JSON.stringify(row.row))
+    }
 
     groupChang(comparisonOperators)
     dialogVisible.value = true
@@ -183,11 +207,25 @@ const groupChang = e => {
 }
 // 安全等级配置确认
 const add = () => {
+    if (sum.value == 0) {
         addCarryc(form.value).then(res => {
             ElMessage.success('修改成功!')
             dialogVisible.value = false
             info()
         })
+    } else {
+        // sum.value = num
+        // list.value = row
+        list.value['comparisonOperators' + sum.value] = form.value.comparisonOperators
+        list.value['count' + sum.value] = form.value.count
+        list.value.userFlag = 0
+        list.value.protoFlag = 0
+        adddhl(list.value).then(res => {
+            ElMessage.success('修改成功!')
+            dialogVisible.value = false
+            info()
+        })
+    }
 }
 // 还原
 const restores = () => {
@@ -197,7 +235,7 @@ const restores = () => {
     })
 }
 // 通用行合并函数（将相同多列数据合并为一行）
-const mergeRowMethod: VxeTablePropTypes.SpanMethod = ({ row, _rowIndex, column, visibleData }) => {
+const mergeRowMethod = ({ row, _rowIndex, column, visibleData }) => {
     const fields = ['name']
     const cellValue = row[column.field]
     if (cellValue && fields.includes(column.field)) {