feat: 增加设备分类

Gary Gu

5 days ago 36e044280298d6f6b37b1295f9eba25584ef66a2

feat: 增加设备分类

 public/config.js

@@ -8,12 +8,12 @@
 */
window.ProjectConfig = {
    // axiosBaseURL: "http://47.117.124.20:2002/",
    axiosBaseURL: "http://8.140.54.245:5000",
    axiosBaseURL: "http://101.201.155.10:4011",
    axiosTimeout: 1000 * 30, //毫秒
    panoUrl: 'http://8.140.54.245:4010', // 全景预览地址
    panoBaseUrl: 'http://8.140.54.245:5000', // 全景图及文档接口
    modelUrl: 'http://8.140.54.245:4010/#/Home/sceneManagementDetail?shareUrlToken=AA82C10E34245412D8E276559C8582363A2CD38177A286C582C0471DC44FA5D836CAFB932F2C33B44201FE828EF6545397771FA675F7518619FAD578EB06FB6FA7671DFBEA34C32F8241C1EF1DDEA645', // 模型预览地址
    panoUrl: 'http://101.201.155.10:4010', // 全景预览地址
    panoBaseUrl: 'http://101.201.155.10:4011', // 全景图及文档接口
    modelUrl: 'http://101.201.155.10:4010/#/Home/sceneManagementDetail?shareUrlToken=AA82C10E34245412D8E276559C8582363A2CD38177A286C582C0471DC44FA5D836CAFB932F2C33B44201FE828EF6545397771FA675F7518619FAD578EB06FB6FA7671DFBEA34C32F8241C1EF1DDEA645', // 模型预览地址
    sceneUrl: 'http://resources.vothing.com/mp4/12.mp4', // 实况地址
    projectId: 'de42bc0a-9a5a-4d43-877f-0ae980f905b2', // 项目id
    xieTongIframeSrc: 'http://8.140.54.245:4010/#/', // BIMe地址
    xieTongIframeSrc: 'http://101.201.155.10:4010/#/', // BIMe地址
}

 src/Dashboard.vue

@@ -15,13 +15,11 @@
      backgroundImage: `url(${backgroundImage})`,
      backgroundRepeat: 'no-repeat',
      backgroundPosition: 'center center',
      backgroundSize: 'cover'
      backgroundSize: 'cover',
    }"
  >
    <!--头部-->
    <app-header class="absolute z-[100] top-0 left-0 right-0" :selected-id="currentProjectId" @onHomeClick="switchView" />


    <app-header class="absolute z-[100] top-0 left-0 right-0" :selected-id="currentProjectId" @onHomeClick="switchView" @onSelectChange="onSelectChange" />

    <!--页面内容-->
    <div class="content-wrapper px-[22px] py-[10px] absolute inset-0 top-[80px] flex gap-[20px]">
@@ -34,7 +32,7 @@
      <div class="flex-1 min-w-0">
        <!-- 中间模块 -->
        <div class="w-full h-full">
          <equipment-view v-if="isReady"/>
          <equipment-view :selected-id="selectedId" v-if="isReady" />
        </div>
      </div>
      <div class="w-[1080px]">
@@ -51,8 +49,6 @@

    <!--multiverse渲染容器
    <div id="renderDom" class="absolute z-[40] top-0 bottom-0 left-0 right-0 w-full h-full"></div>-->


  </main>
</template>

@@ -82,24 +78,24 @@
  name: "Dashboard",
  components: {
    "app-header": Header,
    "Home": Home,
      Home: Home,
    "project-view": ProjectView,
    "equipment-view": EquipmentView  
      "equipment-view": EquipmentView,
  },
  data() {
    return {
      backgroundImage: new URL('@/assets/images/backgrounds/screen.png', import.meta.url).href,
      currentProjectId: '1c179617-a7d9-4243-b813-84fa55a17ce7',
        backgroundImage: new URL("@/assets/images/backgrounds/screen.png", import.meta.url).href,
        currentProjectId: "1c179617-a7d9-4243-b813-84fa55a17ce7",
      isReady: false,
      clickTab:'home',
      iframeSrc: window.ProjectConfig.xieTongIframeSrc
        clickTab: "home",
        iframeSrc: window.ProjectConfig.xieTongIframeSrc,
        selectedId: "",
    };
  },
  computed: {
    ...mapGetters("common", [])
      ...mapGetters("common", []),
  },
  watch: {
  },
    watch: {},
  mounted() {
    this.getLoginInfo();
  },
