liu_li
/
yxk-storeroom-system
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

3D库房配置是否显示/样式修改

master
xuhuajiao 3 years ago
parent
847680f4d7
commit
767bafda30
13 changed files with 134 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      public/webA/index.js
  2. 26
      public/webB/index.js
  3. 24
      public/webC/index.js
  4. 4
      src/views/archivesManage/archivesList/index.vue
  5. 3
      src/views/archivesManage/archivesList/mixins/archives.js
  6. 5
      src/views/components/echarts/lendAcross.vue
  7. 2
      src/views/components/echarts/typePie.vue
  8. 4
      src/views/home.vue
  9. 17
      src/views/storeManage/warehouse3D/archivesStorage/index.vue
  10. 14
      src/views/storeManage/warehouse3D/collateRoom/index.vue
  11. 2
      src/views/storeManage/warehouse3D/index.vue
  12. 14
      src/views/storeManage/warehouse3D/readRoom/index.vue
  13. 2
      src/views/system/archiveStatistics/index.vue

30
public/webA/index.js
View File

@ -22,6 +22,8 @@ var deviceData = [];
BABYLON.DefaultLoadingScreen.prototype.displayLoadingUI = function() {
if (document.getElementById("customLoadingScreenDiv")) {
document.getElementById("customLoadingScreenDiv").style.display = "initial";
// 给vue页面传值，加载完成之前
parent.getIframeLoading("true")
return;
}
@ -202,10 +204,10 @@ var moveTrans = function(move_transformNode) {
BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() {
show = 50;
document.getElementById("customLoadingScreenDiv").style.display = "none";
document.getElementById("customLoadingScreenDiv_first").style.display =
"none";
document.getElementById("customLoadingScreenDiv_first").style.display = "none";
document.title = "档案库";
//scene.getMaterialByName("材质.023").roughness = 0;
notmoveGroup = [
@ -340,7 +342,9 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() {
"#000000",
true
);
if(transformNodex.canshow == true){
xd.setEnabled(true);
}
} else {
var location = transformNodex.absolutePosition;
var xd = scene.getMeshByName("tapblue");
@ -372,10 +376,12 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() {
true
);
if(transformNodex.canshow == true){
xd.setEnabled(true);
}
}
}
}
)
);
@ -598,6 +604,11 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() {
yangan03.baojing = false;
yangan04.baojing = false;
yangan01.canshow = true;
yangan02.canshow = true;
yangan03.canshow = true;
yangan04.canshow = true;
yangan01.wendu = 0;
yangan01.sidu = 0;
yangan02.wendu = 0;
@ -616,6 +627,7 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() {
prepareGroupButtonOther(yangan03, new BABYLON.Color3(0, 0, 1));
prepareGroupButtonOther(yangan04, new BABYLON.Color3(0, 0, 1));
var x = scene.getMeshByName("档案架01_primitive0");
x.overlayColor = BABYLON.Color3.White();
x.renderOverlay = true;
@ -865,6 +877,9 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() {
material3.emissiveColor = new BABYLON.Color3(0.278, 0.278, 0.278);
material3.metallic = 0.87;
material3.roughness = 0;
// 给vue页面传值，加载完成之后
parent.getIframeLoading("false")
};
// createScene function that creates and return the scene
@ -1506,7 +1521,6 @@ var createScene = function() {
/*show--;
showdd--;*/
});
return scene;
};
@ -1674,6 +1688,16 @@ function setAlertValue(MathineID, wendu, sidu) {
}
//设置温湿度: setAlertValue("DAK_MO_OAO_001",4,5)
// 设置是否显示
function setYangGanCanshow(MathineID, canshow){
var theName = yangans.get(MathineID);
if(theName.indexOf("yangan") >= 0){
scene.getTransformNodeByName(theName).canshow = canshow;
}
}
// setYangGanCanshow("DAK_MO_OAO_001",false)
//功能：档案柜标点点击
// function cabinetClick(cabinet) {
// alert(cabinet.nameID);

26
public/webB/index.js
View File

