conf

src/dashoo.cn/backend/api/conf/app.conf

@@ -19,7 +19,7 @@ orderurl=http://uid.labsop.cn:8182/worker/2
 type=mysql
 
 #本地测试服务器
-name=supplier_system
+name=supplier_system_test
 host=47.92.212.59
 user=root
 pwd=zks123456
@@ -27,29 +27,6 @@ pwd=zks123456
 #user=ixcell
 #pwd=ixcell123456
 
-#AWS服务器
-#name=IxCellDB
-#host=mydb01.cnbkzlqg5w7l.rds.cn-north-1.amazonaws.com.cn
-#user=mydb01_user
-#pwd=mydb01_user58717168
-
-#阿里云 labsop_base数据库
-#name=supplier_system
-#host=60.30.245.229
-#user=root
-#pwd=zks123456
-
-#阿里云BioBank服务器
-#name=BiobankDB
-#host=121.42.244.202
-#user=biobank
-#pwd=biobank@234@qwsdashoo
-
-#临沂 BioBank服务器
-#name=BiobankDB
-#host=188.188.30.89
-#user=root
-#pwd=DA20180926#&*Shoo
 
 [redis]
 addr = 114.215.26.149:26379
@@ -65,7 +42,7 @@ excelPassword = lims123456
 type=mysql
 
 #本地测试服务器
-name=casbin_gf
+name=casbin_test
 host=47.92.212.59
 user=root
 pwd=zks123456

src/dashoo.cn/backend/api/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"dashoo.cn/backend/api/controllers/toolbox"
+	//	"dashoo.cn/backend/api/controllers/toolbox"
 	"github.com/astaxie/beego"
 
 	"dashoo.cn/backend/api/controllers"

src/dashoo.cn/frontend_web/src/pages/system/tmpzcgf.vue

@@ -67,6 +67,11 @@
     </el-card>
     <el-card class="box-card">
     </el-card>
+    <el-dialog :title="dialogtitle" :visible.sync="datadialogVisible" width="60%">
+      <div class="wrapper">
+        <h1 id=mytime>{{str}}</h1>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -79,8 +84,15 @@
 
     data () {
       return {
-        fullscreenLoading: false
-
+        dialogtitle: '',
+        fullscreenLoading: false,
+        datadialogVisible: false,
+        h: 0, // 定义时，分，秒，毫秒并初始化为0
+        m: 0,
+        ms: 0,
+        s: 0,
+        time: 0,
+        str: ''
       }
     },
     computed: mapGetters({
@@ -89,6 +101,55 @@
     created () {
     },
     methods: {
+      start () {
+        this.datadialogVisible = true
+        this.time = setInterval(this.timer, 50)
+      },
+      stop () {
+        clearInterval(this.time)
+      },
+
+      reset () {
+        console.log(this.str, '时间=======')
+        clearInterval(this.time)
+        this.h = 0
+        this.m = 0
+        this.ms = 0
+        this.s = 0
+        this.str = '00:00:00:00'
+        this.datadialogVisible = false
+      },
+      timer () { // 定义计时函数
+        this.ms = this.ms + 50 // 毫秒
+        if (this.ms >= 1000) {
+          this.ms = 0
+          this.s = this.s + 1
+        }
+        if (this.s >= 60) {
+          this.s = 0
+          this.m = this.m + 1
+        }
+        if (this.m >= 60) {
+          this.m = 0
+          this.h = this.h + 1
+        }
+        this.str = this.toDub(this.h) + ':' + this.toDub(this.m) + ':' + this.toDub(this.s) + ':' + this.toDubms(this.ms) + '毫秒'
+      },
+      toDub (n) { // 补0操作
+        if (n < 10) {
+          return '0' + n
+        } else {
+          return '' + n
+        }
+      },
+      toDubms (n) {
+        if (n < 10) {
+          return '00' + n
+        } else {
+          return '0' + n
+        }
+      },
+
       insertsuppler () {
         this.$confirm('是否继续?', '提示', {
           confirmButtonText: '确定',
@@ -96,10 +157,13 @@
           type: 'warning'
         })
           .then(() => {
-            this.fullscreenLoading = true
+            // this.fullscreenLoading = true
+            this.dialogtitle = '导入OilSuppler'
+            this.start()
             this.$axios.get('tmpzcgf/insertsupplier')
               .then(res => {
-                this.fullscreenLoading = false
+                // this.fullscreenLoading = false
+                this.reset()
               })
           })
       },
@@ -110,10 +174,13 @@
           type: 'warning'
         })
           .then(() => {
-            this.fullscreenLoading = true
+            // this.fullscreenLoading = true
+            this.dialogtitle = '导入OilSupplerCert'
+            this.start()
             this.$axios.get('tmpzcgf/insertsuppliercert')
               .then(res => {
-                this.fullscreenLoading = false
+                // this.fullscreenLoading = false
+                this.reset()
               })
           })
       },
