flx:冲突

This commit is contained in:
X_Rian 2024-06-20 10:17:40 +08:00
commit 81e524c0dc
10 changed files with 78 additions and 105 deletions

View File

@ -1,45 +0,0 @@
// ? 全局不动配置项 只做导出不做修改
// * 首页地址(默认)
export const HOME_URL: string = "/government";
// * 登录页地址(默认)
export const LOGIN_URL: string = "/login";
// export const PROJECT_URL: string = "/projectlogon";
// * 默认主题颜色
export const DEFAULT_PRIMARY: string = "#008BFF";
// * 路由白名单地址(必须是本地存在的路由 staticRouter.ts
export const ROUTER_WHITE_LIST: string[] = ["/500", "/projectlogon", "/compLogon"];
// * 高德地图 key
export const AMAP_MAP_KEY: string = "142e51d55274a0140e838245345cf9ad";
// * 百度地图 key
export const BAIDU_MAP_KEY: string = "";
export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
// 项目环境标识配置 部署时需更改对应的项目
// export const COMPANY: string = ""; //标准版
// export const COMPANY: string = "zhzrf"; //中海·臻如府
// export const COMPANY: string = "zsbf"; //中水北方
// export const COMPANY: string = "as"; //鞍山项目
// export const COMPANY: string = "agjt"; //鞍钢集团
// export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏
// export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏
// export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏
export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览
// export const COMPANY: string = "zkjc"; //中科佳成项目
// export const COMPANY: string = "cqna"; //重庆南岸项目
// export const COMPANY: string = "slx"; //苏立信项目
// export const COMPANY: string = "hfqc"; //合肥启程项目
// export const COMPANY: string = "jsyc"; // 江苏盐城项目
// export const COMPANY: string = "syhy"; //沈阳合盈盘锦项目 (需要去src\routers\modules\staticRouter.ts更换首页)
// export const COMPANY: string = "jxwjj"; //嘉兴王江泾公用码头项目 (需要去src\routers\modules\staticRouter.ts更换首页)
// export const COMPANY: string = "phmw"; //鄱湖美湾医疗、医美产业集群项目 (需要去src\routers\modules\staticRouter.ts更换首页)
// export const COMPANY: string = "xjnb"; // 新建宁波项目
// export const COMPANY: string = "ahsa"; // 安徽水安项目
// export const COMPANY: string = "zkax"; // 中科安信项目

View File

