U 排序问题

he wei

2022-10-21 eb980d06674958cf53d0716b0801a92e0306d827

U 排序问题

 src/pages/resourceManage/materialsCenter/history/history.vue

@@ -294,7 +294,7 @@
    },
    diff(data) {
      // console.log("比较两个版本", data);
      let params = data.map((v) => v * 1).sort();
      let params = data.map((v) => v * 1).sort((a, b) => a - b);
      dwgCompare(...params).then((res) => {
        const { code, data, data2, msg } = res.data;


 src/pages/resourceManage/product/details/details.vue

@@ -11,11 +11,19 @@
    <a-layout>
      <a-layout-header>
        <a-card size="small">
          <a-descriptions :column="4"  title="">
            <a-descriptions-item label="产品编号">{{ parentCode }}</a-descriptions-item>
            <a-descriptions-item label="产品型号">{{ parentModel }}</a-descriptions-item>
            <a-descriptions-item label="产品名称">{{ parentName }}</a-descriptions-item>
            <a-descriptions-item label="定制单号" :span="2">{{ customCode }}</a-descriptions-item>
          <a-descriptions :column="4" title="">
            <a-descriptions-item label="产品编号">{{
              parentCode
            }}</a-descriptions-item>
            <a-descriptions-item label="产品型号">{{
              parentModel
            }}</a-descriptions-item>
            <a-descriptions-item label="产品名称">{{
              parentName
            }}</a-descriptions-item>
            <a-descriptions-item label="定制单号" :span="2">{{
              customCode
            }}</a-descriptions-item>
          </a-descriptions>
        </a-card>
      </a-layout-header>
@@ -48,9 +56,16 @@
                  </template>
                  <template slot="action" slot-scope="text, record">
                    <div v-if="record.dwgUrl">
                      <a v-if="canViewDoc" @click="dwgReview(record.dwgUrl)">预览</a>
                      <a-divider v-if="canViewDoc && canDownloadDoc" type="vertical"></a-divider>
                      <a v-if="canDownloadDoc" @click="downloadLog(record)">下载</a>
                      <a v-if="canViewDoc" @click="dwgReview(record.dwgUrl)"
                        >预览</a
                      >
                      <a-divider
                        v-if="canViewDoc && canDownloadDoc"
                        type="vertical"
                      ></a-divider>
                      <a v-if="canDownloadDoc" @click="downloadLog(record)"
                        >下载</a
                      >
                    </div>
                    <template
                      v-if="
@@ -76,7 +91,11 @@
                            :row-key="(record1, index) => index"
                          >
                            <template slot="action" slot-scope="text, record1">
                              <a v-if="canDownloadSoftware" @click="downloadLog(record1)">下载</a>
                              <a
                                v-if="canDownloadSoftware"
                                @click="downloadLog(record1)"
                                >下载</a
                              >
                            </template>
                          </a-table>
                        </div>
@@ -255,13 +274,14 @@
      :width="800"
      title="操作日志"
      :destroyOnClose="true"
      @cancel="logCancel">
      @cancel="logCancel"
    >
      <div class="log-content">
        <a-timeline v-if="logList.length">
          <a-timeline-item
              v-for="(item, idx) in logList"
              :key="'log_' + idx"
              :color="item.lockFlag == 1 ? 'red' : 'green'"
            v-for="(item, idx) in logList"
            :key="'log_' + idx"
            :color="item.lockFlag == 1 ? 'red' : 'green'"
          >
            <div>
              <span class="user">{{ item.owner }}</span> 在
@@ -293,11 +313,12 @@
  getBomHistoryAndMaterial,
  compare,
} from "./apis";
import {setpHistoryEnable, getLockedList, getLogList} from "../apis";
import { setpHistoryEnable, getLockedList, getLogList } from "../apis";
import { dwgReview } from "@/pages/workplace/apis";
import { downloadLog } from "@/pages/system/logs/apis";
import { mapGetters } from "vuex";
import createWs from "@/assets/js/websocket";
import bg from 'date-fns/locale/bg/index';
const WSMixin = createWs("version");
export default {
  name: "",
@@ -487,7 +508,7 @@
          title: "锁定说明",
          dataIndex: "localReason",
          align: "center",
        }
        },
      ],
      otherLockColumns: [
        {
@@ -499,8 +520,8 @@
          title: "锁定说明",
          dataIndex: "localReason",
          align: "center",
        }
      ]
        },
      ],
    };
  },
  components: {
@@ -727,7 +748,7 @@
    },
    diff(data) {
      console.log("比较两个版本", data);
      let params = data.map((v) => v * 1).sort();
      let params = data.map((v) => v * 1).sort((a, b) => a - b);
      compare(...params).then((res) => {
        const { code, data, data2, data3 } = res.data;
        if (code) {
@@ -790,7 +811,10 @@
      this.otherDocVisible = false;
    },
    viewLog() {
      getLogList({ parentCode: this.parentCode, customCode:this.customCode }).then((res) => {
      getLogList({
        parentCode: this.parentCode,
        customCode: this.customCode,
      }).then((res) => {
        const { code, data } = res.data;
        if (code) {
          this.logList = data;