@@ -124,10 +191,13 @@
           type: 'warning'
         })
           .then(() => {
-            this.fullscreenLoading = true
+            // this.fullscreenLoading = true
+            this.dialogtitle = '更新SupplierTypeCodeAndInFlag'
+            this.start()
             this.$axios.get('tmpzcgf/updatecerttypeandinflag')
               .then(res => {
-                this.fullscreenLoading = false
+                // this.fullscreenLoading = false
+                this.reset()
               })
           })
       },
@@ -138,10 +208,13 @@
           type: 'warning'
         })
           .then(() => {
-            this.fullscreenLoading = true
+            // this.fullscreenLoading = true
+            this.dialogtitle = '更新Cert表的SupplierID'
+            this.start()
             this.$axios.get('tmpzcgf/updatesupplierid')
               .then(res => {
-                this.fullscreenLoading = false
+                // this.fullscreenLoading = false
+                this.reset()
               })
           })
       },
@@ -152,68 +225,110 @@
           type: 'warning'
         })
           .then(() => {
-            this.fullscreenLoading = true
+            // this.fullscreenLoading = true
+            this.start()
             this.$axios.get('tmpcertsub/insertcertsub')
               .then(res => {
-                this.fullscreenLoading = false
+                // this.fullscreenLoading = false
+                this.reset()
               })
           })
       },
       insterAnnualAudit () {
-        this.$confirm('是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        })
-          .then(() => {
-            this.fullscreenLoading = true
-            this.$axios.get('tmpzcgf/insterannualaudit')
-              .then(res => {
-                this.fullscreenLoading = false
-              })
+        this.start()
+        this.$axios.get('tmpzcgf/insterannualaudit')
+          .then(res => {
+            // this.fullscreenLoading = false
+            this.reset()
+            this.updateAnnualAudit()
           })
+        // this.$confirm('是否继续?', '提示', {
+        //   confirmButtonText: '确定',
+        //   cancelButtonText: '取消',
+        //   type: 'warning'
+        // })
+        //   .then(() => {
+        //     // this.fullscreenLoading = true
+        //     this.start()
+        //     this.$axios.get('tmpzcgf/insterannualaudit')
+        //       .then(res => {
+        //         // this.fullscreenLoading = false
+        //         this.reset()
+        //         this.updateAnnualAudit()
+        //       })
+        //   })
       },
       updateAnnualAudit () {
-        this.$confirm('是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        })
-          .then(() => {
-            this.fullscreenLoading = true
-            this.$axios.get('tmpzcgf/updateAnnualAudit')
-              .then(res => {
-                this.fullscreenLoading = false
-              })
+        this.start()
+        this.$axios.get('tmpzcgf/updateAnnualAudit')
+          .then(res => {
+            // this.fullscreenLoading = false
+            this.reset()
+            this.insterOilPaymentInfo()
           })
+        // this.$confirm('是否继续?', '提示', {
+        //   confirmButtonText: '确定',
+        //   cancelButtonText: '取消',
+        //   type: 'warning'
+        // })
+        //   .then(() => {
+        //     // this.fullscreenLoading = true
+        //     this.start()
+        //     this.$axios.get('tmpzcgf/updateAnnualAudit')
+        //       .then(res => {
+        //         // this.fullscreenLoading = false
+        //         this.reset()
+        //         this.insterOilPaymentInfo()
+        //       })
+        //   })
       },
       insterOilPaymentInfo () {
-        this.$confirm('是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        })
-          .then(() => {
-            this.fullscreenLoading = true
-            this.$axios.get('tmpzcgf/insterOilPaymentInfo')
-              .then(res => {
-                this.fullscreenLoading = false
-              })
+        this.start()
+        this.$axios.get('tmpzcgf/insterOilPaymentInfo')
+          .then(res => {
+            // this.fullscreenLoading = false
+            this.reset()
+            this.insterBadRecord()
           })
+        // this.$confirm('是否继续?', '提示', {
+        //   confirmButtonText: '确定',
+        //   cancelButtonText: '取消',
+        //   type: 'warning'
+        // })
+        //   .then(() => {
+        //     // this.fullscreenLoading = true
+        //     this.start()
+        //     this.$axios.get('tmpzcgf/insterOilPaymentInfo')
+        //       .then(res => {
+        //         // this.fullscreenLoading = false
+        //         this.reset()
+        //         this.insterBadRecord()
+        //       })
+        //   })
       },
       insterBadRecord () {
-        this.$confirm('是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        })
-          .then(() => {
-            this.fullscreenLoading = true
-            this.$axios.get('tmpzcgf/insterBadRecord')
-              .then(res => {
-                this.fullscreenLoading = false
-              })
+        this.start()
+        this.$axios.get('tmpzcgf/insterBadRecord')
+          .then(res => {
+            // this.fullscreenLoading = false
+            this.reset()
+            this.insertOilInfoChange()
           })
+        // this.$confirm('是否继续?', '提示', {
+        //   confirmButtonText: '确定',
+        //   cancelButtonText: '取消',
+        //   type: 'warning'
+        // })
+        //   .then(() => {
+        //     // this.fullscreenLoading = true
+        //     this.start()
+        //     this.$axios.get('tmpzcgf/insterBadRecord')
+        //       .then(res => {
+        //         // this.fullscreenLoading = false
+        //         this.reset()
+        //         this.insertOilInfoChange()
+        //       })
+        //   })
       },
       insertCertSub () {
         this.$confirm('是否继续?', '提示', {
@@ -222,10 +337,13 @@
           type: 'warning'
         })
           .then(() => {
-            this.fullscreenLoading = true
+            // this.fullscreenLoading = true
+            this.dialogtitle = '导入CertSub表'
+            this.start()
             this.$axios.get('tmpzcgf/insertCertSub')
               .then(res => {
-                this.fullscreenLoading = false
+                // this.fullscreenLoading = false
+                this.reset()
               })
           })
       },
@@ -236,10 +354,13 @@
           type: 'warning'
         })
           .then(() => {
-            this.fullscreenLoading = true
+            // this.fullscreenLoading = true
+            this.dialogtitle = '更新CertSub表'
+            this.start()
             this.$axios.get('tmpzcgf/updateOilSupplierCertSub')
               .then(res => {
-                this.fullscreenLoading = false
+                // this.fullscreenLoading = false
+                this.reset()
               })
           })
       },
@@ -264,10 +385,13 @@
           type: 'warning'
         })
           .then(() => {
-            this.fullscreenLoading = true
+            // this.fullscreenLoading = true
+            this.dialogtitle = '跟新OilSupplierCertAppend表的SupplierId和CerId'
+            this.start()
             this.$axios.get('tmpzcgf/updateOilSupplierCertAppend')
               .then(res => {
-                this.fullscreenLoading = false
+                // this.fullscreenLoading = false
+                this.reset()
               })
           })
       },
@@ -278,10 +402,13 @@
           type: 'warning'
         })
           .then(() => {
-            this.fullscreenLoading = true
+            // this.fullscreenLoading = true
+            this.dialogtitle = '导入增项申请'
+            this.start()
             this.$axios.get('tmpzcgf/insertOilSupplierCertAppend')
               .then(res => {
-                this.fullscreenLoading = false
+                // this.fullscreenLoading = false
+                this.reset()
               })
           })
       },
@@ -300,32 +427,50 @@
           })
       },
       insertOilInfoChange () {
-        this.$confirm('是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        })
-          .then(() => {
-            this.fullscreenLoading = true
-            this.$axios.get('tmpzcgf/insertOilInfoChange')
-              .then(res => {
-                this.fullscreenLoading = false
-              })
+        this.start()
+        this.$axios.get('tmpzcgf/insertOilInfoChange')
+          .then(res => {
+            // this.fullscreenLoading = false
+            this.reset()
+            this.updateOilInfoChange()
           })
+        // this.$confirm('是否继续?', '提示', {
+        //   confirmButtonText: '确定',
+        //   cancelButtonText: '取消',
+        //   type: 'warning'
+        // })
+        //   .then(() => {
+        //     // this.fullscreenLoading = true
+        //     this.start()
+        //     this.$axios.get('tmpzcgf/insertOilInfoChange')
+        //       .then(res => {
+        //         // this.fullscreenLoading = false
+        //         this.reset()
+        //         this.updateOilInfoChange()
+        //       })
+        //   })
       },
       updateOilInfoChange () {
-        this.$confirm('是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        })
-          .then(() => {
-            this.fullscreenLoading = true
-            this.$axios.get('tmpzcgf/updateOilInfoChange')
-              .then(res => {
-                this.fullscreenLoading = false
-              })
+        this.start()
+        this.$axios.get('tmpzcgf/updateOilInfoChange')
+          .then(res => {
+            // this.fullscreenLoading = false
+            this.reset()
           })
+        // this.$confirm('是否继续?', '提示', {
+        //   confirmButtonText: '确定',
+        //   cancelButtonText: '取消',
+        //   type: 'warning'
+        // })
+        //   .then(() => {
+        //     // this.fullscreenLoading = true
+        //     this.start()
+        //     this.$axios.get('tmpzcgf/updateOilInfoChange')
+        //       .then(res => {
+        //         // this.fullscreenLoading = false
+        //         this.reset()
+        //       })
+        //   })
       },
       updateCertAppendIsType2 () {
         this.$confirm('是否继续?', '提示', {
@@ -348,10 +493,13 @@
           type: 'warning'
         })
           .then(() => {
-            this.fullscreenLoading = true
+            // this.fullscreenLoading = true
+            this.start()
             this.$axios.get('tmpzcgf/updateCertSubIsType3')
               .then(res => {
-                this.fullscreenLoading = false
+                // this.fullscreenLoading = false
+                this.reset()
+                this.insterAnnualAudit()
               })
           })
       },
@@ -372,3 +520,11 @@
     }
   }
 </script>
+
+<style scoped>
+  #mytime{
+    background: #bbb;
+    color: #ff3223;
+    display: block;
+  }
+</style>

src/dashoo.cn/liquibase/labsop_base_update.bat

@@ -1 +1 @@
-liquibase --driver=com.mysql.jdbc.Driver --classpath=mysql-connector-java-5.1.27.jar --changeLogFile=./src/master.xml --url="jdbc:mysql://47.92.212.59:3306/supplier_system?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC" --username=root --password=zks123456 update
+liquibase --driver=com.mysql.jdbc.Driver --classpath=mysql-connector-java-5.1.27.jar --changeLogFile=./src/master.xml --url="jdbc:mysql://47.92.212.59:3306/supplier_system_test?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC" --username=root --password=zks123456 update

src/dashoo.cn/liquibase/src/dump_data_sql_full.txt

@@ -1 +1 @@
-mysqldump -t supplier_system_1116 -u root -pzks123456 -h47.92.212.59 -P3306 --tables base_areas_json  Base_ItemDetails Base_Items  Base_ItemTreeDetails  Base_Module  Base_Parameter  Base_PermissionItem Base_Role Base_TableHeader  CodecSequence OilBasisBuild OilGoodsAptitude OilGoodsAptitudeClass OilTechnologyService OilTechnologyServiceClass > src/initdata/db_script.sql
+mysqldump -t supplier_system_1116 -u root -pzks123456 -h47.92.212.59 -P3306 --tables base_areas_json  Base_ItemDetails Base_Items  Base_ItemTreeDetails  Base_Module  Base_Parameter  Base_PermissionItem Base_Role Base_User Base_Organize Base_OilAuditSetting Base_TableHeader  CodecSequence OilBasisBuild OilGoodsAptitude OilGoodsAptitudeClass OilTechnologyService OilTechnologyServiceClass > src/initdata/db_script.sql