@ -49,6 +49,7 @@ import {
selectWorkerTeamAndDepartmentStatisticsApi, selectWorkerTeamAndDepartmentStatisticsApi,
} from "@/api/modules/agjtLiveApi"; } from "@/api/modules/agjtLiveApi";
const store = GlobalStore(); const store = GlobalStore();
const BASEURL = import.meta.env.VITE_API_URL
// //
const lwInfo1 = ref({} as any) const lwInfo1 = ref({} as any)
@ -56,11 +57,14 @@ const lwInfo2 = ref({} as any)
async function getLwInfo() { async function getLwInfo() {
//Id //Id
await getEnterpriseIdApi().then(res => { await getEnterpriseIdApi().then(res => {
// console.log("id",res.result.id) let data = {
projectSn: '',
}
if(BASEURL == 'http://182.90.224.237:51234' || BASEURL == 'http://192.168.34.221:9111') data.projectSn = 'BD3137498CB84BF0969979E0342CDBCA'
if(BASEURL == 'http://42.180.188.17:9809' || BASEURL == 'http://42.180.188.17:11211') data.projectSn = '471568F45EB247A3912A0D10EA1BFCEB'
selectPersonTypeAndEduStatisticsApi({ selectPersonTypeAndEduStatisticsApi({
enterpriseId: res.result.id, enterpriseId: res.result.id,
// projectSn: store.sn, projectSn: data.projectSn,
projectSn: 'BD3137498CB84BF0969979E0342CDBCA' // yh001---ProjectSn
}).then(res1 => { }).then(res1 => {
if(res1.success){ if(res1.success){
if(res1.result){ if(res1.result){
@ -69,8 +73,7 @@ async function getLwInfo() {
} }
}) })
selectWorkerTeamAndDepartmentStatisticsApi({ selectWorkerTeamAndDepartmentStatisticsApi({
// projectSn: store.sn, projectSn: data.projectSn,
projectSn: 'BD3137498CB84BF0969979E0342CDBCA' // yh001---ProjectSn
}).then(res2 => { }).then(res2 => {
if(res2.success){ if(res2.success){
if(res2.result){ if(res2.result){

View File

@ -40,26 +40,22 @@ import {
qualityPageApi, qualityPageApi,
} from "@/api/modules/agjtLiveApi"; } from "@/api/modules/agjtLiveApi";
const store = GlobalStore(); const store = GlobalStore();
const BASEURL = import.meta.env.VITE_API_URL
// //
const qualityData = ref([] as any) const qualityData = ref([] as any)
async function getQualityData() { async function getQualityData() {
let data = {
//Id
await getEnterpriseIdApi().then(res => {
if(res.success){
qualityPageApi({
page: 1, page: 1,
pageSize: 9999, pageSize: 9999,
status: 60, status: 60,
// enterpriseId: res.result.id, projectSn: '',
// projectSn: store.sn,
projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001---ProjectSn
}).then(res2 => {
if(res2.success){
qualityData.value = res2.result.page.records
} }
}); if(BASEURL == 'http://182.90.224.237:51234' || BASEURL == 'http://192.168.34.221:9111') data.projectSn = 'BD3137498CB84BF0969979E0342CDBCA'
if(BASEURL == 'http://42.180.188.17:9809' || BASEURL == 'http://42.180.188.17:11211') data.projectSn = '471568F45EB247A3912A0D10EA1BFCEB'
qualityPageApi(data).then(res => {
if(res.success){
qualityData.value = res.result.page.records
} }
}); });
}; };

View File

@ -39,6 +39,7 @@ import setVideoDialog from "@/components/setVideoDialog.vue";
import { configWeekVideoListApi } from "@/api/modules/agjtLiveApi"; import { configWeekVideoListApi } from "@/api/modules/agjtLiveApi";
import moment from "moment"; import moment from "moment";
const store = GlobalStore(); const store = GlobalStore();
const BASEURL = import.meta.env.VITE_API_URL
const videoList = ref([] as any); const videoList = ref([] as any);
// ts // ts
type Props = { type Props = {
@ -67,7 +68,7 @@ watch(
} }
); );
const BASEURL = import.meta.env.VITE_API_URL; // const BASEURL = import.meta.env.VITE_API_URL;
// //
// const showVideo = ref(1 as any); // const showVideo = ref(1 as any);
const showVideo = ref(2 as any); const showVideo = ref(2 as any);
@ -79,13 +80,13 @@ const updateConfig = () => {
}; };
// //
const configWeekVideoListFn = async (showLoading: boolean) => { const configWeekVideoListFn = async (showLoading: boolean) => {
const res: any = await configWeekVideoListApi( let data = {
{ projectSn: '',
projectSn: store.sn,
type: 3 type: 3
}, }
showLoading if(BASEURL == 'http://182.90.224.237:51234' || BASEURL == 'http://192.168.34.221:9111') data.projectSn = 'BD3137498CB84BF0969979E0342CDBCA'
); if(BASEURL == 'http://42.180.188.17:9809' || BASEURL == 'http://42.180.188.17:11211') data.projectSn = '471568F45EB247A3912A0D10EA1BFCEB'
const res: any = await configWeekVideoListApi(data, showLoading);
if (res.result) { if (res.result) {
// //
const today = moment().format("d"); const today = moment().format("d");

View File

@ -43,14 +43,15 @@ import {
countTaskProgressApi, countTaskProgressApi,
} from "@/api/modules/agjtLiveApi"; } from "@/api/modules/agjtLiveApi";
const store = GlobalStore(); const store = GlobalStore();
const BASEURL = import.meta.env.VITE_API_URL
const statisticsCount = ref(null as any); const statisticsCount = ref(null as any);
const projectData = ref(null as any); const projectData = ref(null as any);
// //
const getProjectInfo = async (showLoading: boolean) => { // const getProjectInfo = async (showLoading: boolean) => {
const res = await getProjectDetail({ projectSn: store.sn },showLoading); // const res = await getProjectDetail({ projectSn: store.sn },showLoading);
projectData.value = res.result; // projectData.value = res.result;
}; // };
// //
const remainDays = ref('0' as any) const remainDays = ref('0' as any)
@ -58,12 +59,13 @@ async function countTaskProgress() {
//Id //Id
await getEnterpriseIdApi().then(res => { await getEnterpriseIdApi().then(res => {
if(res.success){ if(res.success){
// console.log("id",res.result.id) let data = {
countTaskProgressApi({
enterpriseId: res.result.id, enterpriseId: res.result.id,
// projectSn: store.sn projectSn: '',
projectSn: 'BD3137498CB84BF0969979E0342CDBCA' // yh001---ProjectSn }
}).then(res2 => { if(BASEURL == 'http://182.90.224.237:51234' || BASEURL == 'http://192.168.34.221:9111') data.projectSn = 'BD3137498CB84BF0969979E0342CDBCA'
if(BASEURL == 'http://42.180.188.17:9809' || BASEURL == 'http://42.180.188.17:11211') data.projectSn = '471568F45EB247A3912A0D10EA1BFCEB'
countTaskProgressApi(data).then(res2 => {
remainDays.value = res2.result.projectSurplusDayNum.toString() remainDays.value = res2.result.projectSurplusDayNum.toString()
}) })
} }

View File

@ -24,6 +24,7 @@ import {
getStatBySpecialApi, getStatBySpecialApi,
} from "@/api/modules/agjtLiveApi"; } from "@/api/modules/agjtLiveApi";
const store = GlobalStore(); const store = GlobalStore();
const BASEURL = import.meta.env.VITE_API_URL
const isShow = ref(false as any) const isShow = ref(false as any)
@ -38,10 +39,12 @@ const outPie = ref([
// //
async function getSpecialInfo() { async function getSpecialInfo() {
await getStatBySpecialApi({ let data = {
// projectSn: store.sn, projectSn: '',
projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001---ProjectSn }
}).then(res => { if(BASEURL == 'http://182.90.224.237:51234' || BASEURL == 'http://192.168.34.221:9111') data.projectSn = 'BD3137498CB84BF0969979E0342CDBCA'
if(BASEURL == 'http://42.180.188.17:9809' || BASEURL == 'http://42.180.188.17:11211') data.projectSn = '471568F45EB247A3912A0D10EA1BFCEB'
await getStatBySpecialApi(data).then(res => {
if(res.success){ if(res.success){
if(res.result){ if(res.result){
// //

View File

@ -29,6 +29,7 @@ import {
selectAIPageListApi, selectAIPageListApi,
} from "@/api/modules/agjtLiveApi"; } from "@/api/modules/agjtLiveApi";
const store = GlobalStore(); const store = GlobalStore();
const BASEURL = import.meta.env.VITE_API_URL
// //
const isData = ref(false as any) const isData = ref(false as any)
@ -39,15 +40,16 @@ async function getAlarmInfo() {
//Id //Id
await getEnterpriseIdApi().then(res => { await getEnterpriseIdApi().then(res => {
if(res.success){ if(res.success){
// console.log("id",res.result.id) let data = {
selectAIPageListApi({
pageNo: 1, pageNo: 1,
pageSize: 1, pageSize: 1,
enterpriseId: res.result.id, enterpriseId: res.result.id,
isPushed: 1, isPushed: 1,
// projectSn: store.sn, projectSn: '',
projectSn: 'BD3137498CB84BF0969979E0342CDBCA' // yh001---ProjectSn }
}).then(res2 => { if(BASEURL == 'http://182.90.224.237:51234' || BASEURL == 'http://192.168.34.221:9111') data.projectSn = 'BD3137498CB84BF0969979E0342CDBCA'
if(BASEURL == 'http://42.180.188.17:9809' || BASEURL == 'http://42.180.188.17:11211') data.projectSn = '471568F45EB247A3912A0D10EA1BFCEB'
selectAIPageListApi(data).then(res2 => {
if(res2.success){ if(res2.success){
if(res2.result.records && res2.result.records.length !== 0){ if(res2.result.records && res2.result.records.length !== 0){
alarmInfo.value = res2.result.records[0] alarmInfo.value = res2.result.records[0]

View File

@ -47,18 +47,21 @@ import {
getEnterpriseInfoByIdApi, getEnterpriseInfoByIdApi,
} from "@/api/modules/agjtLiveApi"; } from "@/api/modules/agjtLiveApi";
const store = GlobalStore(); const store = GlobalStore();
const BASEURL = import.meta.env.VITE_API_URL
const cbsProjectInfo = ref({} as any) const cbsProjectInfo = ref({} as any)
async function getCbsProjectInfo() { async function getCbsProjectInfo() {
console.log("BASEURL===>",BASEURL)
//Id //Id
await getEnterpriseIdApi().then(res => { await getEnterpriseIdApi().then(res => {
if(res.success){ if(res.success){
// console.log("id",res.result.id) let data = {
getEnterpriseInfoByIdApi({
enterpriseId: res.result.id, enterpriseId: res.result.id,
// projectSn: store.sn projectSn: '',
projectSn: 'BD3137498CB84BF0969979E0342CDBCA' // yh001---ProjectSn }
}).then(res2 => { if(BASEURL == 'http://182.90.224.237:51234' || BASEURL == 'http://192.168.34.221:9111') data.projectSn = 'BD3137498CB84BF0969979E0342CDBCA'
if(BASEURL == 'http://42.180.188.17:9809' || BASEURL == 'http://42.180.188.17:11211') data.projectSn = '471568F45EB247A3912A0D10EA1BFCEB'
getEnterpriseInfoByIdApi(data).then(res2 => {
cbsProjectInfo.value = res2.result.projectEnterprise cbsProjectInfo.value = res2.result.projectEnterprise
}) })
} }

View File

@ -51,17 +51,20 @@ import {
securityPageApi, securityPageApi,
} from "@/api/modules/agjtLiveApi"; } from "@/api/modules/agjtLiveApi";
const store = GlobalStore(); const store = GlobalStore();
const BASEURL = import.meta.env.VITE_API_URL
// //
const securityData = ref([] as any) const securityData = ref([] as any)
async function getSecurityData() { async function getSecurityData() {
await securityPageApi({ let data = {
page: 1, page: 1,
pageSize: 9999, pageSize: 9999,
status: 60, status: 60,
// projectSn: store.sn, projectSn: '',
projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001---ProjectSn }
}).then(res => { if(BASEURL == 'http://182.90.224.237:51234' || BASEURL == 'http://192.168.34.221:9111') data.projectSn = 'BD3137498CB84BF0969979E0342CDBCA'
if(BASEURL == 'http://42.180.188.17:9809' || BASEURL == 'http://42.180.188.17:11211') data.projectSn = '471568F45EB247A3912A0D10EA1BFCEB'
await securityPageApi(data).then(res => {
if(res.success){ if(res.success){
securityData.value = res.result.page.records securityData.value = res.result.page.records
} }

View File

@ -51,16 +51,21 @@ import {
emergencyPageApi emergencyPageApi
} from "@/api/modules/agjtLiveApi"; } from "@/api/modules/agjtLiveApi";
const store = GlobalStore(); const store = GlobalStore();
const BASEURL = import.meta.env.VITE_API_URL
// //
const emergencyData = ref([] as any) const emergencyData = ref([] as any)
async function getEmergencyDataData() { async function getEmergencyDataData() {
await emergencyPageApi({ let data = {
page: 1, page: 1,
pageSize: 9999, pageSize: 9999,
// inDispositionStatus: '', // 123 // inDispositionStatus: '', // 123
// projectSn: store.sn, projectSn: '',
projectSn: 'BD3137498CB84BF0969979E0342CDBCA', // yh001---ProjectSn }
if(BASEURL == 'http://182.90.224.237:51234' || BASEURL == 'http://192.168.34.221:9111') data.projectSn = 'BD3137498CB84BF0969979E0342CDBCA'
if(BASEURL == 'http://42.180.188.17:9809' || BASEURL == 'http://42.180.188.17:11211') data.projectSn = '471568F45EB247A3912A0D10EA1BFCEB'
await emergencyPageApi({
}).then(res => { }).then(res => {
if(res.success){ if(res.success){
emergencyData.value = res.result.records emergencyData.value = res.result.records