Compare commits

...

3 Commits

Author SHA1 Message Date
何嘉峣 2871ac375d 代码提交 2023-01-13 17:54:46 +08:00
何嘉峣 4db321ae10 代码提交 2023-01-13 17:27:55 +08:00
何嘉峣 694b79ecc2 代码提交 2023-01-13 17:27:00 +08:00
26 changed files with 46 additions and 40 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"remainingRequest":"D:\\Hjm项目\\TransFlow\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\Hjm项目\\TransFlow\\src\\views\\bounced\\analysisConfiguration.vue","dependencies":[{"path":"D:\\Hjm项目\\TransFlow\\src\\views\\bounced\\analysisConfiguration.vue","mtime":1673597053892},{"path":"D:\\Hjm项目\\TransFlow\\node_modules\\cache-loader\\dist\\cjs.js","mtime":499162500000},{"path":"D:\\Hjm项目\\TransFlow\\node_modules\\vue-loader\\lib\\index.js","mtime":499162500000}],"contextDependencies":[],"result":["import { render, staticRenderFns } from \"./analysisConfiguration.vue?vue&type=template&id=fd3d0d46&scoped=true&\"\nimport script from \"./analysisConfiguration.vue?vue&type=script&lang=js&\"\nexport * from \"./analysisConfiguration.vue?vue&type=script&lang=js&\"\nimport style0 from \"./analysisConfiguration.vue?vue&type=style&index=0&id=fd3d0d46&lang=scss&scoped=true&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n \"fd3d0d46\",\n null\n \n)\n\n/* hot reload */\nif (module.hot) {\n var api = require(\"D:\\\\Hjm项目\\\\TransFlow\\\\node_modules\\\\vue-hot-reload-api\\\\dist\\\\index.js\")\n api.install(require('vue'))\n if (api.compatible) {\n module.hot.accept()\n if (!api.isRecorded('fd3d0d46')) {\n api.createRecord('fd3d0d46', component.options)\n } else {\n api.reload('fd3d0d46', component.options)\n }\n module.hot.accept(\"./analysisConfiguration.vue?vue&type=template&id=fd3d0d46&scoped=true&\", function () {\n api.rerender('fd3d0d46', {\n render: render,\n staticRenderFns: staticRenderFns\n })\n })\n }\n}\ncomponent.options.__file = \"src/views/bounced/analysisConfiguration.vue\"\nexport default component.exports"]} {"remainingRequest":"D:\\Hjm项目\\TransFlow\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\Hjm项目\\TransFlow\\src\\views\\bounced\\analysisConfiguration.vue","dependencies":[{"path":"D:\\Hjm项目\\TransFlow\\src\\views\\bounced\\analysisConfiguration.vue","mtime":1673602454977},{"path":"D:\\Hjm项目\\TransFlow\\node_modules\\cache-loader\\dist\\cjs.js","mtime":499162500000},{"path":"D:\\Hjm项目\\TransFlow\\node_modules\\vue-loader\\lib\\index.js","mtime":499162500000}],"contextDependencies":[],"result":["import { render, staticRenderFns } from \"./analysisConfiguration.vue?vue&type=template&id=fd3d0d46&scoped=true&\"\nimport script from \"./analysisConfiguration.vue?vue&type=script&lang=js&\"\nexport * from \"./analysisConfiguration.vue?vue&type=script&lang=js&\"\nimport style0 from \"./analysisConfiguration.vue?vue&type=style&index=0&id=fd3d0d46&lang=scss&scoped=true&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n \"fd3d0d46\",\n null\n \n)\n\n/* hot reload */\nif (module.hot) {\n var api = require(\"D:\\\\Hjm项目\\\\TransFlow\\\\node_modules\\\\vue-hot-reload-api\\\\dist\\\\index.js\")\n api.install(require('vue'))\n if (api.compatible) {\n module.hot.accept()\n if (!api.isRecorded('fd3d0d46')) {\n api.createRecord('fd3d0d46', component.options)\n } else {\n api.reload('fd3d0d46', component.options)\n }\n module.hot.accept(\"./analysisConfiguration.vue?vue&type=template&id=fd3d0d46&scoped=true&\", function () {\n api.rerender('fd3d0d46', {\n render: render,\n staticRenderFns: staticRenderFns\n })\n })\n }\n}\ncomponent.options.__file = \"src/views/bounced/analysisConfiguration.vue\"\nexport default component.exports"]}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"remainingRequest":"D:\\Hjm项目\\TransFlow\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\Hjm项目\\TransFlow\\src\\views\\AnalysisMain.vue","dependencies":[{"path":"D:\\Hjm项目\\TransFlow\\src\\views\\AnalysisMain.vue","mtime":1673507216982},{"path":"D:\\Hjm项目\\TransFlow\\node_modules\\cache-loader\\dist\\cjs.js","mtime":499162500000},{"path":"D:\\Hjm项目\\TransFlow\\node_modules\\vue-loader\\lib\\index.js","mtime":499162500000}],"contextDependencies":[],"result":["import { render, staticRenderFns } from \"./AnalysisMain.vue?vue&type=template&id=689d6d6f&\"\nimport script from \"./AnalysisMain.vue?vue&type=script&lang=js&\"\nexport * from \"./AnalysisMain.vue?vue&type=script&lang=js&\"\nimport style0 from \"./AnalysisMain.vue?vue&type=style&index=0&lang=css&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n null,\n null\n \n)\n\n/* hot reload */\nif (module.hot) {\n var api = require(\"D:\\\\Hjm项目\\\\TransFlow\\\\node_modules\\\\vue-hot-reload-api\\\\dist\\\\index.js\")\n api.install(require('vue'))\n if (api.compatible) {\n module.hot.accept()\n if (!api.isRecorded('689d6d6f')) {\n api.createRecord('689d6d6f', component.options)\n } else {\n api.reload('689d6d6f', component.options)\n }\n module.hot.accept(\"./AnalysisMain.vue?vue&type=template&id=689d6d6f&\", function () {\n api.rerender('689d6d6f', {\n render: render,\n staticRenderFns: staticRenderFns\n })\n })\n }\n}\ncomponent.options.__file = \"src/views/AnalysisMain.vue\"\nexport default component.exports"]} {"remainingRequest":"D:\\Hjm项目\\TransFlow\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\Hjm项目\\TransFlow\\src\\views\\AnalysisMain.vue","dependencies":[{"path":"D:\\Hjm项目\\TransFlow\\src\\views\\AnalysisMain.vue","mtime":1673602077978},{"path":"D:\\Hjm项目\\TransFlow\\node_modules\\cache-loader\\dist\\cjs.js","mtime":499162500000},{"path":"D:\\Hjm项目\\TransFlow\\node_modules\\vue-loader\\lib\\index.js","mtime":499162500000}],"contextDependencies":[],"result":["import { render, staticRenderFns } from \"./AnalysisMain.vue?vue&type=template&id=689d6d6f&\"\nimport script from \"./AnalysisMain.vue?vue&type=script&lang=js&\"\nexport * from \"./AnalysisMain.vue?vue&type=script&lang=js&\"\nimport style0 from \"./AnalysisMain.vue?vue&type=style&index=0&lang=css&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n null,\n null\n \n)\n\n/* hot reload */\nif (module.hot) {\n var api = require(\"D:\\\\Hjm项目\\\\TransFlow\\\\node_modules\\\\vue-hot-reload-api\\\\dist\\\\index.js\")\n api.install(require('vue'))\n if (api.compatible) {\n module.hot.accept()\n if (!api.isRecorded('689d6d6f')) {\n api.createRecord('689d6d6f', component.options)\n } else {\n api.reload('689d6d6f', component.options)\n }\n module.hot.accept(\"./AnalysisMain.vue?vue&type=template&id=689d6d6f&\", function () {\n api.rerender('689d6d6f', {\n render: render,\n staticRenderFns: staticRenderFns\n })\n })\n }\n}\ncomponent.options.__file = \"src/views/AnalysisMain.vue\"\nexport default component.exports"]}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -229,12 +229,7 @@
console.log("组件名称",name) console.log("组件名称",name)
window.parent.getSimulationAreaEdit(id,type,componentType,name); window.parent.getSimulationAreaEdit(id,type,componentType,name);
} }
//删除模拟区组件
function delComponent(data){
if(unity!=null){
unity.SendMessage("GameManager",'Unity_DeleteGraphicNode',data);
}
}
document.body.appendChild(script); document.body.appendChild(script);

