zhangdan hace 4 años
padre
commit
39e22ff71c

+ 81 - 91
src/views/appSetting/addEditionSetting.vue

@@ -4,11 +4,7 @@
       <a-form :form="form" @submit="handleSubmit">
         <a-row>
           <a-col :span="24">
-            <a-form-item
-              :label-col="formItemLayout.labelCol"
-              :wrapper-col="formItemLayout.wrapperCol"
-              label="版本号"
-            >
+            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="版本号">
               <a-input
                 v-decorator="[
                   'formData.version',
@@ -16,27 +12,21 @@
                     rules: [{ required: true, message: '请输入版本号' }]
                   },
                 ]"
-				id="addEditionSetting-version"
+                id="addEditionSetting-version"
                 placeholder="请输入版本号"
-				allowClear
-				type="number"
-              />
+                allowClear
+                type="number" />
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item
-              :label-col="formItemLayout.labelCol"
-              :wrapper-col="formItemLayout.wrapperCol"
-              label="请选择更新时间"
-            >
-			<a-date-picker
-			  show-time
-			  id="addEditionSetting-publicDate"
-			  placeholder="年/月/日 时/分/秒"
-			  :disabled-date="disabledDate"
-			  v-decorator="['formData.publicDate', { initialValue: formData.publicDate, rules: [{ required: true, message: '请选择更新时间!' }] }]"
-			   />
-             <!-- <a-date-picker
+            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="请选择更新时间">
+              <a-date-picker
+                show-time
+                id="addEditionSetting-publicDate"
+                placeholder="年/月/日 时/分/秒"
+                :disabled-date="disabledDate"
+                v-decorator="['formData.publicDate', { initialValue: formData.publicDate, rules: [{ required: true, message: '请选择更新时间!' }] }]" />
+              <!-- <a-date-picker
                 show-time
 				id="addEditionSetting-publicDate"
                 placeholder="年/月/日 时/分/秒"
@@ -49,33 +39,24 @@
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item
-              :label-col="formItemLayout.labelCol"
-              :wrapper-col="formItemLayout.wrapperCol"
-              label="强制升级"
-            >
+            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="强制升级">
               <a-radio-group
                 name="radioGroup"
-				id="addEditionSetting-forceUpgrade"
+                id="addEditionSetting-forceUpgrade"
                 @change="onChange"
                 v-decorator="[
                   'formData.forceUpgrade',
                   {
                     initialValue: formData.forceUpgrade,
                     rules: [{ required: true, type: 'number', message: '请选择是否强制升级!' }] },
-                ]"
-              >
+                ]">
                 <a-radio :value="1">是</a-radio>
                 <a-radio :value="0">否</a-radio>
               </a-radio-group>
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item
-              :label-col="formItemLayout.labelCol"
-              :wrapper-col="formItemLayout.wrapperCol"
-              label="下载链接"
-            >
+            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="下载链接">
               <a-input
                 v-decorator="[
                   'formData.downloadUrl',
@@ -83,45 +64,35 @@
                     rules: [{ message: '请输入下载链接' }]
                   },
                 ]"
-				id="addEditionSetting-downloadUrl"
+                id="addEditionSetting-downloadUrl"
                 placeholder="请输入下载链接"
-				allowClear
-              />
+                allowClear />
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item
-              :label-col="formItemLayout.labelCol"
-              :wrapper-col="formItemLayout.wrapperCol"
-              label="升级内容"
-            >
+            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="升级内容">
 
               <a-textarea
                 placeholder="请输入升级内容512个字以内"
-				:maxLength="512"
-				id="addEditionSetting-upgradeContent"
+                :maxLength="512"
+                id="addEditionSetting-upgradeContent"
                 auto-size
                 v-decorator="[
                   'formData.upgradeContent',
                   { initialValue: formData.upgradeContent,
                     rules: [{ required: true, message: '请输入升级内容512个字以内' }]
                   },
-                ]"
-              />
+                ]" />
             </a-form-item>
           </a-col>
         </a-row>
         <a-row>
           <a-col :span="24">
-            <a-form-item
-              label="附件"
-              :label-col="formItemLayout.labelCol"
-              :wrapper-col="formItemLayout.wrapperCol"
-            >
+            <a-form-item label="附件" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <div style="display: block;">
                 <Upload
                   ref="upfile"
-				  id="addEditionSetting-attachment"
+                  id="addEditionSetting-attachment"
                   :maxNums="1"
                   :fileSize="100"
                   v-decorator="[
@@ -143,7 +114,7 @@
             保存
           </a-button>
           <a-button style="margin-left: 20px;" @click="cansel" id="addEditionSetting-cansel">
-            返回列表
+            取消
           </a-button>
         </a-form-item>
       </a-form>
@@ -152,16 +123,27 @@
 </template>
 
 <script>
