日志等bug修复

src/assets/css/main.css

@@ -29,6 +29,16 @@ li {
 }
 
 
+::-webkit-scrollbar {
+    width: 8px;
+    height: 8px;
+}
+
+::-webkit-scrollbar-thumb {
+    width: 5px;
+    border-radius: 6px;
+    background: #d7d7d7;
+}
 .content-box {
     -webkit-transition: left .3s ease-in-out;
     transition: left .3s ease-in-out;

src/views/data/Product.vue

@@ -14,13 +14,12 @@
                     </el-select>
                 </li>
             </ul>
-            <div>
-                <el-input placeholder="请输入产品名称" prefix-icon="el-icon-search" v-model="keyword" clearable></el-input>
-            </div>
         </div>
 
         <div class="tool">
-            <div></div>
+            <div>
+                <el-input placeholder="请输入产品名称" prefix-icon="el-icon-search" v-model="keyword" clearable></el-input>
+            </div>
             <div>
                 <el-button type="primary" round @click="add" v-auth="'/data:产品管理:新增'">新增</el-button>
                 <el-button type="primary" round @click="delAllSelection" v-auth="'/data:产品管理:批量删除'">批量删除</el-button>
@@ -52,7 +51,7 @@
             <el-pagination background layout="total, prev, pager, next" @current-change="handleCurrentChange" :current-page="page" :total="totals"></el-pagination>
         </div>
 
-        <el-dialog :title="isDetail ? '查看产品' : (id ? '编辑产品' : '新增产品')" :visible.sync="productVisible" width="30%" center @close="closeProduct" class="dialog" :close-on-click-modal="false">
+        <el-dialog :title="isDetail ? '查看产品' : (id ? '编辑产品' : '新增产品')" :visible.sync="productVisible" width="600px" center @close="closeProduct" class="dialog" :close-on-click-modal="false">
             <el-form ref="form" label-width="98px" :disabled="isDetail">
                  <el-form-item label="数据产品名称">
                     <el-input v-model="productName" placeholder="请输入数据产品名称"></el-input>
@@ -64,14 +63,15 @@
                 </el-form-item>
                 <el-form-item label="配置数据">
                     <el-button type="primary" @click="configData">配置数据权限</el-button>
-                    <div class="type-wrap" ref="typeWrap" @scroll="loadType" v-show="checkedIds.length">
+                    
-                        <el-tree ref="type" :data="typeList" show-checkbox accordion node-key="id" :default-expanded-keys="checkedIds" :default-checked-keys="checkedIds" :props="defaultProps" @node-expand="typeExpand">
-                            <span class="custom-tree-node" slot-scope="{ node, data }">
-                                <span :title="node.label">{{ node.label }}</span>
-                            </span>
-                        </el-tree>
-                    </div>
                 </el-form-item>
+                <div class="type-wrap" ref="typeWrap" @scroll="loadType" v-show="checkedIds.length">
+                    <el-tree ref="type" :data="typeList" show-checkbox accordion node-key="id" :default-expanded-keys="checkedIds" :default-checked-keys="checkedIds" :props="defaultProps" @node-expand="typeExpand">
+                        <span class="custom-tree-node" slot-scope="{ node, data }">
+                            <span :title="node.label">{{ node.label }}</span>
+                        </span>
+                    </el-tree>
+                </div>
             </el-form>
             <span slot="footer" class="dialog-footer" v-if="!isDetail">
                 <el-button @click="productVisible = false">取 消</el-button>
@@ -628,6 +628,7 @@ export default {
 }
 .type-wrap{
     height: 450px;
+    margin-left: 25px;
     overflow:auto;
 }
 </style>

src/views/order/AddOrder.vue

@@ -1337,25 +1337,25 @@ export default {
         // 使用期限转换以及计算剩余天数
         deadLine(e,row,options, isDate) {
             // 只有改变了起止日期才需要调接口查询订单，该接口作用是把开始时间传过去，会返回一个提示或者时间，如果是时间，则把时间+1天，如果是提示，则无法保存
-            if (isDate) {
+            // if (isDate) {
-                const date = row.startTime
+            //     const date = row.startTime
-                const orderRepeat = this.orderRepeat
+            //     const orderRepeat = this.orderRepeat
-                this.$post(this.api.getOrderOtherTime, {
+            //     this.$post(this.api.getOrderOtherTime, {
-                    customerId: this.form.customerId,
+            //         customerId: this.form.customerId,
-                    id: row.dataOrCourseId,
+            //         id: row.dataOrCourseId,
-                    startTime: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
+            //         startTime: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
-                }).then(res => {
+            //     }).then(res => {
-                    if (res.endTime) {
+            //         if (res.endTime) {
-                        orderRepeat.includes(row.id) && orderRepeat.splice(orderRepeat.findIndex(e => e === row.id), 1)
+            //             orderRepeat.includes(row.id) && orderRepeat.splice(orderRepeat.findIndex(e => e === row.id), 1)
-                        let time = new Date(res.endTime)
+            //             let time = new Date(res.endTime)
-                        time = new Date(time.setDate(time.getDate() + 1))
+            //             time = new Date(time.setDate(time.getDate() + 1))
-                        row.startTime = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
+            //             row.startTime = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
-                    }
+            //         }
-                }).catch(res => {
+            //     }).catch(res => {
-                    this.repeatMsg = res.message
+            //         this.repeatMsg = res.message
-                    orderRepeat.includes(row.id) || orderRepeat.push(row.id)
+            //         orderRepeat.includes(row.id) || orderRepeat.push(row.id)
-                })
+            //     })
-            }
+            // }
             let optionsData = ''
             if(e > 0){
                 if (options == 1){

src/views/serve/backstage/index.vue

@@ -55,6 +55,6 @@ export default {
 
 <style lang="scss" scoped>
 .page {
-    min-height: 100%;
+    min-height: calc(100vh - 250px);
 }
 </style>

src/views/serve/backstage/model.vue

@@ -95,6 +95,7 @@ export default {
           // 如果是首级，要调另一个接口
           if (!curNode.level) {
             this.$post(this.api.getAllModelList, {
+              modelName: this.keyword,
               pageNum: this.page,
               pageSize: this.pageSize,
               systemId: this.systemId

src/views/serve/backstage/sourceModel.vue

@@ -83,6 +83,7 @@ export default {
           // 如果是首级，要调另一个接口
           if (!curNode.level) {
             this.$post(this.api.getAllModelListBySys, {
+              modelName: this.keyword,
               pageNum: this.page,
               pageSize: this.pageSize
             }).then(res => {

src/views/system/log.vue

@@ -4,7 +4,7 @@
         <div class="tool">
             <ul class="filter">
                 <li>
-                    <el-input placeholder="请输入日志名称" prefix-icon="el-icon-search" v-model.trim="keyword" clearable></el-input>
+                    <el-input placeholder="请输入平台名称" prefix-icon="el-icon-search" v-model.trim="keyword" clearable></el-input>
                 </li>
             </ul>
         </div>

src/views/system/manageLog.vue

@@ -35,7 +35,7 @@
                         <p class="sign" :id="'ver' + i">{{ item.draft ? '未发布' : item.updateTime }}</p>
                         <div class="ver">
                             <div>
-                                {{ platformName + item.versionName + (item.draft ? '（草稿）' : '') }}
+                                {{ item.versionName + (item.draft ? '（草稿）' : '') }}
                                 <span class="action">
                                     <i class="el-icon-edit-outline" @click="edit(item)" v-auth="'/system:日志更新:管理:编辑日志'"></i>
                                     <i class="el-icon-delete" @click="del(item)" v-auth="'/system:日志更新:管理:删除日志'"></i>
@@ -177,7 +177,7 @@ export default {
     min-height: calc(100vh - 300px);
     padding: 24px 0;
     .inner {
-        width: 1100px;
+        width: 900px;
         margin: 0 auto;
     }
 }
@@ -199,7 +199,7 @@ export default {
         padding-left: 40px;
     }
     .sign {
-        margin: -11px 0 0 -16%;
+        margin: -11px 0 0 -22%;
         font-size: 14px;
         color: #9076FF;
     }
@@ -240,8 +240,8 @@ export default {
             font-size: 14px;
             color: #9984f1;
             img {
+                width: 30px;
                 margin-right: 5px;
-                margin-left: -25px;
             }
         }
         .val {
@@ -252,11 +252,10 @@ export default {
               position: relative;
               &:before {
                 content: '';
-                position: absolute;
+                display: inline-block;
-                top: 11px;
-                left: -10px;
                 width: 5px;
                 height: 5px;
+                margin: 0 10px 0 5px;
                 border-radius: 20px;
                 background-color: #c5b8ff;
               }

src/views/system/role.vue

@@ -107,7 +107,7 @@ export default {
     },
     methods: {
         getData() {
-            this.$get(`${this.api.roleList}?page=${this.page}&size=${this.pageSize}&name=${this.keyword}&platformId=1`).then(res => {
+            this.$get(`${this.api.roleList}?page=${this.page}&size=${this.pageSize}&name=${this.keyword}&platformId=${Setting.platformId}`).then(res => {
                 this.listData = res.rolePage.records;
                 this.total = res.rolePage.total;
             }).catch(res => {});

src/views/user/User.vue

@@ -1,12 +1,12 @@
 <template>
-    <div>
+    <div class="wrap">
         <el-card shadow="hover" class="mgb20">
             <div>
                 <div class="flex-center mgb20">
                     <p class="hr_tag"></p>
                     <span>筛选</span>
                 </div>
-                <div>
+                <div style="overflow: auto;">
                     <el-form label-width="80px">
                         <el-row>
                             <el-col :span="5">
@@ -59,7 +59,7 @@
                             </el-col> -->
                         </el-row>
                         <el-row>
-                            <el-col :span="8" style="width: 32.8%;margin-right: 0.5333%">
+                            <el-col :span="8">
                                 <el-form-item label="创建时间" class="userRadio">
                                     <el-radio-group v-model="form.month">
                                         <el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border>{{item.name}}</el-radio>
@@ -78,7 +78,6 @@
                                         format="yyyy-MM-dd"
                                         value-format="yyyy-MM-dd"
                                         clearable
-                                        style="width: 100%"
                                     ></el-date-picker>
                                 </el-form-item>
                             </el-col>
@@ -114,7 +113,7 @@
                 <el-table-column prop="schoolName" label="学校" align="center"></el-table-column>
                 <el-table-column prop="platformName" label="来源" align="center"></el-table-column>
                 <el-table-column prop="phone" label="手机号" align="center"></el-table-column>
-                <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
+                <el-table-column prop="createTime" label="创建时间" width="150" align="center"></el-table-column>
                 <el-table-column prop="logInNumber" label="登录次数" align="center"></el-table-column>
                 <el-table-column label="操作" width="300" align="center">
                     <template slot-scope="scope">
@@ -401,6 +400,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.el-form {
+    min-width: 1800px;
+}
 .card {
     min-height: calc(100vh - 380px);
 }