迁出云打印的界面，成为单独的界面。

.eslintrc.js

@@ -89,12 +89,10 @@ module.exports = {
     'localStorage': true,
     'window': true,
     'BootstrapDialog': true,
-    'gantt': true,
     '__webpack_public_path__': true,
     'Notify': true,
     'Vue': true,
     'Handsontable': true,
-    'X6': true,
     'REMOTE_DEV_PORT': true
   },
 };

package.json

@@ -18,8 +18,7 @@
     "click-outside-vue3": "^4.0.1",
     "dayjs": "^1.11.6",
     "dingtalk-jsapi": "^2.10.3",
-    "pc-component-v3": "1.0.81",
-    "qrcode": "^1.5.3",
+    "pc-component-v3": "1.0.82",
     "uuid": "^8.3.2",
     "v-tooltip": "^4.0.0-beta.17",
     "vue-request": "^1.2.4",

public/index-debug.html

@@ -18,12 +18,9 @@
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="./static/bootstrap/dist/css/bootstrap-theme.min.css">
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="./static/bootstrap3-dialog/dist/css/bootstrap-dialog.css">
 	
-	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="./static/layui/dist/css/layui.css">
-
 
 
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="./static/cropper/dist/cropper.css">
-	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="./static/animate.css/animate.css">
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="./static/colResizable/colResizable-1.6.css">
 
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="./static/jQuery-ResizableColumns/jQuery.resizableColumns.css">
@@ -51,8 +48,6 @@
 
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="./static/reconnecting-websocket/reconnecting-websocket.js"></script>
 	
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="./static/layui/dist/layui.js"></script>
-
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="./static/plugin/dingtalk-jsapi/2.10.3/dingtalk.open.js"></script>
 
 	<!--VueJS has 2 different versions: the full version and the runtime version. 'unsafe-eval' is only needed for the full version of VueJS; the runtime version doesn't need it. 
@@ -64,7 +59,6 @@
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="./static/dayjs/dayjs.min.js"></script>
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="./static/axios/dist/axios.js"></script>
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="./static/sortablejs/Sortable.js"></script>
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="./static/antv/x6/dist/x6.js"></script>
 
 
 	

src/client/top-nav-download.vue

@@ -94,4 +94,109 @@ export default {
 
   },
 };
