Merge remote-tracking branch 'origin/master'

frontend_web/src/views/demo/page1/index.vue

@@ -30,17 +30,18 @@
                   border
                   fit
                   @row-click="openDetails"
-                  style="width: 100%;margin:5px;white-space:pre;"
-                  height="280px">
+                  tooltip-effect="light">
           <el-table-column prop="title"
                            fit
                            min-width="80px"
                            label="信息标题"
-                           align="center"></el-table-column>
+                           align="center"
+                           show-overflow-tooltip></el-table-column>
           <el-table-column prop="content"
                            label="信息内容"
                            align="center"
-                           min-width="160px"></el-table-column>
+                           min-width="160px"
+                           show-overflow-tooltip></el-table-column>
           <el-table-column prop="createdtime"
                            align="center"
                            min-width="50px"
@@ -363,7 +364,7 @@ export default {
       this.informationId = row.id
       this.$refs.informationDialog.dialogvisible = true
     },
-    //课程
+    // 课程
     openCourseDetails (row) {
       this.courselist.CourseId = row.Id
       this.courselist.Year = row.Year
@@ -576,8 +577,7 @@ export default {
       this.searchduty.Term = ''
       this.searchduty.Title = ''
       this.initDatas_duty()
-    },
-
+    }
 
   }
 }

frontend_web/src/views/duty/detail/index.vue

@@ -4,19 +4,23 @@
               style="padding: 5px;">
       <el-form :model="dutyDetail">
         <el-row>
-          <el-col :span="4">
+          <el-col :span="10">
             <el-form-item label="标题"
                           label-width="120px">
               {{dutyDetail.Title}}
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+        </el-row>
+        <el-row>
+          <el-col :span="10">
             <el-form-item label="学年"
                           label-width="120px">
               {{dutyDetail.Year}}年
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+        </el-row>
+        <el-row>
+          <el-col :span="10">
             <el-form-item label="学期"
                           label-width="120px">
               {{this.termName}}
@@ -58,8 +62,8 @@
                        style="float:left">{{item.PersonnelName}}</el-button>
           </el-form-item>
         </el-row>
-        <el-row :gutter="20">
-          <el-col :span="18">
+        <el-row :gutter="24">
+          <el-col :span="16">
             &nbsp;
           </el-col>
           <el-col :span="2">
@@ -75,12 +79,14 @@
           <el-col :span="2">
             <el-button size="mini"
                        type="warning"
+                       @click="exportExcel()">导出</el-button>
+          </el-col>
+          <el-col :span="1">
+            <el-button size="mini"
+                       type="danger"
                        Updated
                        upstream
-                       @click="back()">返回</el-button>
-          </el-col>
-          <el-col :span="2">
-            <button @click="exportExcel()">导出</button>
+                       @click="back()">关闭</el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -243,7 +249,7 @@ export default {
       /* get binary string as output */
       var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' })
       try {
-        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), '值日表.xlsx')
+        FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), '值班表.xlsx')
       } catch (e) { if (typeof console !== 'undefined') console.log(e, wbout) }
       return wbout
     },
@@ -482,14 +488,14 @@ export default {
     },
     // 关闭页面
     ...mapActions('d2admin/page', [
-      'close'
+      'close_return'
     ]),
     // 关闭
     back () {
-      this.$router.push({ path: '/duty' })
-
-      // let tagName = this.current
-      // this.close({ tagName })
+      this.close_return({
+        tagName: this.$route.fullPath,
+        returnTagName: '/duty'
+      })
     }
   }
 }

frontend_web/src/views/information/index.vue

@@ -50,7 +50,8 @@
               border
               style="width: 100%"
               @sort-change="orderby"
-              height="100%">
+              height="100%"
+              tooltip-effect="light">
       <el-table-column label="操作"
                        width="160px"
                        align="center"
@@ -82,11 +83,13 @@
       <el-table-column prop="title"
                        min-width="80px"
                        label="信息标题"
-                       align="center"></el-table-column>
+                       align="center"
+                       show-overflow-tooltip></el-table-column>
       <el-table-column prop="content"
                        label="信息内容"
                        align="center"
-                       min-width="160px"></el-table-column>
+                       min-width="160px"
+                       show-overflow-tooltip></el-table-column>
       <el-table-column prop="status"
                        align="center"
                        min-width="40px"

frontend_web/src/views/instrument/components/instrumentadd.vue

@@ -123,8 +123,8 @@ import InstrumentApi from '@/api/instrument'
 import {
   getRoomNumber
 } from '@/api/instrumentroom'
-import axios from 'axios'
-import uploadajax from '@/assets/js/uploadajax.js'
+// import axios from 'axios'
+// import uploadajax from '@/assets/js/uploadajax.js'
 // import { addTrigger,
 //   gettriggerlist
 // } from '@/api/trigger'

frontend_web/src/views/instrument/confirmandscrap/index.vue

@@ -29,7 +29,7 @@
         <!-- <el-form-item label="操作人">
           <el-input v-model="search.OperaUser"
                     style="width: 165px;"
-                     
+
                     placeholder="输入操作人"></el-input>
         </el-form-item> -->
         <el-col :span="6"></el-col>

frontend_web/src/views/instrument/maintainlog/_opera/edit.vue

@@ -104,7 +104,7 @@
 
 <script>
 import {
-  OperaTpyelist,
+  // OperaTpyelist,
   selectinstrument,
   DonorsInfoAttachment,
   initDatamaintainlog,

frontend_web/src/views/system/index/page.vue

@@ -8,7 +8,7 @@
               :data="activities"
               border
               fit
-              tooltip-effect="dark"
+              tooltip-effect="light"
               style="width: 100%"
               @sort-change="orderby">
       <!-- <el-table-column label="操作"

frontend_web/src/views/system/index/pagex.vue

@@ -12,7 +12,7 @@
               :data="activities"
               border
               fit
-              tooltip-effect="dark"
+              tooltip-effect="light"
               style="width: 100%"
               @sort-change="orderby"
               height="100%">
@@ -136,7 +136,7 @@ export default {
     formatStatus (row, column) {
       for (var i = 0; i < this.status.length; i++) {
         if (this.status[i].value == row.status) {
-          return this.status[i].key;
+          return this.status[i].key
         }
       }
     },
@@ -144,10 +144,10 @@ export default {
       this.search = {
         Title: '',
         Status: -1,
-        Content: '',
+        Content: ''
       }
     },
-    //初始化分页分页对象
+    // 初始化分页分页对象
     initPageInfo () {
       this.search.page = {
         total: 0,
@@ -170,7 +170,7 @@ export default {
       this.$refs.informationDialog.dialogvisible = false
       this.initPageInfo()
       this.initDatas()
-      console.log("handleClose informationId" + this.informationId)
+      console.log('handleClose informationId' + this.informationId)
     },
     publish (information) {
       information.status = 1
@@ -194,7 +194,6 @@ export default {
       this.initDatas()
     },
 
-
     deleteinformation (val) {
       let _this = this
       let params = {