@@ -107,14 +103,18 @@
    this.resetEngineRelated();
  },
  methods: {
      onSelectChange(val) {
        this.selectedId = val;
        console.log("onSelectChange", val);
      },
    /**
     * 切换视图
     * @param val
     */
    switchView(val){
      switch (val){
        case 'xietong':
          window.open(window.ProjectConfig.xieTongIframeSrc, '_blank');
          case "xietong":
            window.open(window.ProjectConfig.xieTongIframeSrc, "_blank");
          break;
      }
    },
@@ -152,20 +152,19 @@
      }
    },
    getLoginInfo() {
      this.isReady = true
        this.isReady = true;
      const data = {
        "UserName": "JSC",
        "Password": "JSC@jsc123",
        "IfSingleLogin": "",
      }
      HomeAPI.WhLogin(data).then(res => {
          UserName: "JSC",
          Password: "JSC@jsc123",
          IfSingleLogin: "",
        };
        HomeAPI.WhLogin(data).then((res) => {
        console.log(res);
        if(res.Ret === 1) {
          const result = res.Data
          window.localStorage.setItem("token", result.token)
            const result = res.Data;
            window.localStorage.setItem("token", result.token);
          console.log(result);
        }
        
      });
    },


 src/api/home.js

@@ -10,7 +10,7 @@
export const HomeAPI = {
    GetProject: (data) => {
        return http.get("/api/User/Project/GetProject", {
            params: data
      params: data,
        });
    },

@@ -20,22 +20,52 @@

    GetParticipatingList: (data) => {
        return http.get("/api/User/Home/GetParticipatingList", {
            params: data
      params: data,
        });
    },
    GetParticipatingNumber: (data) => {
        return http.get("/api/User/Home/GetParticipatingNumber", {
            params: data
      params: data,
        });
    },
    GetProjectPanoramaList: (data) => {
        return http.get("/api/Panorama/PanoramaFile/GetProjectPanoramaList", {
            params: data
      params: data,
        });
    },
    GetScenesByPbGuid: (data) => {
        return http.get("/api/Panorama/PanoramaFile/GetScenesByPbGuid", {
            params: data
      params: data,
        });
    }
  },
  GetBindSelect: (data) => {
    return http.get("/api/jsc/JSCManage/GetBindSelect", {
      params: data,
    });
  },
  GetDeviceType: (data) => {
    return http.get("/api/jsc/JSCManage/GetDeviceType", {
      params: data,
    });
  },
  GetJSCDeviceState: (data) => {
    return http.get("/api/jsc/JSCManage/GetJSCDeviceState", {
      params: data,
    });
  },
  GetJSCEnvMonitor: (data) => {
    return http.get("/api/jsc/JSCManage/GetJSCEnvMonitor", {
      params: data,
    });
  },
  GetJSCProgress: (data) => {
    return http.get("/api/jsc/JSCManage/GetJSCProgress", {
      params: data,
    });
  },
  GetJSCProjectMonitor: (data) => {
    return http.get("/api/jsc/JSCManage/GetJSCProjectMonitor", {
      params: data,
    });
  },
};

 src/components/Header.vue

@@ -43,7 +43,7 @@
      </div>
      <div class="absolute top-0 right-0">
        <div class="flex items-center h-[80px] mr-[20px]">
          <el-select v-model="projectSelected" placeholder="请选择" class="mr-[24px]">
          <el-select v-model="bindSelected" placeholder="请选择" class="mr-[24px]" @change="handleSelect">
            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
          </el-select>
          <i
