Skip to content

X
xtj-ui
Commit d4bba50b by T
Options

现场版本

parent bd87faea
正在显示 包含 171 行增加 和 66 行删除
public/index.html
......@@ -8,9 +8,16 @@
<title>巡特警装备管理系统</title>
<script>
window._CONFIG = {};
// window._CONFIG['dlURL'] = 'http://192.168.2.105:5007';
// window._CONFIG['dlURL'] = 'http://192.168.3.188:5007';
window._CONFIG['dlURL'] = 'http://41.204.124.248:5001';
window._CONFIG['dlURL'] = 'http://192.168.3.188:5007';
//window._CONFIG['dlURL'] = 'http://41.204.124.248:5001';
//装备库总大屏（开预案）
window._CONFIG['yaURL'] = 'http://192.168.3.188:9555/';
//入口大屏
window._CONFIG['rkURL'] = 'http://192.168.3.188:9557/';
//出口大屏
window._CONFIG['ckURL'] = 'http://192.168.3.188:9556/';
//路线指引视图
window._CONFIG['mapURL'] = 'http://192.168.3.188:9558/equipmentshow.html';
</script>
</head>
......
src/main.js
......@@ -32,6 +32,10 @@ Vue.prototype.$moment = moment
Vue.config.productionTip = false
axios.defaults.baseURL = window._CONFIG['dlURL']
axios.defaults.baseyaURL = window._CONFIG['yaURL']
axios.defaults.baserkURL = window._CONFIG['rkURL']
axios.defaults.baseckURL = window._CONFIG['ckURL']
axios.defaults.basemapURL = window._CONFIG['mapURL']
// 配置请求超时
......
src/views/baseInfo/Materiel.vue
......@@ -134,6 +134,8 @@
<el-table-column prop="EqCount" label="所含装备数量" align="center">
</el-table-column>
<el-table-column prop="CreateTime" label="创建时间" sortable align="center">
</el-table-column>
<el-table-column
label="操作"
......
src/views/baseInfo/equipmentManage.vue
......@@ -183,7 +183,7 @@
<!-- </el-table-column> -->
<el-table-column prop="LibraryName" label="所属仓库" align="center" />
<el-table-column prop="CreateTime" label="创建时间" align="center" />
<el-table-column prop="CreateTime" label="创建时间" sortable align="center" />
<el-table-column
prop="EqHaoCai"
:formatter="stateFormat"
......@@ -816,7 +816,7 @@ export default {
Page: 1,
Rows: 10,
Sort: "ID",
Order: "ESC",
//Order: "ESC",
LibraryID: "",
CategoryID: "",
Epc: "",
......@@ -833,7 +833,7 @@ export default {
Page: 1,
Rows: 999,
Sort: "ID",
Order: "ESC",
// Order: "ESC",
UserName: "",
DeparId: "",
},
......@@ -841,20 +841,20 @@ export default {
Page: 1,
Rows: 10,
MatId: "",
Order: "ESC",
//Order: "ESC",
Sort: "ID",
},
searchWarehouseData: {
Page: 1,
Rows: 999,
Sort: "ID",
Order: "DESC",
//Order: "DESC",
},
searchEqCategoryData: {
Page: 1,
Rows: 999,
Sort: "ID",
Order: "ASC",
//Order: "ASC",
},
ruleForm: {
ID: 0,
......@@ -885,7 +885,7 @@ export default {
Page: 1,
Rows: 999,
Sort: "ID",
Order: "ESC",
// Order: "ESC",
CategoryID: "",
IsHaoCai:1
},
......@@ -893,14 +893,14 @@ export default {
Page: 1,
Rows: 999,
Sort: "ID",
Order: "ESC",
// Order: "ESC",
MaterielId: "",
},
searchStorageData: {
Page: 1,
Rows: 999,
Sort: "ID",
Order: "ESC",
// Order: "ESC",
LibraryID: "",
},
resetForm() {
......
src/views/baseInfo/equipmentType.vue
......@@ -88,7 +88,7 @@
<el-table-column prop="CreateName" label="创建人员" align="center">
</el-table-column>
<el-table-column prop="CreateTime" label="创建时间" align="center">
<el-table-column prop="CreateTime" label="创建时间" sortable align="center">
</el-table-column>
<el-table-column label="操作" width="200" align="center">
......@@ -199,7 +199,7 @@ export default {
Page: 1,
Rows: 10,
Sort: "ID",
Order: "ESC",
//Order: "ESC",
EqCategoryName: "",
},
title: "",
......
src/views/borrow/borrowGet.vue
......@@ -66,7 +66,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
>
</el-date-picker>
......
src/views/borrow/repairGet.vue
......@@ -66,7 +66,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
>
</el-date-picker>
......
src/views/borrow/userGet.vue
......@@ -66,7 +66,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
>
</el-date-picker>
......@@ -596,7 +596,7 @@ export default {
PlanName: "",
PlanState: 0,
borrowType: 0,
IsHaoCai: 0,
IsHaoCai: 1,
submitUsrID: "",
submitUserName: "",
BorrowList: [
......@@ -816,7 +816,7 @@ export default {
return this.$message.warning("请选择领用人员");
}
this.ruleForm.IsHaoCai = 0;
this.ruleForm.IsHaoCai = 1;
this.ruleForm.borrowType=0;
const borrowUrl = "/api/Borrow/AdminCreateBorrow";
......
src/views/home.vue
......@@ -46,10 +46,10 @@
/>
</div>
<div class="card-panel-description">
<div class="card-panel-text">公共装备</div>
<div class="card-panel-text">在库数量</div>
<count-to
:start-val="0"
:end-val="eqCount.h_EqPublicCount"
:end-val="eqCount.h_kucunCount"
:duration="3000"
class="card-panel-num"
/>
......@@ -122,7 +122,7 @@
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div
class="card-panel"
@click="handleSetBFData('2')"
@click="gotoWXEq('2')"
>
<div class="card-panel-icon-wrapper icon-weixiu">
<img
......@@ -358,7 +358,7 @@
display: block;
color: rgba(15, 56, 84, 0.58);
"
>装备状态比例</span
>装备类别比例</span
>
<div id="pieChart" class="chartD" style="height:280px;width: 520px;"/>
</el-card>
......@@ -457,10 +457,6 @@ export default {
query: { StateType: type}
});
// this.$route.push('/borrow/user')
},
//跳去未归还装备
gotoBorrow() {
......@@ -489,6 +485,15 @@ export default {
},
});
},
//跳去维修已出库页面
gotoWXEq(type) {
this.$router.push({
name: "repairGet",
query: {
options: type,
},
});
},
//跳去维修待审批页面
gotoWXEq(type) {
this.$router.push({
......@@ -533,7 +538,7 @@ export default {
this.linedata.push({
date: item.date,
borCount: parseInt(item.borCount),
type: "借出数",
type: "出库数",
});
});
......@@ -541,7 +546,7 @@ export default {
this.linedata.push({
date: item.date,
borCount: parseInt(item.rtnCount),
type: "归还数",
type: "入库数",
});
});
//linedata
......@@ -590,14 +595,14 @@ export default {
//饼图
async initPie() {
const { data: Pieclass } = await this.$axios.get(
"api/ChartStatistics/GetPie"
"api/ChartStatistics/GetAllEqCategory"
);
//let a = [{"name":"在库","value":1021,"bfb":"1.00"},{"name":"出库","value":2,"bfb":"0.00"},{"name":"维修","value":0,"bfb":"0.00"},{"name":"报废","value":0,"bfb":"0.00"}];
Pieclass.forEach((item) => {
this.pieData.push({
name: item.name,
value: parseInt(item.value),
bfb: parseFloat(item.bfb),
name: item.EqCategoryName,
value: parseInt(item.EqCount),
//bfb: parseFloat(item.bfb),
});
});
const chart = new Chart({
......@@ -611,11 +616,11 @@ export default {
radius: 0.75,
});
chart.data(this.pieData);
console.log(this.pieData);
chart.scale("bfb", {
chart.data(this.pieData.reverse());
//console.log(this.pieData[0].value);
chart.scale("value", {
formatter: (val) => {
val = val * 100 + "%";
//val = val * 100 + "%";
return val;
},
});
......@@ -624,14 +629,15 @@ export default {
showTitle: false,
showMarkers: false,
});
chart
.interval()
.position("bfb")
.position("value")
.color("name")
.label("bfb", {
.label("value", {
content: (pieData) => {
return `${pieData.name}: ${pieData.bfb * 100}%`;
//return `${pieData.name}: ${pieData.bfb * 100}%`;
return `${pieData.name}: ${pieData.value }`;
//return `${pieData.name}: ${(pieData.value/(this.pieData[0].value+this.pieData[1].value+this.pieData[2].value+this.pieData[3].value))* 100}%`;
},
})
.adjust("stack");
......@@ -649,9 +655,13 @@ export default {
autoFit: true,
height: 215,
});
chart.data(eqclass.Rows);
chart.scale("UseCount", {
//console.log(eqclass.Rows)
// 显示数据处理，将请求返回值的'UseCount'字段属性处理为'使用数量'
let newDataSource= eqclass.Rows.map(obj=>{
return { MaterialName: obj.MaterialName, 使用数量: obj.UseCount };
})
chart.data(newDataSource);
chart.scale("使用数量", {
nice: true,
});
chart.axis("MaterialName", {
......@@ -666,7 +676,7 @@ export default {
});
chart.interaction("active-region");
chart.interval().position("MaterialName*UseCount");
chart.interval().position("MaterialName*使用数量");
chart.render();
},
......
src/views/index.vue
......@@ -11,11 +11,31 @@
<!-- <div class="time_box">
<bo-time></bo-time>
</div> -->
<div class="right_box">
<span class="user mgr15">
<div class="right_box">
<template>
<el-tooltip content="装备大屏展示" effect="dark" placement="bottom" style="margin-right: 10px;">
<i class="el-icon-monitor" @click="goToNewPage(1)" style="cursor: pointer;"/>
</el-tooltip>
<el-tooltip content="入口大屏展示" effect="dark" placement="bottom" style="margin-right: 10px;">
<i class="el-icon-data-analysis" @click="goToNewPage(2)" style="cursor: pointer;"/>
</el-tooltip>
<el-tooltip content="出口大屏展示" effect="dark" placement="bottom" style="margin-right: 15px;">
<i class="el-icon-data-line" @click="goToNewPage(3)" style="cursor: pointer;"/>
</el-tooltip>
<el-tooltip content="预案路线指引视图" effect="dark" placement="bottom" style="margin-right: 15px;">
<i class="el-icon-map-location" @click="goToNewPage(4)" style="cursor: pointer;"/>
</el-tooltip>
</template>
<template>
<el-tooltip :content="nameContent" effect="dark" placement="bottom" style="margin-right: 15px;">
<i class="el-icon-full-screen" @click="toggleFullScreen" style="cursor: pointer;"/>
</el-tooltip>
</template>
<el-avatar style="margin-right: 10px;"><img src="../assets/images/user.png" alt="logo" /> </el-avatar>
<span class="user mgr15">
<el-dropdown>
<span style="color:white;" >
<svg-icon icon-class="全屏" class="svgicon"></svg-icon>
<span style="color:white; cursor: pointer;" >
<!-- <svg-icon icon-class="全屏" class="svgicon"></svg-icon> -->
欢迎您:{{ userData.UserName
}}<i class="el-icon-arrow-down el-icon--right"></i>
</span>
......@@ -61,6 +81,7 @@ export default {
// flag: '',
// 定时器
timer: null,
nameContent:'全屏'
};
},
......@@ -96,6 +117,48 @@ export default {
name: "systemConfig/userInfo"
});
},
goToNewPage(val){
if(val==1){
window.open( window._CONFIG['yaURL'], '_blank');
}
if(val==2){
window.open(window._CONFIG['rkURL'], '_blank');
}
if(val==3){
window.open(window._CONFIG['ckURL'], '_blank');
}
if(val==4){
window.open(window._CONFIG['mapURL'], '_blank');
}
},
toggleFullScreen() {
const el = document.documentElement;
if (!this.isFullScreen) {
if (el.requestFullscreen) {
el.requestFullscreen();
} else if (el.webkitRequestFullscreen) {
el.webkitRequestFullscreen();
} else if (el.mozRequestFullScreen) {
el.mozRequestFullScreen();
} else if (el.msRequestFullscreen) {
el.msRequestFullscreen();
}
this.nameContent='取消全屏';
} else {
if (document.exitFullscreen) {
document.exitFullscreen();
} else if (document.webkitExitFullscreen) {
document.webkitExitFullscreen();
} else if (document.mozCancelFullScreen) {
document.mozCancelFullScreen();
} else if (document.msExitFullscreen) {
document.msExitFullscreen();
}
this.nameContent='全屏';
}
this.isFullScreen = !this.isFullScreen;
},
// 图标栏点击事件
activeClick(e) {
const path = e ? e.path : this.activeOnePath;
......
src/views/statistics/stock.vue
......@@ -146,7 +146,7 @@ export default {
Page: 1,
Rows: 10,
Sort: "ID",
Order: "ASC",
//Order: "ASC",
OrderBy: "",
MaterialName:"",
LibraryID:"",
......@@ -156,7 +156,7 @@ export default {
Page: 1,
Rows: 999,
Sort: "ID",
Order: "ASC",
//Order: "ASC",
},
// 日期配置
pickerOptions: {
......
src/views/systemConfig/borrowApply.vue
......@@ -59,7 +59,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
>
</el-date-picker>
......
src/views/systemConfig/receiveApply.vue
......@@ -59,7 +59,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
>
</el-date-picker>
......
src/views/systemConfig/repairApply.vue
......@@ -59,7 +59,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
>
</el-date-picker>
......
src/views/warehouse/cabinet.vue
......@@ -503,7 +503,7 @@ export default {
Page: 1,
Rows: 10,
Sort: "ID",
Order: "ESC",
//Order: "ESC",//按最新时间排序
StorageCode: "",
UserName: "",
StorageType: -1,
......@@ -512,7 +512,7 @@ export default {
Page: 1,
Rows: 9999,
Sort: "ID",
Order: "ESC",
//Order: "ESC",//按最新时间排序
StorageCode: "",
},
equipmentInData: {
......
src/views/warehouse/emergencyPlan.vue
......@@ -63,6 +63,16 @@
@click="getQueuData(1)"
>查询</a-button
>
<el-tooltip content="一键入库所有预案出库的装备" placement="top">
<el-button
type="success"
icon="el-icon-s-claim"
style="height: 40px"
class="funcButton"
@click="planEqBack()"
>预案装备入库</el-button
>
</el-tooltip>
<el-button
type="primary"
icon="el-icon-plus"
......@@ -104,7 +114,7 @@
}}
</template>
</el-table-column>
<el-table-column prop="CreateTime" label="创建时间" align="center">
<el-table-column prop="CreateTime" label="创建时间" sortable align="center">
</el-table-column>
<el-table-column prop="CreateName" label="创建人员" align="center">
</el-table-column>
......@@ -998,6 +1008,15 @@ export default {
this.picVisible = true;
this.imgurl = window._CONFIG["dlURL"] + "/" + row.ImagePath;
},
//一键入库所有预案出库的物资
async planEqBack(){
const { data: res } = await this.$axios.post("api/Plan/RecoveryEquByPlan");
if(res.Success===true){
this.$message.success('所有预案出库装备已入库成功');
}else{
this.$message.error(res.Remark);
}
},
//新增预案
async addPlan() {
this.title = "添加预案";
......
src/views/warehouse/equMaintenanceLog.vue
......@@ -20,7 +20,7 @@
</el-table-column>
<el-table-column prop="BaoyangPersonName" label="保养人" align="center">
</el-table-column>
<el-table-column prop="BaoyangTime" label="保养时间" align="center" />
<el-table-column prop="BaoyangTime" label="保养时间" sortable align="center" />
<el-table-column prop="Remark" label="保养备注" align="center" />
<!-- <el-table-column label="操作" width="200" align="center">
<template v-slot="scope">
......
src/views/warehouse/equMaintenanceReminder.vue
......@@ -89,7 +89,7 @@
/>
<el-table-column prop="BaoYangDays" label="保养时间（天）" align="center" />
<el-table-column prop="NextBaoYang" :formatter="formDate" label="下次保养时间" width="150" align="center" />
<el-table-column prop="NextBaoYang" :formatter="formDate" label="下次保养时间" sortable width="150" align="center" />
<!-- <el-table-column prop="LabelEpc" label="EPC编码" align="center" /> -->
......@@ -243,9 +243,9 @@
label="是否贴标"
align="center"
/>
<el-table-column prop="BuyTime" :formatter="formDate" label="采购日期" width="150" align="center" />
<el-table-column prop="BuyTime" :formatter="formDate" label="采购日期" sortable width="150" align="center" />
<el-table-column prop="TermTime" :formatter="formDate" label="报废日期" width="150" align="center" />
<el-table-column prop="TermTime" :formatter="formDate" label="报废日期" sortable width="150" align="center" />
<!-- <el-table-column prop="LabelEpc" label="EPC编码" align="center" /> -->
<!-- <el-table-column prop="Remarks" label=" 备注" align="center" /> -->
......
src/views/warehouse/modularization.vue
......@@ -92,7 +92,7 @@
</el-table-column>
<el-table-column prop="Remark" label="备注" align="center">
</el-table-column>
<el-table-column prop="CreateTime" label="创建时间" align="center">
<el-table-column prop="CreateTime" label="创建时间" sortable align="center">
</el-table-column>
<!-- <el-table-column prop="CreateName" label="创建人员" align="center">
</el-table-column> -->
......
src/views/warehouse/storehouse.vue
......@@ -104,7 +104,7 @@
<el-table-column prop="CreateName" label="创建人员" align="center">
</el-table-column>
<el-table-column prop="CreateTime" label="创建时间" align="center">
<el-table-column prop="CreateTime" label="创建时间" sortable align="center">
</el-table-column>
<el-table-column label="操作" width="200" align="center">
......@@ -242,7 +242,7 @@ export default {
Page: 1,
Rows: 10,
Sort: "ID",
Order: "ESC",
//Order: "ESC",//按最新时间排序
LibaryName: "",
LibaryType: "-1",
},
......
src/views/warehouse/warehouseInventory.vue
......@@ -44,7 +44,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
>
</el-date-picker>
......@@ -104,7 +104,7 @@
>
</el-table-column>
<el-table-column prop="CreateName" label=" 创建人" align="center" />
<el-table-column prop="CreateTime" label=" 盘点时间" align="center" />
<el-table-column prop="CreateTime" label=" 盘点时间" sortable align="center" />
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论