Merge remote-tracking branch 'origin/master' into master

frontend_web/.env.development

@@ -3,23 +3,33 @@
 # 页面 title 前缀
 VUE_APP_TITLE=Lims Dev
 
-# 登录验证地址
+
+# 登录验证地址 线上 
+# VUE_APP_LOGINAPI=http://81.68.138.114:24006/login
+# VUE_APP_LOGOUTAPI=http://81.68.138.114:24006/logout
+
+# 网络请求公用地址线上 
+#VUE_APP_API=http://81.68.138.114:24006/api/
+
+# 第二后端API地址线上
+#VUE_APP_API02=http://81.68.138.114:24007/api/
+
+
+# 登录验证地址 线下
 VUE_APP_LOGINAPI=http://127.0.0.1:8090/login
 VUE_APP_LOGOUTAPI=http://127.0.0.1:8090/logout
 
-# 网络请求公用地址
-#VUE_APP_API=http://39.98.34.197:9905/api/
+# 网络请求公用地址 线下
 VUE_APP_API=http://127.0.0.1:8090/api/
-#VUE_APP_API=http://localhost:9635/api/
 
-# 第二后端API地址
-#VUE_APP_API02=http://39.98.34.197:9915/api/
-VUE_APP_API02=http://192.168.0.252:12002/api/
-#VUE_APP_API02=http://127.0.0.1:9635/api/
+# 第二后端API地址 
+ VUE_APP_API02=http://192.168.0.252:12002/api/
+
+
 
 # 分模块地址
 VUE_APP_MODULE01=http://localhost:8081/#
 VUE_APP_MODULE02=http://localhost:8082/#
 
 # 租户
-VUE_APP_TENANT=CU6zmPWhZp
+VUE_APP_TENANT=CU6zmPWhZp

frontend_web/package-lock.json

@@ -3517,12 +3517,11 @@
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "cfb": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npm.taobao.org/cfb/download/cfb-1.1.3.tgz",
-      "integrity": "sha1-Bd5oFiWcjovDJxOrqQVgjuOF32Y=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npm.taobao.org/cfb/download/cfb-1.2.0.tgz",
+      "integrity": "sha1-ak0IcrUl7WA0nh71H7Swv3Psqag=",
       "requires": {
         "adler-32": "~1.2.0",
-        "commander": "^2.16.0",
         "crc-32": "~1.2.0",
         "printj": "~1.1.2"
       }
@@ -3924,7 +3923,7 @@
       "dependencies": {
         "commander": {
           "version": "2.14.1",
-          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.14.1.tgz?cache=0&sync_timestamp=1605992590449&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.14.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.14.1.tgz?cache=0&sync_timestamp=1607931337320&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.14.1.tgz",
           "integrity": "sha1-IjUSPjevjKPGXfRbAm29NXsBuao="
         }
       }
@@ -6499,9 +6498,9 @@
       }
     },
     "file-saver": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npm.taobao.org/file-saver/download/file-saver-2.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffile-saver%2Fdownload%2Ffile-saver-2.0.2.tgz",
-      "integrity": "sha1-BtbnKKnqLfLM4vjZ6E383DOOwXo="
+      "version": "2.0.5",
+      "resolved": "https://registry.npm.taobao.org/file-saver/download/file-saver-2.0.5.tgz?cache=0&sync_timestamp=1605790845476&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffile-saver%2Fdownload%2Ffile-saver-2.0.5.tgz",
+      "integrity": "sha1-1hz+LOBZ9BTYmendbUEH7iVnDDg="
     },
     "filename-regex": {
       "version": "2.0.1",
@@ -13755,9 +13754,9 @@
       "dev": true
     },
     "ssf": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npm.taobao.org/ssf/download/ssf-0.10.2.tgz",
-      "integrity": "sha1-ZbK0/N/ZZ7yOg4OkE0kAmJMRWXY=",
+      "version": "0.10.3",
+      "resolved": "https://registry.npm.taobao.org/ssf/download/ssf-0.10.3.tgz",
+      "integrity": "sha1-jq4fwpyQpVLnkhII+BiS1vd6yys=",
       "requires": {
         "frac": "~1.1.2"
       }
@@ -15407,9 +15406,9 @@
       }
     },
     "vue-router": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.6.tgz",
-      "integrity": "sha512-Ox0ciFLswtSGRTHYhGvx2L44sVbTPNS+uD2kRISuo8B39Y79rOo0Kw0hzupTmiVtftQYCZl87mwldhh2L9Aquw=="
+      "version": "3.4.9",
+      "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.9.tgz",
+      "integrity": "sha1-wBb0IDCuKTLxTkdIs5odmg4lDmY="
     },
     "vue-splitpane": {
       "version": "1.0.6",
@@ -15930,6 +15929,11 @@
       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
       "dev": true
     },
+    "wmf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npm.taobao.org/wmf/download/wmf-1.0.2.tgz",
+      "integrity": "sha1-fRnWIQcaCMK9xrfmiKnENSmMwto="
+    },
     "wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/wordwrap/download/wordwrap-1.0.0.tgz",
