luochaofan 3 лет назад
Родитель
Сommit
9fb24d01f5

+ 1 - 1
.eslintrc.js

@@ -34,7 +34,7 @@ module.exports = {
     indent: ['error', 2],
     // 该规则旨在通过限制代码行的长度来提高代码的可读性和可维护性。
     // 一行的长度为行中的 Unicode 字符的数量。
-    'max-len': ['error', { code: 185 }],
+    // 'max-len': ['error', { code: 185 }],
     // 这个规则强制在对象和数组字面量中使用一致的拖尾逗号。
     // "always-multiline" 当最后一个元素或属性与闭括号 ] 或 } 在 不同的行时,要求使用拖尾逗号;当在 同一行时,禁止使用拖尾逗号。
     'comma-dangle': ['error', 'always-multiline'],

+ 1 - 0
.gitignore

@@ -0,0 +1 @@
+node_modules

+ 10 - 11
src/customer/printTemp/index.vue

@@ -4,23 +4,22 @@
     <a-step title="编辑模版" />
   </a-steps>
   <div style="height: 40px;" />
-  <!-- <RouterView /> -->
-  <!-- <Step2 /> -->
+  <div v-if="step == 0">
+    <Step1 />
+  </div>
+  <div v-if="step == 1">
+    <Step2 />
+  </div>
 </template>
 
 <script setup>
-import { Graph } from '@antv/x6';
-import { Addon } from '@antv/x6';
-// import Step1 from './step1.vue';
-// import Step2 from './step2.vue';
+import Step1 from './step1.vue';
+import Step2 from './step2.vue';
 import { computed } from 'vue';  
 import { useStore } from 'vuex';
 
 const store = useStore();
-const step = computed(()=>store.state.step);
-
-console.log(Graph);
-console.log(Addon);
-
+const step = computed(()=>store.state.downloadStore.step);
+console.log(store);
 </script>
 <style scoped></style>

+ 135 - 109
src/customer/printTemp/step1.vue

@@ -3,6 +3,7 @@
     <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>
 
@@ -13,12 +14,32 @@
       style="width: 220px"
       @change="handleChange"
     >
-      <a-select-option value="1">模版1</a-select-option>
-      <a-select-option value="2">模版2</a-select-option>
+      <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-modal v-model:visible="visible" title="提示" @ok="handleOk">
-      <p>请先选择模版!</p>
+    <a-spin v-show="loadingshow" />
+  </div>
+  <div v-show="value == 'c'" style="margin: 30px;">
+    <a-select
+      ref="select"
+      v-model:value="delTemVal"
+      style="width: 220px"
+      @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>确认删除?</p>
     </a-modal>
   </div>
   <a-divider type="horizontal" />
@@ -28,134 +49,139 @@
 </template>
 <script setup>
 import { Modal } from 'ant-design-vue';
-import { ref,h } from '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 TemArr = [
-  `{"cells":[{"position":{"x":100,"y":200},"size":{"width":200,"height":100},
-  "attrs":{"rect":{"stroke":"#fff"}},"shape":"rect","id":"7826bdf1-c7f4-4dde-be95-128c07017d9f",
-  "data":{"parent":true},"zIndex":1},
-  {"position":{"x":250,"y":250},"size":{"width":50,"height":50},
-  "attrs":{"image":{"xlink:href":"data:image/png;base64,iVBORw0KGgoAAAA
-  NSUhEUgAAAZAAAAGQAQAAAACoxAthAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQA
-  APoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAd2KE6QAAAAJcEhZcwAAFxEAABcRAco
-  m8z8AAADvSURBVHja7dZBbgQhDARA/v/pRNHIQwOz2d2zyydsKG4tGD9f10AQBEGQj8hY6q+v2bmHIEgEaFu
-  fewiCZLyu2XixhyDI+hwlRRDk/4hVhyDIE6lKklGLPQRpTrLWZ2nfQ5Du5KzxYo4gSB3aIzZpdgiCrN+1eWRe
-  giDItczv2/1V2+J19wjSnOxxml0+VEvEEKQxSboG61ghSGuy1zx2zhCkOxlLPV2RFyBId7Ju731diyBIHbuGk
-  9R0zrZfH4IgEbr5SGXwEAR5iliSD1OJIC1IVa5rcoG7R5DmJKvg/QQ9RwxBmpLvCkEQBEHe1i8/Fy+ejOFn3QA
-  AAABJRU5ErkJggg=="}},"shape":"image","id":"bcce3b7f-3107-463a-bd65-ce283928a412","zInde
-  x":2},{"position":{"x":140,"y":230},"size":{"width":100,"height":50},"attrs":{"rect":{"st
-  roke":"#fff"},"label":{"fontSize":12,"text":"节点1","refX":5,"textAnchor":"start","textVert
-  icalAnchor":"middle"}},"shape":"rect","id":"f75d61e0-0354-48f1-85d9-8fb8aa46ef82","stroke":"#fff","zIndex":3}]}`,
-  `{"cells":[{"position":{"x":100,"y":200},"size":{"width":200,"height":100},"attrs":{"rect"
-  :{"stroke":"#fff"}},"shape":"rect","id":"7826bdf1-c7f4-4dde-be95-128c07017d9f","data":{"par
-  ent":true},"zIndex":1},{"position":{"x":250,"y":250},"size":{"width":50,"height":50},"attrs":
-  {"image":{"xlink:href":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZAAAAGQAQAAAACoxAthAAA
-  ABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAd2KE
-  6QAAAAJcEhZcwAAFxEAABcRAcom8z8AAADvSURBVHja7dZBbgQhDARA/v/pRNHIQwOz2d2zyydsKG4tGD9f10AQBEGQj8h
-  Y6q+v2bmHIEgEaFufewiCZLyu2XixhyDI+hwlRRDk/4hVhyDIE6lKklGLPQRpTrLWZ2nfQ5Du5KzxYo4gSB3aIzZpdgiCr
-  N+1eWRegiDItczv2/1V2+J19wjSnOxxml0+VEvEEKQxSboG61ghSGuy1zx2zhCkOxlLPV2RFyBId7Ju731diyBIHbuGk9R0
-  zrZfH4IgEbr5SGXwEAR5iliSD1OJIC1IVa5rcoG7R5DmJKvg/QQ9RwxBmpLvCkEQBEHe1i8/Fy+ejOFn3QAAAABJRU5ErkJg
-  gg=="}},"shape":"image","id":"bcce3b7f-3107-463a-bd65-ce283928a412","zIndex":2},{"position":{"x":
-  100,"y":280},"size":{"width":100,"height":20},"attrs":{"rect":{"stroke":"#fff"},"label":{"fontSize
-  ":12,"text":"节点1","refX":5,"textAnchor":"start","textVerticalAnchor":"middle"}},"shape":"rect","id
-  ":"f75d61e0-0354-48f1-85d9-8fb8aa46ef82","stroke":"#fff","zIndex":3},{"position":{"x":150,"y":210},"s
-  ize":{"width":96,"height":30},"attrs":{"image":{"xlink:href":"data:image/png;base64,iVBORw0KGgoAAAANS
-  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"}},"shape":"imag
-  e","id":"0fff7e93-8128-4ed9-81e1-5a65aa98d6a6","zIndex":4}]}`,
-];
+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 value = ref('');
-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 getTem = () =>{
 
+const delChange = (_,val) =>{
+  console.log(val);
+  tempId.value = val.key;
+};
+const getTem = () =>{
+  loadingshow.value = true;
+  //  重新发请求获取模版列表
+  getTemp();
+};
+const delTem = () =>{
+  if (delTemVal.value == '') return;
+  delVisible.value = true;
 };
 const next = () =>{
-  if (value.value == '' ||  (value.value == 'b' && temVal.value == '')) {
+  if (value.value == 'a') {
+    store.commit('changeTemplateId','');
+    store.commit('changeTemplate','');
+    store.commit('changeTempText','新建模版');
+    
+  }
+  if ((value.value == 'b' && temVal.value == '') || value.value == 'c') {
     Modal.info({
       title: '提示',
-      content: h('div', {}, [h('p', '请先选择模版!')]),
+      content: h('div', {}, [h('p', '请先选择模版或新建模板!')]),
       onOk() {
         console.log('ok');
       },
     });
     return;
   }
-  let text = '';
-  if (value.value == 'a') {
-    text = '新建模版';
-    window.localStorage.setItem('template','');  
-  }else{
-    if (temVal.value == '1' ) {
-      text = '模版1';
-      window.localStorage.setItem('template',JSON.stringify(TemArr[0]));    
-    }else if(temVal.value == '2' ){
-      text = '模版2';
-      window.localStorage.setItem('template',JSON.stringify(TemArr[1]));    
-    }
-  }
+
   store.commit('changeStep',1);
-  router.push({
-    path:'barCode-edit/step2',
-    query:{
-      text,
+};
+
+const delOk = () =>{
+  delVisible.value = false;
+  loadingshow.value = true;
+  // 发请求删除模版
+  $.ajax({
+    url:'/api/printPageResource',
+    type:'delete',
+    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 = '';
+          temVal.value = '';
+          getTemp();
+        },
+      });
+      // console.log(res);
+    },
+    error:e=>{
+      loadingshow.value = false;
+      Common.processException(e);
     },
   });
 };
-const handleOk = () =>{
-  visible.value = false;
+
+// 获取模版数据
+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 = '';
+            temVal.value = '';
+            TempList.value = [];
+          },
+        });
+        // Notify.error('提示', errorMessage, false);''
+      }
+
+    },
+    error:e=>{
+      loadingshow.value = false;
+      Common.processException(e);
+    },
+  });
 };
