2

src/pages/components/drawModal/KeyTest.vue

@@ -12,7 +12,7 @@
             <template #footer>
                 <span class="dialog-footer">
                     <el-button @click="cancels">取消</el-button>
-                    <el-button type="primary" @click="sureClick">确定</el-button>
+                    <el-button type="primary" @click="sureClick">验证</el-button>
                 </span>
             </template>
         </el-dialog>
@@ -73,9 +73,9 @@ export default {
                                 type: "success"
                             })
                             // 模态框状态设置为关闭
-                            dialogVisible.value = false
+                            // dialogVisible.value = false
                             // 传回给AbilityModal.vue
-                            emit("ktBack", dialogVisible.value)
+                            // emit("ktBack", dialogVisible.value)
                         } else {
                             ElMessage({
                                 message: "验证失败！",

src/pages/mission/components/HaveMis.vue

@@ -8,8 +8,10 @@
         <img src="../../../assets/image/start_btn.png" alt="" style="cursor: pointer;" @click="startNow(lookingTask)" />
         <p class="nowModel" v-if="lookingTask.name">
           <span style="margin-right: 15px;">检测模型:</span>
-          <el-select v-model="currEditTaskModels" @change="relison"><el-option v-for="(item, index) in taskModels"
-              :title="item.model_name" :key="index" :label="item.model_name" :value="item.model_id" /></el-select>
+          <el-select v-model="currEditTaskModels" @change="relison">
+            <el-option v-for="(item, index) in taskModels" :title="item.model_name" :key="index"
+              :label="item.model_name" :value="item.model_id" />
+          </el-select>
           <span style="margin: 10px;cursor: pointer;"><img src="../../../assets/icon/pencil.png" alt="编辑所选模型"
               @click="editTaskModel" /></span>
         </p>
@@ -123,7 +125,7 @@
                 <img style="width: 15px;height: 15px;float: left;padding-top:2px"
                   :src="isImgs && isIndexs == index ? require('../../../assets/icon/white_clock.png') : require('../../../assets/icon/clock_darkBlue.png')"
                   alt="" />
-                <span style="font-size: 12px;" class="commonSpan">{{ item.ct }}</span>
+                <span style="font-size: 12px;" class="commonSpan">{{ item.start_time }}</span>
               </p>
             </div>
             <!-- 点击检测 -->
@@ -164,7 +166,7 @@ export default {
     let misList = ref([])//待检测任务列表
     let nowRunList = ref([])//正在检测任务列表
     let passList = ref([])//已完成检测任务列表
-    let currEditTaskModels = ref(null)
+    let currEditTaskModels = ref('')
     let emLoading = ref(true)
     let isImg = ref(false)
     let isImgs = ref(false)
@@ -178,7 +180,7 @@ export default {
       lookingTask.value = row
       taskModels.value = []
       task.getTaskById({ id: row.id }).then(res => {
-        if(res==null) return
+        if (res == null) return
         if (res.code != 0) {
           ElMessage({
             message: res.msg,
@@ -192,9 +194,9 @@ export default {
       })
     }
     function startNow(row, num) {
-      if (row.name == null || row.name == '' || row.name == undefined) {
+      if (row.name == null || row.name == '' || row.name == undefined || currEditTaskModels.value == '') {
         ElMessage({
-          message: "暂无检测任务",
+          message: "暂无检测任务或未选择模型",
           type: "info"
         })
       } else {
@@ -250,7 +252,7 @@ export default {
       })
       // 0为待检测
       task.getTask({ pageno: 1, pagesize: 6, state: 0 }).then(res => {
-        if (res==null || res.data == null) {
+        if (res == null || res.data == null) {
           loading.close()
           misList.value = []
           return
@@ -272,16 +274,23 @@ export default {
       })
       // 2为完成检测
       task.getTask({ pageno: 1, pagesize: 6, state: 2 }).then(res => {
-        if (res==null || res.data == null) {
+        if (res == null || res.data == null) {
           passList.value = []
           return
         } else {
-          passList.value = res.data
+          console.log(res.data, 'asdkjk');
+          passList.value = res.data.sort((a, b) => {
+            // 将日期字符串转换为 Date 对象进行比较
+            const dateA = new Date(a.start_time);
+            const dateB = new Date(b.start_time);
+            // 返回结果以实现降序排列
+            return dateB - dateA;
+          });
         }
       })
       // 1为正在检测
       task.getTask({ pageno: 1, pagesize: 10, state: 1 }).then(res => {
-        if (res==null ||res.data == null) {
+        if (res == null || res.data == null) {
           nowRunList.value = []
           lookingTask.value = []
           return
@@ -295,7 +304,7 @@ export default {
       task.reladyTask({
         id: row.id
       }).then(res => {
-        if (res!=null &&res.code == 0) {
+        if (res != null && res.code == 0) {
           ElMessage({
             message: "任务已重置",
             type: "success"

src/pages/mission/components/HistoryMis.vue

@@ -44,8 +44,8 @@
                     <template #default="scoped">
                         <!-- <el-popconfirm title="你确定删除吗？" @confirm="sureDelMis">
                             <template #reference> -->
-                        <el-button v-if="scoped.row.state == '2' || scoped.row.state == '3'" link type="primary" size="small"
-                            @click="relady(scoped.row)">重新检测</el-button>
+                        <el-button v-if="scoped.row.state == '2' || scoped.row.state == '3'" link type="primary"
+                            size="small" @click="relady(scoped.row)">重新检测</el-button>
                         <el-button v-if="scoped.row.state != '1'" link type="danger" size="small"
                             @click="delMis(scoped.row)">删除</el-button>
                         <!-- <el-button v-if="scoped.row.state == '2'" link type="primary" size="small"
@@ -58,7 +58,7 @@
                 </el-table-column>
             </el-table>
             <PageNation :totals="totals" :pageNum="pageNum" :pageSize="pageSize" @pageBack="pageBack"
-                @currentBack="currentBack">
+                @currentBack="currentBack" @sizeBack="sizeBack">
             </PageNation>
         </div>
         <DelHistory v-if="delModal" :delModal="delModal" :delId="delId" :reload="reload" @delBack="delBack">
@@ -90,21 +90,36 @@ export default {
             loading.value = true
             task.getTask({ pageno: 1, pagesize: 10 }).then(res => {
                 if (res.code == 0) {
-                    tableData.value = res.data
+                    tableData.value = res.data.sort((a, b) => {
+                        // 将日期字符串转换为 Date 对象进行比较
+                        const dateA = new Date(a.start_time);
+                        const dateB = new Date(b.start_time);
+                        // 返回结果以实现降序排列
+                        return dateB - dateA;
+                    });
                     totals.value = res.count
                     loading.value = false
                 }
             })
         }
         function record() {
+            loading.value = true
             names.value = ''
             startTime.value = ''
             endTime.value = ''
             getTime.value = ''
             pageNum.value = 1
-            task.getTask({ pageno: 1, pagesize: 10 }).then(res => {
-                tableData.value = res.data
+            pageSize.value = 10
+            task.getTask({ pageno: pageNum.value - 0, pagesize: pageSize.value - 0 }).then(res => {
+                tableData.value = res.data.sort((a, b) => {
+                    // 将日期字符串转换为 Date 对象进行比较
+                    const dateA = new Date(a.start_time);
+                    const dateB = new Date(b.start_time);
+                    // 返回结果以实现降序排列
+                    return dateB - dateA;
+                });
                 totals.value = res.count
+                loading.value = false
             })
         }
         function filterState(num) {
@@ -171,9 +186,14 @@ export default {
         function delBack(data) {
             delModal.value = data
         }
+        // 分页组件返回的页码
         function currentBack(data) {
             pageNum.value = data
         }
+        // 分页组件返回的每页多少条
+        function sizeBack(data) {
+            pageSize.value = data
+        }
         onMounted(() => {
             reload()
         })
@@ -201,6 +221,7 @@ export default {
             relady,//重新检测
             loading,
             currentBack,
+            sizeBack,// 分页组件返回的每页多少条
         }
     },
     components: {

src/pages/mission/components/PageNation.vue

@@ -37,15 +37,20 @@ export default {
         })
         watch(() => props.pageNum, (newVal) => {
             currentPage.value = newVal
-            console.log(currentPage.value,'watch');
-        },{
-            deep:true
+            console.log(currentPage.value, 'watch');
+        }, {
+            deep: true
+        })
+        watch(() => props.pageSize, (newVal) => {
+            pageSize.value = newVal
+        }, {
+            deep: true
         })
         function reload() {
             currentPage.value = props.pageNum
             pageSize.value = props.pageSize
             total.value = props.totals
-            console.log(currentPage.value,'页码');
+            console.log(currentPage.value, '页码');
         }
         function handleSizeChange(e) {//每页条数
             pageSize.value = e
@@ -54,7 +59,15 @@ export default {
                 pagesize: pageSize.value - 0
             }).then(res => {
                 total.value = res.count
-                emit("pageBack", res.data)
+                let arr = res.data.sort((a, b) => {
+                    // 将日期字符串转换为 Date 对象进行比较
+                    const dateA = new Date(a.start_time);
+                    const dateB = new Date(b.start_time);
+                    // 返回结果以实现降序排列
+                    return dateB - dateA;
+                });
+                emit("pageBack", arr)
+                emit("sizeBack", pageSize.value)
             })
         }
         function handleCurrentChange(e) {//页码
@@ -63,9 +76,15 @@ export default {
                 pageno: currentPage.value - 0,
                 pagesize: pageSize.value - 0
             }).then(res => {
-                total.value = res.count
-                emit("currentBack",currentPage.value)
-                emit("pageBack", res.data)
+                let arr = res.data.sort((a, b) => {
+                    // 将日期字符串转换为 Date 对象进行比较
+                    const dateA = new Date(a.start_time);
+                    const dateB = new Date(b.start_time);
+                    // 返回结果以实现降序排列
+                    return dateB - dateA;
+                });
+                emit("pageBack", arr)
+                emit("currentBack", currentPage.value)
             })
         }
         onMounted(() => {

src/pages/system/components/InsideModule.vue

@@ -90,7 +90,7 @@
                             :searchModule="searchModule" :coolObj="coolObj" :svOrGoose="svOrGoose" @backxy="backxy"
                             @drawCor="drawCor"></DrawDesigns>
                     </div>
-                    <CopyLoad v-if="copyType" :copyType="copyType" :coolObj=coolObj></CopyLoad>
+                    <CopyLoad v-if="copyType" :copyType="copyType" :coolObj="coolObj" @copyBack="copyBack"></CopyLoad>
                 </div>
             </div>
         </div>
@@ -252,6 +252,10 @@ export default {
                 alignListValue.value=""
             }, 1000);            
         }
+        //copyload.vue返回的模态框状态
+        function copyBack(data){
+            copyType.value = data
+        }
         onMounted(() => {
             searchModule()
         })
@@ -289,6 +293,7 @@ export default {
             selectModeState,
             alignList,
             alignListValue,
+            copyBack,//copyload.vue返回的模态框状态
         }
     },
     components: {

src/pages/system/components/Pagination.vue

@@ -1,43 +1,61 @@
 <template>
     <div>
         <el-pagination v-model:current-page="page" v-model:page-size="size" :page-sizes="[10, 20, 30, 100]"
-            :small="small" :disabled="disabled" :background="background" layout="total, sizes, prev, pager, next, jumper"
-            :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+            :small="small" :disabled="disabled" :background="background"
+            layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange"
+            @current-change="handleCurrentChange" />
     </div>
 </template>
 
 <script>
 import { ref, onMounted, watch } from 'vue'
 export default {
-    props:{
-        totals:{
-            type:Number,
-            required:true,
+    props: {
+        totals: {
+            type: Number,
+            required: true,
         },//总条数
+        pages: {
+            type: Number,
+            required: true,
+        },//SetModule.vue传过来的页码
+        pageNum: {
+            type: Number,
+            required: true
+        },//SetModule.vue传过来的页数
     },
-    setup(props,{emit}) {
+    setup(props, { emit }) {
         let page = ref(1)//页码
         let size = ref(10)//页数
         let total = ref(0)//总数
         let disabled = ref(false)
         let background = ref(false)
-        watch(()=>props.totals,(newVal)=>{
+        watch(() => props.totals, (newVal) => {
             total.value = newVal
-            console.log(total.value,'paginationwatch');
         })
-        function reload(){
+        watch(()=>props.pageNum,(newVal)=>{
+            size.value = newVal
+            console.log(size.value,'watch');
+        },{
+            deep:true
+        })
+        function reload() {
             total.value = props.totals
-            console.log(total.value,'pagination');
+            page.value = props.pages
+            size.value = props.pageNum
+            console.log(size.value,'size');
         }
-        function handleCurrentChange(e){
+        // 页码
+        function handleCurrentChange(e) {
             page.value = e
-            emit("pageBack",page.value,size.value)
+            emit("pageBack", page.value, size.value)
         }
-        function handleSizeChange(e){
+        // 条数
+        function handleSizeChange(e) {
             size.value = e
-            emit("pageBack",page.value,size.value)
+            emit("pageBack", page.value, size.value)
         }
-        onMounted(()=>{
+        onMounted(() => {
             reload()
         })
         return {

src/pages/system/components/SetModule.vue

@@ -33,7 +33,7 @@
                 </el-table>
             </div>
             <div style="position: absolute;right: 0px;bottom: -50px;">
-                <Pagination :totals="totals" @pageBack="pageBack"></Pagination>
+                <Pagination :totals="totals" :pages="pages" :pageNum="pageNum" @pageBack="pageBack"></Pagination>
             </div>
             <div>
                 <AddNode v-if="nodeMos" :nodeMos="nodeMos" :goMap="goMap" :needRow="needRow" :modelType="modelType"
@@ -84,6 +84,8 @@ export default {
         let needRow = ref({})
         let modelType = ref(0)//0为新增1为修改
         let totals = ref(0)
+        let pages = ref(1)//页码
+        let pageNum = ref(10)//页数
         let loading = ref(false)
         let delType = ref(false)//delmodule.vue状态
         let delObj = ref({})//应该删除的模型对象
@@ -102,7 +104,7 @@ export default {
         function ready() {
             flashId.value = props.volId
             loading.value = true
-            litLine.getAllm({ pageno: 1, pagesize: 20 }).then(res => {
+            litLine.getAllm({ pageno: 1, pagesize: 10 }).then(res => {
                 if (res.code == 0) {
                     tableData.value = res.data
                     totals.value = res.count
@@ -182,13 +184,18 @@ export default {
         function addBack(isshow) {
             nodeMos.value = false
             needRow.value = null
+            console.log(isshow,'isshow');
             if (isshow) {
                 litLine.getAllm({ pageno: 1, pagesize: 20, line_link_style: props.linkstyleid, vol_id: props.volId || '' }).then(res => {
                     tableData.value = res.data
+                    pageNum.value = 10
+                    console.log(pageNum.value,'pagenum');
                 })
             }
         }
         function pageBack(no, index) {
+            pages.value = no
+            pageNum.value = index
             emit("pageCase", no, index)
         }
         function dmBack(data) {
@@ -221,6 +228,8 @@ export default {
             sunReady,//传给delmodule.vue的刷新数据方法
             checkFlash,//传给delmodule.vue的刷新数据方法
             flashId,//本组件的flashid
+            pages,//页码
+            pageNum,//页数
         }
     },
     components: {