From f7a0b81d4b78a01b5a3abfbcd03ddff25c5d1878 Mon Sep 17 00:00:00 2001
From: FightingN <18300240052@163.com>
Date: Mon, 3 Aug 2020 15:49:50 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E4=BC=98=E5=8C=96=E3=80=91-?=
 =?UTF-8?q?=E5=BC=A0=E6=99=93=E5=AE=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/analysis/item/item-detail-view.vue     |  8 ++++++--
 .../custom/gridoperatorinfo-add-or-update.vue      | 14 +++++++-------
 .../modules/events/category-add-or-update.vue      | 10 +++++-----
 src/views/modules/heart/actinfo-add-or-update.vue  |  6 ++++--
 .../modules/master/masteruserrelation-add.vue      |  4 ++--
 src/views/modules/news/banner-add-or-update.vue    | 14 ++++++--------
 6 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/views/modules/analysis/item/item-detail-view.vue b/src/views/modules/analysis/item/item-detail-view.vue
index 7c670286..a75886af 100644
--- a/src/views/modules/analysis/item/item-detail-view.vue
+++ b/src/views/modules/analysis/item/item-detail-view.vue
@@ -109,8 +109,8 @@
       <el-dialog width="90%" title="评论" :visible.sync="innerVisible" append-to-body>
           <el-table :data="commentsDTOs" border style="width: 100%;">
               <el-table-column prop="user.userName" label="发言人" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="commentTime" label="发言时间" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="content" label="发言内容" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="commentTime" label="发言时间" header-align="center" align="center" width="180"></el-table-column>
+              <el-table-column prop="content" label="发言内容" header-align="center" align="center" min-width="200" show-overflow-tooltip ></el-table-column>
               <el-table-column prop="replyComment.userName" label="被回复人" header-align="center" align="center"></el-table-column>
               <el-table-column prop="replyComment.content" label="被回复内容" header-align="center" align="center"></el-table-column>
               <el-table-column :label="$t('handle')" header-align="center" align="center" width="150" v-if="false">
@@ -433,4 +433,8 @@ export default {
             float:left;
         }
     }
+    .el-pagination{
+      margin-top: 10px;
+      text-align: right;
+    }
 </style>
diff --git a/src/views/modules/custom/gridoperatorinfo-add-or-update.vue b/src/views/modules/custom/gridoperatorinfo-add-or-update.vue
index f88bda54..39b85c56 100755
--- a/src/views/modules/custom/gridoperatorinfo-add-or-update.vue
+++ b/src/views/modules/custom/gridoperatorinfo-add-or-update.vue
@@ -8,14 +8,14 @@
              ref="dataForm"
              :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item label="姓名"
-                    prop="realName">
+                    prop="realName" style="width:300px">
         <el-input v-model="dataForm.realName"
                   placeholder="姓名" maxlength="10"></el-input>
       </el-form-item>
       <el-form-item label="性别"
                     prop="sex">
         <el-select v-model="dataForm.sex"
-                   placeholder="性别">
+                   placeholder="性别" style="width:220px">
           <el-option v-for="item in sexFlagArr"
                      :key="item.dictValue"
                      :label="item.dictName"
@@ -24,12 +24,12 @@
         </el-select>
       </el-form-item>
       <el-form-item label="身份证号"
-                    prop="identityNo">
+                    prop="identityNo" style="width:300px">
         <el-input v-model="dataForm.identityNo"
                   placeholder="身份证号"></el-input>
       </el-form-item>
       <el-form-item label="联系电话"
-                    prop="mobile">
+                    prop="mobile" style="width:300px">
         <el-input v-model="dataForm.mobile"
                   placeholder="联系电话"></el-input>
       </el-form-item>
@@ -40,7 +40,7 @@
                      :options="options"
                      :props="{ multiple: true }"
                      filterable
-                     collapse-tags></el-cascader>
+                     collapse-tags style="width:220px"></el-cascader>
       </el-form-item>
       <el-form-item label="所属机构"
                     v-if="dataForm.id">
@@ -50,7 +50,7 @@
                     prop="dutyCategoryId">
         <el-select v-model="dataForm.dutyCategoryId"
                    @change="changeCaterory"
-                   placeholder="请选择网络职责">
+                   placeholder="请选择网络职责" style="width:220px">
           <el-option v-for="item in dutyCategorys"
                      :key="item.id"
                      :label="item.dutyCategoryName"
@@ -63,7 +63,7 @@
         <el-input-number v-model="dataForm.sort"
                          controls-position="right"
                          :min="0"
-                         :label="$t('dict.sort')"></el-input-number>
+                         :label="$t('dict.sort')" style="width:220px"></el-input-number>
       </el-form-item>
       <el-form-item label="工作单位"
                     prop="workUnit">
diff --git a/src/views/modules/events/category-add-or-update.vue b/src/views/modules/events/category-add-or-update.vue
index 06ed928a..f40c144b 100644
--- a/src/views/modules/events/category-add-or-update.vue
+++ b/src/views/modules/events/category-add-or-update.vue
@@ -4,9 +4,6 @@
       <el-form-item prop="categoryName" label="分类名称">
         <el-input v-model="dataForm.categoryName" placeholder="分类名称" maxlength="500"></el-input>
       </el-form-item>
