3

src/pages/mission/components/HaveMis.vue

@@ -107,7 +107,7 @@
         <div style="display: flex;justify-content: flex-start;align-items: center;">
           <div class="intBox" v-for="(item, index) in passList" @mouseover="intOvers(index)" @mouseout="intOuts(index)">
             <div class="intBoxOne">
-              <p class="intOne">
+              <p class="intOne" @click="editItem(item, index)">
                 <span>{{ item.name }}</span>
                 <span style="cursor: pointer;" @click="editItem(item, index)">详情<el-icon>
                     <Right />
@@ -132,7 +132,8 @@
               <span style="margin: 0 10px;" class="setnowspan">|</span>
               <span class="setnowspan" @click="outcome(item, index)">检测结果</span>
               <span style="margin: 0 10px;" class="setnowspan">|</span>
-              <span class="setnowspan" @click="startBefore(item, index)">重新检测</span>
+              <!-- <span class="setnowspan" @click="startBefore(item, index)">重新检测</span> -->
+              <span class="setnowspan" @click="restart(item, index)">重新检测</span>
             </div>
           </div>
         </div>
@@ -289,6 +290,24 @@ export default {
         }
       })
     }
+    function restart(row, num) {
+      task.reladyTask({
+        id: row.id
+      }).then(res => {
+        if (res.code == 0) {
+          ElMessage({
+            message: "任务已重置",
+            type: "success"
+          })
+          getList()
+        } else {
+          ElMessage({
+            message: res.msg,
+            type: "error"
+          })
+        }
+      })
+    }
     function editItem(row) {
       emit("haveInCreate", 1, row, 2)
     }
@@ -354,6 +373,7 @@ export default {
       outcome,//生成报告和跳转yemian
       moreMis,
       isType,//本组件刷新状态
+      restart,
     };
   },
   components: {

src/pages/setting/components/SystemCode.vue

@@ -6,7 +6,8 @@
             </div>
             <div class="tableBox">
                 <div style="width: 30%;">
-                    <el-tree :data="treeFather" accordion node-key="id" :props="defaultProps" @node-click="handleNodeClick">
+                    <el-tree :data="treeFather" accordion node-key="id" :props="defaultProps"
+                        @node-click="handleNodeClick">
                         <template #default="{ node, data }">
                             <span class="custom-tree-node">
                                 <svg t="1709689483117" class="icon" viewBox="0 0 1180 1024" version="1.1"
@@ -28,11 +29,13 @@
                         新增系统字典
                     </el-button>
                     <el-table :data="systemList" style="width: 100%;height: calc(100vh - 260px);" :stripe="true">
-                        <el-table-column fixed prop="code" label="字典代码" width="auto" />
+                        <el-table-column label="序号" #default="scope">
+                            {{ scope.$index + 1 }}
+                        </el-table-column>
+                        <el-table-column prop="code" label="字典代码" width="auto" />
                         <el-table-column prop="name" label="字典名称" width="auto" />
                         <el-table-column prop="parentcode" label="上级字典代码" width="auto" />
                         <el-table-column fixed="right" label="操作" width="120">
-
                             <template #default="scope">
                                 <el-button link type="primary" size="small" @click="openModal(1, scope.row)">
                                     <el-icon>
@@ -54,8 +57,8 @@
             </div>
             <!-- 模态框盒子 -->
             <div class="modalBox">
-                <AddSc v-if="setModal" :setModal="setModal" :addOrEdit="addOrEdit" :searchSystem="searchSystem"
-                    :editRow="editRow" @getModal="getModal">
+                <AddSc v-if="setModal" :setModal="setModal" :addOrEdit="addOrEdit" :handleNodeClick="handleNodeClick"
+                    :pageCode="pageCode" :searchSystem="searchSystem" :editRow="editRow" @getModal="getModal">
                 </AddSc>
                 <DelSc v-if="delModal" :delModal="delModal" :delId="delId" :searchSystem="searchSystem"
                     @delBack="delBack">
@@ -140,7 +143,8 @@ export default {
                     systemList.value = res.data
                     totals.value = res.data.length
                 } else {
-                    messageFun('未找到相关数据')
+                    systemList.value = []
+                    totals.value = 0
                 }
             })
         }

src/pages/setting/modalComp/AddSc.vue

@@ -1,7 +1,8 @@
 <template>
     <div>
         <div class="bigBox">
