Skip to content

I
inspection-pad-web
提交 2e5db679 authored 作者: 刘守彩's avatar 刘守彩
浏览文件
操作

feat: new app add

上级 90114c3f
隐藏空白字符变更
内嵌 并排
正在显示 包含 76 行增加 和 193 行删除
README.md
浏览文件 @ 2e5db679
......@@ -2,4 +2,4 @@
## 说明
**`master`分支，用于F座3楼机房，`master_two`分支，用于坑洞机房。两个分支互不合并。**
\ No newline at end of file
**`master`分支，用于F座3楼机房，`master_two`分支，用于山南机房。两个分支互不合并。**
\ No newline at end of file
baseData/assroom.json
浏览文件 @ 2e5db679
[
{
"id": "1",
"roomName": "F3内环屏蔽机房",
"id": "61b4dafea514193b9b39e3d4bb847bbd",
"roomName": "山南UPS间",
"buildingId": "8a02454d00bd9df7bda41f7d1a6c471e",
"buildingName": "G座",
"roomType": "1",
"roomFile": "http://192.168.100.103:8099/profile/upload/2025/03/25/20de409bc81f48dbbeaeb9c198683ee6_20250325143326A008.jpeg,http://192.168.100.103:8099/profile/upload/2025/03/25/1711459331134717_20250325143340A009.png",
"roomFile": "",
"roomAddress": null,
"keynoteFlag": "0",
"sort": "1",
......@@ -22,12 +22,12 @@
"dictValue": "1"
},
{
"id": "2",
"roomName": "F3外环屏蔽机房",
"id": "2cd89f11ca6bf410a2e9921a832ceff3",
"roomName": "接入机房",
"buildingId": "8",
"buildingName": "A座",
"roomType": "1",
"roomFile": "/profile/upload/2025/03/24/sample_640×426 - 副本_20250324135659A007.JPG",
"roomFile": "",
"roomAddress": null,
"keynoteFlag": "0",
"sort": "4",
......@@ -44,12 +44,12 @@
"dictValue": "2"
},
{
"id": "3",
"roomName": "F2汇聚机房",
"id": "920c0307eca9fa9d84a8b718762873c5",
"roomName": "传输机房",
"buildingId": "10",
"buildingName": "B座",
"roomType": "1",
"roomFile": "http://192.168.100.103:8099/profile/upload/2025/03/18/20de409bc81f48dbbeaeb9c198683ee6_20250318141902A009.jpeg",
"roomFile": "",
"roomAddress": null,
"keynoteFlag": "0",
"sort": "4",
......@@ -66,12 +66,12 @@
"dictValue": "3"
},
{
"id": "4",
"roomName": " A2汇聚机房",
"id": "d1b0c6686d7563b8e9d9fb51b139a4bc",
"roomName": " 国安专区",
"buildingId": "10",
"buildingName": "B座",
"roomType": "1",
"roomFile": "http://192.168.100.103:8099/profile/upload/2025/03/27/微信截图_20250327155657_20250327155711A005.png",
"roomFile": "",
"roomAddress": null,
"keynoteFlag": "0",
"sort": "4",
......@@ -88,12 +88,12 @@
"dictValue": "4"
},
{
"id": "5",
"roomName": "A3屏蔽机房",
"id": "8d1704ba09694bc4d7e681d5b00ef52e",
"roomName": "纪委专区",
"buildingId": "10",
"buildingName": "B座",
"roomType": "1",
"roomFile": "http://192.168.100.103:8099/profile/upload/2025/03/18/1711459331134717_20250318150705A002.png",
"roomFile": "",
"roomAddress": null,
"keynoteFlag": "0",
"sort": "5",
......@@ -110,12 +110,12 @@
"dictValue": "5"
},
{
"id": "6",
"roomName": "A-1UPS间",
"id": "f9264f7781e9a6d467894a886dce5918",
"roomName": "山南市委机房",
"buildingId": "8",
"buildingName": "A1座",
"roomType": "1",
"roomFile": "http://192.168.100.103:8099/profile/upload/2025/03/18/1711459331134717_20250318150705A002.png",
"roomFile": "",
"roomAddress": null,
"keynoteFlag": "0",
"sort": "6",
......@@ -130,115 +130,5 @@
"SHOW": null,
"roomFeature": "3",
"dictValue": "6"
},
{
"id": "7",
"roomName": "B2汇聚机房",
"buildingId": "10",
"buildingName": "B座",
"roomType": "1",
"roomFile": "http://192.168.100.103:8099/profile/upload/2025/03/18/1711459331134717_20250318150705A002.png",
"roomAddress": null,
"keynoteFlag": "0",
"sort": "7",
"roomDesc": "市民中心A座4楼",
"remark": null,
"createTime": "1742785651000",
"createBy": "",
"updateTime": "1742785651000",
"updateBy": "",
"delFlag": "0",
"synFlag": "1",
"SHOW": null,
"roomFeature": "1",
"dictValue": "7"
},
{
"id": "8",
"roomName": "C2汇聚机房",
"buildingId": "8",
"buildingName": "A1座",
"roomType": "1",
"roomFile": "http://192.168.100.103:8099/profile/upload/2025/03/20/sample_640×426 - 副本_20250320091529A001.JPG",
"roomAddress": null,
"keynoteFlag": "0",
"sort": "9",
"roomDesc": "A座-3楼",
"remark": null,
"createTime": "1742785675000",
"createBy": "",
"updateTime": "1742785675000",
"updateBy": "",
"delFlag": "0",
"synFlag": "1",
"SHOW": null,
"roomFeature": "1",
"dictValue": "8"
},
{
"id": "9",
"roomName": "D2汇聚机房",
"buildingId": "8",
"buildingName": "A1座",
"roomType": "1",
"roomFile": "http://192.168.100.103:8099/profile/upload/2025/03/20/sample_640×426 - 副本_20250320091529A001.JPG",
"roomAddress": null,
"keynoteFlag": "0",
"sort": "9",
"roomDesc": "A座-3楼",
"remark": null,
"createTime": "1742785675000",
"createBy": "",
"updateTime": "1742785675000",
"updateBy": "",
"delFlag": "0",
"synFlag": "1",
"SHOW": null,
"roomFeature": "1",
"dictValue": "9"
},
{
"id": "10",
"roomName": "E2汇聚机房",
"buildingId": "8",
"buildingName": "A1座",
"roomType": "1",
"roomFile": "http://192.168.100.103:8099/profile/upload/2025/03/20/sample_640×426 - 副本_20250320091529A001.JPG",
"roomAddress": null,
"keynoteFlag": "0",
"sort": "9",
"roomDesc": "A座-3楼",
"remark": null,
"createTime": "1742785675000",
"createBy": "",
"updateTime": "1742785675000",
"updateBy": "",
"delFlag": "0",
"synFlag": "1",
"SHOW": null,
"roomFeature": "1",
"dictValue": "10"
},
{
"id": "11",
"roomName": "F-2UPS间",
"buildingId": "8",
"buildingName": "A1座",
"roomType": "1",
"roomFile": "http://192.168.100.103:8099/profile/upload/2025/03/20/sample_640×426 - 副本_20250320091529A001.JPG",
"roomAddress": null,
"keynoteFlag": "0",
"sort": "9",
"roomDesc": "A座-3楼",
"remark": null,
"createTime": "1742785675000",
"createBy": "",
"updateTime": "1742785675000",
"updateBy": "",
"delFlag": "0",
"synFlag": "1",
"SHOW": null,
"roomFeature": "1",
"dictValue": "11"
}
}
]
baseData/user.json
浏览文件 @ 2e5db679
[{
"userId": "1",
"user": "姜安平",
"user": "姚祚",
"avatar": "",
"passWord": "Jap@123",
"passWord": "Yz@123",
"roleName": "巡检员",
"unitName": "运维",
"isAdmin": "",
......@@ -10,9 +10,9 @@
},
{
"userId": "2",
"user": "段树梁",
"user": "郑宏杰",
"avatar": "",
"passWord": "Dsl@123",
"passWord": "Zhj@123",
"roleName": "巡检员",
"unitName": "运维",
"isAdmin": "",
......@@ -20,9 +20,9 @@
},
{
"userId": "3",
"user": "孔佳真",
"user": "何祥",
"avatar": "",
"passWord": "Kjz@123",
"passWord": "Hx@123",
"roleName": "巡检员",
"unitName": "运维",
"isAdmin": "",
......@@ -30,16 +30,6 @@
},
{
"userId": "4",
"user": "钟校明",
"avatar": "",
"passWord": "Zxm@123",
"roleName": "巡检员",
"unitName": "运维",
"isAdmin": "",
"LastSynchronizationTime": ""
},
{
"userId": "5",
"user": "管理员",
"avatar": "",
"passWord": "Gly@124",
......
components/searchCom/index.vue
浏览文件 @ 2e5db679
......@@ -2,9 +2,9 @@
<!-- 巡检管理搜索页 -->
<view class="search-com">
<view class="search-com-left">
<uni-data-select v-if="!hiddenSearch.includes('inspectionType')" class="uni-search-item"
<!-- <uni-data-select v-if="!hiddenSearch.includes('inspectionType')" class="uni-search-item"
v-model="searchFrom.inspectionType" :localdata="inspectArr" @change="(e) => change(e, 'inspectionType')"
placeholder="类型"></uni-data-select>
placeholder="类型"></uni-data-select> -->
<uni-data-select v-if="!hiddenSearch.includes('synFlag')" class="uni-search-item" v-model="searchFrom.synFlag" :localdata="synchronization" placeholder="是否同步"
@change="(e) => change(e, 'synFlag')"></uni-data-select>
......
pages/home/home.vue
浏览文件 @ 2e5db679
......@@ -65,7 +65,7 @@
@confirm="dialogInputConfirm2"
>
</uni-popup-dialog>
</uni-popup>
</uni-popup>
</view>
</template>
......@@ -81,11 +81,11 @@ export default {
text: "机房巡检",
url: "/pages/inspectionContent/inspectionContentList?backValue=home",
},
{
image: "../../static/img/jd.png",
text: "井道巡检",
url: "/pages/shaftInspection/shaftInspectionList?backValue=home",
},
// {
// image: "../../static/img/jd.png",
// text: "井道巡检",
// url: "/pages/shaftInspection/shaftInspectionList?backValue=home",
// },
{
image: "../../static/img/sj.png",
text: "设备上架",
......@@ -322,7 +322,7 @@ export default {
.card-container {
display: flex;
justify-content: space-between;
justify-content: space-evenly;
.card {
width: 224px;
......@@ -345,5 +345,6 @@ export default {
}
}
}
}
}
</style>
pages/inspectionContent/inspectionContentList.vue
浏览文件 @ 2e5db679
......@@ -129,22 +129,21 @@
<text class="iconfont icon-weixunjian"></text>
</template>
<template v-else>
<text
v-if="card.status == 0"
class="iconfont icon-weixunjian"
></text>
<text
v-if="card.status == 1"
class="iconfont icon-wancheng"
></text>
<text
v-if="card.status == 2"
v-else-if="card.status == 2"
class="iconfont icon-shibai1"
></text>
></text>
<text
v-else
class="iconfont icon-weixunjian"
></text>
</template>
<text class="status" v-if="card.isSubmit == 0">草稿</text>
<text class="status" v-else>{{ card.statusLable }}</text>
<text class="status" v-else>{{ card.statusLable || '未巡检' }}</text>
</view>
<view class="second-row">
<text class="location">{{ card.name }}</text>
......@@ -152,7 +151,7 @@
</view>
<view class="spacer-image right" v-if="cardIndex < row.length - 1">
<image
v-if="inspectionNumber == 11"
v-if="inspectionNumber == 6"
class="img"
src="@/static/img/arr2.svg"
mode="aspectFit"
......@@ -172,7 +171,7 @@
"
>
<image
v-if="inspectionNumber == 11"
v-if="inspectionNumber == 6"
class="img"
src="@/static/img/arr2.svg"
mode="aspectFit"
......@@ -259,6 +258,7 @@ import assRoomApi from "@/api/assRoom.js";
import inspectApi from "@/api/inspect";
import { sqlToData, dataToSql, getHistoryData } from "./shared";
import Dialog from "@/pages/inspectionManagement/dialog.vue";
import log from "../../api/log";
export default {
components: {
......@@ -289,7 +289,7 @@ export default {
isList: true,
isLast: false,
}, //弹窗文案
name: "F座3楼-内环屏蔽机房",
name: "山南UPS间",
value: "1",
listData: [],
isDialog: false,
......@@ -380,13 +380,12 @@ export default {
(item) => item.isSubmit == 1
);
let group1 = this.cardsInfo.slice(0, 5);
let group2 = this.cardsInfo.slice(5, 10);
let group3 = this.cardsInfo.slice(10);
let group1 = this.cardsInfo.slice(0, 3);
let group2 = this.cardsInfo.slice(3, 6);
if (!this.isSign) {
group2 = group2.reverse();
}
this.rows = [group1, group2, group3];
this.rows = [group1, group2];
this.detailsInfo = detailsInfo;
} else {
......@@ -427,12 +426,14 @@ export default {
* 前端用的：jfType 机房类型 0屏蔽  1汇聚  2电池间（1） 3电池间（2）
* roomFeature 机房类型枚举：1.汇聚机房，2.屏蔽机房，3.UPS机房，4.数据机房
*/
jfType: item.dictValue == "11" ? "3" : jfType,
// jfType: item.dictValue == "11" ? "3" : jfType,
jfType,
isVaild: item.isVaild || false, // 校验通过
status: item.status || 0,
statusLable: item.statusLable || "未巡检",
};
});
});
console.log('listFormat', list)
return list;
},
init(baseList) {
......@@ -443,10 +444,9 @@ export default {
console.log("this.listData", this.listData);
const group1 = list.slice(0, 5);
const group2 = list.slice(5, 10).reverse();
const group3 = list.slice(10);
this.rows = [group1, group2, group3];
const group1 = list.slice(0, 3);
const group2 = list.slice(3, 6).reverse();
this.rows = [group1, group2];
if (this.uid) {
this.inspectionCode = this.detailsInfo.inspectionCode;
......@@ -516,13 +516,12 @@ export default {
(item) => item.isSubmit == 1
);
let group1 = this.cardsInfo.slice(0, 5);
let group2 = this.cardsInfo.slice(5, 10);
let group3 = this.cardsInfo.slice(10);
let group1 = this.cardsInfo.slice(0, 3);
let group2 = this.cardsInfo.slice(3, 6);
if (!this.isSign) {
group2 = group2.reverse();
}
this.rows = [group1, group2, group3];
this.rows = [group1, group2];
console.log("this.cardsInfo", this.cardsInfo);
this.isDisable = this.isDisable || detailsInfo.synchronization == 1; // 是否禁用 1:已同步数据 0: 未同步数据
......@@ -548,7 +547,7 @@ export default {
}
console.log("this.detailsItem", this.detailsItem);
},
startDialogBtn(name = "F座3楼-内环屏蔽机房", jfType = "0", value = "1") {
startDialogBtn(name = "山南UPS间", jfType = "0", value = "1") {
let item = this.findTargetObject(this.listData);
console.log("即将操作的机房", item);
......@@ -564,7 +563,7 @@ export default {
this.value = value;
this.$refs.startDialog.open();
},
startDialog(name = "F座3楼-内环屏蔽机房", jfType = "0", value = "1") {
startDialog(name = "山南UPS间", jfType = "0", value = "1") {
this.name = name;
this.jfType = jfType;
this.value = value;
......@@ -937,7 +936,7 @@ export default {
border-radius: 9.6px;
overflow: auto;
.card-wrapper {
width: calc((100% - 4 * 12.8px) / 5); /* 严格五等分宽度 */
width: calc((100% - 3 * 12.8px) / 3); /* 严格3等分宽度 */
.card {
margin-bottom: 12.8px;
}
......@@ -951,7 +950,7 @@ export default {
position: relative;
width: 100%;
.card-wrapper {
width: calc((100% - 4 * 43.2px) / 5); /* 严格五等分宽度 */
width: calc((100% - 3 * 43.2px) / 3); /* 严格3等分宽度 */
.card {
height: 51.2px;
margin-bottom: 43.2px;
......
pages/inspectionContent/inspectionContentNew.vue
浏览文件 @ 2e5db679
......@@ -126,7 +126,7 @@
</view>
<!-- v-if="value > 2" -->
<view class="action-btn complete-btn" @click="submit(1)"> 完成巡检 </view>
<!-- <view class="action-btn" @click="normal"> 一键正常 </view> -->
<view class="action-btn" @click="normal"> 一键正常 </view>
</view>
<startDialog
ref="startDialog"
......@@ -247,7 +247,7 @@ export default {
this.dictValue = options.dictValue;
this.inspectionCode = options.inspectionCode;
this.backValue = options.backValue || "";
this.imgSrc = `../../static/img/jf/jf${this.value}.png`;
this.imgSrc = `../../static/img/jf_new/jf${this.value}.png`;
this.tabs =
this.jfType === "2" || this.jfType === "3"
......@@ -448,7 +448,8 @@ export default {
* 前端用的：jfType 机房类型 0屏蔽  1汇聚  2电池间（1） 3电池间（2）
* roomFeature 机房类型枚举：1.汇聚机房，2.屏蔽机房，3.UPS机房，4.数据机房
*/
jfType: item.dictValue == "11" ? "3" : jfType,
// jfType: item.dictValue == "11" ? "3" : jfType,
jfType,
isVaild: false, // 校验通过
details: this.paramsObjFirst,
status: item.status,
......@@ -984,7 +985,7 @@ export default {
margin-bottom: 15px;
.weitu {
width: 100%;
height: 280px;
height: 320px;
}
}
.kong {
......
pages/inspectionManagement/index.vue
浏览文件 @ 2e5db679
......@@ -10,7 +10,7 @@
<block slot="right" class="nav-right">
<view class="header-buttons">
<view class="button" @click="clickInspection(1)">机房巡检</view>
<view class="button" @click="clickInspection(2)">井道巡检</view>
<!-- <view class="button" @click="clickInspection(2)">井道巡检</view> -->
</view>
</block>
</uni-nav-bar>
......
pages/login/login.vue
浏览文件 @ 2e5db679
......@@ -44,8 +44,8 @@
data() {
return {
person: {
account: "", // "管理员",
pwd: "" // Gly@124",
account: "管理员", // "管理员",
pwd: "Gly@124" // Gly@124",
},
backButtonPress: 0,
personList: [],
......
zs/zI7Z5z3b.txt 0 → 100644
浏览文件 @ 2e5db679
zI7Z5z3b
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论