启动页

epmet-oper-web/src/views/modules/customer/customize/StartPage.vue

@@ -9,7 +9,7 @@
 
     <el-row class="row"
             :style="{paddingLeft: paddingWidth+'px',paddingRight:paddingWidth+'px'}"
-            :gutter="100">
+            :gutter="gutter">
       <el-col :span="12">
         <el-card>
           <div slot="header"
@@ -35,22 +35,29 @@
               </el-upload>
             </div>
 
+            <div class="div_time">
+              <span>展示时长：</span>
+              <el-input-number v-model="resiForm.time"
+                               style="width:200px;margin-left:10px"
+                               :min="3"
+                               :max="10"
+                               label="启动页展示时长"></el-input-number>
+
+            </div>
             <div class="div_button">
               <el-button class="btn"
                          type="primary"
                          @click="changeImage('resi')">修改</el-button>
               <el-button class="btn btn_2"
                          @click="changeDefault('resi')">恢复默认</el-button>
-              <div class="div_tip">{{tip}}</div>
+              <div class="div_tip">
+                <div>注：</div>
+                <div class="tip2">{{tip1}}</div>
+                <div class="tip2">{{tip2}}</div>
               </div>
 
-            <div class="div_time">
-              <span>启动页展示时长：</span>
-              <el-input-number v-model="resiForm.time"
-                               :min="3"
-                               :max="10"
-                               label="启动页展示时长"></el-input-number>
             </div>
+
           </div>
 
         </el-card>
@@ -81,21 +88,26 @@
                 </el-upload>
               </div>
 
+              <div class="div_time">
+                <span>展示时长：</span>
+                <el-input-number v-model="workForm.time"
+                                 style="width:200px;margin-left:10px"
+                                 :min="3"
+                                 :max="10"
+                                 label="启动页展示时长"></el-input-number>
+              </div>
               <div class="div_button">
                 <el-button class="btn"
                            type="primary"
                            @click="changeImage('work')">修改</el-button>
                 <el-button class="btn btn_2"
                            @click="changeDefault('work')">恢复默认</el-button>
-                <div class="div_tip">{{tip}}</div>
-              </div>
+                <div class="div_tip">
+                  <div>注：</div>
+                  <div class="tip2">{{tip1}}</div>
+                  <div class="tip2">{{tip2}}</div>
 
-              <div class="div_time">
-                <span>启动页展示时长：</span>
-                <el-input-number v-model="workForm.time"
-                                 :min="3"
-                                 :max="10"
-                                 label="启动页展示时长"></el-input-number>
+                </div>
               </div>
             </div>
 
@@ -127,7 +139,8 @@ export default {
       params: {
         customerId: '',
       },
-      tip: "（文件大小不能超过200kb，格式仅支持jpg、png、gif）",
+      tip1: "1、点击图片选择要更换的启动页",
+      tip2: "2、文件大小不能超过200kb，仅支持jpg、png、gif",
       // imageHeight: 444,
       // imageWidth: 250,
 
@@ -168,7 +181,11 @@ export default {
       return (this.clientHeight - 300) + 'px'
     },
     paddingWidth () {
-      return this.resolution === 'small' ? 150 : 350
+      return this.resolution === 'small' ? 150 : 300
+
+    },
+    gutter () {
+      return this.resolution === 'small' ? 70 : 250
 
     },
     imageHeight () {
@@ -355,9 +372,14 @@ export default {
 }
 
 .div_tip {
-  margin-top: 10px;
+  text-align: left;
+  margin-left: 50rpx;
+  margin-top: 15px;
   font-size: 10px;
 }
+.tip2 {
+  margin-top: 7px;
+}
 
 .div_time {
   margin-top: 30px;

epmet-oper-web/src/views/modules/productConfig/workRoleAuth.vue

@@ -46,13 +46,13 @@
             <el-table-column prop="description"
                              label="角色职责"
                              header-align="center"
-                             align="center"
-                             width="380">
+                             align="center">
               <template slot-scope="scope">
                 <p>{{scope.row.description}}</p>
               </template>
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column width="450"
+                             label="操作">
               <template slot-scope="scope">
 
                 <el-button type="primary"
@@ -89,11 +89,20 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                title="角色职责"
+               width="30%"
                @closed="handleDutyClosed">
-      <div class="d-textarea"
+      <div class="div_duty"
            v-if="dutyShow">
         <el-input type="textarea"
+                  :rows="8"
                   v-model="description"></el-input>
+        <div class="div_btn">
+          <el-button type="primary"
+                     size="small"
+                     @click="saveDuty()">保存</el-button>
+          <el-button size="small"
+                     @click="dutyShow=false">取消</el-button>
+        </div>
 
       </div>
     </el-dialog>
@@ -268,25 +277,26 @@ export default {
 
     //保存角色职责
     async saveDuty () {
+      console.log(this.description)
       const url = "/gov/access/govcustomermenu/getcustomerids"
-      const params = {
-        tableId: this.tableId
-      }
-      const { data, code, msg } = await requestPost(url, params)
-      if (code === 0) {
-        this.menuList = data
+      // const params = {
+      //   tableId: this.tableId
+      // }
+      // const { data, code, msg } = await requestPost(url, params)
+      // if (code === 0) {
+      //   this.menuList = data
 
-        this.menuList.forEach(element => {
-          if (this.customerIdList.indexOf(element) > -1) {
-            this.menuListShow.push(element)
-          }
-        });
+      //   this.menuList.forEach(element => {
+      //     if (this.customerIdList.indexOf(element) > -1) {
+      //       this.menuListShow.push(element)
+      //     }
+      //   });
 
-        this.handleCheckedCitiesChange(this.menuListShow)
+      //   this.handleCheckedCitiesChange(this.menuListShow)
 
-      } else {
-        this.$message.error(msg)
-      }
+      // } else {
+      //   this.$message.error(msg)
+      // }
     },
     //关闭功能配置弹出框
     handleDialogClosed () {
@@ -507,7 +517,14 @@ export default {
 .role-container .el-dialog__body {
   padding: 0 20px 20px;
 }
-.d-textarea {
-  height: 500px;
+.div_duty {
+  height: 300px;
+  position: relative;
+}
+
+.div_btn {
+  position: absolute;
+  bottom: 30px;
+  right: 15px;
 }
 </style>