3

src/pages/components/draw/DrawDesigns.vue

@@ -362,7 +362,13 @@ export default {
                     },//节点内文字样式
                 });
                 lf.value.on("edge:click", function (data, e, position) {
+                    console.log(data,'data1');
                     delId.value = data.data.id
+                    if (copyColor.value == '#255CE7') {
+                        lf.value.graphModel.updateText(data.data.id, "GOOSE");
+                    } else if (copyColor.value == 'orange') {
+                        lf.value.graphModel.updateText(data.data.id, "SV");
+                    }
                 })
                 lf.value.on("edge:add", function (data, e, position) {
                     if (copyColor.value == '#255CE7') {
@@ -377,6 +383,7 @@ export default {
                     }
                 })
                 lf.value.on('node:click', function (data, e, position) {//传送坐标轴参数到父组件
+                    console.log(data,'data3');
                     copyId.value = data.data.id
                     nodeId.value = data.data.id
                     setX.value = data.data.x
@@ -387,7 +394,7 @@ export default {
                     if (numCase.value == 0) {
                         lf.value.graphModel.updateText(data.edgeModel.id, "SV");
                     } else if (numCase.value == 1) {
-                        lf.value.graphModel.updateText(data.edgeModel.id, "Goose");
+                        lf.value.graphModel.updateText(data.edgeModel.id, "GOOSE");
                     }
                 })
                 lf.value.on('node:dbclick', function (data, e, position) {//双击打开弹窗
@@ -406,10 +413,8 @@ export default {
                     console.log(data, 'data');
                     if (copyColor.value == '#255CE7') {
                         lf.value.graphModel.updateText(data.data.id, "GOOSE");
-                        console.log('修改了goose');
                     } else if (copyColor.value == 'orange') {
                         lf.value.graphModel.updateText(data.data.id, "SV");
-                        console.log('修改了sv');
                     }
                     ldModal.value = true
                 })
@@ -421,6 +426,7 @@ export default {
                 })
                 // console.log(lf.value.graphModel,'sss');
                 lf.value.on('edge:click', function (data, e, position) {//解决点击连接线问题
+                    console.log(data,'data2');
                     if (copyColor.value == '#255CE7') {
                         blue()
                         lf.value.changeEdgeType(data.data.id, "baseEdge")

src/pages/mission/MissionVue.vue

@@ -139,6 +139,9 @@ export default {
         }
         function moreBack(data) {
             btnSelect.value = data
+            btnList.value.forEach((tag) => {
+                tag.isSelected = tag.id === data + 1;
+            });
         }
         function haveInCreate(data, row, num) {
             btnSelect.value = data

src/pages/mission/components/CreateMis.vue

@@ -95,9 +95,9 @@
                         <div
                             style="position: absolute;top: 0px;right: 0px;display: flex;justify-content: center;align-items: center;">
 
-                            <div style="margin: 0 10px;">
+                            <!-- <div style="margin: 0 10px;">
                                 <el-checkbox label="开启检测" size="large" />
-                            </div>
+                            </div> -->
 
                             <div style="margin: 5px;">
                                 <el-button type="primary" size="small" plain @click="checkTime">选择装置</el-button>

src/pages/mission/components/HaveMis.vue

@@ -16,8 +16,17 @@
       </div>
       <!-- 待检测任务 -->
       <div class="noReportBox">
-        <div>
+        <div style="display: flex;justify-content: flex-start;align-items: center;">
           <p class="norep">待检测任务</p>
+          <p style="display: flex;justify-content: flex-start;align-items: center;margin-left: 10px;cursor: pointer;">
+            <span style="display: block;color: #5090F1;" @click="moreMis">更多</span>
+            <svg style="width: 14px;height: 14px;display: block;" t="1706067807079" class="icon" viewBox="0 0 1024 1024"
+              version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4220" width="48" height="48">
+              <path
+                d="M160.117 212.026v-82.233a8 8 0 0 1 13.33-5.966l407.697 364.298c0.9 0.804 1.753 1.658 2.556 2.558 11.764 13.186 10.62 33.419-2.556 45.192L173.448 900.173a8 8 0 0 1-13.33-5.966v-82.233a16 16 0 0 1 5.338-11.93L487.814 512 165.456 223.957a16 16 0 0 1-5.339-11.931z m272.057 0v-82.233a8 8 0 0 1 13.33-5.966l407.697 364.298c0.9 0.804 1.753 1.658 2.556 2.558 11.764 13.186 10.62 33.419-2.556 45.192L445.505 900.173a8 8 0 0 1-13.33-5.966v-82.233a16 16 0 0 1 5.339-11.93L759.87 512 437.514 223.957a16 16 0 0 1-5.34-11.931z"
+                fill="#5090F1" p-id="4221"></path>
+            </svg>
+          </p>
         </div>
         <div style="display: flex;justify-content: flex-start;align-items: center;overflow-x: auto;"
           v-if="nowRunList.name || misList.length > 0">
@@ -86,8 +95,8 @@
           <p class="norep">最近检测任务-已完成</p>
           <p style="display: flex;justify-content: flex-start;align-items: center;margin-left: 10px;cursor: pointer;">
             <span style="display: block;color: #5090F1;" @click="moreMis">更多</span>
-            <svg style="width: 14px;height: 14px;display: block;" t="1706067807079" class="icon" viewBox="0 0 1024 1024" version="1.1"
-              xmlns="http://www.w3.org/2000/svg" p-id="4220" width="48" height="48">
+            <svg style="width: 14px;height: 14px;display: block;" t="1706067807079" class="icon" viewBox="0 0 1024 1024"
+              version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4220" width="48" height="48">
               <path
                 d="M160.117 212.026v-82.233a8 8 0 0 1 13.33-5.966l407.697 364.298c0.9 0.804 1.753 1.658 2.556 2.558 11.764 13.186 10.62 33.419-2.556 45.192L173.448 900.173a8 8 0 0 1-13.33-5.966v-82.233a16 16 0 0 1 5.338-11.93L487.814 512 165.456 223.957a16 16 0 0 1-5.339-11.931z m272.057 0v-82.233a8 8 0 0 1 13.33-5.966l407.697 364.298c0.9 0.804 1.753 1.658 2.556 2.558 11.764 13.186 10.62 33.419-2.556 45.192L445.505 900.173a8 8 0 0 1-13.33-5.966v-82.233a16 16 0 0 1 5.339-11.93L759.87 512 437.514 223.957a16 16 0 0 1-5.34-11.931z"
                 fill="#5090F1" p-id="4221"></path>
@@ -229,7 +238,7 @@ export default {
         background: 'rgba(0, 0, 0, 0.7)',
       })
       // 0为待检测
-      task.getTask({ pageno: 1, pagesize: 10, state: 0 }).then(res => {
+      task.getTask({ pageno: 1, pagesize: 6, state: 0 }).then(res => {
         if (res.data == null) {
           loading.close()
           misList.value = []
@@ -281,8 +290,8 @@ export default {
         return "intBox"
       }
     }
-    function moreMis(){
-      emit("moreBack",2)
+    function moreMis() {
+      emit("moreBack", 2)
     }
     function relison(e) {
       currEditTaskModels.value = e

src/pages/mission/components/HistoryMis.vue

@@ -137,7 +137,7 @@ export default {
             }).then(res=>{
                 if(res.code ==0){
                     ElMessage({
-                        message:"任务已重置，请前往当前检测任务查看!",
+                        message:"任务已重置",
                         type:"success"
                     })
                     reload()

src/pages/report/ReportVue.vue

@@ -1,34 +1,44 @@
 <template>
-    <div>
-        <div class="bigBox">
-            <div class="tableBox">
-                <el-table :data="reportList" style="width: 100%;height: calc(100vh - 240px);position: relative;"
-                    :stripe="true">
-                    <el-table-column label="序号" width="auto">
-                        <template #default="{ $index }">{{ $index + 1 }}</template>
-                    </el-table-column>
-                    <el-table-column prop="name" label="任务名称" width="auto" />
-                    <el-table-column prop="station_name" label="变电站" width="auto" />
-                    <el-table-column prop="scd_name" label="SCD名称" width="auto" />
-                    <el-table-column prop="start_time" label="检测日期" width="auto" />
-                    <el-table-column fixed="right" label="操作" width="auto">
-                        <template #default="scope">
-                            <el-button text type="primary" size="small" @click="lookReport(scope.row)"><el-icon>
-                                    <View />
-                                </el-icon>查看</el-button>
-                            <el-button text type="primary" size="small" @click="downFile(scope.row)"><el-icon>
-                                    <Download />
-                                </el-icon>报告下载</el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <!-- 分页组件 -->
-            <div class="pageBox">
-                <Pagination style="position: relative;" :totals="totals" @pageBack="pageBack"></Pagination>
-            </div>
+    <!-- <div> -->
+    <div class="bigBox">
+        <div style="background-color: white;">
+            <p style="
+            font-size: 18px;
+            font-family: Source Han Sans CN, Source Han Sans CN;
+            font-weight: 500;
+            margin: 0;
+            padding: 0;
+            ">任务列表</p>
+        </div>
+        <div class="tableBox">
+            <el-table :data="reportList" style="width: 100%;height: calc(100vh - 240px);position: relative;" :stripe="true">
+                <el-table-column label="序号" width="80">
+                    <template #default="{ $index }">{{ $index + 1 }}</template>
+                </el-table-column>
+                <el-table-column prop="name" label="任务名称" width="220" />
+                <el-table-column prop="station_name" label="变电站" width="180" />
+                <el-table-column prop="scd_name" label="SCD名称" width="auto" />
+                <el-table-column prop="start_time" label="检测日期" width="200" />
+                <el-table-column fixed="right" label="操作" width="180">
+                    <template #default="scope">
+                        <el-button style="color: #255CE7;" text type="primary" size="small"
+                            @click="lookReport(scope.row)"><el-icon>
+                                <View />
+                            </el-icon>查看</el-button>
+                        <el-button style="color: #255CE7;" text type="primary" size="small"
+                            @click="downFile(scope.row)"><el-icon>
+                                <Download />
+                            </el-icon>报告下载</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+        <!-- 分页组件 -->
+        <div class="pageBox">
+            <Pagination style="position: relative;" :totals="totals" @pageBack="pageBack"></Pagination>
         </div>
     </div>
+    <!-- </div> -->
 </template>
 
 <script>
@@ -89,12 +99,12 @@ export default {
             })
         }
         // 下载报告
-        function downFile(row){
-            console.log(row,'row');
+        function downFile(row) {
+            console.log(row, 'row');
             system.downLoad({
-                ids:row.report_id
-            }).then(res=>{
-                console.log(res,'down');
+                ids: row.report_id
+            }).then(res => {
+                console.log(res, 'down');
             })
         }
         onMounted(() => {
@@ -119,7 +129,8 @@ export default {
 .bigBox {
     width: 98%;
     height: calc(100vh - 240px);
-    margin: 0 auto;
+    /* margin: 0 auto; */
+    margin-left: 15px;
 }
 
 .tableBox {
@@ -131,8 +142,8 @@ export default {
     width: 420px;
     height: auto;
     position: absolute;
-    bottom: 20px;
-    right: 30px;
+    bottom: 40px;
+    right: 80px;
 }
 
 :deep(.el-scrollbar__view) {

src/pages/report/components/ReportDetails.vue

@@ -37,7 +37,7 @@
                     <div class="btnBox">
                         <!-- 按钮盒子 -->
                         <div class="btn">
-                            <el-button style="font-size: 16px;" type="primary" plain @click="excelPort">
+                            <el-button style="font-size: 16px;margin-left: 10px;" type="primary" plain @click="excelPort">
                                 <svg t="1705980404021" class="iconSvg" viewBox="0 0 1024 1024" version="1.1"
                                     xmlns="http://www.w3.org/2000/svg" p-id="7825" width="48" height="48">
                                     <path
@@ -46,15 +46,6 @@
                                 </svg>
                                 导出所有结果
                             </el-button>
-                            <!-- <el-button style="font-size: 16px;" type="primary" plain>
-                                <svg t="1705980404021" class="iconSvg" viewBox="0 0 1024 1024" version="1.1"
-                                    xmlns="http://www.w3.org/2000/svg" p-id="7825" width="48" height="48">
-                                    <path
-                                        d="M486.4 367.616l-89.344 86.016a25.6 25.6 0 1 1-35.584-36.864l131.84-128A25.6 25.6 0 0 1 512 281.6h2.816a25.6 25.6 0 0 1 16.128 7.68l123.392 128a25.6 25.6 0 1 1-36.864 35.584L537.6 370.688V614.4a25.6 25.6 0 0 1-51.2 0zM972.8 230.4v691.2a102.4 102.4 0 0 1-102.4 102.4H153.6a102.4 102.4 0 0 1-102.4-102.4V102.4a102.4 102.4 0 0 1 102.4-102.4h593.92z m-230.4-162.56V204.8a25.6 25.6 0 0 0 25.6 25.6h133.12zM921.6 281.6h-153.6a76.8 76.8 0 0 1-76.8-76.8V51.2H153.6a51.2 51.2 0 0 0-51.2 51.2v819.2a51.2 51.2 0 0 0 51.2 51.2h716.8a51.2 51.2 0 0 0 51.2-51.2zM358.4 768a25.6 25.6 0 0 1 0-51.2h307.2a25.6 25.6 0 0 1 0 51.2z"
-                                        fill="#255be7" p-id="7826"></path>
-                                </svg>
-                                导出当前节点结果
-                            </el-button> -->
                         </div>
                         <!-- 统计数据盒子 -->
                         <div class="count">
@@ -71,22 +62,22 @@
                     <div class="realBox" style="position: relative;">
                         <el-table :data="tableData" stripe
                             style="width: 100%;height: calc(100vh - 420px);margin-top: 10px;">
-                            <el-table-column prop="ied_name" label="装置名称" width="180" />
-                            <el-table-column prop="ied_desc" label="装置描述" width="180" />
-                            <el-table-column label="等级" width="150">
+                            <el-table-column prop="ied_name" label="装置名称" width="120" />
+                            <el-table-column prop="ied_desc" label="装置描述" width="240" show-overflow-tooltip />
+                            <el-table-column label="等级" width="100">
                                 <template #default="scope">
                                     <el-tag class="ml-2" :type="typeLevel(scope.row.alert_level)">{{
                                         canLevel(scope.row.alert_level) }}</el-tag>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="行号" width="150">
+                            <el-table-column label="行号" width="120">
                                 <template #default="scope">
                                     <span style="color: blue;border-bottom: 1px solid blue;cursor: pointer;">{{
                                         scope.row.line_no }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="parse_result" label="描述" width="auto" />
-                            <el-table-column label="标准及条款" width="150">
+                            <el-table-column prop="parse_result" label="描述" width="auto" show-overflow-tooltip />
+                            <el-table-column label="标准及条款" width="200" show-overflow-tooltip>
                                 <template #default="scope">
                                     <p>{{ scope.row.apply_standard }}</p>
                                     <p>{{ scope.row.apply_standard_no }}</p>
@@ -347,7 +338,8 @@ em {
 }
 
 .count {
-    width: 25%;
+    width: 20%;
+    text-align: center;
 }
 
 .iconSvg {

src/pages/system/components/LitLine.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="bigBox">
+        <div class="bigBox" style="position: relative;">
             <div style="text-align: center;">
                 <h2>接线方式管理</h2>
             </div>
@@ -40,6 +40,8 @@
                         </template>
                     </el-table-column>
                 </el-table>
+            </div>
+            <div style="position: absolute;right: 0px;bottom: 0px;">
                 <Pagination :totals="totals" @pageBack="pageBack"></Pagination>
             </div>
             <div>
@@ -186,6 +188,9 @@ export default {
 
 <style scoped>
 .bigBox {
+    width: 100%;
+    height: calc(100vh - 175px);
     margin-top: 10px;
+    position: relative;
 }
 </style>

src/pages/system/components/SetModule.vue

@@ -29,7 +29,9 @@
                     </el-table-column>
                 </el-table>
             </div>
-            <Pagination :totals="totals" @pageBack="pageBack"></Pagination>
+            <div style="position: absolute;right: 0px;bottom: -50px;">
+                <Pagination :totals="totals" @pageBack="pageBack"></Pagination>
+            </div>
             <div>
                 <AddNode v-if="nodeMos" :nodeMos="nodeMos" :goMap="goMap" :needRow="needRow" :modelType="modelType"
                     @addBack="addBack"></AddNode>
@@ -151,4 +153,8 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style scoped>
+.bigBox {
+    position: relative;
+}
+</style>

src/pages/system/modalComp/AddLine.vue

@@ -63,7 +63,7 @@ export default {
                 { required: true, message: '请输入名称', trigger: 'blur' },
             ],
             volId: [
-                { required: true, message: '请选择电压等级', trigger: 'blur' },
+                { required: true, message: '请选择电压等级', trigger: 'change' },
             ],
         })
         let ruleFormRef = ref(null)
@@ -105,6 +105,11 @@ export default {
                                 duration: 1500
                             })
                             props.search()
+                        }else{
+                            ElMessage({
+                                message:res.msg,
+                                type:"error"
+                            })
                         }
                     })
                 } else {