合并分支 'crs' 到 'master'

src/assets/changeElementStyle.css

@@ -4,9 +4,13 @@
     right: 15px;
     top: 15px;
     cursor: pointer;
+    display: inline-block;
+    width: 22px;
+    height: 24px;
+    background: url("../assets/img/close.png");
 }
 .closeModel:hover{
-    content: url("../assets/img/closeH.png");
+    background: url("../assets/img/closeH.png");
 }
 .el-dialog{
     width: 740px;

src/components/admittance/company/company.vue

@@ -65,7 +65,7 @@
     </el-row>
     <!-- 新增 / 编辑 公用弹窗 -->
     <el-dialog :visible.sync="openModel" class="model">
-      <img src="../../../assets/img/close.png" class="closeModel" @click="reset()">
+      <span class="closeModel" @click="reset()"></span>
       <component :is="components" :name="companyName" :list="companyList" @on-cancel="reset" @on-name="getName"></component>
     </el-dialog>
   </div>

src/components/admittance/product/product.vue

@@ -80,7 +80,7 @@
     </el-row>
     <!-- 新增 / 编辑 公用弹窗 -->
     <el-dialog :visible.sync="openModel" class="model">
-      <img src="../../../assets/img/close.png" class="closeModel" @click="reset()">
+      <span class="closeModel" @click="reset()"></span>
       <component :is="components" :productName="productName" :list="productList" :techList="techList" @on-cancel="reset" @on-name="getName"></component>
     </el-dialog>
   </div>

src/components/admittance/technical/addTechnical.vue

@@ -29,9 +29,9 @@
                                         :value="item.id">
                                 </el-option>
                             </el-select>
-                            <img src="./img/delN.png" class="del" @click="dele(index)" v-if="allProduct.length > 1">
+                            <span class="del" @click="dele(index)" v-if="allProduct.length > 1"></span>
                         </p>
-                        <p class="addProduct" @click="addProduct"><img src="./img/clickN.png"><span>新增产品组合</span></p>
+                        <p class="addProduct" @click="addProduct"><span class="add"></span><span>新增产品组合</span></p>
                     </el-scrollbar>
                 </div>
             </div>
@@ -248,9 +248,16 @@ export default {
         justify-content: space-evenly;
         margin-top: 20px;
     }
-    .addTechnical .del:hover{
-        content: url("./img/del.png");
+    .addTechnical .del{
+        margin-left: 10px;
         cursor: pointer;
+        display: inline-block;
+        width: 19px;
+        height: 21px;
+        background: url("./img/delN.png");
+    }
+    .addTechnical .del:hover{
+        background: url("./img/del.png");
     }
     .addTechnical .select{
         margin-top: 24px;
@@ -280,7 +287,13 @@ export default {
         color: #4C7AE6;
         cursor: pointer;
     }
-    .addTechnical .addProduct:hover>img{
-        content: url("./img/click.png");
+    .addTechnical .add{
+        display: inline-block;
+        width: 19px;
+        height: 19px;
+        background: url("./img/clickN.png");
+    }
+    .addTechnical .addProduct:hover .add{
+        background: url("./img/click.png");
     }
 </style>

src/components/admittance/technical/technical.vue

@@ -40,7 +40,7 @@
                                     label="应用项目"
                                     align="center">
                                 <template slot-scope="scope">
-                                    <span class="change"><img src="./img/look.png">查看项目</span>
+                                    <span class="change"><span class="img"></span>查看项目</span>
                                 </template>
                             </el-table-column>
                             <el-table-column
@@ -53,7 +53,7 @@
                                     label="产品组合"
                                     align="center">
                                 <template slot-scope="scope">
-                                    <span class="change" @click="product(scope.row)"><img src="./img/look.png">产品管理</span>
+                                    <span class="change" @click="product(scope.row)"><span class="img"></span>产品管理</span>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -76,7 +76,7 @@
         </el-row>
         <!-- 新增 / 编辑 公用弹窗 -->
         <el-dialog :visible.sync="openModel" class="model">
-            <img src="../../../assets/img/close.png" class="closeModel" @click="reset()">
+            <span class="closeModel" @click="reset()"></span>
             <component :is="components" :row="nowRow" @on-cancel="reset"></component>
         </el-dialog>
     </div>
@@ -223,8 +223,12 @@ export default {
         color: #4877e6;
         cursor: pointer;
     }
-    .technical .content .change>img{
+    .technical .content .change .img{
         margin-right: 3px;
+        display: inline-block;
+        width: 18px;
+        height: 17px;
+        background: url("./img/look.png");
     }
     .technical .content>>>.el-input__inner{
         border: 1px solid rgba(8,104,157,.3);
@@ -264,16 +268,16 @@ export default {
         color: #fff;
         /*表格双行hover样式*/
     }
-    .technical>>>.el-table--striped .el-table__body tr.el-table__row--striped.el-table__row--striped.el-table__row--striped:hover td .change>img{
-        content: url("./img/lookH.png");
+    .technical>>>.el-table--striped .el-table__body tr.el-table__row--striped.el-table__row--striped.el-table__row--striped:hover td .change .img{
+        background: url("./img/lookH.png");
         /*表格双行hover样式*/
     }
     .technical>>>.el-table--enable-row-hover .el-table__body tr:hover>td .change{
         color: #fff;
         /*表格单行hover样式*/
     }
-    .technical>>>.el-table--enable-row-hover .el-table__body tr:hover>td .change>img{
-        content: url("./img/lookH.png");
+    .technical>>>.el-table--enable-row-hover .el-table__body tr:hover>td .change .img{
+        background: url("./img/lookH.png");
         /*表格单行hover样式*/
     }
 </style>

src/components/basicInformation/company/company.vue

@@ -81,7 +81,7 @@
     </el-row>
     <!-- 新增 / 编辑 公用弹窗 -->
     <el-dialog :visible.sync="openModel" class="model">
-      <img src="../../../assets/img/close.png" class="closeModel" @click="reset()">
+      <span class="closeModel" @click="reset()"></span>
       <component :is="components" :name="companyName" :list="companyList" @on-cancel="reset" @on-name="getName"></component>
     </el-dialog>
   </div>

src/components/basicInformation/person/person.vue

@@ -82,7 +82,7 @@
         </el-row>
         <!-- 新增 / 编辑 公用弹窗 -->
         <el-dialog :visible.sync="openModel" class="model">
-            <img src="../../../assets/img/close.png" class="closeModel" @click="reset()">
+            <span class="closeModel" @click="reset()"></span>
             <component :is="components" @on-cancel="reset" :roleList="roleList" :unitList="unitList"></component>
         </el-dialog>
     </div>

src/components/basicInformation/person/personPage.vue

@@ -6,7 +6,7 @@
                     <el-row>
                         <el-col :span="9">
                             <p class="title">人员信息
-                                <img src="./img/goback.png" class="back" @click="back" title="返回">
+                                <span class="back" @click="back" title="返回"></span>
                             </p>
                             <p class="search">
                                 <span class="value">
@@ -143,9 +143,13 @@ export default {
         left: 25px;
         top: 28px;
         cursor: pointer;
+        display: inline-block;
+        width: 25px;
+        height: 25px;
+        background: url("./img/goback.png");;
     }
     .personPage .content .back:hover{
-        content: url("./img/gobackH.png");
+        background: url("./img/gobackH.png");
     }
     .personPage .content .search{
         position: relative;

src/components/basicInformation/product/product.vue

@@ -96,7 +96,7 @@
     </el-row>
     <!-- 新增 / 编辑 公用弹窗 -->
     <el-dialog :visible.sync="openModel" class="model">
-      <img src="../../../assets/img/close.png" class="closeModel" @click="reset()">
+      <span class="closeModel" @click="reset()"></span>
       <component :is="components" :productName="productName" :list="productList" :authority="authority" @on-cancel="reset" @on-name="getName"></component>
     </el-dialog>
   </div>

src/components/basicInformation/role/authority.vue

@@ -14,13 +14,13 @@
                 <span>角色权限：</span>
                 <span style="margin-left: 180px;">
                     <span class="selected" @click="selected">
-                        <img src="./img/selectedH.png" class="img">
+                        <span class="img"></span>
                         <span class="val">全选</span>
                     </span>
                 </span>
             </p>
             <p class="authorityList">
-                <span v-for="(item,index) of authority" @click="clickList(index,item)"><img src="./img/clickN.png">{{item.name}}</span>
+                <span v-for="(item,index) of authority" @click="clickList(index,item)"><span class="author"></span>{{item.name}}</span>
             </p>
         </div>
         <p class="line"></p>
@@ -120,7 +120,7 @@ export default {
             if (this.clickAll === false) {
                 $('.selected').addClass('selectedClick');
                 $('.authorityList>span').addClass('authorityListClick');
-                $('.selected>img').addClass('noClick')
+                $('.selected .img').addClass('noClick')
                 $('.val').html('全不选')
                 this.allAuthority = [];
                 for (let item of this.authority) {
@@ -128,7 +128,7 @@ export default {
                 }
                 this.clickAll = true;
             } else {
-                $('.selected>img').removeClass('noClick')
+                $('.selected .img').removeClass('noClick')
                 $('.selected').removeClass('selectedClick');
                 $('.val').html('全选')
                 this.allAuthority = [];
@@ -200,10 +200,13 @@ export default {
         color: #4877e6;
     }
     .authority .img{
-        content: url("./img/selected.png");
+        display: inline-block;
+        width: 19px;
+        height: 19px;
+        background: url("./img/selected.png");
     }
     .authority .noClick{
-        content: url("./img/selectedN.png");
+        background: url("./img/selectedN.png");
     }
     .authority .authorityList{
         width: 280px;
@@ -218,10 +221,15 @@ export default {
         width: 100px;
         cursor: pointer;
     }
-    .authority .authorityList>span>img{
+    .authority .author{
         margin-right: 5px;
+        display: inline-block;
+        width: 21px;
+        height: 21px;
+        background: url("./img/clickN.png");
+        vertical-align: bottom;
     }
-    .authority .authorityListClick>img{
-        content: url("./img/click.png");
+    .authority .authorityListClick>span{
+        background: url("./img/click.png");
     }
 </style>

src/components/basicInformation/role/role.vue

@@ -29,7 +29,7 @@
                                     label="人员"
                                     align="center">
                                 <template slot-scope="scope">
-                                    <span class="change" @click="readPerson(scope.row)"><img src="./img/look.png">查看</span>
+                                    <span class="change" @click="readPerson(scope.row)"><span class="img"></span>查看</span>
                                 </template>
                             </el-table-column>
                             <el-table-column
@@ -37,7 +37,7 @@
                                     label="权限"
                                     align="center">
                                 <template slot-scope="scope">
-                                    <span class="change" @click="readAuthority(scope.row)"><img src="./img/look.png">查看</span>
+                                    <span class="change" @click="readAuthority(scope.row)"><span class="img"></span>查看</span>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -60,7 +60,7 @@
         </el-row>
         <!-- 新增 / 编辑 公用弹窗 -->
         <el-dialog :visible.sync="openModel" class="model">
-            <img src="../../../assets/img/close.png" class="closeModel" @click="reset()">
+            <span class="closeModel" @click="reset()"></span>
             <component :is="components" :name="rolename" :list="roleList" @on-cancel="reset" @on-name="getName"></component>
         </el-dialog>
     </div>
@@ -205,8 +205,12 @@ export default {
         color: #4877e6;
         cursor: pointer;
     }
-    .role .content .change>img{
+    .role .content .change .img{
         margin-right: 3px;
+        display: inline-block;
+        width: 18px;
+        height: 17px;
+        background: url("./img/look.png");
     }
     .role>>>.el-input__inner{
         border: 1px solid rgba(8,104,157,.3);
@@ -242,16 +246,16 @@ export default {
         color: #fff;
         /*表格双行hover样式*/
     }
-    .role>>>.el-table--striped .el-table__body tr.el-table__row--striped.el-table__row--striped.el-table__row--striped:hover td .change>img{
-        content: url("./img/lookH.png");
+    .role>>>.el-table--striped .el-table__body tr.el-table__row--striped.el-table__row--striped.el-table__row--striped:hover td .change .img{
+        background: url("./img/lookH.png");
         /*表格双行hover样式*/
     }
     .role>>>.el-table--enable-row-hover .el-table__body tr:hover>td .change{
         color: #fff;
         /*表格单行hover样式*/
     }
-    .role>>>.el-table--enable-row-hover .el-table__body tr:hover>td .change>img{
-        content: url("./img/lookH.png");
+    .role>>>.el-table--enable-row-hover .el-table__body tr:hover>td .change .img{
+        background: url("./img/lookH.png");
          /*表格单行hover样式*/
      }
 </style>

src/components/complaint/complaint/complaintDetail.vue

@@ -185,7 +185,7 @@ export default {
         line-height: 40px;
         color: #666;
         display: inline-block;
-        width: 124px;
+        width: 130px;
         text-align: right;
     }
     .complaintDetail .content .button{
@@ -241,7 +241,7 @@ export default {
         border-radius: 2px;
     }
     .complaintDetail .selected>>>.el-input{
-        width: 270px;
+        width: 260px;
     }
     .complaintDetail .selected>>>.el-input.is-disabled .el-input__inner{
         border: 1px solid rgba(8, 104, 157, .3);

src/components/complaint/complaintManagement/complaintManagementDetail.vue

@@ -257,7 +257,7 @@ export default {
         line-height: 40px;
         color: #666;
         display: inline-block;
-        width: 124px;
+        width: 130px;
         text-align: right;
     }
     .complaintManagementDetail .content .button{
@@ -313,7 +313,7 @@ export default {
         border-radius: 2px;
     }
     .complaintManagementDetail .selected>>>.el-input{
-        width: 270px;
+        width: 260px;
     }
     .complaintManagementDetail .selected>>>.el-input.is-disabled .el-input__inner{
         border: 1px solid rgba(8, 104, 157, .3);