Procházet zdrojové kódy

排版表页面优化

zangkai před 5 roky
rodič
revize
b41d45e26a

+ 0 - 9
frontend_web/src/views/class/components/classedit.vue

@@ -182,15 +182,6 @@ export default {
       // this.$refs['uploader'].clearFiles()
       this.fileList = []
       this.$emit('closeEditDialog')
-    },
-    deletedataforDid (val) {
-      deletetriggerlistfordid(val)
-        .then(res => {
-        })
-        .catch(err => {
-          // handle error
-          console.error(err)
-        })
     }
 
   }

+ 3 - 2
frontend_web/src/views/course/components/courseInfoDialog.vue

@@ -41,7 +41,8 @@
       </el-form-item>
       <el-form-item label="班级"
                     prop="ClassId">
-        <el-select v-model="course.ClassId" filterable
+        <el-select v-model="course.ClassId"
+                   filterable
                    placeholder="请选择班级">
           <el-option v-for="item in classList"
                      :key="item.Id"
@@ -94,7 +95,7 @@ export default {
   },
   created () {
     let myDate = new Date()
-    let year = myDate.getFullYear() +1 // 获取当前年
+    let year = myDate.getFullYear() + 1 // 获取当前年
     this.initSelectYear(year)
     this.getData()
   },

+ 5 - 4
frontend_web/src/views/course/index.vue

@@ -31,7 +31,8 @@
         </el-form-item>
         <el-form-item label="班级"
                       class="sbutton_margin">
-          <el-select v-model="search.ClassId" filterable
+          <el-select v-model="search.ClassId"
+                     filterable
                      style="width: 140px;">
             <el-option v-for="item in classList"
                        :key="item.Id"
@@ -304,9 +305,9 @@ export default {
         // 分页信息
         size: this.search.page.size,
         current: this.search.page.current,
-        Year:  this.search.Year,
-        Term:  this.search.Term,
-        ClassId:  this.search.ClassId
+        Year: this.search.Year,
+        Term: this.search.Term,
+        ClassId: this.search.ClassId
       }
       this.getClassList()
       CourseApi.getPageList(params)

+ 5 - 1
frontend_web/src/views/duty/detail/index.vue

@@ -75,6 +75,8 @@
           <el-col :span="2">
             <el-button size="mini"
                        type="warning"
+                       Updated
+                       upstream
                        @click="back()">返回</el-button>
           </el-col>
         </el-row>
@@ -467,7 +469,7 @@ export default {
     ]),
     // 关闭
     back () {
-      this.$router.push({path:'/duty'})
+      this.$router.push({ path: '/duty' })
 
       // let tagName = this.current
       // this.close({ tagName })
@@ -477,6 +479,8 @@ export default {
 </script>
 <style>
 .selectedCell {
+  transition: background-color 2s;
+  -webkit-transition: background-color 2s; /* Safari */
   background-color: green !important;
   color: white;
 }

+ 2 - 2
frontend_web/src/views/managingrooms/_opera/add.vue

@@ -95,7 +95,7 @@
 
 <script>
 import {
-  saveroomdata,
+  saveroomdata
 } from '@/api/instrumentroom'
 
 export default {
@@ -115,7 +115,7 @@ export default {
         RoomType: '',
         RoomDescribe: '',
         PositionInformation: '',
-        building:''
+        building: ''
       },
       classificationlist: [],
 

+ 3 - 3
frontend_web/src/views/managingrooms/_opera/edit.vue

@@ -104,7 +104,7 @@ export default {
   name: 'instrumentadd',
   props: {
     typeList: Array,
-    buildingList: Array,
+    buildingList: Array
   },
   data () {
     return {
@@ -118,7 +118,7 @@ export default {
         RoomType: '',
         RoomDescribe: '',
         PositionInformation: '',
-        Building:''
+        Building: ''
 
       },
       classificationlist: [],
@@ -142,7 +142,7 @@ export default {
           required: true,
           message: '请选择楼宇',
           trigger: 'blur'
-        }],
+        }]
 
       }
     }

+ 19 - 23
frontend_web/src/views/managingrooms/index.vue

@@ -47,15 +47,13 @@
                        align="center"
                        label="实验室类型"
                        show-overflow-tooltip
-                       :formatter="formatRoomType"
-      ></el-table-column>
+                       :formatter="formatRoomType"></el-table-column>
       <el-table-column prop="Building"
                        min-width="10px"
                        align="center"
                        label="楼宇"
                        show-overflow-tooltip
-                       :formatter="formatBuilding"
-      ></el-table-column>
+                       :formatter="formatBuilding"></el-table-column>
       <el-table-column prop="PositionInformation"
                        min-width="10px"
                        align="center"
@@ -108,14 +106,12 @@
              @closeAddDialog="handleCloseAdd"
              @initdata="searchroomdata"
              :typeList="typeList"
-             :buildingList="buildingList"
-    ></addroom>
+             :buildingList="buildingList"></addroom>
     <editroom ref="editroom"
               @closeEditDialog="handleCloseEdit"
               @initdata="searchroomdata"
               :typeList="typeList"
-              :buildingList="buildingList"
-    ></editroom>
+              :buildingList="buildingList"></editroom>
     <role-user :role="role"
                v-model="roleUserDialogVisible" />
     <template slot="footer">
@@ -160,7 +156,7 @@ export default {
       RoomType: '',
       RoomDescribe: '',
       PositionInformation: '',
-      buildingList:[], // 楼宇
+      buildingList: [], // 楼宇
       name: '',
       totalsize: 0,
       currpage: 1,
@@ -194,21 +190,21 @@ export default {
     // 获取所有实验室类型
     getRoomTypeList () {
       itemDetailApi.getItemDetailByItemCode({ ItemCode: 'RoomType' })
-              .then(res => {
-                this.typeList = res
-              })
-              .catch(err => {
-                console.error(err)
-              })
+        .then(res => {
+          this.typeList = res
+        })
+        .catch(err => {
+          console.error(err)
+        })
     },
-    formatRoomType(row, column) {
+    formatRoomType (row, column) {
       for (var i = 0; i < this.typeList.length; i++) {
         if (parseInt(this.typeList[i].ItemValue) === parseInt(row.RoomType)) {
           return this.typeList[i].ItemName
         }
       }
     },
-    formatBuilding(row, column) {
+    formatBuilding (row, column) {
       for (var i = 0; i < this.buildingList.length; i++) {
         if (parseInt(this.buildingList[i].ItemValue) === parseInt(row.Building)) {
           return this.buildingList[i].ItemName
@@ -218,12 +214,12 @@ export default {
     // 获取位置列表
     getBuildingList () {
       itemDetailApi.getItemDetailByItemCode({ ItemCode: 'Local' })
-              .then(res => {
-                this.buildingList = res
-              })
-              .catch(err => {
-                console.error(err)
-              })
+        .then(res => {
+          this.buildingList = res
+        })
+        .catch(err => {
+          console.error(err)
+        })
     },
     // 添加 实验室
     maintainlogadd () {