-</script>
+</script>
+
+
+
+
+
+<style>
+/* animate.css 			96.4 kB */
+/* 动画样式，来源于animate.css组件库，2024-05-09，为了提高前端的加载速度，删除了animate.css，直接使用用到的样式。 */
+/* 整个项目就这一个地方用到这个动画 */
+
+:root {
+  --animate-duration: 1s;
+  --animate-delay: 1s;
+  --animate-repeat: 1;
+}
+
+.animate__animated {
+  -webkit-animation-duration: 1s;
+  animation-duration: 1s;
+  -webkit-animation-duration: var(--animate-duration);
+  animation-duration: var(--animate-duration);
+  -webkit-animation-fill-mode: both;
+  animation-fill-mode: both;
+}
+
+
+@-webkit-keyframes bounceInUp {
+  from,
+  60%,
+  75%,
+  90%,
+  to {
+    -webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
+    animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
+  }
+
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(0, 3000px, 0) scaleY(5);
+    transform: translate3d(0, 3000px, 0) scaleY(5);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: translate3d(0, -20px, 0) scaleY(0.9);
+    transform: translate3d(0, -20px, 0) scaleY(0.9);
+  }
+
+  75% {
+    -webkit-transform: translate3d(0, 10px, 0) scaleY(0.95);
+    transform: translate3d(0, 10px, 0) scaleY(0.95);
+  }
+
+  90% {
+    -webkit-transform: translate3d(0, -5px, 0) scaleY(0.985);
+    transform: translate3d(0, -5px, 0) scaleY(0.985);
+  }
+
+  to {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+@keyframes bounceInUp {
+  from,
+  60%,
+  75%,
+  90%,
+  to {
+    -webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
+    animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
+  }
+
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(0, 3000px, 0) scaleY(5);
+    transform: translate3d(0, 3000px, 0) scaleY(5);
+  }
+
+  60% {
+    opacity: 1;
+    -webkit-transform: translate3d(0, -20px, 0) scaleY(0.9);
+    transform: translate3d(0, -20px, 0) scaleY(0.9);
+  }
+
+  75% {
+    -webkit-transform: translate3d(0, 10px, 0) scaleY(0.95);
+    transform: translate3d(0, 10px, 0) scaleY(0.95);
+  }
+
+  90% {
+    -webkit-transform: translate3d(0, -5px, 0) scaleY(0.985);
+    transform: translate3d(0, -5px, 0) scaleY(0.985);
+  }
+
+  to {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+.animate__bounceInUp {
+  -webkit-animation-name: bounceInUp;
+  animation-name: bounceInUp;
+}
+</style>

src/common/X6.js

@@ -1,94 +0,0 @@
-
-// 为了加快主页的启动速度，延迟加载X6，使用全局的X6
-// import { Graph, Shape, Addon, DataUri } from '@antv/x6';
-
-import QRCode from 'qrcode';
-
-
-// 字符串转base64
-const textQrcodeToBase64 = text => {
-  return new Promise((res, rej) => {
-    QRCode.toDataURL(
-      text, // 二维码字符串
-      {
-        type: 'image/png', // 生成dataurl图片格式
-        width: 200, // 二维码宽度
-        quality: 0.8, // 质量
-        margin: 1, // 白边大小
-        color: {
-          dark: '#000', // 暗色颜色
-          light: '#fff', // 亮色颜色
-        },
-      },
-      (err, dataUrl) => {
-        if (err) rej(err);
-        res(dataUrl);
-      },
-    );
-  });
-};
-export default function CreateJPEG(dom) {
-  let graph = new X6.Graph(
-    {
-      container: dom,
-      width: 1,
-      height: 1,
-      background: {
-        color: '#ddd',
-      },
-      grid: {
-        size: 10,
-        visible: true,
-      },
-      history: true,
-      resizing: {
-        enabled: true,
-        restricted: true,
-      },
-    },
-  );
-  return async function (json, tempStr,assetNo) {
-    let test = JSON.parse(tempStr);
-    let tempObj = JSON.parse(test);
-    for (const key in json) {
-      for (let index = 0; index < tempObj.cells.length; index++) {
-
-        if (tempObj.cells[index].data.type == key) {
-          if (tempObj.cells[index].shape == 'image') {
-            tempObj.cells[index].attrs.image['xlink:href'] = await textQrcodeToBase64(json[key]);
-          }
-          if (tempObj.cells[index].shape == 'rect') {
-            tempObj.cells[index].attrs.label.text = tempObj.cells[index].attrs.label.text + json[key];
-          }
-        }
-      }
-    }
-    graph.fromJSON(tempObj);
-    return new Promise(res => {
-      setTimeout(() => {
-        graph.toJPEG(dataUri => {
-          // dataUri就是base64的图片地址
-          res(dataUri);
-          // DataUri.downloadDataUri(dataUri, assetNo);
-        }, {
-          serializeImages: true,
-          quality: 1,
-        });
-      }, 500);
-    });
-  };
-}
-export const base64toFile = (url, imageName) => {
-  const arr = url.split(',');
-  const mime = arr[0].match(/.*?:(.*?);/)[1];
-  const suffix = mime.split('/')[1];
-  const bstr = window.atob(arr[1]);
-  let n = bstr.length;
-  const u8arr = new Uint8Array(n);
-  while (n--) {
-    u8arr[n] = bstr.charCodeAt(n);
-  }
-  return new File([u8arr], `${imageName}.${suffix}`, {
-    type: 'image/jpeg',
-  });
-};

src/customer/printTemp/index.vue

@@ -1,33 +0,0 @@
-<template>
-  <Navbar title="模板编辑" :is-go-back="true" />
-  <a-steps :current="step">
-    <a-step title="选择模版" />
-    <a-step title="编辑模版" />
-  </a-steps>
-  <!-- <div style="height: 40px;" /> -->
-  <a-divider />
-  <div v-if="step == 0">
-    <Step1 />
-  </div>
-  <div v-if="step == 1">
-    <Step2 />
-  </div>
-</template>
-
-<script setup>
-import Step1 from './step1.vue';
-import Step2 from './step2.vue';
-import { computed,onMounted } from 'vue';  
-import { useStore } from 'vuex';
-import { useRouter  } from 'vue-router';
-import CreateJPEG from '../../common/X6.js';
-
-const router =  useRouter();
-const store = useStore();
-const step = computed(()=>store.state.downloadStore.step);
-onMounted(() => {
-  store.commit('changeStep',0);
-});
-
-</script>
-<style scoped></style>

src/customer/printTemp/step1.vue

@@ -1,188 +0,0 @@
-<template>
-  <div>
-    <a-radio-group v-model:value="value" button-style="solid">
-      <a-radio-button value="a">新建模板</a-radio-button>
-      <a-radio-button value="b">编辑模板</a-radio-button>
-      <a-radio-button value="c">删除模板</a-radio-button>
-    </a-radio-group>
-  </div>
-
-  <div v-show="value == 'b'" style="margin: 30px 0;">
-    <a-select
-      ref="select"
-      v-model:value="temVal"
-      style="width: 220px"
-      placeholder="请选择要编辑的模板"
-      @change="handleChange"
-    >
-      <a-select-option v-for="item in TempList" :key="item.id" :x6="item.contentX6" :value="item.name">
-        {{ item.contentX6 == null || item.contentX6 == '' ? '无效模版' : item.name }}
-      </a-select-option>
-    </a-select>
-    <a-button @click="getTem">刷新</a-button>
-    <a-spin v-show="loadingshow" />
-  </div>
-  <div v-show="value == 'c'" style="margin: 30px 0;">
-    <a-select
-      ref="select"
-      v-model:value="delTemVal"
-      style="width: 220px"
-      placeholder="请选择要删除的模板"
-      @change="delChange"
-    >
-      <a-select-option v-for="item in TempList" :key="item.id" :x6="item.contentX6" :value="item.name">
-        {{ item.contentX6 == null || item.contentX6 == '' ? '无效模版' : item.name }}
-      </a-select-option>
-    </a-select>
-    <a-button @click="getTem">刷新</a-button>
-    <a-button @click="delTem">删除</a-button>
-    <a-spin v-show="loadingshow" />
-    <a-modal
-      v-model:visible="delVisible" title="提示" ok-text="确认"
-      cancel-text="取消" @ok="delOk"
-    >
-      <p>您确认删除{{ delTemVal }}吗？如果是的话，请点击【确认】按钮，否则点击【取消】按钮。</p>
-    </a-modal>
-  </div>
-  <a-divider type="horizontal" />
-  <div>
-    <a-button @click="next">下一步</a-button>
-  </div>
-</template>
-<script setup>
-import { Modal } from 'ant-design-vue';
-import { ref,h , onBeforeMount } from 'vue';
-import { useRoute,useRouter } from 'vue-router';
-import { useStore } from 'vuex';
-import { Notify, Uuid } from 'pc-component-v3';
-import Common from '../../common/Common.js';
-const store = useStore();
-const router = useRouter();
-const temVal = ref();
-const delTemVal = ref();
-const TempList = ref([]);
-const loadingshow = ref(false);
-const template = ref('');
-const tempId = ref('');
-const value = ref('a');
-
-const delVisible = ref(false);
-// const visible = ref(false);
-
-const handleChange = (_,val) =>{
-  // console.log(val);
-  store.commit('changeTempText',val.value);
-  store.commit('changeTemplate',val.x6);
-  store.commit('changeTemplateId',val.key);
-  // template.value = val.x6;
-  // tempText.value = val.name;
-};
-
-const delChange = (_,val) =>{
-  // console.log(val);
-  tempId.value = val.key;
-};
-const getTem = () =>{
-  loadingshow.value = true;
-  //  重新发请求获取模版列表
-  getTemp();
-};
-const delTem = () =>{
-  if (delTemVal.value == undefined) return;
-  delVisible.value = true;
-};
-const next = () =>{
-  if (value.value == 'a') {
-    store.commit('changeTemplateId','');
-    store.commit('changeTemplate','');
-    store.commit('changeTempText','新建模板');
-  }
-  if ((value.value == 'b' && temVal.value == undefined || null) || value.value == 'c') {
-    Modal.info({
-      title: '提示',
-      content: h('div', {}, [h('p', '请先选择模版或新建模板！')]),
-      onOk() {
-        // console.log('ok');
-      },
-    });
-    return;
-  }
-
-  store.commit('changeStep',1);
-};
-
-const delOk = () =>{
-  delVisible.value = false;
-  loadingshow.value = true;
-  // 发请求删除模版
-  $.ajax({
-    url:'/api/printPageResource',
-    type:'post',
-    dataType:'json',
-    data:{
-      templateId:tempId.value,
-    },
-    beforeSend: function(request) {
-      Common.addTokenToRequest(request);
-    },
-    success:()=>{
-      loadingshow.value = false;
-      Modal.info({
-        title: '提示',
-        content: h('div', {}, [h('p', '删除成功！')]),
-        onOk() {
-          // console.log('ok');
-          delTemVal.value = undefined;
-          temVal.value = undefined;
-          getTemp();
-        },
-      });
-      // console.log(res);
-    },
-    error:e=>{
-      loadingshow.value = false;
-      Common.processException(e);
-    },
-  });
-};
-
-// 获取模版数据
-const getTemp = () =>{
-  $.ajax({
-    url:'/api/printPageResource/loadCustomerTemplateX6',
-    type: 'get',
-    contentType: 'application/json',
-    beforeSend: function(request) {
-      Common.addTokenToRequest(request);
-    },
-    success:({errorCode,datas,errorMessage})=>{
-      loadingshow.value = false;
-      if (errorCode == 0) {
-        TempList.value = datas;
-        // console.log(datas);
-      }else{
-        TempList.value = [];
-        Modal.info({
-          title: '提示',
-          content: h('div', {}, [h('p', '没有基础模版，请新建模版数据！')]),
-          onOk() {
-            // console.log('ok');
-            delTemVal.value = undefined;
-            temVal.value = undefined;
-            TempList.value = [];
-          },
-        });
-        // Notify.error('提示', errorMessage, false);''
-      }
-
-    },
-    error:e=>{
-      loadingshow.value = false;
-      Common.processException(e);
-    },
-  });
-};
-onBeforeMount(()=>{
-  getTemp();
-});
-</script>

src/index.js

@@ -67,8 +67,6 @@ import ReportApprove from './workflow/ReportApprove.vue';
 import ExcelReport from './client/ExcelReport.vue';
 import DateExcelReport from './client/DateExcelReport.vue';
 import DelegationReport from './client/DelegationReport.vue';
-import PrintTemp from '../src/customer/printTemp/index.vue';
-import PrintCard from '../src/print/PrintCard.vue';
 import DataArchive from '../src/archive/DataArchive.vue';
 import ArchivalRecord from '../src/archive/ArchivalRecord.vue';
 import IdentityManager  from '../src/identity/IdentityManager.vue';
@@ -134,8 +132,6 @@ export {
   ExcelReport,
   DateExcelReport,
   DelegationReport,
-  PrintTemp,
-  PrintCard,
   DataArchive,
   ArchivalRecord,
   ExcelImport,

src/print/PrintCard.vue

@@ -1,601 +0,0 @@
-<template>
-  <div>
-    <div v-show="printing">
-      <Navbar title="标签打印" :is-go-back="true" />
-      <div class="printDiv">
-        <div>
-          <span style="color: red"> * </span>
-          <label>导入批次：</label>
-          <a-select
-            v-model:value="queryParams.batchNo"
-            show-search
-            class="commonStyle"
-            :options="batchNos.map((item) => ({ value: item.label }))"
-            @change="batchNoChange"
-          />
-          <label>保管人员：</label>
-          <a-select
-            v-model:value="queryParams.depositoryUser"
-            show-search
-            class="commonStyle"
-            :options="depositoryUsers.map((item) => ({ value: item.label }))"
-            @change="searchDatas"
-          />
-          <label>打印状态：</label>
-          <a-select
-            v-model:value="queryParams.labelPrintType"
-            show-search
-            class="commonStyle"
-            :options="
-              statusOptions.map((item) => ({
-                value: item.value,
-                label: item.label,
-              }))
-            "
-            @change="searchDatas"
-          />
-        </div>
-        <div style="margin: 8px 0 0 9px">
-          <label>公司名称：</label>
-          <a-select
-            v-model:value="queryParams.clientName"
-            show-search
-            class="commonStyle"
-            :options="clientNames.map((item) => ({ value: item.label }))"
-            @change="searchDatas"
-          />
-          <label>所属部门：</label>
-          <a-select
-            v-model:value="queryParams.organizationName"
-            show-search
-            class="commonStyle"
-            :options="organizationNames.map((item) => ({ value: item.label }))"
-            @change="searchDatas"
-          />
-          <label>成本中心：</label>
-          <a-select
-            v-model:value="queryParams.costCenterName"
-            show-search
-            class="commonStyle"
-            :options="costCenterNames.map((item) => ({ value: item.label }))"
-            @change="searchDatas"
-          />
-          <a-button type="primary" @click="searchDatas">查询</a-button>
-        </div>
-        <div style="margin-top: 8px">
-          <span style="color: red"> * </span>
-          <label>打印模板：</label>
-          <a-select
-            v-model:value="printTemplate"
-            show-search
-            class="commonStyle"
-            :options="
-              templateNames.map((item) => ({
-                value: `${item.id}-${item.name}`,
-                label: item.name,
-              }))
-            "
-            @change="getTemplateInfo"
-          />
-          <a-button
-            type="dashed"
-            style="margin-right: 16px"
-            @click="printPreview"
-          >
-            效果预览
-          </a-button>
-          <a-button
-            type="dashed"
-            style="margin-right: 16px"
-            @click="showPrintInfo"
-          >
-            打印
-          </a-button>
-          <a-button type="dashed" style="margin-right: 16px" @click="printAll">
-            打印全部
-          </a-button>
-          <a-button type="dashed" @click="downloadImageZip">
-            下载全部
-          </a-button>
-        </div>
-        <a-divider />
-        <CommonTable
-          ref="table"
-          :total="total"
-          :columns="columns"
-          :is-loading="isLoading"
-          :is-select="isSelect"
-          :data-source="dataSource"
-          @get-selected="selectColumn"
-          @get-pager="getPageParams"
-        >
-          <template #bodyCell="{ column, record }">
-            <template v-if="column.key === 'imageUrl'">
-              <a-image
-                :width="100"
-                :height="50"
-                :src="getImageSrc(className, record.imageUrl)"
-              />
-            </template>
-          </template>
-        </CommonTable>
-        <a-modal
-          v-model:visible="printVisible"
-          title="包装信息"
-          ok-text="确认"
-          cancel-text="取消"
-          @ok="
-            all === false
-              ? printCard(select.selectedRows)
-              : printCard(select.allData)
-          "
-        >
-          <label>包装批号：</label>
-          <a-input
-            id="displayName"
-            v-model:value="packageBatchNo"
-            :disabled="true"
-          />
-          <label>上次的批号：</label>
-          <a-input v-model:value="lastPackageBatchNo" :disabled="true" />
-          <label>包装名称：</label>
-          <a-input
-            id="displayName"
-            v-model:value="packageName"
-            :disabled="true"
-          />
-          <label>上次的名称：</label>
-          <a-input v-model:value="lastPackageName" :disabled="true" />
-          <div class="operationBtn">
-            <a-button type="dashed" style="width: 240px" @click="lastTime">
-              同上一次
-            </a-button>
-            <a-button
-              type="dashed"
-              style="width: 240px; margin-left: 4px"
-              @click="createNew"
-            >
-              生成新的
-            </a-button>
-          </div>
-        </a-modal>
-        <a-modal
-          v-model:visible="imageVisible"
-          title="效果预览"
-          :mask-closable="false"
-          :body-style="bodyStyle"
-        >
-          <a-image :src="imageUrls[0]" />
-          <template #footer />
-        </a-modal>
-        <Loading v-if="globalLoading" :text="propText" />
-      </div>
-    </div>
-    <div ref="hua" style="float: left; z-index: -999" />
-  </div>
-</template>
-
-<script setup>
-import Common from '../common/Common';
-import CreateJPEG from '../common/X6';
-import { message } from 'ant-design-vue';
-import { base64toFile } from '../common/X6';
-import CommonTable from '../common/CommonTable.vue';
-import { SqlApi, Notify } from 'pc-component-v3';
-import { getImageSrc } from '../common/image-src';
-import { ref, reactive, onMounted, watch } from 'vue';
-import {
-  columns,
-  dateConvert,
-  multipleImageUpload,
-  getTemplate,
-  downloadZip,
-} from './config';
-
-const className = ref('com.leanwo.prodog.print.model.LabelPrintLine');
-const table = ref(null);
-const imageUrls = reactive([]);
-const printing = ref(true);
-const total = ref(0);
-const isSelect = ref(true);
-const isLoading = ref(false);
-const select = reactive({ selectedRows: [], allData: [] });
-const dataSource = ref([]);
-const printVisible = ref(false);
-const imageVisible = ref(false);
-const visible = ref(false);
-const globalLoading = ref(false);
-const all = ref(false);
-const propText = ref('');
-const bodyStyle = {
-  display: 'flex',
-  justifyContent: 'center',
-};
-const batchNos = ref([]);
-const clientNames = ref([]);
-const depositoryUsers = ref([]);
-const costCenterNames = ref([]);
-const organizationNames = ref([]);
-const statusOptions = ref([
-  {
-    value: '',
-    label: '',
-  },
-  {
-    value: 'To_Be_Printed',
-    label: '待打印',
-  },
-  {
-    value: 'Printing',
-    label: '打印中',
-  },
-  {
-    value: 'Printed',
-    label: '已打印',
-  },
-]);
-const queryParams = reactive({
-  batchNo: '',
-  depositoryUser: '',
-  labelPrintType: '',
-  clientName: '',
-  organizationName: '',
-  costCenterName: '',
-});
-const pager = reactive({
-  start: 0,
-  length: 20,
-});
-const templateId = ref('');
-const allTemplate = ref([]);
-const templateData = ref(null);
-const lastBatchNo = ref('');
-const printTemplate = ref('');
-const templateNames = ref([]);
-const packageBatchNo = ref('');
-const lastPackageBatchNo = ref('');
-const packageName = ref('');
-const lastPackageName = ref('');
-const newPackageName = ref('');
-const hua = ref(null);
-const clientId = ref('');
-let getBase64;
-// 获取分页
-const getPageParams = (start, length) => {
-  pager.start = (start - 1) * length;
-  pager.length = length;
-  searchPrintInfo();
-};
-// 批次号切换
-const batchNoChange = () => {
-  queryParams.clientName = '';
-  queryParams.depositoryUser = '';
-  queryParams.costCenterName = '';
-  queryParams.organizationName = '';
-  queryParams.labelPrintType = '';
-  commonSqlApi('20230613_192444', depositoryUsers); // 查询保管人
-  commonSqlApi('20230613_193808', clientNames); // 查询公司
-  commonSqlApi('20230613_194108', organizationNames); // 查询部门
-  commonSqlApi('20230613_194557', costCenterNames); // 查询成本中心
-  table.value.clear(); // 清空选择
-  table.value.backFirstPage(); // 回到第一页
-};
-// 查询回到第一页
-const searchDatas = () => {
-  table.value.backFirstPage();
-};
-// 查询信息
-const searchPrintInfo = () => {
-  isLoading.value = true;
-  clientId.value = JSON.parse(localStorage.getItem('#LoginInfo')).loginClientId;
-  let params = { ...queryParams, ...pager, clientId: clientId.value };
-  if (queryParams.batchNo !== '') {
-    SqlApi.execute('20230613_140456', params).then(
-      successData => {
-        const { lines, errorMessage, errorCode } = successData;
-        if (errorCode == 0) {
-          total.value = successData.total;
-          dataSource.value = lines;
-          select.allData = lines;
-          isLoading.value = false;
-        } else {
-          Notify.error('查询异常', errorMessage, true);
-        }
-        isLoading.value = false;
-      },
-      errorData => {
-        Common.processException(errorData);
-        isLoading.value = false;
-      },
-    );
-  } else {
-    isLoading.value = false;
-  }
-};
-// 获取所选项的数据
-const selectColumn = selected => {
-  select.selectedRows = selected.selectedRows;
-  // console.log('onSelectChange', select.selectedRows);
-};
-// 展开打印框
-const showPrintInfo = () => {
-  if (printTemplate.value !== '' && queryParams.batchNo !== '') {
-    printVisible.value = true;
-    const nameArr = [];
-    const obj = JSON.parse(JSON.stringify(queryParams));
-    delete obj.labelPrintType;
-    for (let key in obj) {
-      if (obj[key] !== '') nameArr.push(obj[key]);
-    }
-    packageName.value = nameArr.join('-');
-    newPackageName.value = nameArr.join('-');
-    packageBatchNo.value = dateConvert(new Date());
-  } else {
-    message.warning('请检查是否已选择导入批次或模板！');
-  }
-};
-// 同上一次包装信息
-const lastTime = () => {
-  if (lastPackageName.value == null && lastPackageBatchNo.value == null) {
-    message.info('没有上次的包装信息');
-  } else {
-    packageName.value = lastPackageName.value;
-    packageBatchNo.value = lastPackageBatchNo.value;
-  }
-};
-
-// 生产新的包装信息
-const createNew = () => {
-  packageBatchNo.value = dateConvert(new Date());
-  packageName.value = newPackageName.value;
-};
-
-// 获取模板数据及 ID
-const getTemplateInfo = async () => {
-  templateId.value = printTemplate.value.slice(
-    0,
-    printTemplate.value.indexOf('-'),
-  );
-  allTemplate.value.forEach(item => {
-    if (item.id == templateId.value) {
-      templateData.value = item.contentX6;
-    }
-  });
-};
-
-// 打印预览
-const printPreview = async () => {
-  if (printTemplate.value !== '' && queryParams.batchNo !== '') {
-    imageVisible.value = true;
-    printing.value = false;
-    imageUrls.length = 0;
-    let tempStr = JSON.stringify(templateData.value);
-    const rows = JSON.parse(JSON.stringify(dataSource.value[0]));
-    let base64 = await getBase64(rows, tempStr);
-    imageUrls.push(base64);
-    printing.value = true;
-  } else {
-    message.warning('请检查是否已选择导入批次或模板！');
-  }
-};
-
-// 确认打印
-const printCard = async data => {
-  if (data.length !== 0) {
-    printVisible.value = false;
-    globalLoading.value = true;
-    printing.value = false;
-    const formData = new FormData();
-    formData.append('customerPrintTemplateId', templateId.value);
-    formData.append('packageBatchNo', packageBatchNo.value);
-    formData.append('packageName', packageName.value);
-
-    let tempStr = JSON.stringify(templateData.value);
-    const rows = JSON.parse(JSON.stringify(data));
-    let amount = 0;
-    for (let key in rows) {
-      amount = amount + 1;
-      let base64 = await getBase64(rows[key], tempStr, rows[key].assetNo);
-      let file = base64toFile(base64, rows[key].id);
-      formData.append('file', file);
-      propText.value = `生成中,已生成${amount}张`;
-    }
-    multipleImageUpload(formData).then(
-      successData => {
-        if (successData.success === true) {
-          message.success('资产生产图片成功');
-        } else {
-          message.error('资产生产图片失败');
-        }
-        globalLoading.value = false;
-        printing.value = true;
-        all.value = false;
-        searchPrintInfo();
-        clearSelect();
-      },
-      errorData => {
-        Common.processException(errorData);
-        globalLoading.value = false;
-
-        printing.value = true;
-        all.value = false;
-        clearSelect();
-      },
-    );
-  } else {
-    all.value = false;
-    printVisible.value = false;
-    message.warning('请选择打印数据');
-  }
-};
-// 全部生成图片
-const printAll = () => {
-  all.value = true;
-  pager.start = 0;
-  pager.length = 10000;
-  searchPrintInfo();
-  showPrintInfo();
-};
-
-//下载全部图片(zip)
-const downloadImageZip = () => {
-  if (queryParams.batchNo === '') {
-    message.warning('请选择导入批次');
-  } else {
-    globalLoading.value = true;
-    var xhr = new XMLHttpRequest();
-    xhr.open('get', `api/LabelPrintResource/batchImageDownload?batchNo=${queryParams.batchNo}`, true);
-    const token = localStorage.getItem('#token');
-    xhr.setRequestHeader('token', token);
-    xhr.setRequestHeader('Content-type', 'application/json');
-    xhr.responseType = 'blob';
-    xhr.onreadystatechange = function(){
-      if(xhr.readyState === 4 && xhr.status === 200){
-        let res = xhr.response;
-        let blob = new Blob([res]);   
-        const blobUrl = URL.createObjectURL(blob);
-        const link = document.createElement('a');
-        link.download = '图片.zip';
-        link.style.display = 'none';
-        link.href = blobUrl;
-        document.body.appendChild(link);
-        link.click();
-        URL.revokeObjectURL(blobUrl);
-        document.body.removeChild(link);  
-        globalLoading.value = false;
-        message.success('下载成功');
-      }
-    };
-    xhr.send();
-  }
-};
-
-// 打印后清除所有选择
-const clearSelect = () => {
-  table.value.clear();
-};
-
-onMounted(() => {
-  init();
-  getBase64 = CreateJPEG(hua.value);
-  clientId.value = JSON.parse(localStorage.getItem('#LoginInfo')).loginClientId;
-});
-
-// 封装通用sqlApi请求函数
-const commonSqlApi = (url, data) => {
-  clientId.value = JSON.parse(localStorage.getItem('#LoginInfo')).loginClientId;
-  let params = { clientId: clientId.value, batchNo: queryParams.batchNo };
-  SqlApi.execute(url, params).then(
-    successData => {
-      if (successData.errorCode == 0) {
-        if (successData.lines !== null) {
-          data.value = successData.lines.map(item => {
-            return (item = { label: item });
-          });
-          data.value.unshift({ label: '' });
-        } else {
-          data.value = [];
-        }
-      } else {
-        Notify.error('查询信息异常', successData.errorMessage, true);
-      }
-    },
-    errorData => {
-      Common.processException(errorData);
-    },
-  );
-};
-
-// 初始化数据
-const init = () => {
-  clientId.value = JSON.parse(localStorage.getItem('#LoginInfo')).loginClientId;
-  let params = { clientId: clientId.value };
-  getTemplate().then(res => {
-    allTemplate.value = res.datas;
-  });
-  // 查询批次号
-  SqlApi.execute('20230613_134214', params).then(
-    successData => {
-      if (successData.errorCode == 0) {
-        if (successData.lines !== null) {
-          let datas = successData.lines.map(item => {
-            return (item = { label: item });
-          });
-          batchNos.value = datas.reverse();
-        }
-      } else {
-        Notify.error('查询导入批次异常', successData.errorMessage, true);
-      }
-    },
-    errorData => {
-      Common.processException(errorData);
-    },
-  );
-  // 查询模板
-  SqlApi.execute('20230613_135541', params).then(
-    successData => {
-      if (successData.errorCode == 0) {
-        if (successData.label !== null) {
-          templateNames.value = successData.lines;
-        }
-      } else {
-        Notify.error('查询模板信息异常', successData.errorMessage, true);
-      }
-    },
-    errorData => {
-      Common.processException(errorData);
-    },
-  );
-  // 获取上一次的包装信息
-  SqlApi.execute('20230613_194855', params).then(
-    successData => {
-      if (successData.errorCode == 0) {
-        const { packageName, packageBatchNo } = successData.lines[0];
-        lastPackageName.value = packageName;
-        lastPackageBatchNo.value = packageBatchNo;
-      } else {
-        Notify.error('获取包装信息异常', successData.errorMessage, true);
-      }
-    },
-    errorData => {
-      Common.processException(errorData);
-    },
-  );
-};
-</script>
-
-<style scoped>
-.commonStyle {
-  margin-right: 16px;
-  width: 160px;
-}
-.search,
-.operationBtn {
-  margin-top: 8px;
-}
-.operationBtn {
-  display: flex;
-  justify-content: space-between;
-}
-#displayName:disabled {
-  background: white;
-  color: black;
-}
-.full-modal .ant-modal {
-  max-width: 100%;
-  top: 0;
-  padding-bottom: 0;
-  margin: 0;
-}
-.full-modal .ant-modal-content {
-  display: flex;
-  flex-direction: column;
-  height: calc(100vh);
-}
-.full-modal .ant-modal-body {
-  flex: 1;
-}
-.ant-divider-horizontal{
-  margin: 4px 0;
-}
-</style>

src/print/config.js

@@ -1,184 +0,0 @@
-import Common from '../common/Common';
-
-export const columns = [
-  {
-    title: '部门',
-    dataIndex: 'organizationName',
-    key: 'organizationName',
-    width: 160,
-  },
-  {
-    title: '保管人',
-    dataIndex: 'depositoryUser',
-    key: 'depositoryUser',
-    width: 100,
-  },
-  {
-    title: '资产名称',
-    dataIndex: 'assetName',
-    key: 'assetName',
-    width: 120,
-  },
-  {
-    title: '资产编号',
-    dataIndex: 'assetNo',
-    key: 'assetNo',
-    width: 120,
-  },
-  {
-    title: '二维码',
-    dataIndex: 'barCode',
-    key: 'barCode',
-    width: 250,
-  },
-  {
-    title: 'EPC',
-    key: 'epc',
-    dataIndex: 'epc',
-    width: 140,
-  },
-  {
-    title: '序号',
-    key: 'printField',
-    dataIndex: 'printField',
-    width: 80,
-  },
-  {
-    title: '标签类型',
-    key: 'printField1',
-    dataIndex: 'printField1',
-    width: 180,
-  },
-  {
-    title: '所属单位',
-    key: 'printField2',
-    dataIndex: 'printField2',
-    width: 140,
-  },
-  {
-    title: '图片',
-    key: 'imageUrl',
-    dataIndex: 'imageUrl',
-    width: 150,
-  },
-  {
-    title: '状态',
-    key: 'labelPrintType',
-    dataIndex: 'labelPrintType',
-    width: 80,
-    customCell: record => {
-      if (record.labelPrintType === 'To_Be_Printed') {
-        record.labelPrintType = '待打印';
-      } else if (record.labelPrintType === 'Printing') {
-        record.labelPrintType = '打印中';
-      } else if (record.labelPrintType === 'Printed') {
-        record.labelPrintType = '已打印';
-      }
-    },
-  },
-  {
-    title: '打印次数',
-    key: 'printCount',
-    dataIndex: 'printCount',
-    width: 75,
-  },
-  {
-    title: '成本中心',
-    dataIndex: 'costCenterName',
-    key: 'costCenterName',
-    width: 100,
-  },
-  {
-    title: '公司',
-    dataIndex: 'clientName',
-    key: 'clientName',
-    width: 120,
-  },
-].map(item => ({ ...item, align: 'center' }));
-
-// 图片上传
-export const multipleImageUpload = params => {
-  var requestUrl = 'LabelPrintResource/multipleImageUpload';
-
-  return new Promise((resolve, reject) => {
-    $.ajax({
-      url: Common.getApiURL(requestUrl),
-      type: 'post',
-      contentType: false,
-      processData: false,
-      data: params,
-
-      beforeSend: function (request) {
-        Common.addTokenToRequest(request);
-      },
-      success: function (data) {
-        resolve(data);
-      },
-      error: function (XMLHttpRequest, textStatus, errorThrown) {
-        reject(XMLHttpRequest);
-      },
-    });
-  });
-};
-
-// 获取模板信息
-export const getTemplate = () => {
-  var requestUrl = 'printPageResource/loadCustomerTemplateX6';
-
-  return new Promise((resolve, reject) => {
-    $.ajax({
-      url: Common.getApiURL(requestUrl),
-      type: 'get',
-      dataType: 'json',
-
-      beforeSend: function (request) {
-        Common.addTokenToRequest(request);
-      },
-      success: function (data) {
-        resolve(data);
-      },
-      error: function (XMLHttpRequest, textStatus, errorThrown) {
-        reject(XMLHttpRequest);
-      },
-    });
-  });
-};
-
-// 图片下载 zip
-export const downloadZip = params => {
-  var requestUrl = 'LabelPrintResource/batchImageDownload';
-
-  return new Promise((resolve, reject) => {
-    $.ajax({
-      url: Common.getApiURL(requestUrl),
-      type: 'get',
-      data: params,
-      // dataType: 'octet-stream',
-      beforeSend: function (request) {
-        Common.addTokenToRequest(request);
-      },
-      success: function (data) {
-        resolve(data);
-      },
-      error: function (XMLHttpRequest, textStatus, errorThrown) {
-        reject(XMLHttpRequest);
-      },
-    });
-  });
-};
-
-
-const plusZero = n => {
-  return n > 10 ? n : '0' + n;
-};
-// 日期处理函数
-export const dateConvert = dateStr => {
-  const date = new Date(dateStr);
-  const year = date.getFullYear();
-  const month = date.getMonth() + 1;
-  const day = date.getDate();
-  const hour = date.getHours();
-  const minute = date.getMinutes();
-  const second = date.getSeconds();
-  return year + '-' + plusZero(month) + '-' + plusZero(day) + ' ' + plusZero(hour) + ':' + plusZero(minute) + ':' + plusZero(second);
-};

src/routes/main_routes.js

@@ -53,11 +53,6 @@ const ContainerLayout = () => import(/* webpackChunkName: "component-test-1" */
 const DynamicImport = () => import(/* webpackChunkName: "component-test-2" */ '../../test/DynamicImport.vue');
 const Test = () => import(/* webpackChunkName: "component-test-4" */ '../../test/Test.vue');
 const Training = () => import(/* webpackChunkName: "component-test-5" */ '../../test/Training.vue');
-const PrintTemp = () => import(/* webpackChunkName: "component-test-6" */ '../customer/printTemp/index.vue');
-// const PrintTempStep1 = () => import(/* webpackChunkName: "component-test-5" */ '../customer/printTemp/step1.vue');
-// const PrintTempStep2 = () => import(/* webpackChunkName: "component-test-5" */ '../customer/printTemp/step2.vue');
-
-const PrintCard = () => import('../print/PrintCard.vue');
 const DataArchive = () => import('../archive/DataArchive.vue');
 const ArchivalRecord = () => import('../archive/ArchivalRecord.vue');
 const ExcelImport = () => import('../customer/ExcelImport.vue');
@@ -248,37 +243,6 @@ export default [
           ],
         },
       },
-      // 条码编辑
-      {
-        path: 'barCode-edit', component: PrintTemp,
-        // children:[
-        //   // {path: '', component: PrintTempStep1},
-        //   // {path:'',component: PrintTempStep2},
-        // ],
-        meta: {
-          'loginRequired': true,
-          'functionAccessArray': [
-            {
-              'functionNo': '20220328_092713',
-              'itemNo': '3',
-            },
-          ],
-        },
-        // path: 'barCode-edit', component: PrintTemp,
-        //  children:[
-        //     {path: '', component: PrintTempStep1},
-        //     {path:'',component: PrintTempStep2},
-        //  ],
-        // meta: {
-        //   'loginRequired': true,
-        //   'functionAccessArray': [
-        //     {
-        //       'functionNo': '20220328_092713',
-        //       'itemNo': '3',
-        //     },
-        //   ],
-        // },
-      },
       // 归档
       { path: 'archive', component: Archive },
 
@@ -353,8 +317,6 @@ export default [
 
       // 打印页面
       { path: '/single/PrintPage', component: PrintPage },
-      // 卡片打印
-      { path: '/desktop/PrintCard', component: PrintCard },
 
 
       //钉钉待办任务审批跳转

src/store/modules/downloadStore.js

@@ -4,9 +4,6 @@ export default {
     count: '0',
     fileDownloads: [],
     step:0,
-    tempText:'新建模版',
-    templateVal:'',
-    templateId:'',
     imageSrc:'',
   },
 
@@ -17,15 +14,6 @@ export default {
     changeStep(state,val){
       state.step = val;
     },
-    changeTempText(state,val){
-      state.tempText = val;
-    },
-    changeTemplate(state,val){
-      state.templateVal = val;
-    },
-    changeTemplateId(state,val){
-      state.templateId = val;
-    },
     /**
      * 添加下载次数和下载文件
      * @param {*} state 

src/widget/GanttScale.vue

@@ -1,259 +0,0 @@
-
-<template>
-    <div>
-        <div class="radio">
-            <label class="radio-inline">
-                <input autocomplete="off" type="radio" id="scale0" value="0" v-model="scale"/>时标度
-            </label>
-            <label class="radio-inline">
-                <input autocomplete="off" type="radio" id="scale1" value="1" v-model="scale"/>日标度
-            </label>
-            <label class="radio-inline">
-                <input autocomplete="off" type="radio" id="scale2" value="2" v-model="scale"/>周标度
-            </label>
-            <label class="radio-inline">
-                <input autocomplete="off" type="radio" id="scale3" value="3" v-model="scale"/>月标度
-            </label>
-            <label class="radio-inline">
-                <input autocomplete="off" type="radio" id="scale4" value="4" v-model="scale"/>年标度
-            </label>
-            <button type="button" class="btn btn-link pull-right" @click="saveGantt">
-                 <i class="fa fa-download" aria-hidden="true" ></i>
-            </button>
-            <button v-if="hideButtons != true" type="button" class="btn btn-link pull-right" @click="showGanttChanged">
-                <span v-if="showGantt == 1" >显示甘特图</span>
-                <span v-if="showGantt == 2" >显示表格</span>
-            </button>
-        </div>
-        <Modal v-model:show="create" @cancel="$refs.create.show = false" large="true" @ok="runSaveGantt" >
-            <template #header>
-               保存甘特图
-            </template>
-            <div>
-                <div class="form-horizontal">
-                    <div class="form-group">
-                        <label for="ganttName" class="col-xs-4 col-sm-3 col-md-2 col-lg-1 control-label">
-                            <nobr>甘特图名称</nobr>
-                        </label>
-                        <div class="col-xs-8 col-sm-9 col-md-10 col-lg-11">
-                            <input autocomplete="off"  type="text" class="form-control" id="ganttName" v-model="ganttName" />
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </Modal>
-    </div>
-</template>
-
-
-<script>
-import { Common } from 'pc-component-v3';
-import { Notify, Uuid } from 'pc-component-v3';
-export default {
-    /**
-     * ganttDivId : 甘特图DIV的id
-     */
-    props: ["ganttDivId","hideIndex","hideButtons"],
-
-    data: function() {
-        return {
-            scale: 1,
-            showGantt: 1,   // 1：表格和甘特图一起显示  2：仅显示表格  3：仅显示甘特图  
-            columnsTemp:[],
-            ganttName:"",
-            create: false
-        };
-    },
-
-    components:{
-    },
-
-    methods: {
-        showGanttChanged:function(){
-            if (this.showGantt >= 2){
-                this.showGantt = 1;
-            } else{
-                this.showGantt ++;
-            }
-        },
-        /**
-         * 设置默认的标度
-         */
-        setDefaultScale: function(){
-			this.setScaleConfig("1");
-        },
-
-        /**
-         * 设置标度
-         */
-        setScaleConfig: function(value) {
-            switch (value) {
-                case "0":
-                    gantt.config.scale_unit = "day";
-                    gantt.config.date_scale = "%l, %F %d";
-                    gantt.config.min_column_width = 20;
-                    gantt.config.scale_height = 20 * 3;
-                    gantt.templates.task_cell_class = function(task, date) {
-                        if (date.getHours() == 8) {
-                            return "day_start";
-                        }
-                        if (date.getHours() == 18) {
-                            return "day_end";
-                        }
-                        return "";
-                    };
-                    var weekScaleTemplate = function(date) {
-                        var dateToStr = gantt.date.date_to_str("%d %M");
-                        var weekNum = gantt.date.date_to_str("(week %W)");
-                        var endDate = gantt.date.add(
-                            gantt.date.add(date, 1, "week"),
-                            -1,
-                            "day"
-                        );
-                        return (
-                            dateToStr(date) + " - " + dateToStr(endDate) + " " + weekNum(date)
-                        );
-                    };
-                    gantt.config.subscales = [
-                        { unit: "week", step: 1, template: weekScaleTemplate },
-                        { unit: "hour", step: 1, date: "%G" }
-                    ];
-                    /* gantt.ignore_time = function(date) {
-                        if (date.getDay() == 0 || date.getDay() == 6) return true;
-                        if (date.getHours() < 8 || date.getHours() > 18) return true;
-                        return false;
-                    };*/
-                    break;
-                case "1":
-                    gantt.config.scale_unit = "day";
-                    gantt.config.step = 1;
-                    gantt.config.date_scale = "%M %d日";
-                    gantt.config.subscales = [];
-                    gantt.config.scale_height = 27;
-                    gantt.config.min_column_width = 50;
-                    gantt.templates.date_scale = null;
-                    break;
-                case "2":
-                    var weekScaleTemplate = function(date) {
-                        var dateToStr = gantt.date.date_to_str("%M %d日");
-                        var startDate = gantt.date.week_start(new Date(date));
-                        var endDate = gantt.date.add(
-                        gantt.date.add(startDate, 1, "week"),
-                        -1,
-                        "day"
-                        );
-                        return dateToStr(startDate) + " - " + dateToStr(endDate);
-                    };
-
-                    gantt.config.scale_unit = "week";
-                    gantt.config.step = 1;
-                    gantt.templates.date_scale = weekScaleTemplate;
-                    gantt.config.min_column_width = 50;
-                    gantt.config.subscales = [{ unit: "day", step: 1, date: "%D" }];
-                    gantt.config.scale_height = 50;
-                    break;
-                case "3":
-                    gantt.config.scale_unit = "month";
-                    gantt.config.date_scale = "%Y年%F";
-                    gantt.config.subscales = [{ unit: "day", step: 1, date: "%j, 周%D" }];
-                    gantt.config.scale_height = 50;
-                    gantt.config.min_column_width = 50;
-                    gantt.templates.date_scale = null;
-                    break;
-                case "4":
-                    gantt.config.scale_unit = "year";
-                    gantt.config.step = 1;
-                    gantt.config.date_scale = "%Y年";
-                    gantt.config.min_column_width = 50;
-                    gantt.config.scale_height = 90;
-                    gantt.templates.date_scale = null;
-                    gantt.config.subscales = [{ unit: "month", step: 1, date: "%M" }];
-                    break;
-            }
-            gantt.render();
-        },
-        saveGantt:function(){
-            this.create = true;
-            
-        },
-        runSaveGantt:function(){
-            var _self = this;
-            var ganttData = [];
-            gantt.eachTask(item =>{
-                var event = {
-                    id:item.id,
-                    text:item.text,
-                    type:item.type,
-                    parant : item.parent
-                }
-                if(item.start_date){
-                    event.start_date = item.start_date.getTime();
-                }
-                if(item.end_date){
-                    event.end_date = item.end_date.getTime();
-                }
-
-                if(item.unscheduled == true){
-                    event.start_date = undefined;
-                    event.end_date = undefined;
-                }
-                   
-                ganttData.push(event);
-            });
-
-            var ganttInfo ={
-                name : _self.ganttName,
-                ganttType : "TJDHJ",
-                ganttJson : JSON.stringify(ganttData)
-            }
-            $.ajax({
-                url :Common.getApiURL("GeneticAlgorithmParameterResource/saveGantt"),
-                type : "post",
-                dataType : "json",
-                contentType : "application/json",
-                data : JSON.stringify(ganttInfo),
-                beforeSend : function(request){
-                    Common.addTokenToRequest(request);
-                },
-                success : function(data){
-                    Notify.success("提示","甘特图保存成功，可在排产回放界面查看",1500);
-                },
-                error: function (XMLHttpRequest, textStatus, errorThrown){     
-                    Common.processException(XMLHttpRequest, textStatus, errorThrown);
-                }
-            });
-        }
-    },
-
-    watch: {
-        scale: function(newValue, oldValue) {
-            this.setScaleConfig(newValue);
-        },
-
-        showGantt: function(newValue, oldValue){
-            if(newValue == 1){
-                if( this.columnsTemp != undefined &&  this.columnsTemp.length > 0){
-                    gantt.config.columns = this.columnsTemp;
-                }
-                    gantt.config.grid_width = this.grid_width;
-            }else if(newValue == 2){
-                this.columnsTemp =  gantt.config.columns;
-                this.grid_width = gantt.config.grid_width;
-                if(this.hideIndex == true){
-                     gantt.config.columns = [
-                        {name:"text", label:"名称", width: 200 , tree:true}
-                    ];
-                }else{
-                    gantt.config.columns = [
-                        {name:"index", label:"序号", width: 40, align: "center"},
-                        {name:"text", label:"名称", width: 200 , tree:true}
-                    ];
-                }
-                
-                gantt.config.grid_width = 240; 
-            }
-            gantt.render();
-        }
-    }
-};
-</script>

webpack.base.js

@@ -87,7 +87,6 @@ module.exports = {
     'vue-router': 'VueRouter',
     'vuex': 'Vuex',
     'sortablejs': 'Sortable',
-    // '@antv/x6': 'X6',
   },
   
   plugins: [