+onBeforeMount(()=>{
+  getTemp();
+});
 </script>

Разница между файлами не показана из-за своего большого размера
+ 315 - 318
src/customer/printTemp/step2.vue


+ 3 - 3
src/main.js

@@ -31,11 +31,11 @@ window.dd = dd;
 import routes from './routes/main_routes.js';
 
 
-console.log(window.$);
+// console.log(window.$);
 // import $ from 'jquery';
-console.log(window.$);
+// console.log(window.$);
 //$ = window.$;
-console.log($);
+// console.log($);
 
 import store from './store/index.js';
 

+ 12 - 0
src/store/modules/downloadStore.js

@@ -4,12 +4,24 @@ export default {
     count: '0',
     fileDownloads: [],
     step:0,
+    tempText:'新建模版',
+    templateVal:'',
+    templateId:'',
   },
 
   mutations: {
     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 

+ 12 - 12
webpack.dev.js

@@ -60,71 +60,71 @@ module.exports = WebpackMerge.merge(baseConfig, {
     
     proxy: {
       '/api': {
-        target: 'http://localhost:83/',
+        target: 'http://192.168.1.105:10022/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/static': {
-        target: 'http://localhost:83/',
+        target: 'http://192.168.1.105:10022/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/content': {
-        target: 'http://127.0.0.1:83/',
+        target: 'http://192.168.1.105:10022/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/dashboard': {
-        target: 'http://localhost:83/',
+        target: 'http://192.168.1.105:10022/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/assets': {
-        target: 'http://127.0.0.1:83/',
+        target: 'http://192.168.1.105:10022/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/mock': {
-        target: 'http://localhost:83/',
+        target: 'http://192.168.1.105:10022/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/authApi': {
-        target: 'http://localhost:83/',
+        target: 'http://192.168.1.105:10022/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/Dictionary': {
-        target: 'http://localhost:83/',
+        target: 'http://192.168.1.105:10022/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/Files': {
-        target: 'http://localhost:83/',
+        target: 'http://192.168.1.105:10022/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/WebSocket': {
-        target: 'http://localhost:83/',
+        target: 'http://192.168.1.105:10022/',
         ws: true,
         changeOrigin: true,
       },
       '/TrainVideo': {
-        target: 'http://localhost:83/',
+        target: 'http://192.168.1.105:10022/',
         ws: true,
         changeOrigin: true,
       },
       '/gateway-api': {
-        target: 'http://localhost:83/',
+        target: 'http://192.168.1.105:10022/',
         ws: true,
         changeOrigin: true,
         secure:true,

Некоторые файлы не были показаны из-за большого количества измененных файлов