This commit is contained in:
zhutianqi
2021-10-11 16:14:27 +08:00
parent dd3bad1a91
commit dddb7b613e
26 changed files with 31 additions and 31 deletions
@@ -2,7 +2,7 @@
<template> <template>
<div class="attribute-custom v-class"> <div class="attribute-custom v-class">
<div class="action-bar1"> <div class="action-bar1">
<el-button class="common-button-primary add-button" size="mini" v-btn-permission="''" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button> <el-button class="common-button-primary add-button" size="mini" v-btn-permission="''" type="primary" @click="showAddModel"><i class="el-icon-plus"></i>新增</el-button>
<el-button class="common-button-default" size="mini" v-btn-permission="''" @click="showDisplayLocationDialog" >展示区域管理</el-button> <el-button class="common-button-default" size="mini" v-btn-permission="''" @click="showDisplayLocationDialog" >展示区域管理</el-button>
</div> </div>
<loading :loading="attributeDataLoading">数据处理中</loading> <loading :loading="attributeDataLoading">数据处理中</loading>
@@ -2,7 +2,7 @@
<template> <template>
<div class="attribute-custom v-class"> <div class="attribute-custom v-class">
<div class="action-bar1"> <div class="action-bar1">
<el-button class="common-button-primary add-button" size="mini" type="primary" v-btn-permission="'H9WU2ZJHG5WNTY5MDUXH'" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button> <el-button class="common-button-primary add-button" size="mini" type="primary" v-btn-permission="'H9WU2ZJHG5WNTY5MDUXH'" @click="showAddModel"><i class="el-icon-plus"></i>新增</el-button>
<el-button class="common-button-default" size="mini" @click="showDisplayLocationDialog" v-btn-permission="'XT94XKWBCTELWNJQVYCU'">展示区域管理</el-button> <el-button class="common-button-default" size="mini" @click="showDisplayLocationDialog" v-btn-permission="'XT94XKWBCTELWNJQVYCU'">展示区域管理</el-button>
</div> </div>
<loading :loading="attributeDataLoading">数据处理中</loading> <loading :loading="attributeDataLoading">数据处理中</loading>
@@ -2,7 +2,7 @@
<template> <template>
<div class="attribute-custom v-class"> <div class="attribute-custom v-class">
<div class="action-bar1"> <div class="action-bar1">
<el-button size="mini" style="margin-right: 5px" class="common-button-primary add-button" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button> <el-button size="mini" style="margin-right: 5px" class="common-button-primary add-button" type="primary" @click="showAddModel"><i class="el-icon-plus"></i>新增</el-button>
<el-button size="small" class="common-button-default" @click="showDisplayLocationDialog">展示区域管理</el-button> <el-button size="small" class="common-button-default" @click="showDisplayLocationDialog">展示区域管理</el-button>
</div> </div>
<loading :loading="attributeDataLoading">数据处理中</loading> <loading :loading="attributeDataLoading">数据处理中</loading>
@@ -37,7 +37,7 @@
type="primary" type="primary"
round round
@click="openAddMSGModal" @click="openAddMSGModal"
v-btn-permission="'HJ9NVMRSUN'"><i class="iconfont">&#xe84e;</i>新增</el-button> v-btn-permission="'HJ9NVMRSUN'"><i class="el-icon-plus"></i>新增</el-button>
<el-button class="common-button-default delete-button" <el-button class="common-button-default delete-button"
round round
@click="batchMSGDel" @click="batchMSGDel"
@@ -31,7 +31,7 @@
type="primary" type="primary"
round round
v-btn-permission="'QZL5DZDFNM'" v-btn-permission="'QZL5DZDFNM'"
@click="openAddMSGModal(1)"><i class="iconfont">&#xe84e;</i>新增</el-button> @click="openAddMSGModal(1)"><i class="el-icon-plus"></i>新增</el-button>
<el-button class="common-button-default delete-button" <el-button class="common-button-default delete-button"
round round
v-btn-permission="'HVGR9K778X'" v-btn-permission="'HVGR9K778X'"
@@ -5,7 +5,7 @@
<el-button class="common-button-primary add-button" <el-button class="common-button-primary add-button"
type="primary" type="primary"
round round
@click="openAddMSGModal(1)" v-btn-permission="'W8VY4K4XNPH6GABQBG82'"><i class="iconfont">&#xe84e;</i>新增</el-button> @click="openAddMSGModal(1)" v-btn-permission="'W8VY4K4XNPH6GABQBG82'"><i class="el-icon-plus"></i>新增</el-button>
<el-button class="common-button-default delete-button" <el-button class="common-button-default delete-button"
round round
@click="batchMSGDel(1)" v-btn-permission="'58URKBHGS4QDHSKXG4SS'"><i class="iconfont">&#xe61b;</i>批量删除</el-button> @click="batchMSGDel(1)" v-btn-permission="'58URKBHGS4QDHSKXG4SS'"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
@@ -8,7 +8,7 @@
<!-- class="common-button-primary add-button"--> <!-- class="common-button-primary add-button"-->
<!-- type="primary"--> <!-- type="primary"-->
<!-- round--> <!-- round-->
<!-- @click="clickAddTree"><i class="iconfont">&#xe84e;</i>新增</el-button>--> <!-- @click="clickAddTree"><i class="el-icon-plus"></i>新增</el-button>-->
</span> </span>
<div class="tree"> <div class="tree">
<laws-tree :zNodes="zNodes" <laws-tree :zNodes="zNodes"
@@ -41,7 +41,7 @@
<!-- round--> <!-- round-->
<!-- @click="addRow"--> <!-- @click="addRow"-->
<!-- v-btn-permission="'XBRKH5BP5K'"--> <!-- v-btn-permission="'XBRKH5BP5K'"-->
<!-- ><i class="iconfont">&#xe84e;</i>新增</el-button>--> <!-- ><i class="el-icon-plus"></i>新增</el-button>-->
<!--</div>--> <!--</div>-->
<loading :loading="tableDataLoading">{{$t('m.dataProcessing')}}</loading> <loading :loading="tableDataLoading">{{$t('m.dataProcessing')}}</loading>
<el-table <el-table
@@ -41,7 +41,7 @@
round round
@click="addRow" @click="addRow"
v-btn-permission="'XBRKH5BP5K'" v-btn-permission="'XBRKH5BP5K'"
><i class="iconfont">&#xe84e;</i>新增</el-button> ><i class="el-icon-plus"></i>新增</el-button>
</div> </div>
<loading :loading="tableDataLoading">{{$t('m.dataProcessing')}}</loading> <loading :loading="tableDataLoading">{{$t('m.dataProcessing')}}</loading>
<el-table <el-table
@@ -52,7 +52,7 @@
size="mini" size="mini"
@click="showAddModel(1, null)" @click="showAddModel(1, null)"
v-btn-permission="''" v-btn-permission="''"
><i class="iconfont">&#xe84e;</i>新增</el-button ><i class="el-icon-plus"></i>新增</el-button
> >
<el-button @click="deleteAttr" size="mini" class="common-button-default" v-btn-permission="" <el-button @click="deleteAttr" size="mini" class="common-button-default" v-btn-permission=""
><i class="iconfont">&#xe61b;</i>删除</el-button ><i class="iconfont">&#xe61b;</i>删除</el-button
+1 -1
View File
@@ -108,7 +108,7 @@
round round
@click="openAddUserModal" @click="openAddUserModal"
v-btn-permission="'KFKJFQ97LC'" v-btn-permission="'KFKJFQ97LC'"
><i class="iconfont">&#xe84e;</i>新增</el-button> ><i class="el-icon-plus"></i>新增</el-button>
<el-button <el-button
@click="batchUserDel" @click="batchUserDel"
v-btn-permission="'Q2G9W2GCVU'" v-btn-permission="'Q2G9W2GCVU'"
+1 -1
View File
@@ -677,7 +677,7 @@
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
round round
@click="addknowledge(1)"><i class="iconfont">&#xe84e;</i>新增</el-button> @click="addknowledge(1)"><i class="el-icon-plus"></i>新增</el-button>
<el-button class="common-button-default delete-button" <el-button class="common-button-default delete-button"
round round
@click="deleteknowledge(2)"><i class="iconfont">&#xe61b;</i>批量删除</el-button> @click="deleteknowledge(2)"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
@@ -957,7 +957,7 @@
class="common-button-primary add-button" class="common-button-primary add-button"
size="mini" size="mini"
:v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'PVBSWCJQ9X4RVBM9RK7L' : 'NJ3YL4SVEJADWH7ESHDX'" :v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'PVBSWCJQ9X4RVBM9RK7L' : 'NJ3YL4SVEJADWH7ESHDX'"
@click="addknowledge(1)"><i class="iconfont">&#xe84e;</i>新增 @click="addknowledge(1)"><i class="el-icon-plus"></i>新增
</el-button> </el-button>
<el-button class="common-button-default delete-button" <el-button class="common-button-default delete-button"
size="mini" size="mini"
@@ -1116,7 +1116,7 @@
size="mini" size="mini"
@click="clearComparison()"></el-button> @click="clearComparison()"></el-button>
<el-button type="primary" class="common-button-primary" size="mini" @click="addComparison"> <el-button type="primary" class="common-button-primary" size="mini" @click="addComparison">
<i class="iconfont">&#xe84e;</i>新增 <i class="el-icon-plus"></i>新增
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
+3 -3
View File
@@ -686,7 +686,7 @@
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
round round
@click="addknowledge(1)"><i class="iconfont">&#xe84e;</i>新增</el-button> @click="addknowledge(1)"><i class="el-icon-plus"></i>新增</el-button>
<el-button class="common-button-default delete-button" <el-button class="common-button-default delete-button"
round round
@click="deleteknowledge(2)"><i class="iconfont">&#xe61b;</i>批量删除</el-button> @click="deleteknowledge(2)"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
@@ -827,7 +827,7 @@
icon="el-icon-refresh-left" icon="el-icon-refresh-left"
round round
@click="clearComparison()"></el-button> @click="clearComparison()"></el-button>
<el-button type="primary" class="common-button-primary" round @click="addComparison"><i class="iconfont">&#xe84e;</i>新增</el-button> <el-button type="primary" class="common-button-primary" round @click="addComparison"><i class="el-icon-plus"></i>新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@@ -835,7 +835,7 @@
<!-- <el-button type="primary"--> <!-- <el-button type="primary"-->
<!-- class="common-button-primary add-button"--> <!-- class="common-button-primary add-button"-->
<!-- round--> <!-- round-->
<!-- @click="addComparison"><i class="iconfont">&#xe84e;</i>新增</el-button>--> <!-- @click="addComparison"><i class="el-icon-plus"></i>新增</el-button>-->
<div class="myRadio"> <div class="myRadio">
<template> <template>
<el-radio-group v-for="(item, index) in comparisonList" :key="index" v-model="comparisonId"> <el-radio-group v-for="(item, index) in comparisonList" :key="index" v-model="comparisonId">
@@ -54,7 +54,7 @@
size="mini" size="mini"
@click="openModal(null,'addOpt')" @click="openModal(null,'addOpt')"
v-btn-permission="'7aaf236bdf6b1657c615380f7f34b8a8'" v-btn-permission="'7aaf236bdf6b1657c615380f7f34b8a8'"
><i class="iconfont">&#xe84e;</i>新增 ><i class="el-icon-plus"></i>新增
</el-button> </el-button>
<el-button <el-button
class="common-button-default delete-button" class="common-button-default delete-button"
@@ -46,7 +46,7 @@
@click="openModal(null,'addOpt')" @click="openModal(null,'addOpt')"
v-btn-permission="'389d3690eeea9d3808bdff4d02dddbd8'"> v-btn-permission="'389d3690eeea9d3808bdff4d02dddbd8'">
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
<!-- <i class="iconfont">&#xe84e;</i>--> <!-- <i class="el-icon-plus"></i>-->
新增 新增
</el-button> </el-button>
<el-button <el-button
@@ -55,7 +55,7 @@
size="mini" size="mini"
@click="openModal(null,'addOpt')" @click="openModal(null,'addOpt')"
v-btn-permission="'2dd158ffb07ddcc89ed41468b196b451'" v-btn-permission="'2dd158ffb07ddcc89ed41468b196b451'"
><i class="iconfont">&#xe84e;</i>新增 ><i class="el-icon-plus"></i>新增
</el-button> </el-button>
<el-button <el-button
class="common-button-default delete-button" class="common-button-default delete-button"
@@ -51,7 +51,7 @@
size="mini" size="mini"
@click="openModal(null,'addOpt')" @click="openModal(null,'addOpt')"
v-btn-permission="'J2YEFN9MH4KWW5HMR2QH'" v-btn-permission="'J2YEFN9MH4KWW5HMR2QH'"
><i class="iconfont">&#xe84e;</i>新增</el-button> ><i class="el-icon-plus"></i>新增</el-button>
<el-button <el-button
class="common-button-default delete-button" class="common-button-default delete-button"
:loading="delLoading" :loading="delLoading"
@@ -125,7 +125,7 @@
<!-- @click="addModal"--> <!-- @click="addModal"-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- v-btn-permission="'57f40856850c95912be0760a082db0e0'"--> <!-- v-btn-permission="'57f40856850c95912be0760a082db0e0'"-->
<!-- :disabled="addBtnDisabled"><i class="iconfont">&#xe84e;</i>新增</el-button>--> <!-- :disabled="addBtnDisabled"><i class="el-icon-plus"></i>新增</el-button>-->
<el-button class="common-button-default in-button" <el-button class="common-button-default in-button"
:loading="searching" :loading="searching"
size="mini" size="mini"
@@ -2417,7 +2417,7 @@ export default {
} }
this.modalShowFlag2 = false this.modalShowFlag2 = false
} }
this.$forceUpdate() this.$forceUpdate()
}, },
popoverHideBusVsCancel(){ popoverHideBusVsCancel(){
@@ -2434,7 +2434,7 @@ export default {
} }
this.modalShowFlag3 = false this.modalShowFlag3 = false
} }
this.$forceUpdate() this.$forceUpdate()
}, },
popoverHideCarVsCancel(){ popoverHideCarVsCancel(){
@@ -173,7 +173,7 @@
round round
@click="handleOpenAddModal" @click="handleOpenAddModal"
v-btn-permission="'MHV7SA5CPD8UHYBUT3YQ'" v-btn-permission="'MHV7SA5CPD8UHYBUT3YQ'"
><i class="iconfont">&#xe84e;</i>新增</el-button ><i class="el-icon-plus"></i>新增</el-button
> >
<el-button <el-button
class="common-button-default in-button" class="common-button-default in-button"
@@ -220,7 +220,7 @@
<!-- round--> <!-- round-->
<!-- @click="addModal"--> <!-- @click="addModal"-->
<!-- v-btn-permission="'RKK25EG2WD'"--> <!-- v-btn-permission="'RKK25EG2WD'"-->
<!-- ><i class="iconfont">&#xe84e;</i>新增</el-button>--> <!-- ><i class="el-icon-plus"></i>新增</el-button>-->
<!-- <el-button--> <!-- <el-button-->
<!-- class="common-button-default in-button"--> <!-- class="common-button-default in-button"-->
<!-- round--> <!-- round-->
@@ -82,7 +82,7 @@
class="common-button-primary add-button" class="common-button-primary add-button"
round round
@click="addModal" @click="addModal"
v-btn-permission="'KFW98JENT2N8VPVR8JM6'"><i class="iconfont">&#xe84e;</i>新增</el-button> v-btn-permission="'KFW98JENT2N8VPVR8JM6'"><i class="el-icon-plus"></i>新增</el-button>
<el-button <el-button
class="common-button-default in-button" class="common-button-default in-button"
round round
@@ -85,7 +85,7 @@
round round
@click="openLawsModal" @click="openLawsModal"
v-btn-permission="'XBRKH5BP5K'" v-btn-permission="'XBRKH5BP5K'"
><i class="iconfont">&#xe84e;</i>新增</el-button> ><i class="el-icon-plus"></i>新增</el-button>
<el-button <el-button
class="common-button-default in-button" class="common-button-default in-button"
round round
@@ -122,7 +122,7 @@
size="mini" size="mini"
@click="addModal" @click="addModal"
v-btn-permission="'ceb5fb1e00'" v-btn-permission="'ceb5fb1e00'"
:disabled="addBtnDisabled"><i class="iconfont">&#xe84e;</i>新增 :disabled="addBtnDisabled"><i class="el-icon-plus"></i>新增
</el-button> </el-button>
<el-button class="common-button-default in-button" <el-button class="common-button-default in-button"
size="mini" size="mini"
@@ -38,7 +38,7 @@
class="common-button-primary add-button" class="common-button-primary add-button"
@click="openAddModel" @click="openAddModel"
v-btn-permission="'L8CEXYGB4TFUUWY8P89V'" v-btn-permission="'L8CEXYGB4TFUUWY8P89V'"
><i class="iconfont">&#xe84e;</i>新增</el-button> ><i class="el-icon-plus"></i>新增</el-button>
<!--<el-button--> <!--<el-button-->
<!-- round--> <!-- round-->
+1 -1
View File
@@ -144,7 +144,7 @@
<!-- round--> <!-- round-->
<!-- @click="openAddModel"--> <!-- @click="openAddModel"-->
<!-- v-btn-permission="'4C796W933W'"--> <!-- v-btn-permission="'4C796W933W'"-->
<!--&gt;<i class="iconfont">&#xe84e;</i>新增</el-button>--> <!--&gt;<i class="el-icon-plus"></i>新增</el-button>-->
<!--<el-button--> <!--<el-button-->
<!-- round--> <!-- round-->