完善

package.json

@@ -22,7 +22,6 @@
     "enquire.js": "^2.1.6",
     "jquery": "^3.2.1",
     "jssha": "^2.3.1",
-    "k-form-design": "^3.7.91",
     "lodash.get": "^4.4.2",
     "lodash.pick": "^4.4.0",
     "md5": "^2.2.1",

src/components/tools/UserMenu.vue

@@ -26,17 +26,6 @@
           </a-menu-item>
         </a-menu>
       </a-dropdown>-->
-      <side-menu
-        mode="inline"
-        :menus="mobileMenus"
-        :theme="navTheme"
-        :collapsed="false"
-        :collapsible="true"
-        @menuSelect="menuSelect"
-      ></side-menu>
-      <v-for>
-
-      </v-for>
       <a style="margin-left: 8px;" @click="handleScreen(1)">设备大屏</a>
       <a style="margin-left: 8px;" @click="handleScreen(2)">详情大屏</a>
       <a style="margin-left: 8px;" @click="handleScreen(3)">维保大屏</a>

src/main.js

@@ -20,10 +20,6 @@ import BaseTool from './utils/install'
 import echarts from 'echarts'
 import VueI18n from 'vue-i18n'
 import Print from 'vue-print-nb'
-import KFormDesign from 'k-form-design'
-import 'k-form-design/lib/k-form-design.css'
-
-Vue.use(KFormDesign)
 Vue.use(Print) // 注册
 
 Vue.prototype.$echarts = echarts

src/router/generator-platform-routers.js

@@ -370,18 +370,6 @@ export const constantRouterMap = [
       }
     ]
   },
-  {
-    path: '/kdesign',
-    component: BlankLayout,
-    redirect: '/kdesign/design',
-    children: [
-      {
-        path: 'design',
-        name: 'design',
-        component: () => import('@/views/kdesign/Design')
-      }
-    ]
-  },
   {
     path: '/404',
     component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')

src/utils/tool.js

@@ -1016,6 +1016,7 @@ BaseTool.UPLOAD = {
         fileDTO.fileName = data.fileName
         fileDTO.fileFormat = data.fileFormat
         fileDTO.url = data.url
+        fileDTO.id = data.id
         temp.push(fileDTO)
       }
     }

src/views/kdesign/Design.vue

@@ -1,39 +0,0 @@
-<template>
-  <div>
-    <k-form-design :title="title" @save="handleSave" ref='kfd'/>
-  </div>
-</template>
-
-<script>
-import { updateDesignFormDesignData } from '@/api/design/designForm'
-
-const id = '628e27250e1cb13acc4ef848'
-export default {
-  name: 'Design',
-  created () {
-  },
-  mounted () {
-  },
-  data () {
-    return {
-      title: '设备报废表单'
-    }
-  },
-  methods: {
-    handleSave (values) {
-      alert('触发保存方法')
-      console.log(values)
-      // 日期处理
-      const parameter = {}
-      parameter.designData = values
-      parameter.id = id
-      updateDesignFormDesignData(parameter)
-        .then(() => {
-          this.$message.info('保存成功')
-        }).catch(() => {
-          this.confirmLoading = false
-        })
-    }
-  }
-}
-</script>

src/views/kdesign/DesignBuild.vue

@@ -1,62 +0,0 @@
-<template>
-  <a-card :bordered="false" v-show="visible" class="card" :title="modalTitle">
-    <a-row :gutter="48" slot="extra">
-      <a-col :md="48" :sm="48">
-        <span class="table-page-search-submitButtons" style="float: right">
-          <a-button :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
-          <a-button style="margin-left: 8px" type="default" @click="handleCancel()">返回</a-button>
-        </span>
-      </a-col>
-    </a-row>
-    <div >
-      <k-form-build ref="kfb" :value="jsonData" />
-    </div>
-  </a-card>
-</template>
-
-<script>
-import { updateDesignFormDesignData } from '@/api/design/designForm'
-
-export default {
-  name: 'Design',
-  created () {
-  },
-  mounted () {
-  },
-  data () {
-    return {
-      title: '设备报废表单填报',
-      visible: false,
-      jsonData: {}
-    }
-  },
-  methods: {
-    base (record) {
-      this.visible = true
-      this.model = record
-    },
-    handleSave (values) {
-      console.log(values)
-      // 日期处理
-      const parameter = this.model
-      parameter.designData = values
-      updateDesignFormDesignData(parameter)
-        .then(() => {
-          this.$message.info('保存成功')
-        }).catch(() => {
-          this.confirmLoading = false
-        })
-    },
-    handleCancel (values) {
-      this.visible = false
-      this.confirmLoading = false
-      this.form.resetFields()
-      if (this.BaseTool.Object.isNotBlank(values)) {
-        this.$emit('ok', values)
-      } else {
-        this.$emit('ok')
-      }
-    }
-  }
-}
-</script>

src/views/sb/info/modules/BaseForm.vue

@@ -901,6 +901,7 @@
             <a-upload
               :action="uploadUrl"
               :multiple="false"
+              list-type="picture"
               :file-list="this.defaultSbFileList"
               @change="handleSbFileChange"
               accept="image/*"
@@ -1275,7 +1276,7 @@ export default {
       })
     },
     getQrcodeSrc () {
-      console.log(111, 22)
+      // console.log(111, 22)
     },
     handleCancel () {
       this.visible = false
@@ -1436,18 +1437,6 @@ export default {
       this.defaultSbFileList = info.fileList
       this.sbFileList = this.setFileList(info, 4)
     },
-    setFileList1 (info, type) {
-      const fileList = [...info.fileList]
-      const file = [...info.file]
-      if (file.status === 'done') {
-        return this.BaseTool.UPLOAD.getUploadFileDTO(fileList, type)
-      } else if (file.status === 'removed') {
-        return this.BaseTool.UPLOAD.getUploadFileDTO(fileList, type)
-      } else if (file.status === 'error') {
-        this.$message.error('上传失败')
-        return []
-      }
-    },
     clearParent () {
       const { form: { setFieldsValue } } = this
       // 日期处理
@@ -1512,6 +1501,7 @@ export default {
       // { file, fileList }
 
       const file = info.file
+      // console.log('file: ' + JSON.stringify(file))
       const fileList = info.fileList
       // fileList = fileList.slice(-2)
       // console.log(111, this.BaseTool.UPLOAD.getUploadFileDTO(fileList, type))
@@ -1539,14 +1529,14 @@ export default {
       modal.base(this.model)
     },
     handleParamList (values) {
-      console.log(values)
+      // console.log(values)
       if (this.paramList == null) {
         this.paramList = []
       }
       this.paramList.push(values)
     },
     handleDelParam (index) {
-      console.log(index)
+      // console.log(index)
       this.paramList.splice(index, 1)
     }
   }

src/views/sb/info/modules/Detail.vue

@@ -452,7 +452,7 @@ export default {
     this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_LEVEL)
     this.firmProducerLevelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.FIRM_PRODUCER_LEVEL)
     this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_INFO_STATUS)
-    this.unitMap = this.DictCache.getRepairCheckFormLabelByValueMapByType(this.DictCache.TYPE.SBINFO_UNIT)
+    this.unitMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_UNIT)
     this.colorMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_COLOR)
     this.rlTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.RANLIAO_TYPE)
     this.sourceTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBTYPE_SOURCETYPE)

yarn.lock

@@ -2057,7 +2057,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-ant-design-vue@^1.4.5, ant-design-vue@^1.7.2:
+ant-design-vue@^1.4.5:
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/ant-design-vue/-/ant-design-vue-1.7.8.tgz#1abbf86b68a4f5b1000bea0487b8031dc0001661"
   integrity sha512-F1hmiS9vwbyfuFvlamdW5l9bHKqRlj9wHaGDIE41NZMWXyWy8qL0UFa/+I0Wl8gQWZCqODW5pN6Yfoyn85At3A==
@@ -2517,13 +2517,6 @@ babel-plugin-import@^1.11.0:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/runtime" "^7.0.0"
 
-babel-plugin-import@^1.13.0:
-  version "1.13.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-import/-/babel-plugin-import-1.13.5.tgz#42eed1c5afd9a35ee1b1f8fe922b07c44077d753"
-  integrity sha512-IkqnoV+ov1hdJVofly9pXRJmeDm9EtROfrc5i6eII0Hix2xMs5FEm8FG3ExMvazbnZBbgHIt6qdO8And6lCloQ==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-
 babel-plugin-istanbul@^4.1.6:
   version "4.1.6"
   resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
@@ -2611,15 +2604,6 @@ babel-polyfill@6.23.0:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-polyfill@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
-  integrity sha512-F2rZGQnAdaHWQ8YAoeRbukc7HS9QgdgeyJ0rQDd485v9opwuPvjpPFcOOT/WmkKTdgy9ESgSPXDcTNpzrGr6iQ==
-  dependencies:
-    babel-runtime "^6.26.0"
-    core-js "^2.5.0"
-    regenerator-runtime "^0.10.5"
-
 babel-preset-jest@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz#8ec7a03a138f001a1a8fb1e8113652bf1a55da46"
@@ -3372,15 +3356,6 @@ clipboard@^2.0.0:
     select "^1.1.2"
     tiny-emitter "^2.0.0"
 
-clipboard@^2.0.6:
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.11.tgz#62180360b97dd668b6b3a84ec226975762a70be5"
-  integrity sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==
-  dependencies:
-    good-listener "^1.2.2"
-    select "^1.1.2"
-    tiny-emitter "^2.0.0"
-
 clipboardy@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.3.0.tgz#3c2903650c68e46a91b388985bc2774287dba290"
@@ -3455,11 +3430,6 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codemirror@^5.22.0:
-  version "5.65.4"
-  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.4.tgz#384c257f27d1d06f44311722c98ad802cce3984e"
-  integrity sha512-tytrSm5Rh52b6j36cbDXN+FHwHCl9aroY4BrDZB2NFFL3Wjfq9nuYVLFFhaOYOczKAg3JXTr8BuT8LcE5QY4Iw==
-
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -6188,11 +6158,6 @@ highlight.js@^10.7.1:
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531"
   integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
 