View File

@ -17,8 +17,8 @@
"pointName": "点2", "pointName": "点2",
"longitude": "1", "longitude": "1",
"latitude": "1", "latitude": "1",
"imageXCoordinate": "440.7274 ", "imageXCoordinate": "29.09",
"imageYCoordinate": "219.3819" "imageYCoordinate": "1056.38"
}] }]
} }
} }

View File

@ -147,6 +147,12 @@
} }
window.parent.saveCoordinate(obj) window.parent.saveCoordinate(obj)
} }
function getDestination(string){
console.log(string,'hjm');
if(unityInstanceA!=null){
unityInstanceA.SendMessage('AAA', 'SendImage', JSON.stringify(string));
}
}
function deletePoint(string){ function deletePoint(string){
unityInstanceA.SendMessage('GameManager','WebToUnityDeletePont',JSON.stringify(string)); unityInstanceA.SendMessage('GameManager','WebToUnityDeletePont',JSON.stringify(string));
} }

View File

@ -473,6 +473,7 @@ export default {
}, },
data() { data() {
return { return {
unityDone:false,
oldName:'', oldName:'',
formRules:{ formRules:{
pointName: [ pointName: [
@ -637,7 +638,11 @@ export default {
analysisConfigurationdata:{ analysisConfigurationdata:{
handler:function(old,newV){ handler:function(old,newV){
console.log("old",old) console.log("old",old)
console.log("newV",newV) console.log("newV",newV)
if(newV!=null&&this.unityDone==true){
console.log(newV,'yyy');
this.$refs.analysisWeb.contentWindow.getDestination(newV)
}
} }
} }
@ -677,7 +682,6 @@ export default {
mounted(){ mounted(){
window.OnSceneload = this.OnSceneload; window.OnSceneload = this.OnSceneload;
window.saveCoordinate = this.saveCoordinate; window.saveCoordinate = this.saveCoordinate;
}, },
methods: { methods: {
saveCoordinate(obj){ saveCoordinate(obj){
@ -710,8 +714,9 @@ export default {
}) })
}, },
OnSceneload(){ OnSceneload(newV){
this.$refs.analysisWeb.contentWindow.getDianwei(this.$route.query.id) this.$refs.analysisWeb.contentWindow.getDianwei(this.$route.query.id)
this.unityDone=true
}, },
handleDeleteDian(row){ handleDeleteDian(row){
this.$confirm('此操作将删除该点位, 是否继续?', '提示', { this.$confirm('此操作将删除该点位, 是否继续?', '提示', {

View File

@ -82,16 +82,16 @@
</el-dialog> --> </el-dialog> -->
<el-drawer <el-drawer
class="new-dialog" class="new-dialog"
:visible.sync="dialogFormVisible" :visible.sync="dialogFormVisible"
direction="btt" direction="btt"
custom-class="demo-drawer" custom-class="demo-drawer"
ref="drawer" ref="drawer"
:modal="false" :modal="false"
:close-on-click-modal="false" :close-on-click-modal="false"
v-alterELDialogMarginTop="{marginTop:'0vh'}" customClass='customWidth' width="100%" v-alterELDialogMarginTop="{marginTop:'0vh'}" customClass='customWidth' width="100%"
:wrapperClosable="false" :wrapperClosable="false"
:with-header="false" :with-header="false"
> >
<div class="formBox"> <div class="formBox">
<el-form ref="form" :model="form" label-width="80px" :inline="true"> <el-form ref="form" :model="form" label-width="80px" :inline="true">
<el-form-item label="组件名称"> <el-form-item label="组件名称">
@ -355,7 +355,7 @@ export default {
loadingShow1: true, loadingShow1: true,
number:'', number:'',
componentId:'', componentId:'',
analysisConfigurationdata:'' analysisConfigurationdata:{}
// carInfo: [], // // carInfo: [], //
// carName: '', // carName: '',
// palletizerInfo: [], // // palletizerInfo: [], //