@ -20,7 +20,8 @@ var deviceData = [];
BABYLON.DefaultLoadingScreen.prototype.displayLoadingUI = function() {
if (document.getElementById("customLoadingScreenDiv")) {
document.getElementById("customLoadingScreenDiv").style.display = "initial";
// 给vue页面传值，加载完成之前
parent.getIframeLoading("true")
return;
}
this._loadingDiv = document.createElement("div");
@ -166,7 +167,9 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() {
"#000000",
true
);
if(transformNodex.canshow == true){
xd.setEnabled(true);
}
} else {
var location = transformNodex.absolutePosition;
var xd = scene.getMeshByName("tapblue");
@ -198,10 +201,12 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() {
true
);
if(transformNodex.canshow == true){
xd.setEnabled(true);
}
}
}
}
)
);
@ -277,12 +282,16 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() {
camera05.baojing = false;
camera06.baojing = false;
var yangan05 = scene.getTransformNodeByName("yangan_4");
yangan05.name = "yangan05";
yangan05.nameID = "ZLS_MO_OAO_001";
yangan05.wendu = 0;
yangan05.sidu = 0;
yangan05.baojing = false;
yangan05.canshow = true;
prepareGroupButtonOther(yangan05, new BABYLON.Color3(0, 0, 1));
@ -491,6 +500,9 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() {
scene.getMaterialByName("Desk.018").roughness = 0.72;
scene.getMaterialByName("材质.29").metallic = 0.8;
// 给vue页面传值，加载完成之后
parent.getIframeLoading("false")
};
// createScene function that creates and return the scene
@ -933,11 +945,9 @@ function Myalert(MathineID, baojing) {
scene.getMeshByName("tapblue").setEnabled(false);
scene.getMeshByName("tapred").setEnabled(false);
var theName = yangans.get(MathineID);
alert(theName);
if (theName == "yangan05") {
scene.getTransformNodeByName("yangan05").baojing = baojing;
}
if (theName == "camera05") {
scene.getTransformNodeByName("camera05").baojing = baojing;
}
@ -959,6 +969,16 @@ function setAlertValue(MathineID, wendu, sidu) {
}
//设置温湿度: setAlertValue("DAK_MO_OAO_001",4,5)
// 设置是否显示
function setYangGanCanshow(MathineID, canshow){
var theName = yangans.get(MathineID);
if(theName == "yangan05"){
scene.getTransformNodeByName("yangan05").canshow = canshow;
}
}
// setYangGanCanshow("DAK_MO_OAO_001",false)
// function cameraClick(TheCamera) {
// alert(TheCamera.nameID);
// }

24
public/webC/index.js
View File

@ -21,7 +21,8 @@ var deviceData = [];
BABYLON.DefaultLoadingScreen.prototype.displayLoadingUI = function() {
if (document.getElementById("customLoadingScreenDiv")) {
document.getElementById("customLoadingScreenDiv").style.display = "initial";
// 给vue页面传值，加载完成之前
parent.getIframeLoading("true")
return;
}
this._loadingDiv = document.createElement("div");
@ -68,6 +69,7 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() {
yangan06.wendu = 0;
yangan06.sidu = 0;
yangan06.canshow = true;
var prepareGroupButtonOther = function(transformNodex, color) {
var mesheses = null;
@ -185,7 +187,9 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() {
"#000000",
true
);
if(transformNodex.canshow == true){
xd.setEnabled(true);
}
} else {
var location = transformNodex.absolutePosition;
var xd = scene.getMeshByName("tapblue");
@ -217,10 +221,12 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() {
true
);
if(transformNodex.canshow == true){
xd.setEnabled(true);
}
}
}
}
)
);
@ -481,6 +487,9 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() {
plane.position = new BABYLON.Vector3(0.11, 1.93, -0.28);
plane.rotation = new BABYLON.Vector3((90 * Math.PI) / 180, 0, 0);
plane.scaling = new BABYLON.Vector3(1.2, 0.8, 1);
// 给vue页面传值，加载完成之后
parent.getIframeLoading("false")
};
// createScene function that creates and return the scene
@ -890,9 +899,6 @@ function Myalert(MathineID, baojing) {
function setAlertValue(MathineID, wendu, sidu) {
var theName = yangans.get(MathineID);
console.log(theName);
console.log(wendu);
console.log(sidu);
if (theName == "yangan06") {
scene.getTransformNodeByName("yangan06").wendu = wendu;
scene.getTransformNodeByName("yangan06").sidu = sidu;
@ -901,6 +907,16 @@ function setAlertValue(MathineID, wendu, sidu) {
//设置温湿度: setAlertValue("DAK_MO_OAO_001",4,5)
// setAlertValue("YLS_MO_OAO_001", 4, 5);
// 设置是否显示
function setYangGanCanshow(MathineID, canshow){
var theName = yangans.get(MathineID);
if(theName == "yangan06"){
scene.getTransformNodeByName(theName).canshow = canshow;
}
}
// setYangGanCanshow("DAK_MO_OAO_001",false)
// function cameraClick(TheCamera) {
// alert(TheCamera.nameID);
// }

4
src/views/archivesManage/archivesList/index.vue
View File

@ -39,7 +39,7 @@
/>
<!-- 案卷 -->
<archivesAnjuan
v-if="( selectedCategory.isType === 2 && selectedCategory.children.length !==0 ) || selectedCategory.isType === 3 || selectedCategory.isType === 5"
v-if="( selectedCategory.isType === 2 && selectedCategory.children.length !== 0 ) || selectedCategory.isType === 3 || selectedCategory.isType === 5"
ref="anjuan"
:selected-category="selectedCategory"
:is-project="isProject"
@ -52,7 +52,7 @@
/>
<!-- 卷内 -->
<archivesJuannei
v-if="( selectedCategory.isType === 2 && selectedCategory.children.length !==0 && selectedCategory.children[0].children.length !==0 ) || ( selectedCategory.isType === 3 && selectedCategory.children.length !==0 ) || selectedCategory.isType === 4"
v-if="( selectedCategory.isType === 2 && selectedCategory.children.length !== 0 && selectedCategory.children[0].children.length !==0 ) || ( selectedCategory.isType === 3 && selectedCategory.children.length !==0 ) || selectedCategory.isType === 4"
ref="file"
:is-anjuan="isAnjuan"
:anjuan-selection="anjuanSelection"

3
src/views/archivesManage/archivesList/mixins/archives.js
View File

@ -174,6 +174,9 @@ export const archivesCrud = {
}
} else if (item.is_storage === 3) {
this.storageTxt[index] = '待出'
if (item.is_borrow === '') {
this.borrowTxt[index] = '-'
}
} else if (item.is_storage === '') {
this.storageTxt[index] = '未入'
if (item.is_borrow === '') {

5
src/views/components/echarts/lendAcross.vue
View File

@ -54,7 +54,7 @@ export default {
grid: { // 边距
left: '10%',
right: '16%',
bottom: '15%',
bottom: '3%',
top: '3%',
containLabel: true
},
@ -79,7 +79,7 @@ export default {
axisTick: {
show: false
},
data: ['在库档案', '已借档案', '待借档案', '逾期档案']
data: ['异常档案', '在库档案', '已借档案', '待借档案', '逾期档案']
},
series: [
{
@ -112,6 +112,7 @@ export default {
// }
color: function(params) {
var colorList = [
['#FF7A7D', '#FF3438'],
['#5FA2E2', '#1C54EE'],
['#84DFC0', '#0D9D81'],
['#FBCE9B', '#FF801E'],

2
src/views/components/echarts/typePie.vue
View File

@ -1,5 +1,5 @@
<template>
<!-- 档案类别 -->
<!-- 档案类型 -->
<div id="maintype" :style="{height:height,width:width}" />
</template>

4
src/views/home.vue
View File

@ -147,7 +147,7 @@
<span class="right-top-line" />
<span class="left-bottom-line" />
<h3 class="table-title">
<p class="title-arrow">档案类别</p>
<p class="title-arrow">档案类型</p>
</h3>
<div class="chart-wrapper">
<type-pie :type-data="typeData" />
@ -209,7 +209,7 @@ export default {
},
data() {
return {
lendData: [18203, 23489, 29034, 104970],
lendData: [100, 18203, 23489, 29034, 104970],
cateData: [1000, 700],
typeData: [1110, 2000, 800, 600, 900]
}

17
src/views/storeManage/warehouse3D/archivesStorage/index.vue
View File

@ -121,9 +121,12 @@ export default {
isScroll: false // 是否滚动
}
},
created() {
window.getIframeLoading = this.getIframeLoading // 把vue实例中的方法引用给window对象
},
mounted() {
const _this = this
this.iframeWin = this.$refs.myIframe.contentWindow
_this.iframeWin = this.$refs.myIframe.contentWindow
// inframe 加载完成之后
document.getElementById('myIframe').onload = function() {
_this.deviceState()
@ -131,6 +134,14 @@ export default {
window.addEventListener('message', this.handleMessageDevice)
},
methods: {
// 加载完成状态传值
getIframeLoading(value) {
// console.log(`我是iframe传过来的参数：${value}`)
if (value === 'false') {
this.handleHide('DAK_MO_OAO_001')
this.handleAlarm('DAK_MO_OAO_003')
}
},
// 传入设备状态data / 给iframe传初始值
deviceState(e) {
this.iframeWin.postMessage({
@ -182,6 +193,10 @@ export default {
handleAlarm(deviceId) {
window.frames['iframeMap'].Myalert(deviceId, true)
},
// 设置是否显示
handleHide(deviceId) {
window.frames['iframeMap'].setYangGanCanshow(deviceId, false)
},
getData() {
this.tableData = data1.rows
},

14
src/views/storeManage/warehouse3D/collateRoom/index.vue
View File

@ -26,6 +26,9 @@ export default {
return {
}
},
created() {
window.getIframeLoading = this.getIframeLoading // 把vue实例中的方法引用给window对象
},
mounted() {
const _this = this
this.iframeWin = this.$refs.myIframe.contentWindow
@ -36,6 +39,13 @@ export default {
// window.addEventListener('message', this.handleMessageDevice)
},
methods: {
// 加载完成状态传值
getIframeLoading(value) {
// console.log(`我是iframe传过来的参数：${value}`)
if (value === 'false') {
this.handleHide('ZLS_MO_OAO_001')
}
},
// 传入设备状态data / 给iframe传初始值
deviceState(e) {
this.iframeWin.postMessage({
@ -48,6 +58,10 @@ export default {
}
]
}, '*')
},
// 设置是否显示
handleHide(deviceId) {
window.frames['iframeMap'].setYangGanCanshow(deviceId, false)
}
// 点击查看设备状况
// handleMessageDevice(event) {

2
src/views/storeManage/warehouse3D/index.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="warehouse">
<div class="warehouse-main">
<div class="warehouse-tab">
<ul class="warehouse-nav">
<li :class="{ 'active-nav': activeIndex == 0 }" @click="changeActiveTab(0)">

14
src/views/storeManage/warehouse3D/readRoom/index.vue
View File

@ -28,6 +28,9 @@ export default {
tableData: []
}
},
created() {
window.getIframeLoading = this.getIframeLoading // 把vue实例中的方法引用给window对象
},
mounted() {
const _this = this
this.iframeWin = this.$refs.myIframe.contentWindow
@ -38,6 +41,13 @@ export default {
// window.addEventListener('message', this.handleMessageDevice)
},
methods: {
// 加载完成状态传值
getIframeLoading(value) {
// console.log(`我是iframe传过来的参数：${value}`)
if (value === 'false') {
this.handleHide('YLS_MO_OAO_001')
}
},
// 传入设备状态data / 给iframe传初始值
deviceState(e) {
this.iframeWin.postMessage({
@ -50,6 +60,10 @@ export default {
}
]
}, '*')
},
// 设置是否显示
handleHide(deviceId) {
window.frames['iframeMap'].setYangGanCanshow(deviceId, false)
}
// 点击查看设备状况
// handleMessageDevice(event) {

2
src/views/system/archiveStatistics/index.vue
View File

@ -97,7 +97,7 @@ export default {
components: { lendAcross, catePie, typePie, BarEcharts, AcrossBar, LineEchart },
data() {
return {
lendData: [18203, 23489, 29034, 104970],
lendData: [100, 18203, 23489, 29034, 104970],
cateData: [1000, 700],
typeData: [1110, 2000, 800, 600, 900]
}

Write Preview
Loading…
Cancel
Save