elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dongming' of http://120.46.222.128:10021/elink-star/epmet-work-pc-chengyang into xiaowang-featrue

xiaowang-featrue
是小王呀\24601 11 months ago
parent
ff889f05bf e31b7c9459
commit
53fe113ffc
10 changed files with 40 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/dataBoard/IoTPerception/Videosurveillance/cpts/videoDialog.vue
  2. 6
      src/views/modules/communityParty/communityNews/index.vue
  3. 6
      src/views/modules/communityParty/employmentService/index.vue
  4. 6
      src/views/modules/communityParty/noticeAnnouncement/index.vue
  5. 6
      src/views/modules/communityParty/policeCivilianInteraction/index.vue
  6. 6
      src/views/modules/communityParty/threeAffairsDisclosure/index.vue
  7. 5
      src/views/modules/shequzhili/eventOld/cpts/event-detail.vue
  8. 2
      src/views/modules/shequzhili/eventOld/cpts/event-info.vue
  9. 11
      src/views/modules/shequzhili/eventOld/eventList.vue
  10. 18
      src/views/modules/shequzhili/videomonitoring/index.vue

2
src/views/dataBoard/IoTPerception/Videosurveillance/cpts/videoDialog.vue
View File

@ -152,7 +152,7 @@ export default {
async getVideoUrl(){
let {data,code} = await requestPost('/actual/base/videoMonitoring/getVideoUrl',{monitorCode:this.monitorCode})
if(code === 0){
this.url = data.replace('http://111.34.21.222:12080/',`${window.SITE_CONFIG['liveURL']}`)
this.url = data.replace('https://111.34.21.222:12443/',`${window.SITE_CONFIG['liveURL']}`)
this.play()
}
},

6
src/views/modules/communityParty/communityNews/index.vue
View File

@ -53,8 +53,8 @@
<el-table-column :show-overflow-tooltip="true" prop="agencyName" header-align="center" align="center"
label="发布单位">
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
</el-table-column>
<!-- <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
</el-table-column>-->
<el-table-column :show-overflow-tooltip="true" prop="title" header-align="center" align="center" label="文章标题">
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="coverPic" header-align="center" align="center"
@ -64,7 +64,7 @@
:preview-src-list="[scope.row.coverPic]"></el-image>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="发布人">
<el-table-column :show-overflow-tooltip="true" prop="publishName" header-align="center" align="center" label="发布人">
<!-- <template slot-scope="scope">
<span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
</template> -->

6
src/views/modules/communityParty/employmentService/index.vue
View File

@ -53,8 +53,8 @@
<el-table-column :show-overflow-tooltip="true" prop="agencyName" header-align="center" align="center"
label="发布单位">
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
</el-table-column>
<!-- <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
</el-table-column>-->
<el-table-column :show-overflow-tooltip="true" prop="title" header-align="center" align="center" label="文章标题">
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="coverPic" header-align="center" align="center"
@ -64,7 +64,7 @@
:preview-src-list="[scope.row.coverPic]"></el-image>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="发布人">
<el-table-column :show-overflow-tooltip="true" prop="publishName" header-align="center" align="center" label="发布人">
<!-- <template slot-scope="scope">
<span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
</template> -->

6
src/views/modules/communityParty/noticeAnnouncement/index.vue
View File

@ -53,8 +53,8 @@
<el-table-column :show-overflow-tooltip="true" prop="agencyName" header-align="center" align="center"
label="发布单位">
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
</el-table-column>
<!-- <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
</el-table-column>-->
<el-table-column :show-overflow-tooltip="true" prop="title" header-align="center" align="center" label="文章标题">
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="coverPic" header-align="center" align="center"
@ -64,7 +64,7 @@
:preview-src-list="[scope.row.coverPic]"></el-image>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="发布人">
<el-table-column :show-overflow-tooltip="true" prop="publishName" header-align="center" align="center" label="发布人">
<!-- <template slot-scope="scope">
<span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
</template> -->

6
src/views/modules/communityParty/policeCivilianInteraction/index.vue
View File

@ -53,8 +53,8 @@
<el-table-column :show-overflow-tooltip="true" prop="agencyName" header-align="center" align="center"
label="发布单位">
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
</el-table-column>
<!-- <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
</el-table-column>-->
<el-table-column :show-overflow-tooltip="true" prop="title" header-align="center" align="center" label="文章标题">
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="coverPic" header-align="center" align="center"
@ -64,7 +64,7 @@
:preview-src-list="[scope.row.coverPic]"></el-image>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="发布人">
<el-table-column :show-overflow-tooltip="true" prop="publishName" header-align="center" align="center" label="发布人">
<!-- <template slot-scope="scope">
<span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
</template> -->

6
src/views/modules/communityParty/threeAffairsDisclosure/index.vue
View File

@ -53,8 +53,8 @@
<el-table-column :show-overflow-tooltip="true" prop="agencyName" header-align="center" align="center"
label="发布单位">
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
</el-table-column>
<!-- <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
</el-table-column>-->
<el-table-column :show-overflow-tooltip="true" prop="title" header-align="center" align="center" label="文章标题">
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="coverPic" header-align="center" align="center"
@ -64,7 +64,7 @@
:preview-src-list="[scope.row.coverPic]"></el-image>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="发布人">
<el-table-column :show-overflow-tooltip="true" prop="publishName" header-align="center" align="center" label="发布人">
<!-- <template slot-scope="scope">
<span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
</template> -->

5
src/views/modules/shequzhili/eventOld/cpts/event-detail.vue
View File

@ -271,7 +271,7 @@ export default {
watch: {
"info.gridId": function (val) {
this.selGridId = val;
this.$emit("changeGridId", val);
this.$emit("handelCLickGridId", val);
this.gridId = this.selGridId;
if (!this.eventDetailData.gridId && this.selGridId) {
this.updateEvent();
@ -296,6 +296,9 @@ export default {
this.user = this.$store.state.user;
if (this.eventId) {
this.info = JSON.parse(JSON.stringify(this.eventDetailData));
if(this.info.gridId){
this.$emit("handelCLickGridId", this.info.gridId);
}
this.agencyId = this.info.agencyId
}
this.loadGrid();

2
src/views/modules/shequzhili/eventOld/cpts/event-info.vue
View File

@ -510,7 +510,7 @@ export default {
}
},
handelCLickGridId(val){
this.grid = val.value;
this.grid = val;
},
async handelDispose() {
console.log(this.grid,"DSFKDSFJDKS");

11
src/views/modules/shequzhili/eventOld/eventList.vue
View File

@ -125,7 +125,16 @@
<div class="m-table">
<div class="div_btn">
<el-button size="small" type="primary " @click="handleAdd">新增</el-button>
<el-dropdown size="small" split-button type="primary" style="margin: 0 10px; height: 30px"
@command="(command) => handleMarkDiffcult(command)">
标记
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="1">标记为难点堵点</el-dropdown-item>
<el-dropdown-item command="2">标记为矛盾纠纷</el-dropdown-item>
<el-dropdown-item command="3">标记为自身问题</el-dropdown-item>
<el-dropdown-item command="4">标记为超出服务范围</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
<el-button @click="handleSuperviseEvent" class="diy-button--white" size="small">批量催办</el-button>
</div>

18
src/views/modules/shequzhili/videomonitoring/index.vue
View File

@ -22,16 +22,16 @@
<div class="m-table">
<div class="resi-row-btn">
<el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
<el-button style="" class="diy-button--add" size="small" @click="downloadTem">下载模板</el-button>
<!-- <el-button style="" class="diy-button&#45;&#45;add" size="small" @click="downloadTem">下载模板</el-button>-->
<!-- <el-button style="" class="diy-button--add" size="small" @click="exportData">导入</el-button>-->
<el-button class="diy-button--white" size="small">
<el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr" :limit="1"
:accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false" :auto-upload="true"
:on-progress="handleProgress" :on-success="handleExcelSuccess" :before-upload="beforeExcelUpload"
:http-request="uploadHttpRequest">
导入
</el-upload>
</el-button>
<!-- <el-button class="diy-button&#45;&#45;white" size="small">-->
<!-- <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr" :limit="1"-->
<!-- :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false" :auto-upload="true"-->
<!-- :on-progress="handleProgress" :on-success="handleExcelSuccess" :before-upload="beforeExcelUpload"-->
<!-- :http-request="uploadHttpRequest">-->
<!-- 导入-->
<!-- </el-upload>-->
<!-- </el-button>-->
</div>
<el-table class="table" :data="tableData" border v-loading="tableLoading" style="width: 100%">

Write Preview
Loading…
Cancel
Save