🎨优化页面显示效果

Hello-hao · Mar 28, 2022 · 8924bc5 · 8924bc5
1 parent 7883515
commit 8924bc5
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 24 deletions.
diff --git a/src/assets/js/photo.js b/src/assets/js/photo.js
@@ -42,12 +42,11 @@ export default {
             treePopup: false,
             violation:false,
             moveImgLoading:false,
-            noImgMsg : false//没有图像的时候提示
+            noImgMsg : false,//没有图像的时候提示
 
         }
     },
     methods: {
-
         selectPhoto(){
             this.issearchimg = false;
             // this.$Spin.show();
@@ -67,15 +66,14 @@ export default {
             paramJson.starttime=this.searchStartDate==''?null:this.searchStartDate;
             paramJson.stoptime=this.searchStopDate==''?null:this.searchStopDate;
             paramJson.violation = this.violation;
-
+            this.treePopup = false;
             request(
                 "/admin/selectPhoto",
                 paramJson).then(res => {
                 if(res.status==200){
                     if(res.data.code=='200'){
                         var arr = res.data.data.rows;
                         this.nextButloading=false;
-                        this.treePopup = false;
                         if(arr.length>0){
                             this.imglist=this.imglist.concat(arr);
                             this.pageNum++;

diff --git a/src/store/index.js b/src/store/index.js
@@ -7,7 +7,7 @@ vue.use(vuex)
 
 const store = new vuex.Store({
     state:{
-        version:20220221,
+        version:20220328,
         serverHost:null,
         copyAllUrl:null,//一键复制存储内容
         userName:'' || localStorage.getItem('userName'),

diff --git a/src/views/admin/photo.vue b/src/views/admin/photo.vue
@@ -12,24 +12,25 @@
           </RadioGroup>
         </FormItem>
         <FormItem label="存储源" v-if="$store.state.RoleLevel=='admin'">
-              <Select v-model="searchbucket" filterable clearable placeholder="存储源(默认全部)">
+              <Select style="width: 250px" v-model="searchbucket" filterable clearable placeholder="存储源(默认全部)">
                 <Option v-for="item in bucketlist" :value="item.storageType" :key="item.id">{{ item.keyname }}</Option>
               </Select>
         </FormItem>
-        <FormItem label="起始日期">
-          <DatePicker @on-change="startDateChange" format="yyyy-MM-dd HH:mm:ss" type="datetime"  split-panels placeholder="起始日期段(默认不限)"></DatePicker>
-        </FormItem>
-        <FormItem label="结束日期">
-          <DatePicker @on-change="stopDateChange" format="yyyy-MM-dd HH:mm:ss" type="datetime"  split-panels placeholder="结束日期段(默认当前日期)"></DatePicker>
-        </FormItem>
         <FormItem label="用户名" v-if="$store.state.RoleLevel=='admin' && selectUserType=='all'">
-          <Input v-model="searchtext" placeholder="填写用户名">
-            <Select v-model="searchtype" slot="prepend" style="width: 100px">
+          <Input v-model="searchtext" placeholder="填写用户名"  style="width: 250px">
+            <Select v-model="searchtype" slot="prepend" style="width: 80px">
               <Option value="1">包含</Option>
               <Option value="0">排除</Option>
             </Select>
           </Input>
         </FormItem>
+        <FormItem label="起始日期">
+          <DatePicker style="width: 250px;" @on-change="startDateChange" format="yyyy-MM-dd HH:mm:ss" type="datetime"  split-panels placeholder="起始日期段(默认不限)"></DatePicker>
+        </FormItem>
+        <FormItem label="结束日期">
+          <DatePicker style="width: 250px;" @on-change="stopDateChange" format="yyyy-MM-dd HH:mm:ss" type="datetime"  split-panels placeholder="结束日期段(默认当前日期)"></DatePicker>
+        </FormItem>
+
         <FormItem label="图像类型" >
           <CheckboxGroup>
             <Checkbox label="违规图片" v-model="violation" border></Checkbox>
@@ -152,8 +153,6 @@
         </TabPane>
       </Tabs>
       </Modal>
-
-
     <Footer class="layout-footer-center" >{{this.$store.state.metaInfo.webname}} &copy; Control Panel</Footer>
       </Layout>
 

diff --git a/src/views/index.vue b/src/views/index.vue
@@ -10,8 +10,8 @@
 <!--        </div>-->
 <!--      </Drawer>-->
 
-      <Drawer title="资讯" placement="top" height ="276" :closable="false" v-model="$store.state.noticePopup" v-if="(this.$store.state.metaInfo.explain!='' && this.$store.state.metaInfo.explain!=null)">
-        <div style="padding: 0 20px;letter-spacing: 2px; line-height: 26px; font-size: 16px;height: 135px; overflow: auto;" v-html="this.$store.state.metaInfo.explain">
+      <Drawer title="资讯" placement="top" height ="363" :closable="false" v-model="$store.state.noticePopup" v-if="(this.$store.state.metaInfo.explain!='' && this.$store.state.metaInfo.explain!=null)">
+        <div style="padding: 0 20px;letter-spacing: 2px; line-height: 26px; font-size: 16px;height: 220px; overflow: auto;" v-html="this.$store.state.metaInfo.explain">
         </div>
         <div style="height: 60px; text-align: center; position: absolute; bottom: 10px; left: 0; right: 0; margin: auto;">
           <Checkbox style="font-size: 14px;" v-model="noticeSwitch">三天内不再通知</Checkbox>

diff --git a/src/views/register.vue b/src/views/register.vue
@@ -9,7 +9,6 @@
               <span style="font-size: large; font-weight: bold;">Register</span>
             </Header>
             <Content>
-<!--               @submit.native.prevent-->
             <Form ref="formInline" :model="formInline" :rules="ruleInline" inline @submit.native.prevent>
               <FormItem prop="username" style="display: inline-block;width: 80%;">
                 <Input prefix="md-contact" size="large" :maxlength="20" show-word-limit v-model="formInline.username" autocomplete="new-password" placeholder="用户名 可数字字母下划线" style="width: 100%;height: 40px;" />
@@ -18,10 +17,10 @@
                 <Input prefix="md-mail" size="large" v-model="formInline.email" :maxlength="200" placeholder="邮箱" autocomplete="new-password" style="width: 100%;height: 40px;" />
               </FormItem>
               <FormItem prop="password" style="display: inline-block;width: 80%;">
-                <Input prefix="md-lock"  size="large"  :maxlength="200"   v-model="formInline.password" autocomplete="new-password" placeholder="用户密码" style="width: 100%;height: 40px;" />
+                <Input prefix="md-lock" type="password" size="large"  :maxlength="200"   v-model="formInline.password" autocomplete="new-password" placeholder="用户密码" style="width: 100%;height: 40px;" />
               </FormItem>
               <FormItem prop="password" style="display: inline-block;width: 80%;">
-                <Input prefix="md-lock"  size="large"  :maxlength="200"   v-model="formInline.passwordtow" autocomplete="new-password" placeholder="确认用户密码" style="width: 100%;height: 40px;" />
+                <Input prefix="md-lock" type="password" size="large"  :maxlength="200"   v-model="formInline.passwordtow" autocomplete="new-password" placeholder="确认用户密码" style="width: 100%;height: 40px;" />
               </FormItem>
               <FormItem style="display: inline-block;width: 80%;">
               <Row>
@@ -34,15 +33,12 @@
               </Row>
               </FormItem>
               <FormItem>
-                <!--            <Button type="success" @click="handleSubmit('formInline')" long>SUBMIT</Button>-->
-                <!--            <Button type="primary" shape="circle" icon="ios-search">Search</Button>-->
                 <ButtonGroup shape="circle">
                   <Button type="primary" @click="handleSubmit('formInline')">注 册</Button>
                 </ButtonGroup>
               </FormItem>
             </Form>
             </Content>
-            <Footer class="layout-footer-center"></Footer>
           </Layout>
 
         </Form>