sxyanzhu
/
jhbigscreen
4
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

update code

prv
haha 2023-10-15 23:58:44 +08:00
parent c3c065d4a3
commit 74da68b685
5 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pages/index.vue
View File

@ -30,7 +30,7 @@
</module-one-2-1>
<module-one-1-1 label="安全/质量管理">
<div class="warning-info-title" style="padding-left: 20px;">
<div class="warning-info-title" style="padding-left: 20px;position: relative;z-index: 9999;">
<div :class="qualityNav == 0 ? 'active' : ''" @click="qualityNavClick(0)">安全管理</div>
<div :class="qualityNav == 1 ? 'active' : ''" @click="qualityNavClick(1)">质量管理</div>
</div>
@ -46,7 +46,7 @@
<el-row>
<el-col :span="12" style="position: relative;">
<module-one-1-1 label="人员统计" :key="elDeptWorks">
<img src="images/icon2001.png" v-if="infoNav == 1" style="position: absolute;cursor: pointer;right: 20px;top: 48px;"
<img src="images/icon2001.png" style="position: absolute;cursor: pointer;right: 20px;top: 12px;"
@click="doShowAttendanceDetail">
<div class="warning-info-title" style="padding-left: 20px;">
<div :class="infoNav == 0 ? 'active' : ''" @click="onWarningInfoNav(0)">在岗人数</div>
@ -220,6 +220,7 @@
<index-dlg3 ref="dlg3"></index-dlg3>
<journalismDlg ref="journalismDlg"></journalismDlg>
<AttendanceDetailDialog ref="attDetailDlg"></AttendanceDetailDialog>
<JobWorkerDialog ref="jobWorkerdlg"></JobWorkerDialog>
</div>
</template>
<script>
@ -235,6 +236,7 @@ import journalismDlg from './dlg/journalismDlg.vue'
import debounce from 'lodash.debounce'
import AttendanceDetailDialog from './components/AttendanceDetailDialog.vue'
import mapIndex from './index/mapIndex.vue'
import JobWorkerDialog from './components/JobWorkerDialog.vue'
export default {
name: 'App',
components: {
@ -244,7 +246,7 @@ export default {
indexMap,
MonitAndWarning,
journalismDlg,
AttendanceDetailDialog,mapIndex
AttendanceDetailDialog,mapIndex,JobWorkerDialog
},
data() {
return {
@ -529,7 +531,11 @@ export default {
projectId:this.prj.id||0,
attendanceTime: this.$dt(new Date()).format("YYYY-MM-DD")
}
this.$refs.attDetailDlg.showDialog(data);
if(this.infoNav == 1){
this.$refs.attDetailDlg.showDialog(data);
}else{
this.$refs.jobWorkerdlg.showDialog(data);
}
},
loadAttendanceData(){
let data={

2
src/pages/projectDetail.vue
View File

@ -84,7 +84,7 @@
<div :class="infoNav == 1 ? 'active' : ''" @click="onWarningInfoNav(1, '今日出勤')">今日出勤
</div>
</div>
<img src="images/icon2001.png" style="position: absolute;cursor: pointer;right: 20px;top: 48px;"
<img src="images/icon2001.png" style="position: absolute;cursor: pointer;right: 20px;top: 12px;"
@click="doShowAttendanceDetail">
<el-row :key="elDeptWorks">
<el-col :span="8">

22
src/pages/projectSafety.vue
View File

@ -186,11 +186,13 @@
</div>
</module-one-1-1>
<module-one-1-1 label="劳务用工">
<module-one-1-1 label="劳务用工" style="position: relative;">
<div class="warning-info-title" style="padding-left: 20px;">
<div :class="infoNav == 0 ? 'active' : ''" @click="onWarningInfoNav(0, '在岗人数')">在岗人数</div>
<div :class="infoNav == 1 ? 'active' : ''" @click="onWarningInfoNav(1, '今日出勤')">今日出勤</div>
</div>
<img src="images/icon2001.png" style="position: absolute;cursor: pointer;right: 20px;top: 12px;"
@click="doShowAttendanceDetail">
<el-row>
<el-col :span="8">
<div class="survey_content">
@ -266,7 +268,9 @@
<worktrainDlg ref="workTrainDlg"></worktrainDlg>
<projectSpecialDlg ref="projectSpecialDlg"></projectSpecialDlg>
<ProblemmodifyDetail ref="probDlg"></ProblemmodifyDetail>
<AttendanceDetailDialog ref="attDetailDlg"></AttendanceDetailDialog>
<projectInsuranceDlg ref="insDlg"></projectInsuranceDlg>
<JobWorkerDialog ref="jobWorkerdlg"></JobWorkerDialog>
</div>
</template>
@ -282,12 +286,14 @@ import worktrainDlg from './dlg/workTrainDlg.vue'
import projectSpecialDlg from './dlg/projectSpecialDlg.vue'
import ProblemmodifyDetail from './components/ProblemmodifyDetail.vue'
import projectInsuranceDlg from './safe/projectInsuranceDlg.vue'
import AttendanceDetailDialog from './components/AttendanceDetailDialog.vue'
import JobWorkerDialog from './components/JobWorkerDialog.vue'
import debounce from 'lodash.debounce'
export default {
components: {
worktrainDlg,
projectSpecialDlg,
ProblemmodifyDetail,
ProblemmodifyDetail,AttendanceDetailDialog,
projectInsuranceDlg
},
data() {
@ -401,6 +407,18 @@ export default {
},
methods: {
doShowAttendanceDetail(){
let data={
deptId:this.dept.id||0,
projectId:this.project.id||0,
attendanceTime: this.$dt(new Date()).format("YYYY-MM-DD")
}
if(this.infoNav == 1){
this.$refs.attDetailDlg.showDialog(data);
}else{
this.$refs.jobWorkerdlg.showDialog(data);
}
},
initMe(){
this.projectInfo=this.$root.project||{};
this.dept=this.$root.dept||{};

8
src/pages/toAIVideoProject.vue
View File

@ -38,7 +38,7 @@
<div class="ai-video-info">
<div class="ai-video-info-flex">
<div class="ai-content-nav-max" style="width: 100% ">
<div class="ai-content-nav-min" v-for="(alertorType,index) in alertorTypeList">
<div class="ai-content-nav-min" v-for="(alertorType,index) in alertorTypeList" :key="index">
<div class="ai-content-nav-con">
<div :class="nav == index?'ai-content-nav active':'ai-content-nav'" @click="aiNav(index,alertorType.dictValue)" v-html="alertorType.dictLabel">
</div>
@ -48,7 +48,7 @@
</div>
<div class="ai-content-info-max">
<el-row>
<el-col style="position: relative;" :span="8" v-for="(video,index) in videoList">
<el-col style="position: relative;" :span="8" v-for="(video,index) in videoList" :key="index">
<div class="ai-content-info-min">
<div class="ai-content-videos" :class="video.state?'active-video':'videobo'">
<H265Player v-if="video.state" :url="getVideoUrl(video)"/>
@ -74,7 +74,7 @@
<img src="/images/ai/left_slip.png" id="leftSlip">
</div> -->
<div class="ai-key-videos-content" id="videosContent">
<div class="ai-key-videos-max" style="position: relative;" v-for="(video,index) in majorVideoList">
<div class="ai-key-videos-max" style="position: relative;" v-for="(video,index) in majorVideoList" :key="index">
<div class="ai-key-videos-min" :class="video.state?'imp-video':'videobo'">
<H265Player v-if="video.state" :url="getVideoUrl(video)"/>
<div class="ai-video-name" style="position: absolute;height: 35px;line-height: 35px;padding: 0px 15px;z-index: 99999;bottom: 8px;font-size: 13px;">
@ -102,7 +102,7 @@
<div class="ai-warning-list-content">
<div class="ai-warning-list-max scroll" @mouseenter="stopListAnm" @mouseleave="listAnm" id="warningListMax" style="overflow-y:auto">
<div id="warningListMin">
<div class="project-expect-list active" v-for="(item,idx) in warningList" v-if="idx<50">
<div class="project-expect-list active" v-for="(item,idx) in warningList" v-if="idx<50" :key="idx">
<div class="project-expect-con">
<div class="project-expect-title">
<div class="project-expect-title-No">{{item.projectName}}</div>

4
vue.config.js
View File

@ -30,8 +30,8 @@ module.exports = defineConfig({
}
},
'/jhapi':{
//target: `http://62.234.3.186/jhapi/`,
target: `http://127.0.0.1:8090/jhapi/`,
target: `http://62.234.3.186/jhapi/`,
//target: `http://127.0.0.1:8090/jhapi/`,
changeOrigin: true,
pathRewrite: {
'^/jhapi':'/'