@@ -61,6 +61,9 @@
</template>

<script>
  import { HomeAPI } from "@/api/home";
  import { mapActions } from "vuex";

  export default {
    name: "AppHeader",
    components: {},
@@ -76,12 +79,8 @@
    },
    data() {
      return {
        projectSelected: "",
        options: [
          { value: "project1", label: "项目1" },
          { value: "project2", label: "项目2" },
          { value: "project3", label: "项目3" },
        ],
        bindSelected: "",
        options: [],
        activeTab: "home",
        currentTime: "",
        currentDate: "",
@@ -91,6 +90,7 @@
    },
    mounted() {
      this.updateTime();
      this.getBinds();
      this.timer = setInterval(this.updateTime, 1000);
    },
    beforeDestroy() {
@@ -127,6 +127,32 @@
        const weekDay = weekDays[now.getDay()];
        this.currentDate = `${year}.${month}.${day} 星期${weekDay}`;
      },
      /**
       * 获取标段信息
       */
      getBinds() {
        HomeAPI.GetBindSelect().then((res) => {
          if (res.Ret === 1) {
            const result = res.Data;
            if (result.length > 0) {
              this.options = result.map((item) => ({
                value: item.Id,
                label: item.BindName,
              }));
              this.bindSelected = this.options[0].value; // 默认选中第一个项目
              this.handleSelect(this.bindSelected);
            } else {
              this.options = [];
            }
          }
        });
      },
      /**
       * 处理选择变化
       */
      handleSelect(val) {
        this.$emit("onSelectChange", val);
      },
    },
  };
</script>

 src/store/modules/common.js

@@ -12,6 +12,7 @@
        code: null, //用户信息
        token: null, //token
        projectEndDate: null, //项目结束日期
    bindId: null,
    }),

    mutations: {
@@ -24,6 +25,9 @@
        setProjectEndDate(state, data) {
            state.projectEndDate = data;
        },
    setBindId(state, data) {
      state.bindId = data;
    },
    },
    actions: {
        setCode(context, data) {
@@ -35,10 +39,14 @@
        setProjectEndDate(context, data) {
            context.commit("setProjectEndDate", data);
        },
    updateBindId({ commit }, data) {
      commit("setBindId", data);
    },
    },
    getters: {
        code: (state) => state.code,
        token: (state) => state.token,
        projectEndDate: (state) => state.projectEndDate,
    bindId: (state) => state.bindId,
    },
};

 src/utils/getToken.js

@@ -15,3 +15,7 @@
    let endDate = store.getters["common/projectEndDate"];
    return endDate;
}
export const getBindId = () => {
    let bindId = store.getters["common/bindId"];
    return bindId;
}

 src/views/EquipmentView.vue

@@ -176,6 +176,12 @@
    components: {
      V2Echarts,
    },
    props: {
      selectedId: {
        type: String,
        default: "",
      },
    },
    data() {
      return {
        equipmentSelected: "",
@@ -496,6 +502,16 @@
        };
      },
    },
    watch: {
      selectedId: {
        handler(newVal) {
          console.log("设备界面接收到的数据:", newVal);
          // 处理数据变化的逻辑
        },
        deep: true, // 深度监听对象内部变化
        immediate: true, // 立即执行一次
      },
    },
    methods: {
      handleControlBtnClick(tab) {
        this.currentTab = tab;
@@ -749,5 +765,4 @@
  .progress-inner {
    display: none;
  }

</style>

 vite.config.js

@@ -52,7 +52,7 @@
            proxy: {
                "^/api/": {
                    // target: "http://47.117.124.20:2002/",
                    target: "http://8.140.54.245:5000/",
                    target: "http://101.201.155.10:4011/",
                    rewrite: (path) => path.replace(/^\/api\//, ""),
                    changeOrigin: true, //通过浏览器查看像是"未生效",实际发送给后端的是更改过的Host(与target的host相同)
                },