-import { Upload } from '@/components'
-import { saveItem, editItem } from '@/api/editionSetting.js'
+import {
+  Upload
+} from '@/components'
+import {
+  saveItem,
+  editItem
+} from '@/api/editionSetting.js'
 import moment from 'moment'
 
 const formItemLayout = {
-  labelCol: { span: 3 },
-  wrapperCol: { span: 6 }
+  labelCol: {
+    span: 3
+  },
+  wrapperCol: {
+    span: 6
+  }
 }
 const formTailLayout = {
-  wrapperCol: { offset: 5 }
+  wrapperCol: {
+    offset: 5
+  }
 }
 export default {
   name: 'AddeditionSetting',
@@ -180,7 +162,7 @@ export default {
         downloadUrl: '',
         forceUpgrade: '0',
         upgradeContent: '',
-        attachment: '',
+        attachment: ''
       },
       applyName: 'IT后台',
       applyCode: 'atit',
@@ -188,27 +170,27 @@ export default {
     }
   },
   methods: {
-		moment,
-		// 禁止当前之前的日期选择
-		range(start, end) {
-		      const result = [];
-		      for (let i = start; i < end; i++) {
-		        result.push(i);
-		      }
-		      return result;
-		    },
+    moment,
+    // 禁止当前之前的日期选择
+    range (start, end) {
+      const result = []
+      for (let i = start; i < end; i++) {
+        result.push(i)
+      }
+      return result
+    },
 
-		    disabledDate(current) {
-		      // Can not select days before today and today
-		      return current && current <moment().subtract(1, "days");
-		    },
-		    // disabledDateTime () {
-		    //   return {
-		    //     disabledHours: () => this.range(0, moment().hour()),
-		    //     disabledMinutes: () => this.range(0, moment().minute()),
-		    //     disabledSeconds: () => this.range(0, moment().second())
-		    //   }
-		    // },
+    disabledDate (current) {
+      // Can not select days before today and today
+      return current && current < moment().subtract(1, 'days')
+    },
+    // disabledDateTime () {
+    //   return {
+    //     disabledHours: () => this.range(0, moment().hour()),
+    //     disabledMinutes: () => this.range(0, moment().minute()),
+    //     disabledSeconds: () => this.range(0, moment().second())
+    //   }
+    // },
     // 保存
     handleSubmit (e) {
       e.preventDefault()
@@ -216,13 +198,19 @@ export default {
       this.form.validateFields((err, values) => {
         if (!err) {
           const query = this.$route.query
-          const formData = Object.assign({}, this.formData, values.formData, { applyName: 'IT后台' }, { applyCode: 'atit' })
+          const formData = Object.assign({}, this.formData, values.formData, {
+            applyName: 'IT后台'
+          }, {
+            applyCode: 'atit'
+          })
           formData.publicDate = formData.publicDate.format('YYYY-MM-DD HH:mm:ss')
           saveItem(formData).then(res => {
             // console.log(res, 'rrrrrrrrr')
             if (res.status == 200) {
               _this.$message.success(res.message ? res.message : '保存成功')
-              _this.$router.push({ name: 'editionSetting_list' })
+              _this.$router.push({
+                name: 'editionSetting_list'
+              })
             } else {
               _this.$message.error(res.message)
             }
@@ -232,7 +220,9 @@ export default {
     },
     // 返回列表
     cansel () {
-      this.$router.push({ name: 'editionSetting_list' })
+      this.$router.push({
+        name: 'editionSetting_list'
+      })
     },
     // 选择时间
     handleOpenChange1 (open) {
@@ -273,13 +263,13 @@ export default {
 </script>
 
 <style lang="less">
-  .addPage{
-    .formBox{
-      padding:34px 0 10px;
-      flex-grow: 1;
-      background: #fff;
-      border-radius: 5px;
+	.addPage {
+		.formBox {
+			padding: 34px 0 10px;
+			flex-grow: 1;
+			background: #fff;
+			border-radius: 5px;
 
-    }
-  }
+		}
+	}
 </style>

+ 8 - 8
src/views/appSetting/bannerSetting.vue

@@ -116,7 +116,7 @@
         </a-form-item>
         <a-form-item :wrapper-col="{ span: 12, offset: 5 }" style="text-align: center;">
           <a-button type="primary" html-type="submit" v-if="!disabled" id="bannerSetting-submit">保存</a-button>
-          <a-button @click="close()" style="margin-left: 8px" id="bannerSetting-close">返回列表</a-button>
+          <a-button @click="close()" style="margin-left: 8px" id="bannerSetting-close">取消</a-button>
         </a-form-item>
       </a-form>
     </a-modal>
@@ -140,12 +140,12 @@ export default {
         {
           title: '序号',
           dataIndex: 'no',
-          minWidth: '40',
+          width: 60,
           align: 'center'
         },
         {
           title: '广告图位置',
-          minWidth: '100',
+          width: 200,
           dataIndex: 'position',
           align: 'center',
           scopedSlots: {
@@ -154,25 +154,25 @@ export default {
         },
         {
           title: '名称',
-          minWidth: '100',
+          width: 100,
           dataIndex: 'title',
           align: 'center'
         },
         {
           title: '排序',
-          minWidth: '100',
+          width: 100,
           dataIndex: 'sort',
           align: 'center'
         },
         {
           title: '跳转链接',
-          minWidth: '200',
+          width: 100,
           dataIndex: 'url',
           align: 'center'
         },
         {
           title: '状态',
-          minWidth: '100',
+          width: 100,
           dataIndex: 'status',
           align: 'center',
           scopedSlots: {
@@ -181,8 +181,8 @@ export default {
         },
         {
           title: '操作',
-          minWidth: '100',
           align: 'center',
+		  width: 200,
           scopedSlots: {
             customRender: 'action'
           }

+ 8 - 8
src/views/appSetting/editionSetting.vue

@@ -45,31 +45,31 @@ export default {
         {
           title: '序号',
           dataIndex: 'no',
-          minWidth: '40',
+          width: 60,
           align: 'center'
         },
         {
           title: '创建时间',
-          minWidth: '100',
+          width: 200,
           dataIndex: 'createDate',
           align: 'center'
         },
         {
           title: '版本号',
-          minWidth: '40',
+          width: 100,
           dataIndex: 'version',
           align: 'center'
         },
         {
           title: '强制升级',
-          minWidth: '40',
+          width: 100,
           dataIndex: 'forceUpgrade',
           align: 'center',
           scopedSlots: { customRender: 'forceUpgrade' }
         },
         {
           title: '升级内容',
-          minWidth: '200',
+          width: 200,
           dataIndex: 'upgradeContent',
           align: 'center',
           ellipsis: true, // 内容超过宽度 自动出现省略号
@@ -78,20 +78,20 @@ export default {
         },
         {
           title: '下载地址',
-          minWidth: '200',
+          width: 200,
           dataIndex: 'downloadUrl',
           align: 'center'
         },
         {
           title: '更新时间',
-          minWidth: '100',
+          width: 200,
           dataIndex: 'publicDate',
           align: 'center'
         },
         {
           title: '操作',
           // dataIndex: 'action',
-          minWidth: '40',
+          width: 100,
           align: 'center',
           scopedSlots: { customRender: 'action' }
         }

+ 4 - 4
src/views/power/OperateJournal/OperateJournal.vue

@@ -66,26 +66,26 @@ export default {
         {
           title: '序号',
           dataIndex: 'no',
-          minWidth: '40',
+          width: 60,
           align: 'center'
         },
         {
           title: '操作人',
           dataIndex: 'actorName',
-          minWidth: '100',
+          width: 100,
           align: 'center',
           scopedSlots: { customRender: 'actorName' }
         },
         {
           title: 'IP',
           dataIndex: 'ip',
-          minWidth: '100',
+          width: 200,
           align: 'center'
         },
         {
           title: '日志明细',
           dataIndex: 'actDesc',
-          minWidth: '100',
+          width: 200,
           align: 'center',
           scopedSlots: { customRender: 'actDesc' }
         }

+ 2 - 2
src/views/power/role/roleList.vue

@@ -83,7 +83,7 @@ export default {
         {
           title: '序号',
           dataIndex: 'no',
-          width: '40',
+          width: 60,
           align: 'center'
         },
         {
@@ -112,7 +112,7 @@ export default {
         },
         {
           title: '操作',
-          width: '100',
+		  width: '100',
           align: 'center',
           scopedSlots: { customRender: 'action' }
         }

+ 15 - 3
src/views/power/user/userList.vue

@@ -5,13 +5,25 @@
         <a-row :gutter="48">
           <a-col :md="6" :sm="24">
             <a-form-item label="用户名称">
-              <a-input allowClear v-model.trim="queryParam.name" placeholder="请输入用户名称" id="userList-name" :maxLength="30" @pressEnter="$refs.table.refresh(true)" />
+              <a-input
+                allowClear
+                v-model.trim="queryParam.name"
+                placeholder="请输入用户名称"
+                id="userList-name"
+                :maxLength="30"
+                @pressEnter="$refs.table.refresh(true)" />
             </a-form-item>
           </a-col>
 
           <a-col :md="6" :sm="24">
             <a-form-item label="手机号码">
-              <a-input allowClear v-model.trim="queryParam.phone" placeholder="请输入手机号码" :maxLength="11" id="userList-phone" @pressEnter="$refs.table.refresh(true)" />
+              <a-input
+                allowClear
+                v-model.trim="queryParam.phone"
+                placeholder="请输入手机号码"
+                :maxLength="11"
+                id="userList-phone"
+                @pressEnter="$refs.table.refresh(true)" />
             </a-form-item>
           </a-col>
 
@@ -98,7 +110,7 @@ export default {
       columns: [{
         title: '序号',
         dataIndex: 'no',
-        width: '40',
+        width: 60,
         align: 'center'
       },
       {