Skip to content

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

上海海警部分调整

parent ef65c839
Hide whitespace changes
Inline Side-by-side
Showing with 155 additions and 27 deletions
.env.development
View file @ 5d4e553d
...@@ -6,7 +6,7 @@ ENV = 'http://demo.ruoyi.vip/' ...@@ -6,7 +6,7 @@ ENV = 'http://demo.ruoyi.vip/'
# 格物管理系统/开发环境 # 格物管理系统/开发环境
VUE_APP_BASE_API = '/dev-api' VUE_APP_BASE_API = '/dev-api'
VUE_APP_BASE_Print = 'http://192.168.30.254:18080/dmg' VUE_APP_BASE_Print = 'http://localhost:9080/shhj'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true
.env.production
View file @ 5d4e553d
...@@ -6,6 +6,7 @@ ENV = 'production' ...@@ -6,6 +6,7 @@ ENV = 'production'
# shhjwpgl/生产环境 # shhjwpgl/生产环境
VUE_APP_BASE_API = 'http://192.168.30.254:28084/erp' VUE_APP_BASE_API = 'http://192.168.30.254:28084/erp'
VUE_APP_BASE_Print = 'http://localhost:9080/shhj'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true
src/views/baseData/3d/index.vue
View file @ 5d4e553d
<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: {
...@@ -33,20 +33,82 @@ ...@@ -33,20 +33,82 @@
}) })
renderer.setPixelRatio(window.devicePixelRatio); renderer.setPixelRatio(window.devicePixelRatio);
renderer.setSize(window.innerWidth, window.innerHeight); renderer.setSize(window.innerWidth, window.innerHeight);
const camera = new THREE.PerspectiveCamera(90, window.innerWidth / window.innerHeight, 0.1, 1000)
camera.position.set(2, 1, 4.2);
/* 设置光源*/
// 创建球体
const geometry = new THREE.SphereGeometry(0.3, 32, 32);
const material = new THREE.MeshBasicMaterial();
// 加载图片纹理
const textureLoader = new THREE.TextureLoader();
const texture = textureLoader.load('/pkq/pkq/textures/lq.jpg');
// 设置材质的 map 属性为加载的纹理
material.map = texture;
const sphere = new THREE.Mesh(geometry, material);
sphere.position.x = 1;
sphere.position.y = 0.3;
sphere.position.z =1;
let fx='r'
function animate() {
// 改变球体的旋转属性
sphere.rotation.x += 0.01;
sphere.rotation.y += 0.01;
const camera = new THREE.PerspectiveCamera(50, window.innerWidth / window.innerHeight, 1, 10) if(sphere.position.x<=2&&(fx=='r')){
camera.position.set(0, 20, 5); sphere.position.x += 0.01;
/* 设置光源*/ console.log(sphere.position.x>1.91)
if(sphere.position.x>1.91){
fx='l'
}
}else if(sphere.position.x>=-2&&(fx=='l')){
sphere.position.x -= 0.01;
if(sphere.position.x<-1.91){
fx='r'
}
}
// 渲染场景
renderer.render(scene, camera);
// 请求下一帧动画
requestAnimationFrame(animate);
}
animate();
// 将球体添加到场景中
scene.add(sphere);
// const axes = new THREE.AxesHelper(2);
// scene.add(axes);
// 创建网格
const grid = new THREE.GridHelper(8, 100);
scene.add(grid);
/* 创建方体*/
(()=>{
const width = 2; // 立方体宽度
const height = 4; // 立方体高度
const depth = 0.2; // 立方体深度
const position = new THREE.Vector3(-1.0, 2, -1); // 立方体位置
const geometry = new THREE.BoxGeometry(width, height, depth); // 创建立方体几何体
const material = new THREE.MeshBasicMaterial(); // 创建基本材质（白色）
const textureLoader = new THREE.TextureLoader();
const texture = textureLoader.load('/pkq/pkq/textures/nn.jpg');
// 设置材质的 map 属性为加载的纹理
material.map = texture;
const cube = new THREE.Mesh(geometry, material); // 创建网格模型
cube.position.copy(position); // 设置立方体位置
scene.add(cube); // 将立方体添加到场景中
})()
/* 加载器*/ /* 加载器*/
const loader = new GLTFLoader(); const loader = new GLTFLoader();
loader.load('/wcy/ag/cp/scene.gltf', function(gltf) { loader.load('/pkq/pkq/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);
controls.addEventListener('change', function() { controls.addEventListener('change', function() {
console.log(camera.position,'camera')
renderer.render(scene, camera); renderer.render(scene, camera);
}); //监听 }); //监听
/* 加载模型动画*/ /* 加载模型动画*/
......
src/views/baseData/case/index.vue
View file @ 5d4e553d
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
formatter(a,b,c){ formatter(a,b,c){
let map={ let map={
0:'行政案件', 0:'行政案件',
1:'刑事案件' 1:'刑事案件',
} }
let value=map[c]||'未知' let value=map[c]||'未知'
return value return value
...@@ -68,7 +68,8 @@ ...@@ -68,7 +68,8 @@
formatter(a,b,c){ formatter(a,b,c){
let map={ let map={
0:'办结', 0:'办结',
1:'在办' 1:'在办',
2:'移交'
} }
let value=map[c]||'未知' let value=map[c]||'未知'
return value return value
...@@ -132,8 +133,17 @@ ...@@ -132,8 +133,17 @@
methods: { methods: {
tz(ctx){ tz(ctx){
if(ctx.singleItem&&ctx.singleItem.id){ if(ctx.singleItem&&ctx.singleItem.id){
ctx.DialogTitle='修改状态' /* 查询最新数据赋值*/
ctx.showDialog=true this.$post('jcsj/u_ajgl/query',{
id:ctx.singleItem.id
}).then(res=>{
/* 更新为最新*/
ctx.singleItem=res.data.records[0]
ctx.DialogTitle='修改状态'
ctx.showDialog=true
})
}else{ }else{
this.$warning('请选择一条数据') this.$warning('请选择一条数据')
} }
......
src/views/baseData/case/tzzt.vue
View file @ 5d4e553d
...@@ -35,6 +35,19 @@ ...@@ -35,6 +35,19 @@
}, },
data() { data() {
return { return {
ajzt:[{
name: '办结',
id: 0
},
{
name: '在办',
id: 1
},
{
name: '移交',
id: 2
}
],
readonly: false, readonly: false,
editColItemList: [{ editColItemList: [{
label: '案件编码', label: '案件编码',
...@@ -78,20 +91,59 @@ ...@@ -78,20 +91,59 @@
type: 'RelSelect', type: 'RelSelect',
required: true, required: true,
typeConfig: { typeConfig: {
optionsData: [{ optionsData:[
// {
// name: '办结',
// id: 0
// },
// {
// name: '在办',
// id: 1
// },
// {
// name: '移交',
// id: 2
// }
],
},
}
]
}
},
computed:{
ajlx(){
return this.form.ajlx
}
},
watch:{
ajlx(val){
if(val==1){
this.editColItemList[3].typeConfig.optionsData= [{
name: '办结', name: '办结',
id: 0 id: 0
}, },
{ {
name: '在办', name: '在办',
id: 1 id: 1
},
{
name: '移交',
id: 2
} }
] ]
}, }else{
} this.editColItemList[3].typeConfig.optionsData=[{
name: '办结',
] id: 0
},
{
name: '在办',
id: 1
}
]
}
} }
}, },
methods: { methods: {
......
src/views/baseData/thing/index.vue
View file @ 5d4e553d
...@@ -169,21 +169,21 @@ ...@@ -169,21 +169,21 @@
{ {
label: '物品信息', label: '物品信息',
prop: 'wpxx', prop: 'wpxx',
span: 3, span: 4,
type: 'input', type: 'input',
value: '' value: ''
}, },
{ {
label: '案件号', label: '案件号',
prop: 'ajbm', prop: 'ajbm',
span: 3, span: 5,
type: 'input', type: 'input',
value: '' value: ''
}, },
{ {
label: '序列号', label: '序列号',
prop: 'xlh', prop: 'xlh',
span: 4, span: 5,
type: 'input', type: 'input',
value: '' value: ''
}, },
...@@ -196,6 +196,10 @@ ...@@ -196,6 +196,10 @@
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: '仓库', label: '仓库',
prop: 'ckid', prop: 'ckid',
...@@ -212,8 +216,7 @@ ...@@ -212,8 +216,7 @@
} }
}, },
}, },
]
],
], ],
...@@ -225,7 +228,7 @@ ...@@ -225,7 +228,7 @@
tz(ctx) { tz(ctx) {
if (ctx.singleItem && ctx.singleItem.id) { if (ctx.singleItem && ctx.singleItem.id) {
this.$post('jcsj/u_wpgl/sync', { this.$post('jcsj/u_wpgl/sync', {
id: ctx.singleItem.id id: ctx.singleItem.id
...@@ -248,8 +251,8 @@ ...@@ -248,8 +251,8 @@
} else { } else {
this.$warning('请选择一条数据') this.$warning('请选择一条数据')
} }
}, },
getRow(e) { getRow(e) {
this.rowItem = e this.rowItem = e
......
vue.config.js
View file @ 5d4e553d
...@@ -39,7 +39,7 @@ module.exports = { ...@@ -39,7 +39,7 @@ module.exports = {
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.30.254:18080/dmg`, // target: `http://192.168.30.254:18080/dmg`,
// target: `http://192.168.30.254:28084/erp`, // target: `http://192.168.30.254:28084/erp`,
target: `http://localhost:9080/shhj`, target: `http://localhost:9081/shhj`,
// target:'http://192.168.30.105:9081/erp', // target:'http://192.168.30.105:9081/erp',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
......
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