-highlight.js@^9.12.0:
-  version "9.18.5"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.5.tgz#d18a359867f378c138d6819edfc2a8acd5f29825"
-  integrity sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==
-
 hmac-drbg@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -7737,24 +7702,6 @@ jssha@^2.3.1:
   resolved "https://registry.yarnpkg.com/jssha/-/jssha-2.4.2.tgz#d950b095634928bd6b2bda1d42da9a3a762d65e9"
   integrity sha512-/jsi/9C0S70zfkT/4UlKQa5E1xKurDnXcQizcww9JSR/Fv+uIbWM2btG+bFcL3iNoK9jIGS0ls9HWLr1iw0kFg==
 
-k-form-design@^3.7.91:
-  version "3.7.91"
-  resolved "https://registry.yarnpkg.com/k-form-design/-/k-form-design-3.7.91.tgz#9c0300124743ba37df5a917a047b3aec27516ec0"
-  integrity sha512-kEuIkJlK3YMojskaGQgFcyCTzkiF4qoj9AQ0Z+LhBqNzPUJIkePe4sMgoNE/DjtIGTzjxgpIccjztIFIayMIxw==
-  dependencies:
-    ant-design-vue "^1.7.2"
-    babel-plugin-import "^1.13.0"
-    babel-polyfill "^6.26.0"
-    clipboard "^2.0.6"
-    core-js "^2.6.5"
-    moment "^2.24.0"
-    vcolorpicker "^1.1.0"
-    vue "^2.6.10"
-    vue-codemirror-lite "^1.0.4"
-    vue-quill-editor "^3.0.6"
-    vue-router "^3.0.3"
-    vuedraggable "^2.23.2"
-
 killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
@@ -10572,7 +10519,7 @@ regenerate@^1.4.2:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.10.0, regenerator-runtime@^0.10.5:
+regenerator-runtime@^0.10.0:
   version "0.10.5"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
   integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=
@@ -11336,11 +11283,6 @@ sort-keys@^1.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
-sortablejs@1.10.2:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.10.2.tgz#6e40364d913f98b85a14f6678f92b5c1221f5290"
-  integrity sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A==
-
 source-list-map@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
@@ -12459,14 +12401,6 @@ vary@~1.1.2:
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
-vcolorpicker@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vcolorpicker/-/vcolorpicker-1.1.0.tgz#527e2463ab330faab8b9637a30f915aebbef75f6"
-  integrity sha512-FbI7rq0EliwaPU8Qh/QVv9MFdZnG3dHjZEvODIcpPS774TTvilg6tq6cWDRbtCITBNDdpgVWnNlJ0aKnecgrJg==
-  dependencies:
-    highlight.js "^9.12.0"
-    vue "^2.5.17"
-
 vendors@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
@@ -12530,13 +12464,6 @@ vue-clipboard2@^0.2.1:
   dependencies:
     clipboard "^2.0.0"
 
-vue-codemirror-lite@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/vue-codemirror-lite/-/vue-codemirror-lite-1.0.4.tgz#48a5cd7d17c0914503c8cd9d9b56b438e49c3410"
-  integrity sha1-SKXNfRfAkUUDyM2dm1a0OOScNBA=
-  dependencies:
-    codemirror "^5.22.0"
-
 vue-cookie@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/vue-cookie/-/vue-cookie-1.1.4.tgz#b8b46d112bda9f93a2f47017c2ed5282d2064fda"
@@ -12638,11 +12565,6 @@ vue-ref@^2.0.0:
   resolved "https://registry.yarnpkg.com/vue-ref/-/vue-ref-2.0.0.tgz#483084d732abed11da796778a8266a3af0ea1a9c"
   integrity sha512-uKNKpFOVeWNqS2mrBZqnpLyXJo5Q+vnkex6JvpENvhXHFNBW/SJTP8vJywLuVT3DpxwXcF9N0dyIiZ4/NpTexQ==
 
-vue-router@^3.0.3:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.4.tgz#c453c0b36bc75554de066fefc3f2a9c3212aca70"
-  integrity sha512-x+/DLAJZv2mcQ7glH2oV9ze8uPwcI+H+GgTgTmb5I55bCgY3+vXWIsqbYUzbBSZnwFHEJku4eoaH/x98veyymQ==
-
 vue-router@^3.1.2:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.3.tgz#041048053e336829d05dafacf6a8fb669a2e7999"
@@ -12689,18 +12611,11 @@ vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0:
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
   integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
 
-vue@^2.5.17, vue@^2.5.3, vue@^2.6.10, vue@^2.6.11:
+vue@^2.5.3, vue@^2.6.10, vue@^2.6.11:
   version "2.6.14"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
   integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==
 
-vuedraggable@^2.23.2:
-  version "2.24.3"
-  resolved "https://registry.yarnpkg.com/vuedraggable/-/vuedraggable-2.24.3.tgz#43c93849b746a24ce503e123d5b259c701ba0d19"
-  integrity sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==
-  dependencies:
-    sortablejs "1.10.2"
-
 vuex@^3.1.1:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.6.2.tgz#236bc086a870c3ae79946f107f16de59d5895e71"