Skip to content

S
shhjwpgl-vue
Commit d27561b4 authored by 李苏's avatar 李苏 💬
Browse files
Options

调整

parent 025692c5
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 91 deletions
src/views/analysis/query/index.vue
View file @ d27561b4
...@@ -71,30 +71,30 @@ ...@@ -71,30 +71,30 @@
{ {
title: "物品编码", title: "物品编码",
field: "wpbm", field: "wpbm",
width: 120, width: 120,
}, },
{ {
title: "物品名称", title: "物品名称",
field: "wpmc", field: "wpmc",
width: 100, width: 100,
}, },
{ {
title: "物品特征", title: "物品特征",
field: "wptz", field: "wptz",
width: 200, width: 200,
}, },
{ {
title: "数量", title: "数量",
field: "count", field: "count",
width: 140, width: 140,
}, },
{ {
title: "物品持有人", title: "物品持有人",
field: "wpcyr", field: "wpcyr",
width: 140, width: 140,
}, },
{ {
title: "案件编码", title: "案件编码",
...@@ -129,83 +129,76 @@ ...@@ -129,83 +129,76 @@
{ {
title: "部门", title: "部门",
field: "bm", field: "bm",
width: 140, width: 140,
"transform": { "transform": {
"url": "hjbm/query", "url": "hjbm/query",
"label": "bmmc", "label": "bmmc",
"value": "bmid" "value": "bmid"
} }
}, },
], ],
queryParams: [ queryParams: [
[{ [{
label: '部门', label: '部门',
prop: 'ssbm', prop: 'ssbm',
span: 4, span: 4,
type: 'RelSelect', type: 'RelSelect',
"typeConfig": { "typeConfig": {
"src": "hjbm/query", "src": "hjbm/query",
"match": { "match": {
"value": "bmid", "value": "bmid",
"label": "bmmc" "label": "bmmc"
}, },
} }
}, },
{ {
label: '仓库', label: '仓库',
prop: 'ckid', prop: 'ckid',
span: 4, span: 4,
"type": "RelSelect", "type": "RelSelect",
"typeConfig": { "typeConfig": {
"src": "jcsj/u_ckwh/query", "src": "jcsj/u_ckwh/query",
"match": { "match": {
"value": "id", "value": "id",
"label": "ckmc" "label": "ckmc"
}, },
params: { params: {
} }
}, },
}, },
{ {
label: '物品信息', label: '物品信息',
prop: 'wpxx', prop: 'wpxx',
span: 4, span: 4,
type: 'input', type: 'input',
value: '' value: ''
}, },
{
{ label: '序列号',
label: '序列号', prop: 'xlh',
prop: 'xlh', span: 4,
span: 4, type: 'input',
type: 'input', value: ''
value: '' },
}, {
{ label: '维护时间',
label: '维护时间', startProp: "kssj",
startProp: "kssj", endProp: "jssj",
endProp: "jssj", span: 6,
span: 6, type: 'RelDaterangeV2',
type: 'RelDaterangeV2', startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30, endValue: new Date().getTime(),
endValue: new Date().getTime(), },
}, ],
[{
label: '案件信息',
], prop: 'ajxx',
[ span: 4,
{ type: 'input',
label: '案件信息', value: ''
prop: 'ajxx', }, ]
span: 4,
type: 'input',
value: ''
},
]
], ],
} }
......
src/views/baseData/3d/index.vue
View file @ d27561b4
<template> <template>
<div class="min_full"> <div class="min_full">
<canvas class="full" id="three"></canvas> <!-- <canvas class="full" id="three"></canvas> -->
</div> </div>
</template> </template>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
export default { export default {
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
this.init() // this.init()
}) })
}, },
methods: { methods: {
...@@ -36,12 +36,13 @@ ...@@ -36,12 +36,13 @@
const camera = new THREE.PerspectiveCamera(50, window.innerWidth / window.innerHeight, 1, 10) 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(); 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); scene.add(gltf.scene);
renderer.render(scene, camera) renderer.render(scene, camera)
const controls = new OrbitControls(camera, renderer.domElement); const controls = new OrbitControls(camera, renderer.domElement);
...@@ -56,4 +57,4 @@ ...@@ -56,4 +57,4 @@
</script> </script>
<style> <style>
</style> </style>
\ No newline at end of file
src/views/baseData/thing/dialog.vue
View file @ d27561b4
...@@ -96,8 +96,8 @@ ...@@ -96,8 +96,8 @@
if (this.b64) { if (this.b64) {
this.loading = true this.loading = true
var mimeString var mimeString
var name = `高拍仪图片.png`
function dataURItoBlob(dataURI) { function dataURItoBlob(dataURI){
var byteString = atob(dataURI.split(',')[1]); var byteString = atob(dataURI.split(',')[1]);
mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0]; mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0];
var ab = new ArrayBuffer(byteString.length); var ab = new ArrayBuffer(byteString.length);
...@@ -110,13 +110,14 @@ ...@@ -110,13 +110,14 @@
}); });
} }
// 将Base64数据转换为Blob对象 // 将Base64数据转换为Blob对象
let name = `${new Date()}.png`
var blob = dataURItoBlob(this.b64); var blob = dataURItoBlob(this.b64);
var formData = new FormData(); var formData = new FormData();
formData.append('file', blob) formData.append('file', blob,name)
formData.append('type', mimeString) formData.append('type', mimeString)
formData.append('name', name) formData.append('name', name)
formData.append('groupid', this.app.singleItem.id) formData.append('groupid', this.app.singleItem.id)
formData.append('folder', '')
uploadAttachDownload(formData, this.app.baseUrl).then(res => { uploadAttachDownload(formData, this.app.baseUrl).then(res => {
if (res.success) { if (res.success) {
this.$success('上传成功') this.$success('上传成功')
......
src/views/warehousing/extension/index.vue
View file @ d27561b4
...@@ -76,10 +76,6 @@ ...@@ -76,10 +76,6 @@
} }
}) })
}) })
}else{ }else{
this.$warning('请填入日期') this.$warning('请填入日期')
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment