zangkai 5 лет назад
Родитель
Сommit
e3e3267587

+ 138 - 141
frontend_web/src/views/course/detail/index.vue

@@ -1,131 +1,129 @@
 <template>
-    <d2-container>
-        <template slot="header">
-            <el-form :inline="true"
-                     :model="searchForm"
-                     ref="searchForm"
+  <d2-container>
+    <template slot="header">
+      <el-form :inline="true"
+               :model="searchForm"
+               ref="searchForm"
+               size="mini"
+               style="height: 25px; margin-top: -7px;text-align:right;">
+        <el-form-item label="课程名称"
+                      prop="name">
+          <el-input v-model="searchForm.name"
+                    placeholder="课程名称"
+                    style="width: 140px;"
+                    clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary"
                      size="mini"
-                     style="height: 25px; margin-top: -7px;text-align:right;">
-                <el-form-item label="课程名称"
-                              prop="name">
-                    <el-input v-model="searchForm.name"
-                              placeholder="课程名称"
-                              style="width: 140px;"
-                              clearable/>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary"
-                               size="mini"
-                               style="margin-left:10px"
-                               @click="handleSearch">
-                        <d2-icon name="search" /> 查询
-                    </el-button>
-                    <el-button @click="handleSearchFormReset"
-                               type="primary"
-                               size="mini">
-                        <d2-icon name="refresh" /> 重置
-                    </el-button>
-                    <el-button type="primary"
-                               size="mini"
-                               icon="el-icon-circle-plus"
-                               @click="add"> 新增
-                    </el-button>
-                    <el-button type="primary"
-                               size="mini"
-                               icon="el-icon-circle-plus"
-                               :disabled="deleteBtnVisible"
-                               @click="delSelectedIds"> 删除
-                    </el-button>
-                    <el-button type="primary"
-                               size="mini"
-                               icon="el-icon-back"
-                               @click="back"> 返回
-                    </el-button>
-                </el-form-item>
-            </el-form>
-        </template>
-
-        <el-table ref="multipleTable"
-                  :data="activities"
-                  border
-                  fit
-                  tooltip-effect="dark"
-                  style="width: 100%"
-                  @sort-change="orderby"
-                  height="100%">
-            <el-table-column label="操作"
-                             width="160px"
-                             align="center"
-                             fixed='right'>
-                <template slot-scope="scope">
-                    <el-button size="mini"
-                               title="编辑"
-                               type="primary"
-                               @click="handleEdit(scope.row.Id)"
-                               icon="el-icon-edit"
-                               circle></el-button>
-                    <el-button size="mini"
-                               type="danger"
-                               title="删除"
-                               @click="handleDelete(scope.row.Id)"
-                               style="margin-left:5px;"
-                               icon="el-icon-delete"
-                               circle></el-button>
+                     style="margin-left:10px"
+                     @click="handleSearch">
+            <d2-icon name="search" /> 查询
+          </el-button>
+          <el-button @click="handleSearchFormReset"
+                     type="primary"
+                     size="mini">
+            <d2-icon name="refresh" /> 重置
+          </el-button>
+          <el-button type="primary"
+                     size="mini"
+                     icon="el-icon-circle-plus"
+                     @click="add"> 新增
+          </el-button>
+          <el-button type="primary"
+                     size="mini"
+                     icon="el-icon-circle-plus"
+                     :disabled="deleteBtnVisible"
+                     @click="delSelectedIds"> 删除
+          </el-button>
+          <el-button type="primary"
+                     size="mini"
+                     icon="el-icon-back"
+                     @click="back"> 返回
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </template>
 
-                </template>
-            </el-table-column>
-            <el-table-column prop="CourseName"
-                             align="center"
-                             min-width="120px"
-                             label="课程名称"
-                             show-overflow-tooltip></el-table-column>
-            <el-table-column prop="Teacher"
-                             align="center"
-                             min-width="120px"
-                             label="授课老师"
-                             show-overflow-tooltip
-                             :formatter="teacherFormatter"
-            ></el-table-column>
-            <el-table-column prop="Local"
-                             align="center"
-                             min-width="120px"
-                             label="实验地点"
-                             show-overflow-tooltip
-                             :formatter="localFormatter"
-            ></el-table-column>
-            <el-table-column prop="Num"
-                             align="center"
-                             min-width="120px"
-                             label="人数"
-                             show-overflow-tooltip></el-table-column>
-            <el-table-column prop="CreatedTime"
-                             align="center"
-                             min-width="120px"
-                             label="创建时间"
-                             show-overflow-tooltip></el-table-column>
-        </el-table>
+    <el-table ref="multipleTable"
+              :data="activities"
+              border
+              fit
+              tooltip-effect="dark"
+              style="width: 100%"
+              @sort-change="orderby"
+              height="100%">
+      <el-table-column label="操作"
+                       width="160px"
+                       align="center"
+                       fixed='right'>
+        <template slot-scope="scope">
+          <el-button size="mini"
+                     title="编辑"
+                     type="primary"
+                     @click="handleEdit(scope.row.Id)"
+                     icon="el-icon-edit"
+                     circle></el-button>
+          <el-button size="mini"
+                     type="danger"
+                     title="删除"
+                     @click="handleDelete(scope.row.Id)"
+                     style="margin-left:5px;"
+                     icon="el-icon-delete"
+                     circle></el-button>
 
-        <template slot="footer">
-            <el-pagination style="margin: -10px;"
-                           @size-change="handleSizeChange"
-                           @current-change="handleCurrentChange"
-                           :current-page="page.current"
-                           :page-size="page.size"
-                           :total="page.total"
-                           :page-sizes="[10, 20]"
-                           layout="total, sizes, prev, pager, next, jumper">
-            </el-pagination>
         </template>
-        <edit-form :id="id"
-                   v-model="editFormVisible"
-                   :CourseId="parseInt(CourseId)"
-                   :Year="parseInt(Year)"
-                   :Term="parseInt(Term)"
-                   :ClassId="parseInt(Class)"
-                   :RoomList="RoomList"
-                   :TeacherList="TeacherList"
-                   @submit="doRefresh" />
-    </d2-container>
+      </el-table-column>
+      <el-table-column prop="CourseName"
+                       align="center"
+                       min-width="120px"
+                       label="课程名称"
+                       show-overflow-tooltip></el-table-column>
+      <el-table-column prop="Teacher"
+                       align="center"
+                       min-width="120px"
+                       label="授课老师"
+                       show-overflow-tooltip
+                       :formatter="teacherFormatter"></el-table-column>
+      <el-table-column prop="Local"
+                       align="center"
+                       min-width="120px"
+                       label="实验地点"
+                       show-overflow-tooltip
+                       :formatter="localFormatter"></el-table-column>
+      <el-table-column prop="Num"
+                       align="center"
+                       min-width="120px"
+                       label="人数"
+                       show-overflow-tooltip></el-table-column>
+      <el-table-column prop="CreatedTime"
+                       align="center"
+                       min-width="120px"
+                       label="创建时间"
+                       show-overflow-tooltip></el-table-column>
+    </el-table>
+
+    <template slot="footer">
+      <el-pagination style="margin: -10px;"
+                     @size-change="handleSizeChange"
+                     @current-change="handleCurrentChange"
+                     :current-page="page.current"
+                     :page-size="page.size"
+                     :total="page.total"
+                     :page-sizes="[10, 20]"
+                     layout="total, sizes, prev, pager, next, jumper">
+      </el-pagination>
+    </template>
+    <edit-form :id="id"
+               v-model="editFormVisible"
+               :CourseId="parseInt(CourseId)"
+               :Year="parseInt(Year)"
+               :Term="parseInt(Term)"
+               :ClassId="parseInt(Class)"
+               :RoomList="RoomList"
+               :TeacherList="TeacherList"
+               @submit="doRefresh" />
+  </d2-container>
 </template>
 
 <script>
@@ -392,7 +390,7 @@ export default {
       this.doRefresh()
     },
     back () { // 返回上一页
-        this.$router.push({path:'/course'})
+      this.$router.push({ path: '/course' })
     },
     // 列表排序功能
     orderby (column) {
@@ -409,23 +407,22 @@ export default {
 </script>
 
 <style lang="scss">
+.el-pagination {
+  margin: 1rem 0 2rem;
+  text-align: right;
+}
 
-    .el-pagination {
-        margin: 1rem 0 2rem;
-        text-align: right;
-    }
-
-    .plab {
-        font-size: 13px;
-        color: #999;
-    }
+.plab {
+  font-size: 13px;
+  color: #999;
+}
 
-    .rowequippower .el-checkbox {
-        margin-left: 1px;
-        padding: 5px 10px 0 0;
-    }
-    .ag-header-cell-text{
-        text-align: center ;
-        width: 100%;
-    }
+.rowequippower .el-checkbox {
+  margin-left: 1px;
+  padding: 5px 10px 0 0;
+}
+.ag-header-cell-text {
+  text-align: center;
+  width: 100%;
+}
 </style>

+ 1 - 2
frontend_web/src/views/sysadmin/item_detail/index.vue

@@ -292,8 +292,7 @@ export default {
       this.doRefresh()
     },
     back () { // 返回上一页
-      this.$router.push({path:'/sysadmin/item'})
-
+      this.$router.push({ path: '/sysadmin/item' })
     }
   }
 }