zz

src/components/MyTable/index.vue

@@ -1,10 +1,19 @@
 <template>
   <div class="table-box">
-    <el-table :data="tableData" style="background-color: transparent;">
+    <el-table class="table-el" :data="tableData" style="background-color: transparent;">
       <el-table-column v-for="column in columns" :key="column.prop" :prop="column.prop" :label="column.label" :width="column.width">
-      
+        <template slot-scope="scope">
+          <div v-if="column.prop=='operationDelete'">
+            <button class="imgOperationDelete" @click="handleDelete(scope.row[column.prop])"></button>
+          </div>
+          <div v-if="column.prop=='operationEdit'">
+            <button class="imgOperationEdit" @click="handleEdit(scope.row)"></button>
+          </div>
+          <div v-if="column.prop!=='operationDelete' && column.prop!=='operationEdit'">{{scope.row[column.prop]}}</div>
+        </template>
       </el-table-column>
     </el-table>
+    <button class="imgOperationAdd" @click="handleAdd()"></button>
   </div>
 </template>
 
@@ -19,10 +28,51 @@ export default {
       type: Array,
       required: true
     },
+    handleDelete: Function,
+    handleEdit: Function,
+    handleAdd: Function,
   }
 };
 </script>
 <style>
+.imgOperationDelete{
+  background-image: url(../../assets/delete.png);
+  background-color:transparent;
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  height: 20px;
+  width: 20px;
+}
+
+.imgOperationEdit{
+  background-image: url(../../assets/edit.png);
+  background-color:transparent;
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  height: 20px;
+  width: 20px;
+}
+.flex-container {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100vh; /* or any other height */
+}
+.imgOperationAdd{
+  background-image: url(../../assets/add.png);
+  background-color:transparent;
+  background-repeat: no-repeat;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-size: 100% 100%;
+  height: 20px;
+  width: 20px;
+  display: block;
+    margin-left: auto;
+    margin-right: auto;
+}
+
 .el-table__header-wrapper,.el-table__body-wrapper,.el-table__cell,tr {
   background-color: transparent !important;
   color: #ebebeb !important;
@@ -55,6 +105,15 @@ tbody tr {
 }
 
 .table-box{
+  width: 70vw;
+  height: 70vh;
+}
+
+.table-el{
+  background-color: transparent;
+  overflow: auto;
+  width: 70vw;
+  height: 65vh;
 }
 
 </style>

src/main.js

@@ -29,22 +29,12 @@ Vue.use(vuescroll, {
 
 Vue.config.productionTip = false;
 
-var strUrl=window.location.href;
-var strIp = "";
-if(strUrl.indexOf("172.16.50.4")!=-1)
-{
-  strIp = "172.16.50.4:19703";
-}
-else
-{
-  strIp = "47.102.97.214";
-}
+var strIp = "121.42.8.157:19702";
 
 Vue.use(
   new VueSocketIO({
     debug: true,
     connection: "ws://" + strIp,
-    //connection: "ws://121.42.8.157:19703",
     options: {
       transports: ["websocket", "polling"],
     },
@@ -145,7 +135,7 @@ window.vm = new Vue({
   store,
   // store,
   render: (h) => h(App),
-})
+}).$mount('#app')
 
 // window.vm.initService();
 

src/uwb-sample.js

@@ -1,6 +1,3 @@
-//import { FBXLoader } from "./FBXLoader.js";
-//import { GLTFLoader } from "three/addons/loaders/GLTFLoader.js";
-//import { MeshBasicMaterial, MeshStandardMaterial, Vector3 } from "three";
 import Vue from "vue";
 import fetchAndCombine from "../public/loader/loader";
 import { UWB } from "../public/plugin/uwb/index.js";
@@ -27,18 +24,31 @@ window.benchMeshMap = {};
 window.benchMeshWaterMap = {};
 window.benchDBList = null
 
+//export function exesql(sqlstr) {
+//    console.log(sqlstr);
+//    let msg = {
+//      cmd: "query", // server端要进行判断的
+//      data: {
+//        name: "name", // 这个无所谓怎么写，有就行
+//        sql: sqlstr,
+//      },
+//    };
+//    // 触发事件进行从服务器获取数据
+//    window.vm.$socket.emit("REPT", msg, (datas) => {
+//      return datas.data;
+//    });
+//}
+
+
 function getsqlData(sdkInstance, uwbInstance, bAddModel) {
   let g_PosArrayResult = null;
   if (g_PosArrayResult == null) {
     var sqlstr = "SELECT * FROM dat_bench_extend order by bench_id asc";
-
-    //sqlstr = sqlstr.format(two_seconds_ago, two_seconds_ago)
     console.log(sqlstr);
     let msg = {
       cmd: "query", // server端要进行判断的
       data: {
         name: "name", // 这个无所谓怎么写，有就行
-        //sql: 'select * from his_location_tadiao_result_unity limit 300'
         sql: sqlstr,
       },
     };
@@ -53,7 +63,6 @@ function getsqlData(sdkInstance, uwbInstance, bAddModel) {
       var one_second_ago = new Date(now.getTime() - 1 * 1000).Format(
         "yyyy-MM-dd hh:mm:ss.S"
       );
-
       {
         let result = g_PosArrayResult;
         for (var item of result) {
@@ -732,28 +741,6 @@ export function uwbMain(domId, modelWidth, modelHeight, finalMode, callback) {
 
         if (g_fbxLoader == null) {
           g_fbxLoader = new THREE.GLTFLoader();
-          // g_fbxLoader.load("../models/mesh2.gltf", function (fbx) {
-          //   let ambientLight = new THREE.AmbientLight(0xffffff); //设置环境光
-          //   sdkInstance.sceneRenderer.scene.add(ambientLight); //将环境光添加到场景中
-          //   let pointLight = new THREE.PointLight(0xffffff, 1, 0);
-          //   pointLight.position.set(200, 200, 200); //设置点光源位置
-          //   sdkInstance.sceneRenderer.scene.add(pointLight); //将点光源添加至场景
-          //   g_fbx = fbx;
-          //   console.log("控制台查看加载gltf文件返回的对象结构", fbx);
-          //   //fbx.scene.children[0].children[0].scale.set(5, 5, 5)
-          //   //window.shader = new THREE.MeshStandardMaterial(fbx.scene.children[0].children[0].material);
-          //   //window.shader1 = new THREE.MeshStandardMaterial(fbx.scene.children[0].children[0].material);
-          // });
-          // if (false) {
-          //   sqlQueryInited = true;
-          //   var index = 0;
-          //   setTimeout(
-          //     function (card_id, x, y, z) {
-          //       
-          //     },
-          //     500
-          //   );
-          // }
           benchListInterval = setInterval(() => {
             let benchIdList = window.store.getters['benchList/getBenchList'].map(m => m.id);
             if (benchIdList.length > 0) {

src/views/ordinaryPage/index.vue

@@ -1,4 +1,5 @@
 <template>
+<<<<<<< HEAD
   <div>
     <div class="main-title">矿井井下人员定位系统</div>
     <Tabs :tabs="tabs" class="main-tab"/>
@@ -24,6 +25,17 @@
       
       <div class="vr-bg" id="vr-bg-container"></div>
       <div id="player" style="width: 100%; height: 100%"></div>
+=======
+  <div style="position: relative;">
+    <div class="main-tab" style="width: 100%; margin-left: 2vw;">
+      <TabList 
+      :tabs="tabs"
+      :tabs_settings="tabs_settings"
+      :divWidth=30></TabList>
+    </div>
+    <!--<div style="position: absolute; top: 3vh; left: 5vw; color: white; font-size: 20px;">
+      矿井井下人员定位系统
+>>>>>>> origin
     </div>
     <div
       class="ordinary-container"
@@ -485,6 +497,7 @@
           ></TabList>
         </div>
       </div>
+<<<<<<< HEAD
     </div>
     <bench-detail
       :is-detail-visible="isDetailVisible"
@@ -523,6 +536,9 @@
       </div>
       <!-- <div class="bmMapItemInfoAfter"></div> -->
     </div>
+=======
+    </div>-->
+>>>>>>> origin
   </div>
 </template>
 <script>
@@ -544,6 +560,7 @@ import { mapState } from "vuex";
 import ImageList from "./components/ImageList";
 import webSocket from "../../service/ws";
 import bus from "../../service/bus";
+import TabList from "../../components/TabList";
 
 import { FBXLoader } from "../../FBXLoader.js";
 import SearchBarMain from "../../components/SearchBarMain";
@@ -563,6 +580,7 @@ for (var iR = 0; iR < 50; iR++) {
 
 export default {
   components: {
+<<<<<<< HEAD
     StatusBar,
     TabList,
     SearchBar,
@@ -612,33 +630,123 @@ export default {
       currentPlanId: null,
       currentPlanName: null,
       currentCaseIndex: 0,
+=======
+    TabList,
+  },
+  data() {
+    return {
+      username: '',
+      password: '',
+>>>>>>> origin
       tabs: [
         {
           title: "实时",
           list: [
+<<<<<<< HEAD
+=======
+            // {
+            // title: 'Item 1',
+            // description: '1111111',
+            // image: 'item1.jpg',
+            // tag: 'Tag 1'
+            // },
+            // {
+            // title: 'Item 2',
+            // description: '32222',
+            // image: 'item2.jpg',
+            // tag: 'Tag 2'
+            // },
+            // {
+            // title: 'Item 3',
+            // description: '1111111',
+            // image: 'item3.jpg',
+            // tag: 'Tag 3'
+            // }
+>>>>>>> origin
           ],
         },
         {
           title: "历史",
           list: [
+<<<<<<< HEAD
             
+=======
+            {
+              itemtype: 2,
+              title: "Item 4",
+              description: "1111111",
+              image: "item4.jpg",
+              tag: "Tag 4",
+            },
+            {
+              itemtype: 2,
+              title: "Item 5",
+              description: "1111111",
+              image: "item5.jpg",
+              tag: "Tag 5",
+            },
+            {
+              itemtype: 2,
+              title: "Item 6",
+              description: "1111111",
+              image: "item6.jpg",
+              tag: "Tag 6",
+            },
+>>>>>>> origin
           ],
         },
         {
           title: "告警",
           list: [
+<<<<<<< HEAD
             
+=======
+            {
+              title: "Item 7",
+              image: "item7.jpg",
+              tag: "Tag 7",
+            },
+            {
+              title: "Item 8",
+              image: "item8.jpg",
+              tag: "Tag 8",
+            },
+            {
+              title: "Item 9",
+              image: "item9.jpg",
+              tag: "Tag 9",
+            },
+>>>>>>> origin
           ],
         },
         {
           title: "报表",
           list: [
+<<<<<<< HEAD
             
+=======
+            {
+              title: "Item 7",
+              image: "item7.jpg",
+              tag: "Tag 7",
+            },
+            {
+              title: "Item 8",
+              image: "item8.jpg",
+              tag: "Tag 8",
+            },
+            {
+              title: "Item 9",
+              image: "item9.jpg",
+              tag: "Tag 9",
+            },
+>>>>>>> origin
           ],
         },
         {
           title: "管理",
           list: [
+<<<<<<< HEAD
             
           ],
         },
@@ -722,6 +830,177 @@ export default {
       selectedBenchId: 0,
       benchDetail: {},
       mouseBenchDetail: {}
+=======
+            {
+              title: "Item 7",
+              image: "item7.jpg",
+              tag: "Tag 7",
+            },
+            {
+              title: "Item 8",
+              image: "item8.jpg",
+              tag: "Tag 8",
+            },
+            {
+              title: "Item 9",
+              image: "item9.jpg",
+              tag: "Tag 9",
+            },
+          ],
+        },
+      ],
+      tabs_settings: [
+        {
+          title: "卡号管理",
+          list: [
+            // {
+            // title: 'Item 1',
+            // description: '1111111',
+            // image: 'item1.jpg',
+            // tag: 'Tag 1'
+            // },
+            // {
+            // title: 'Item 2',
+            // description: '32222',
+            // image: 'item2.jpg',
+            // tag: 'Tag 2'
+            // },
+            // {
+            // title: 'Item 3',
+            // description: '1111111',
+            // image: 'item3.jpg',
+            // tag: 'Tag 3'
+            // }
+          ],
+        },
+        {
+          title: "人员管理",
+          list: [
+            {
+              itemtype: 2,
+              title: "Item 4",
+              description: "1111111",
+              image: "item4.jpg",
+              tag: "Tag 4",
+            },
+            {
+              itemtype: 2,
+              title: "Item 5",
+              description: "1111111",
+              image: "item5.jpg",
+              tag: "Tag 5",
+            },
+            {
+              itemtype: 2,
+              title: "Item 6",
+              description: "1111111",
+              image: "item6.jpg",
+              tag: "Tag 6",
+            },
+          ],
+        },
+        {
+          title: "部门管理",
+          list: [
+            {
+              title: "Item 7",
+              image: "item7.jpg",
+              tag: "Tag 7",
+            },
+            {
+              title: "Item 8",
+              image: "item8.jpg",
+              tag: "Tag 8",
+            },
+            {
+              title: "Item 9",
+              image: "item9.jpg",
+              tag: "Tag 9",
+            },
+          ],
+        },
+        {
+          title: "设备管理",
+          list: [
+            {
+              title: "Item 7",
+              image: "item7.jpg",
+              tag: "Tag 7",
+            },
+            {
+              title: "Item 8",
+              image: "item8.jpg",
+              tag: "Tag 8",
+            },
+            {
+              title: "Item 9",
+              image: "item9.jpg",
+              tag: "Tag 9",
+            },
+          ],
+        },
+        {
+          title: "拓扑关系管理",
+          list: [
+            {
+              title: "Item 7",
+              image: "item7.jpg",
+              tag: "Tag 7",
+            },
+            {
+              title: "Item 8",
+              image: "item8.jpg",
+              tag: "Tag 8",
+            },
+            {
+              title: "Item 9",
+              image: "item9.jpg",
+              tag: "Tag 9",
+            },
+          ],
+        },
+        {
+          title: "用户管理",
+          list: [
+            {
+              title: "Item 7",
+              image: "item7.jpg",
+              tag: "Tag 7",
+            },
+            {
+              title: "Item 8",
+              image: "item8.jpg",
+              tag: "Tag 8",
+            },
+            {
+              title: "Item 9",
+              image: "item9.jpg",
+              tag: "Tag 9",
+            },
+          ],
+        },
+        {
+          title: "角色管理",
+          list: [
+            {
+              title: "Item 7",
+              image: "item7.jpg",
+              tag: "Tag 7",
+            },
+            {
+              title: "Item 8",
+              image: "item8.jpg",
+              tag: "Tag 8",
+            },
+            {
+              title: "Item 9",
+              image: "item9.jpg",
+              tag: "Tag 9",
+            },
+          ],
+        },
+      ],
+>>>>>>> origin
     };
   },
   computed: {
@@ -2721,6 +3000,7 @@ export default {
 /* .benchMapBox {
   margin-top: 30px;
 } */
+<<<<<<< HEAD
 
 .ordinary-map-ex {
   position: absolute;
@@ -4347,4 +4627,6 @@ export default {
 .error {
   background-color: #ff000000 !important;
 }
+=======
+>>>>>>> origin
 </style>

vue.config.js

@@ -1,5 +1,6 @@
 const { defineConfig } = require("@vue/cli-service");
 module.exports = defineConfig({
+  //runtimeCompiler:true,
   transpileDependencies: true,
   lintOnSave: false,
   devServer: {