-            <el-dialog v-model="dialogVisible" :title="letTips" width="30%" @close="closes" :close-on-click-modal="false">
+            <el-dialog v-model="dialogVisible" :title="letTips" width="30%" @close="closes"
+                :close-on-click-modal="false">
                 <el-form :model="newForm" label-width="120px" :rules="formRule" ref="ruleForm">
                     <el-form-item label="字典名称" prop="name">
                         <el-input v-model="newForm.name" />
@@ -48,7 +49,15 @@ export default {
         editRow: {
             type: Object,
             required: true
-        }
+        },
+        handleNodeClick: {
+            type: Function,
+            required: true
+        },//systemCode.vue传过来的树形组件方法
+        pageCode: {
+            type: Object,
+            required: true
+        },//systemCode.vue传过来的code
     },
     setup(props, { emit }) {
         let dialogVisible = ref(false)
@@ -127,7 +136,8 @@ export default {
                             if (res.returncode == 200) {
                                 dialogVisible.value = false
                                 emit("getModal", dialogVisible.value)
-                                props.searchSystem()
+                                let e = { code: props.pageCode }
+                                props.handleNodeClick(e)
                                 ElMessage({
                                     type: "success",
                                     message: "修改成功"

src/pages/system/components/LitLine.vue

@@ -45,10 +45,10 @@
                 <Pagination :totals="totals" @pageBack="pageBack"></Pagination>
             </div>
             <div>
-                <AddLine v-if="alModal" :alModal="alModal" :search="search" @alBack="alBack"></AddLine>
-                <LookLine v-if="lookModal" :lookModal="lookModal" :needList="needList" :search="search" @lookBack="lookBack"
-                    :listNum="listNum"></LookLine>
-                <DelLine v-if="delModal" :delModal="delModal" :needList="needList" :search="search" @delBack=delBack>
+                <AddLine v-if="alModal" :alModal="alModal" :sunSearch="sunSearch" @alBack="alBack"></AddLine>
+                <LookLine v-if="lookModal" :lookModal="lookModal" :needList="needList" :search="search"
+                    @lookBack="lookBack" :listNum="listNum"></LookLine>
+                <DelLine v-if="delModal" :delModal="delModal" :needList="needList" :sunSearch="sunSearch" @delBack=delBack>
                 </DelLine>
                 <PicLook v-if="picModal" :picModal="picModal" :needList="needList" @picBack="picBack"></PicLook>
             </div>
@@ -94,8 +94,10 @@ export default {
         })
         function search() {
             if (totals.value) {
+                console.log('调用了search的if');
                 totals.value = props.moduleTotal
             } else {
+                console.log('调用了search的else');
                 loading.value = true
                 litLine.getAllLine({ pageno: 1, pagesize: 10 }).then(res => {
                     if (res.data != null) {
@@ -109,7 +111,20 @@ export default {
                     }
                 })
             }
-
+        }
+        function sunSearch() {
+            loading.value = true
+            litLine.getAllLine({ pageno: 1, pagesize: 10 }).then(res => {
+                if (res.data != null) {
+                    lineList.value = res.data
+                    totals.value = res.count
+                    loading.value = false
+                } else {
+                    lineList.value = []
+                    totals.value = 0
+                    loading.value = false
+                }
+            })
         }
         function handleSelectionChange(val) {
             console.log(val, 'val');
@@ -194,6 +209,7 @@ export default {
             totals,//总条数
             pageBack,//Pagination.vue返回数据
             loading,
+            sunSearch,//DelLine.VUE需要的刷新
         }
     },
     components: {

src/pages/system/modalComp/AddLine.vue

@@ -44,7 +44,7 @@ export default {
             type: Boolean,
             required: true
         },
-        search: {
+        sunSearch: {
             type: Function,
             required: true
         }
@@ -110,7 +110,7 @@ export default {
                                 type: "success",
                                 duration: 1500
                             })
-                            props.search()
+                            props.sunSearch()
                         }else{
                             ElMessage({
                                 message:res.msg,

src/pages/system/modalComp/DelLine.vue

@@ -35,7 +35,7 @@ export default {
             type: Object,
             required: true
         },
-        search: {
+        sunSearch: {
             type: Function,
             required: true
         }
@@ -62,7 +62,7 @@ export default {
                         message: "删除成功",
                         duration: 1500
                     })
-                    props.search()
+                    props.sunSearch()
                     dialogVisible.value = false
                     emit("delBack", dialogVisible.value)
                 }