Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
duanxiaoduan
/
sheep-admin
1
0
Fork 0
Tiedostot Ongelmat 0 Pull-pyynnöt 0 Wiki
Selaa lähdekoodia

Merge branch 'develop' of duanxiaoduan/sheep-admin into master

xuyiping 11 kuukautta sitten
vanhempi
229004b949 eab6dec756
commit
ed4c550efa
3 muutettua tiedostoa jossa 8 lisäystä ja 8 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 4 4
      .drone-back.yml
  2. 2 2
      Dockerfile
  3. 2 2
      src/views/formulationPlan/dailyExecutionPlan/index.vue

+ 4 - 4
.drone.yml → .drone-back.yml
Näytä tiedosto 

@@ -18,7 +18,7 @@ steps:
 
         from_secret: aliyun_name
 
       password:
 
         from_secret: aliyun_password
 
-      repo: registry.cn-hangzhou.aliyuncs.com/kpt-event/tmr-admin
 
+      repo: registry.cn-hangzhou.aliyuncs.com/kpt-event/sheep-admin
 
       registry: registry.cn-hangzhou.aliyuncs.com
 
       tags: [test]
 
   - name: ssh commands
 
@@ -30,7 +30,7 @@ steps:
 
         from_secret: ssh_password
 
       port: 22
 
       script:
 
-        - cd /data/docker-compose/calf-feed-admin/
 
+        - cd /data/docker-compose/sheep-admin/
 
         - echo "123456" | ./restart.sh
 
 trigger:
 
   branch:
 
@@ -68,7 +68,7 @@ steps:
 
         from_secret: aliyun_name
 
       password:
 
         from_secret: aliyun_password
 
-      repo: registry.cn-hangzhou.aliyuncs.com/kpt-event/tmr-admin
 
+      repo: registry.cn-hangzhou.aliyuncs.com/kpt-event/sheep-admin
 
       registry: registry.cn-hangzhou.aliyuncs.com
 
       tag:
 
         - latest
 
@@ -107,7 +107,7 @@ steps:
 
         from_secret: aliyun_name
 
       password:
 
         from_secret: aliyun_password
 
-      repo: registry.cn-hangzhou.aliyuncs.com/kpt-event/tmr-admin
 
+      repo: registry.cn-hangzhou.aliyuncs.com/kpt-event/sheep-admin
 
       registry: registry.cn-hangzhou.aliyuncs.com
 
       tag:
 
         - latest

+ 2 - 2
Dockerfile
Näytä tiedosto 

@@ -11,8 +11,8 @@ RUN npm run build:prod
 
 
 # 第二阶段构建
 
 FROM nginx:alpine
 
-COPY --from=builder /app/tmr-admin/dist/ /usr/share/nginx/html/
 
-COPY --from=builder /app/tmr-admin/default.conf.template /etc/nginx/conf.d/default.conf
 
+COPY --from=builder /app/sheep-admin/dist/ /usr/share/nginx/html/
 
+COPY --from=builder /app/sheep-admin/default.conf.template /etc/nginx/conf.d/default.conf
 
 EXPOSE 80
 
 
 CMD ["/bin/sh", "-c", "sed -i \"s@<html@<html domain=\"$DOMAIN\"@\" /usr/share/nginx/html/index.html; nginx -g \"daemon off;\""]

+ 2 - 2
src/views/formulationPlan/dailyExecutionPlan/index.vue
Näytä tiedosto 

@@ -1691,7 +1691,7 @@ export default {
 
       this.isDetail = false
 
       this.myheight = document.documentElement.clientHeight - 280
 
     },
 
-    // 计划内容操作详情
 
+    // 计划内容操作详情 
     getList2() {
 
       this.table2.listLoading = true
 
       this.table2.getdataListParm.parammaps.date = this.table.getdataListParm.parammaps.mydate
 
@@ -1761,7 +1761,7 @@ export default {
 
       })
 
     },
 
 
-    // 计划内容栏舍详情
 
+    // 计划内容栏舍详 情
 
     getList3() {
 
       if(this.table3.getdataListParm.parammaps.lpplantype == 0){
 
         const url = 'new_api/user/gear'