调整

src/views/analysis/query/index.vue

@@ -71,30 +71,30 @@
             {
               title: "物品编码",
               field: "wpbm",
-               width: 120,
+              width: 120,
 
             },
             {
               title: "物品名称",
               field: "wpmc",
-               width: 100,
+              width: 100,
 
             },
             {
               title: "物品特征",
               field: "wptz",
-               width: 200,
+              width: 200,
 
             },
             {
               title: "数量",
               field: "count",
-               width: 140,
+              width: 140,
             },
             {
               title: "物品持有人",
               field: "wpcyr",
-               width: 140,
+              width: 140,
             },
             {
               title: "案件编码",
@@ -129,83 +129,76 @@
             {
               title: "部门",
               field: "bm",
-               width: 140,
-               "transform": {
-                                "url": "hjbm/query",
-                                "label": "bmmc",
-                                "value": "bmid"
-                              }
-             
+              width: 140,
+              "transform": {
+                "url": "hjbm/query",
+                "label": "bmmc",
+                "value": "bmid"
+              }
             },
-
           ],
           queryParams: [
-           [{
-               label: '部门',
-               prop: 'ssbm',
-               span: 4,
-               type: 'RelSelect',
-               "typeConfig": {
-                 "src": "hjbm/query",
-                 "match": {
-                   "value": "bmid",
-                   "label": "bmmc"
-                 },
+            [{
+                label: '部门',
+                prop: 'ssbm',
+                span: 4,
+                type: 'RelSelect',
+                "typeConfig": {
+                  "src": "hjbm/query",
+                  "match": {
+                    "value": "bmid",
+                    "label": "bmmc"
+                  },
 
-               }
-             },
-             {
-               label: '仓库',
-               prop: 'ckid',
-               span: 4,
-               "type": "RelSelect",
-               "typeConfig": {
-                 "src": "jcsj/u_ckwh/query",
-                 "match": {
-                   "value": "id",
-                   "label": "ckmc"
-                 },
-                 params: {
-
-                 }
-               },
-             },
-             {
-               label: '物品信息',
-               prop: 'wpxx',
-               span: 4,
-               type: 'input',
-               value: ''
-             },
-
-             {
-               label: '序列号',
-               prop: 'xlh',
-               span: 4,
-               type: 'input',
-               value: ''
-             },
-             {
-               label: '维护时间',
-               startProp: "kssj",
-               endProp: "jssj",
-               span: 6,
-               type: 'RelDaterangeV2',
-               startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
-               endValue: new Date().getTime(),
-             },
-
-
-           ],
-           [
-             {
-               label: '案件信息',
-               prop: 'ajxx',
-               span: 4,
-               type: 'input',
-               value: ''
-             },
-           ]
+                }
+              },
+              {
+                label: '仓库',
+                prop: 'ckid',
+                span: 4,
+                "type": "RelSelect",
+                "typeConfig": {
+                  "src": "jcsj/u_ckwh/query",
+                  "match": {
+                    "value": "id",
+                    "label": "ckmc"
+                  },
+                  params: {
+
+                  }
+                },
+              },
+              {
+                label: '物品信息',
+                prop: 'wpxx',
+                span: 4,
+                type: 'input',
+                value: ''
+              },
+              {
+                label: '序列号',
+                prop: 'xlh',
+                span: 4,
+                type: 'input',
+                value: ''
+              },
+              {
+                label: '维护时间',
+                startProp: "kssj",
+                endProp: "jssj",
+                span: 6,
+                type: 'RelDaterangeV2',
+                startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
+                endValue: new Date().getTime(),
+              },
+            ],
+            [{
+              label: '案件信息',
+              prop: 'ajxx',
+              span: 4,
+              type: 'input',
+              value: ''
+            }, ]
           ],
 
         }

src/views/baseData/3d/index.vue

 <template>
   <div class="min_full">
-    <canvas class="full" id="three"></canvas>
+   <!-- <canvas class="full" id="three"></canvas> -->
   </div>
 </template>
 
@@ -18,7 +18,7 @@
   export default {
     mounted() {
       this.$nextTick(() => {
-        this.init()
+        // this.init()
       })
     },
     methods: {
@@ -36,12 +36,13 @@
 
 
         const camera = new THREE.PerspectiveCamera(50, window.innerWidth / window.innerHeight, 1, 10)
-        camera.position.set(0, 1, 5);
+        camera.position.set(0, 20, 5);
         /* 设置光源*/
 
         /* 加载器*/
         const loader = new GLTFLoader();
-        loader.load('/wcy/fanart/scene.gltf', function(gltf) {
+        loader.load('/wcy/ag/cp/scene.gltf', function(gltf) {
+          console.log(gltf,'加载成功')
           scene.add(gltf.scene);
           renderer.render(scene, camera)
           const controls = new OrbitControls(camera, renderer.domElement);
@@ -56,4 +57,4 @@
 </script>
 
 <style>
-</style>
\ No newline at end of file
+</style>

src/views/baseData/thing/dialog.vue

@@ -96,8 +96,8 @@
         if (this.b64) {
           this.loading = true
           var mimeString
-
-          function dataURItoBlob(dataURI) {
+           var name = `高拍仪图片.png`
+          function dataURItoBlob(dataURI){
             var byteString = atob(dataURI.split(',')[1]);
             mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0];
             var ab = new ArrayBuffer(byteString.length);
@@ -110,13 +110,14 @@
             });
           }
           // 将Base64数据转换为Blob对象
-          let name = `${new Date()}.png`
+
           var blob = dataURItoBlob(this.b64);
           var formData = new FormData();
-          formData.append('file', blob)
+          formData.append('file', blob,name)
           formData.append('type', mimeString)
           formData.append('name', name)
           formData.append('groupid', this.app.singleItem.id)
+          formData.append('folder', '')
           uploadAttachDownload(formData, this.app.baseUrl).then(res => {
             if (res.success) {
               this.$success('上传成功')

src/views/warehousing/extension/index.vue

@@ -76,10 +76,6 @@
                  }
                })
               })
-
-
-
-
             }else{
                this.$warning('请填入日期')
             }