-      <el-form-item prop="categoryCode" label="分类编码">
-        <el-input v-model="dataForm.categoryCode" placeholder="分类编码" maxlength="50"></el-input>
-      </el-form-item>
       <el-form-item prop="parentName" label="上级分类" class="category-list">
         <el-popover v-model="categoryListVisible" ref="categoryListPopover" placement="bottom-start" trigger="click">
           <el-tree :data="categoryList"
@@ -23,14 +20,17 @@
           <i v-if="dataForm.pid !== '0'" slot="suffix" @click.stop="categoryListTreeSetDefaultHandle()" class="el-icon-circle-close el-input__icon"></i>
         </el-input>
       </el-form-item>
+      <el-form-item prop="categoryCode" label="分类编码">
+        <el-input v-model="dataForm.categoryCode" placeholder="分类编码" maxlength="50" style="width:200px"></el-input>
+      </el-form-item>
       <el-form-item label="分类类型" prop="categoryType">
-        <el-select v-model="dataForm.categoryType" @change="changeOrgType" placeholder="分类类型">
+        <el-select v-model="dataForm.categoryType" @change="changeOrgType" placeholder="分类类型" style="width:200px">
           <el-option v-for="item in secondOrgDictList" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item prop="sort" label="排序">
-        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" label="排序"></el-input-number>
+        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" label="排序" style="width:200px"></el-input-number>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue
index 89ac9f20..b9f99868 100644
--- a/src/views/modules/heart/actinfo-add-or-update.vue
+++ b/src/views/modules/heart/actinfo-add-or-update.vue
@@ -195,14 +195,16 @@
                         prop="contacts">
             <el-input v-model="dataForm.contacts"
                       maxlength="5"
+                      placeholder="请输入联系人"
                       style="width:150px"></el-input>
           </el-form-item>
         </el-row>
         <el-row>
           <el-form-item label="联系电话："
-                        prop="tel">
+                        prop="tel" >
             <el-input v-model="dataForm.tel"
                       maxlength="20"
+                      placeholder="请输入联系电话"
                       style="width:200px"></el-input>
           </el-form-item>
         </el-row>
@@ -295,7 +297,7 @@
             </el-upload>
           </el-form-item>
         </el-row>
-        <el-row>
+        <el-row style="text-align:center">
           <el-form-item label-width="500px">
             <el-button type="primary"
                        :disabled="isAble"
diff --git a/src/views/modules/master/masteruserrelation-add.vue b/src/views/modules/master/masteruserrelation-add.vue
index 593d9049..1a92f4ff 100644
--- a/src/views/modules/master/masteruserrelation-add.vue
+++ b/src/views/modules/master/masteruserrelation-add.vue
@@ -11,7 +11,7 @@
         <el-form :inline="true" :rules="dataRule" ref="item" :model="item" >
           <div style="text-align: left;">{{"书记"+(index+1)+":"}}</div>
           <el-row>
-              <el-form-item label="选择书记：" prop="deptName">
+              <el-form-item label="选择书记" prop="deptName" label-width="80px">
                   <el-input v-model="item.deptName"
                             :disabled="true"
                             type="text"
@@ -26,7 +26,7 @@
                   </el-input> &emsp;
                   <el-button @click="selectUserMethod(index)">{{"选择书记"}}</el-button>&emsp;&emsp;
               </el-form-item>
-              <el-form-item label="群内昵称：" prop="nickName">
+              <el-form-item label="群内昵称" prop="nickName" label-width="80px">
                   <el-input v-model="item.nickName"
                             type="text"
                             style="width: 30rem;"
diff --git a/src/views/modules/news/banner-add-or-update.vue b/src/views/modules/news/banner-add-or-update.vue
index 4cae3afc..d48bb1cc 100644
--- a/src/views/modules/news/banner-add-or-update.vue
+++ b/src/views/modules/news/banner-add-or-update.vue
@@ -10,20 +10,18 @@
              :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item label="链接地址"
                     v-if="dataForm.newsFlag !== '1'"
-                    prop="url">
+                    prop="url" label-width="100px">
         <el-input v-model="dataForm.url"
                   maxlength="1000"
-                  show-word-limit
                   placeholder="链接地址"></el-input>
       </el-form-item>
       <el-form-item label="标题"
-                    prop="title">
+                    prop="title" label-width="100px">
         <el-input v-model="dataForm.title"
                   maxlength="50"
-                  show-word-limit
                   placeholder="标题"></el-input>
       </el-form-item>
-      <el-form-item label="所属机构">
+      <el-form-item label="所属机构" label-width="100px">
         <el-cascader v-model="dataForm.allDeptIdsShow"
                      :options="options"
                      :props="{ multiple: true }"
@@ -65,7 +63,7 @@
         </el-select>
       </el-form-item>-->
       <el-form-item label="banner类型"
-                    prop="bannerType">
+                    prop="bannerType" label-width="100px">
         <el-select v-model="dataForm.bannerType"
                    placeholder="请选择">
           <el-option v-for="item in bannerOptions"
@@ -76,7 +74,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="banner位置"
-                    prop="position">
+                    prop="position" label-width="100px">
         <el-select v-model="dataForm.position"
                    placeholder="请选择">
           <el-option v-for="item in positionList"
@@ -88,7 +86,7 @@
       </el-form-item>
       <el-form-item label="banner图片"
                     v-loading="loading"
-                    prop="imgUrl">
+                    prop="imgUrl" label-width="100px">
         <el-upload class="avatar-uploader"
                    :action="this.uploadUrl"
                    :show-file-list="false"