admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev

Browse Source
This commit is contained in:
Vce 2024-05-12 17:44:07 +08:00
commit ef35e21b3e
3 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.env.development
View File

@ -3,10 +3,9 @@ NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用) # 本地环境接口地址(/api/index.ts文件中使用)
# 后端本地 # 后端本地
# VITE_API_URL = 'http://192.168.34.221:9111'
# VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程
VITE_API_URL = 'http://jxj.zhgdyun.com:61212' #杰哥远程
VITE_API_URL = 'http://192.168.34.221:9111' VITE_API_URL = 'http://192.168.34.221:9111'
# VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程
# VITE_API_URL = 'http://jxj.zhgdyun.com:61212' #杰哥远程
# VITE_API_URL = 'http://192.168.34.155:19111' # VITE_API_URL = 'http://192.168.34.155:19111'
# VITE_API_URL = 'http://192.168.34.221:28888' # VITE_API_URL = 'http://192.168.34.221:28888'
# VITE_API_URL = 'http://121.196.214.246/api' # VITE_API_URL = 'http://121.196.214.246/api'

7
src/views/commandScreen/dialogCompnnents/member-count-list.vue
View File

@ -124,6 +124,7 @@
<div class="tabs-four" v-if="activeIndex == 3"> <div class="tabs-four" v-if="activeIndex == 3">
<div class="tabList"> <div class="tabList">
<div>序号</div> <div>序号</div>
<div>危大工程名称</div>
<div>旁站记录</div> <div>旁站记录</div>
<div>图片</div> <div>图片</div>
<div>记录人</div> <div>记录人</div>
@ -132,6 +133,7 @@
<el-scrollbar class="listBox" ref="refScrollbar"> <el-scrollbar class="listBox" ref="refScrollbar">
<div v-for="(item, index) in partyMemberList" class="listStyle" :key="item.id"> <div v-for="(item, index) in partyMemberList" class="listStyle" :key="item.id">
<div>{{index + 1}}</div> <div>{{index + 1}}</div>
<div>{{item.engineeringName}}</div>
<div>{{item.buildSituation}}</div> <div>{{item.buildSituation}}</div>
<div class="list-img"> <div class="list-img">
<el-image <el-image
@ -201,6 +203,7 @@ const handleClick = (tab: TabsPaneContext, event: Event) => {
// if(activeName.value === 'first') console.log('1') // if(activeName.value === 'first') console.log('1')
// if(activeName.value === 'second') console.log('2') // if(activeName.value === 'second') console.log('2')
// if(activeName.value === 'third') console.log('3') // if(activeName.value === 'third') console.log('3')
if(tab.index == activeIndex.value) return;
activeIndex.value = tab.index activeIndex.value = tab.index
partyMemberList.value = []; partyMemberList.value = [];
getMemberCountList('search') getMemberCountList('search')
@ -488,7 +491,7 @@ onMounted(async () => {
margin-top: 2%; margin-top: 2%;
div { div {
text-align: center; text-align: center;
width: 20%; width: 17%;
} }
} }
.listBox { .listBox {
@ -521,7 +524,7 @@ onMounted(async () => {
} }
} }
div { div {
width: 20%; width: 17%;
white-space: nowrap; //单行 white-space: nowrap; //单行
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

54
src/views/commandScreen/dialogCompnnents/safe-hidden.vue
View File

@ -44,6 +44,7 @@
v-model="searchForm.status" v-model="searchForm.status"
:clearable="true" :clearable="true"
style="width: 150px" style="width: 150px"
@change="conditionSearch"
> >
<el-option v-for="(item, index) in statusList" :key="index" :label="item.name" :value="item.value" /> <el-option v-for="(item, index) in statusList" :key="index" :label="item.name" :value="item.value" />
</el-select> </el-select>
@ -57,8 +58,9 @@
v-model="searchForm.level" v-model="searchForm.level"
:clearable="true" :clearable="true"
style="width: 150px" style="width: 150px"
@change="conditionSearch"
> >
<el-option v-for="(item, index) in levelListData" :key="index" :label="item.enterpriseName" :value="item.id" /> <el-option v-for="(item, index) in levelListData" :key="index" :label="item.name" :value="item.value" />
</el-select> </el-select>
</div> </div>
<div class="search-item"> <div class="search-item">
@ -67,11 +69,12 @@
class="m-2" class="m-2"
placeholder="请选择" placeholder="请选择"
size="small" size="small"
v-model="searchForm.inspectId" v-model="searchForm.inspectManId"
:clearable="true" :clearable="true"
style="width: 150px" style="width: 150px"
@change="conditionSearch"
> >
<el-option v-for="(item, index) in inspectList" :key="index" :label="item.realName" :value="item.id" /> <el-option v-for="(item, index) in inspectList" :key="index" :label="item.realName" :value="item.userId" />
</el-select> </el-select>
</div> </div>
<div class="search-item"> <div class="search-item">
@ -83,8 +86,9 @@
v-model="searchForm.changeId" v-model="searchForm.changeId"
:clearable="true" :clearable="true"
style="width: 150px" style="width: 150px"
@change="conditionSearch"
> >
<el-option v-for="(item, index) in inspectList" :key="index" :label="item.realName" :value="item.id" /> <el-option v-for="(item, index) in inspectList" :key="index" :label="item.realName" :value="item.userId" />
</el-select> </el-select>
</div> </div>
<div class="search-item"> <div class="search-item">
@ -96,6 +100,7 @@
v-model="searchForm.enterpriseId" v-model="searchForm.enterpriseId"
:clearable="true" :clearable="true"
style="width: 150px" style="width: 150px"
@change="conditionSearch"
> >
<el-option v-for="(item, index) in enterpriseListData" :key="index" :label="item.enterpriseName" :value="item.id" /> <el-option v-for="(item, index) in enterpriseListData" :key="index" :label="item.enterpriseName" :value="item.id" />
</el-select> </el-select>
@ -118,14 +123,22 @@
<el-scrollbar class="listBox" ref="refScrollbar"> <el-scrollbar class="listBox" ref="refScrollbar">
<div v-for="(item, index) in partyMemberList" class="listStyle" :key="item.id"> <div v-for="(item, index) in partyMemberList" class="listStyle" :key="item.id">
<div>{{index + 1}}</div> <div>{{index + 1}}</div>
<div>{{statusList[item.status].name}}</div> <div>{{item.status?textFilter(item.status):''}}</div>
<div>{{item.level?levelListData[item.level - 1].name:''}}</div> <div>{{item.level?levelListData[item.level - 1].name:''}}</div>
<div>{{item.regionName}}</div> <div>{{item.regionName}}</div>
<div>{{item.dangerItemContent}}</div> <div>
<div>{{item.changeLimitTime}}</div> <el-tooltip class="box-item" effect="dark" :content="item.dangerItemContent" placement="top-start">
<span>{{item.dangerItemContent}}</span>
</el-tooltip>
</div>
<div>
<el-tooltip class="box-item" effect="dark" :content="item.changeLimitTime" placement="top-start">
<span>{{item.changeLimitTime}}</span>
</el-tooltip>
</div>
<div>{{item.inspectManName}}</div> <div>{{item.inspectManName}}</div>
<div style="width: 15%;">{{item.inspectTime}}</div> <div style="width: 15%;">{{item.inspectTime}}</div>
<div>{{item.changeId}}</div> <div>{{item.changeName}}</div>
<div>{{item.enterpriseName}}</div> <div>{{item.enterpriseName}}</div>
</div> </div>
<div class="notoDta" v-if="partyMemberList.length == 0"> <div class="notoDta" v-if="partyMemberList.length == 0">
@ -149,18 +162,18 @@ const BASEURL = import.meta.env.VITE_API_URL;
const inspectList = ref([] as any); const inspectList = ref([] as any);
const enterpriseListData = ref([] as any); const enterpriseListData = ref([] as any);
const levelListData = ref([ const levelListData = ref([
{ name: "重大隐患", value: 1 }, { name: "一级", value: 1 },
{ name: "较大隐患", value: 2 }, { name: "二级", value: 2 },
{ name: "一般隐患", value: 3 }, { name: "三级", value: 3 },
{ name: "低隐患", value: 4 } { name: "四级", value: 4 }
]) ])
const statusList = ref([ const statusList = ref([
{ name: "无需整改", value: 1 }, // { name: "无需整改", value: 1 },
{ name: "待整改", value: 2 }, { name: "待整改", value: 2 },
{ name: "待复查", value: 3 }, { name: "待复查", value: 3 },
{ name: "待核验", value: 4 }, { name: "待核验", value: 4 },
{ name: "合格", value: 5 }, { name: "合格", value: 5 },
{ name: "不合格", value: 6 }, // { name: "不合格", value: 6 },
{ name: "超期未关闭", value: 7 }, { name: "超期未关闭", value: 7 },
]); ]);
let pageNo = ref(1 as any); let pageNo = ref(1 as any);
@ -168,13 +181,24 @@ let moreScroll = ref(true as any);
const refScrollbar = ref(null as any); // 绑定到滚动的盒子上 const refScrollbar = ref(null as any); // 绑定到滚动的盒子上
const searchForm = ref({ const searchForm = ref({
status: '', status: '',
inspectId: '', inspectManId: '',
changeId: '', changeId: '',
enterpriseId: '', enterpriseId: '',
level: '' level: ''
}); });
const topDangerList = ref([] as any) const topDangerList = ref([] as any)
const partyMemberList = ref({} as any); const partyMemberList = ref({} as any);
// 文本处理
const textFilter = (val:any) => {
let findItem:any = statusList.value.find(item => {
return item.value == val;
})
return findItem.name
}
// 条件查询
const conditionSearch = async () => {
getMemberCountList('search')
}
// 获取整改人、检查人 // 获取整改人、检查人
const getSystemUserFn = async () => { const getSystemUserFn = async () => {
let data = { let data = {