@@ -16028,22 +16032,23 @@
       }
     },
     "xlsx": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npm.taobao.org/xlsx/download/xlsx-0.15.1.tgz",
-      "integrity": "sha1-p2fE1BLL0MlbMNvNSL7X3kKOsQc=",
+      "version": "0.15.6",
+      "resolved": "https://registry.npm.taobao.org/xlsx/download/xlsx-0.15.6.tgz?cache=0&sync_timestamp=1605857177269&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxlsx%2Fdownload%2Fxlsx-0.15.6.tgz",
+      "integrity": "sha1-Rh+EHW2eoag3XizSRr8jrs4IodU=",
       "requires": {
         "adler-32": "~1.2.0",
-        "cfb": "^1.1.3",
+        "cfb": "^1.1.4",
         "codepage": "~1.14.0",
         "commander": "~2.17.1",
         "crc-32": "~1.2.0",
         "exit-on-epipe": "~1.0.1",
-        "ssf": "~0.10.2"
+        "ssf": "~0.10.3",
+        "wmf": "~1.0.1"
       },
       "dependencies": {
         "commander": {
           "version": "2.17.1",
-          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz?cache=0&sync_timestamp=1572603184853&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.17.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz?cache=0&sync_timestamp=1607931337320&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.17.1.tgz",
           "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78="
         }
       }

frontend_web/package.json

@@ -44,7 +44,7 @@
     "vue-i18n": "^8.10.0",
     "vue-print-nb": "^1.4.0",
     "vue-property-decorator": "^8.3.0",
-    "vue-router": "^3.0.3",
+    "vue-router": "^3.0.7",
     "vue-splitpane": "^1.0.6",
     "vuedraggable": "^2.23.0",
     "vuex": "^3.0.1",

frontend_web/src/router/index.js

@@ -319,6 +319,12 @@ router.beforeEach(async (to, from, next) => {
   }
 })
 
+const originalPush = VueRouter.prototype.push
+VueRouter.prototype.push = function push(location, onResolve, onReject) {
+	if (onResolve || onReject) return originalPush.call(this, location, onResolve, onReject)
+	return originalPush.call(this, location).catch(err => err)
+}
+
 router.afterEach(to => {
   // 进度条
   NProgress.done()

frontend_web/src/store/modules/d2admin/modules/releases.js

@@ -8,7 +8,7 @@ export default {
      * @param {Object} state vuex state
      */
     versionShow () {
-      util.log.capsule('DQM-NT', `v${process.env.VUE_APP_VERSION}`)
+      util.log.capsule(process.env.VUE_APP_TITLE, `v${process.env.VUE_APP_VERSION}`)
       // console.log('D2 Admin  https://github.com/d2-projects/d2-admin')
       // console.log('D2 Crud   https://github.com/d2-projects/d2-crud')
       // console.log('Document  https://doc.d2admin.fairyever.com/zh/')

frontend_web/src/views/course/components/courseInfoDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="新增课程表信息"
+  <el-dialog title="课程表信息"
              :visible.sync="dialogvisible"
              @opened="dialogOpen"
              @closed="dialogClose"

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/duty/index.vue

@@ -234,6 +234,7 @@ export default {
     },
     // 打开 添加弹窗
     add () {
+      this.dutyId = 0
       this.$refs.editDialog.dialogvisible = true
     },
     // 打开 编辑弹窗

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

@@ -105,7 +105,7 @@
     <span slot="footer">
       <el-button size="mini"
                  type="primary"
-                 @click="savedata()">保存</el-button>
+                 @click="getInstrumentCode()">保存</el-button>
       <el-button size="mini"
                  @click="handleCloseAdd">关闭</el-button>
     </span>
@@ -118,10 +118,11 @@
 //   instrumentGetCode,
 //   getSaveinstrument,
 //   getsupplierlist
-// } from '@/api/instrument'
+// } from '@/api/instrument'import {
 import InstrumentApi from '@/api/instrument'
 import {
-  getRoomNumber
+  getRoomNumber,
+  instrumentGetCode
 } from '@/api/instrumentroom'
 // import axios from 'axios'
 // import uploadajax from '@/assets/js/uploadajax.js'
@@ -241,6 +242,24 @@ export default {
           console.error(err)
         })
     },
+    getInstrumentCode () {
+      let _this = this
+      instrumentGetCode(_this.testlistform.Code)
+        .then(function (response) {
+          _this.total = response.info.items
+          if (_this.total === 0) {
+            _this.savedata()
+          } else {
+            _this.$message({
+              type: 'warning',
+              message: '设备编号已存在'
+            })
+          }
+        })
+        .catch(function (error) {
+          console.log(error)
+        })
+    },
     savedata () {
       let _this = this
       this.$refs.testlistform.validate(valid => {

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

@@ -16,6 +16,7 @@
                         label-width="120px">
             <el-input v-model="testlistform.Code"
                       placeholder="请输入设备编码"
+                      :disabled="true"
                       style="width:100%"></el-input>
           </el-form-item>
         </el-col>