优化:后台新增中心库与习水库大屏一键直达、完善高精度三维标定坐标与引线输出、同步最新大屏静态资源
这个提交包含在:
@@ -263,6 +263,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
|
||||
this.loadData(this.search.keyword, this.currentPage, this.pageSize, this.search.sort);
|
||||
},
|
||||
methods: {
|
||||
// 直达中心库大屏
|
||||
openCenterScreen() {
|
||||
window.open('/screen/index.html', '_blank');
|
||||
},
|
||||
// 直达习水库大屏
|
||||
openXishuiScreen() {
|
||||
window.open('/screen/xishui.html', '_blank');
|
||||
},
|
||||
// 刷新页面
|
||||
refreshPage() {
|
||||
this.search = {
|
||||
|
||||
@@ -216,8 +216,15 @@ function renderHotspots() {
|
||||
container.innerHTML = '';
|
||||
|
||||
STATE.list.forEach(item => {
|
||||
const coord = hotspotCoords[item.id];
|
||||
if (!coord) return;
|
||||
const rawCoord = hotspotCoords[item.id] || hotspotCoords[item.num] || hotspotCoords[item.name];
|
||||
if (!rawCoord) return;
|
||||
|
||||
const coord = {
|
||||
x: rawCoord.x !== undefined ? rawCoord.x : (rawCoord.left !== undefined ? rawCoord.left : 50),
|
||||
y: rawCoord.y !== undefined ? rawCoord.y : (rawCoord.top !== undefined ? rawCoord.top : 50),
|
||||
stemX: rawCoord.stemX,
|
||||
stemY: rawCoord.stemY
|
||||
};
|
||||
|
||||
const isOil = item.isOilTank;
|
||||
const isVisible = STATE.filterType === 'all' ||
|
||||
|
||||
@@ -34,6 +34,12 @@ export const DESIGN_THEME = {
|
||||
if (str.includes('稻') || str.includes('paddy') || str.includes('rice')) {
|
||||
return { color: '#10b981', label: '稻谷', type: 'paddy' };
|
||||
}
|
||||
if (str.includes('玉米') || str.includes('corn')) {
|
||||
return { color: '#eab308', label: '玉米', type: 'corn' };
|
||||
}
|
||||
if (str.includes('大豆') || str.includes('soybean') || str.includes('bean')) {
|
||||
return { color: '#ca8a04', label: '大豆', type: 'soybean' };
|
||||
}
|
||||
return { color: '#38bdf8', label: '小麦', type: 'wheat' };
|
||||
}
|
||||
};
|
||||
@@ -948,7 +954,7 @@ export function mapVarietyToForecastType(varietyName) {
|
||||
if (!varietyName) return null;
|
||||
const str = String(varietyName).toLowerCase();
|
||||
if (str.includes('油') || str.includes('oil') || str.includes('rapeseed')) return null;
|
||||
if (str.includes('麦') || str.includes('wheat')) return 'wheat';
|
||||
if (str.includes('麦') || str.includes('wheat') || str.includes('玉米') || str.includes('corn') || str.includes('高粱')) return 'wheat';
|
||||
if (str.includes('稻') || str.includes('rice') || str.includes('paddy')) return 'rice';
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -204,8 +204,13 @@ function renderHotspots() {
|
||||
container.innerHTML = '';
|
||||
|
||||
STATE.list.forEach(item => {
|
||||
const coord = hotspotCoords[item.id];
|
||||
if (!coord) return;
|
||||
const rawCoord = hotspotCoords[item.id] || hotspotCoords[item.num] || hotspotCoords[item.name];
|
||||
if (!rawCoord) return;
|
||||
|
||||
const coord = {
|
||||
x: rawCoord.x !== undefined ? rawCoord.x : (rawCoord.left !== undefined ? rawCoord.left : 50),
|
||||
y: rawCoord.y !== undefined ? rawCoord.y : (rawCoord.top !== undefined ? rawCoord.top : 50)
|
||||
};
|
||||
|
||||
const isSilo = item.grainTypeCategory === 'silo';
|
||||
const isVisible = STATE.filterType === 'all' ||
|
||||
|
||||
在新工单中引用
屏蔽一个用户