From ffc5600b9bd71f8f2d54366cc519b165246e277f Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Mon, 1 Apr 2024 10:13:53 +0800 Subject: [PATCH 001/161] =?UTF-8?q?fix:=20=E4=BD=BF=E7=94=A8=E5=8E=9F?= =?UTF-8?q?=E5=A7=8Bui=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/role/add.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/system/role/add.vue b/src/views/system/role/add.vue index 2999d9e..e4d47f4 100644 --- a/src/views/system/role/add.vue +++ b/src/views/system/role/add.vue @@ -3,7 +3,12 @@ - + + + + + +
Date: Mon, 1 Apr 2024 10:20:32 +0800 Subject: [PATCH 002/161] =?UTF-8?q?fix:=20=E5=86=8D=E8=AF=95=E4=B8=80?= =?UTF-8?q?=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/role/add.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/system/role/add.vue b/src/views/system/role/add.vue index e4d47f4..54c750b 100644 --- a/src/views/system/role/add.vue +++ b/src/views/system/role/add.vue @@ -4,7 +4,7 @@ - + From e78712801172c1ce81b5d8534d256836e84294d6 Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Mon, 1 Apr 2024 11:00:10 +0800 Subject: [PATCH 003/161] feat: up --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3af5f7a..bde52a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "axios": "^1.4.0", "d3": "^7.8.5", "echarts": "^5.4.2", - "element-plus": "^2.3.5", + "element-plus": "^2.6.0", "highlight.js": "9.18.5", "jquery": "^3.6.0", "js-cookie": "^3.0.5", diff --git a/package.json b/package.json index afaa0d7..a1ae3a7 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "axios": "^1.4.0", "d3": "^7.8.5", "echarts": "^5.4.2", - "element-plus": "^2.3.5", + "element-plus": "^2.6.0", "highlight.js": "9.18.5", "jquery": "^3.6.0", "js-cookie": "^3.0.5", From f1e1def32c70b763c8961722ef3fd2666156e7d9 Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Mon, 1 Apr 2024 11:20:55 +0800 Subject: [PATCH 004/161] feat: up dependencies --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 5606aa1..ff45f09 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: - export NODE_MODULES_PATH=`pwd`/node_modules #- npm config set registry https://registry.npm.taobao.org #- set NODE_OPTIONS=--openssl-legacy-provider -# - npm install + - npm install - npm run build - ls /app/build/$DRONE_REPO_NAME/ - echo $NODE_MODULES_PATH From 9123149565d393e9260a90197f5e35097f7ab355 Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Mon, 1 Apr 2024 11:23:51 +0800 Subject: [PATCH 005/161] feat: up dependencies --- .drone.yml | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 65 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index ff45f09..fada25d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,6 +5,8 @@ platform: os: linux arch: arm64 steps: + + - name: build-package image: node:16.20.0 volumes: @@ -32,8 +34,7 @@ steps: - cp -r dist /app/build/$DRONE_REPO_NAME - - - name: build-docker # 制作docker镜像 + - name: build-docker-prod # 制作docker镜像 image: docker # 使用官方docker镜像 volumes: # 将容器内目录挂载到宿主机 - name: docker @@ -55,6 +56,9 @@ steps: - sed -i 's/$REGISTRY_NAMESPACE/'"$REGISTRY_NAMESPACE"'/' deployment.yml - sed -i 's/$DRONE_REPO_NAME/'"$DRONE_REPO_NAME"'/' deployment.yml - sed -i 's/$DRONE_COMMIT/'"$DRONE_COMMIT"'/' deployment.yml + - sed -i 's/$PORTS_NAME/'"dasdafas"'/' deployment.yml + - sed -i 's/$PORTS_PORT/'"8081"'/' deployment.yml + - sed -i 's/$PROFILES/'"mosr"'/' nginx.conf # docker登录,不能在脚本中登录,并且不能使用docker login -u -p - echo $DOCKER_PASSWORD | docker login $REGISTRY --username $DOCKER_USERNAME --password-stdin - chmod +x docker.sh @@ -62,9 +66,47 @@ steps: - sh docker.sh # 执行完脚本删除本次制作的docker镜像,避免多次后当前runner空间不足 - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}') + when: + branch: + - prod + - name: build-docker-dm # 制作docker镜像 + image: docker # 使用官方docker镜像 + volumes: # 将容器内目录挂载到宿主机 + - name: docker + path: /var/run/docker.sock # 挂载宿主机的docker + - name: config + path: /config + environment: # 获取到密文的docker用户名和密码 + DOCKER_USERNAME: + from_secret: docker_username + DOCKER_PASSWORD: + from_secret: docker_password + REGISTRY: + from_secret: registry + REGISTRY_NAMESPACE: + from_secret: registry_namespace + commands: # 定义在Docker容器中执行的shell命令 + - cat Dockerfile + - sed -i 's/$REGISTRY/'"$REGISTRY"'/' deployment.yml + - sed -i 's/$REGISTRY_NAMESPACE/'"$REGISTRY_NAMESPACE"'/' deployment.yml + - sed -i 's/$DRONE_REPO_NAME/'"$DRONE_REPO_NAME"'/' deployment.yml + - sed -i 's/$DRONE_COMMIT/'"$DRONE_COMMIT"'/' deployment.yml + - sed -i 's/$PORTS_NAME/'"dasdafas"'/' deployment.yml + - sed -i 's/$PORTS_PORT/'"8082"'/' deployment.yml + - sed -i 's/$PROFILES/'"mosr-dm"'/' nginx.conf + # docker登录,不能在脚本中登录,并且不能使用docker login -u -p + - echo $DOCKER_PASSWORD | docker login $REGISTRY --username $DOCKER_USERNAME --password-stdin + - chmod +x docker.sh + - cat docker.sh + - sh docker.sh + # 执行完脚本删除本次制作的docker镜像,避免多次后当前runner空间不足 + - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}') + when: + branch: + - dm - - name: drone-rancher # rancher运行 + - name: drone-rancher-prod # rancher运行 image: bitnami/kubectl:1.26.13-debian-11-r1 volumes: # 将容器内目录挂载到宿主机 - name: config @@ -72,6 +114,24 @@ steps: commands: # 定义在Docker容器中执行的shell命令 # 将deployment中定义的变量替换为drone中的内置变量 - kubectl apply -f deployment.yml -n mosr --kubeconfig=/app/config/base-taishan-kubectl.yml + when: + branch: + - prod + + + - name: drone-rancher-dm # rancher运行 + image: bitnami/kubectl:1.26.13-debian-11-r1 + volumes: # 将容器内目录挂载到宿主机 + - name: config + path: /app/config # 将kubectl 配置文件挂载出来 + commands: # 定义在Docker容器中执行的shell命令 + # 将deployment中定义的变量替换为drone中的内置变量 + - kubectl apply -f deployment.yml -n mosr-dm --kubeconfig=/app/config/base-taishan-kubectl.yml + when: + branch: + - dm + + volumes: - name: cache @@ -84,8 +144,10 @@ volumes: host: path: /var/run/docker.sock +load: trigger: branch: - prod + - dm event: - push From 2560ed701fbff75f0add04ad4f4009c466f42274 Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Mon, 1 Apr 2024 11:25:27 +0800 Subject: [PATCH 006/161] =?UTF-8?q?fix:=20=E6=9A=82=E6=97=B6=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 153 ----------------------------------------------------- 1 file changed, 153 deletions(-) delete mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 4d7a73c..0000000 --- a/.drone.yml +++ /dev/null @@ -1,153 +0,0 @@ -kind: pipeline -type: docker -name: mosr-web -platform: - os: linux - arch: arm64 -steps: - - - - name: build-package - image: node:16.20.0 - volumes: - - name: cache - path: /drone/src/node_modules - commands: - - export CI=false - - mkdir -p /app/build/$DRONE_REPO_NAME - - rm -rf /app/build/$DRONE_REPO_NAME/* - - cp deployment.yml /app/build/$DRONE_REPO_NAME/ - - cp Dockerfile /app/build/$DRONE_REPO_NAME/ - - cp .dockerignore /app/build/$DRONE_REPO_NAME/ - - cp default.conf /app/build/$DRONE_REPO_NAME/ - - cp docker.sh /app/build/$DRONE_REPO_NAME/ - - cp nginx.conf /app/build/$DRONE_REPO_NAME/ - - npm -v - - mkdir -p ./node_modules - - export NODE_MODULES_PATH=`pwd`/node_modules - #- npm config set registry https://registry.npm.taobao.org - #- set NODE_OPTIONS=--openssl-legacy-provider - # - npm install - - npm run build - - ls /app/build/$DRONE_REPO_NAME/ - - echo $NODE_MODULES_PATH - - cp -r dist /app/build/$DRONE_REPO_NAME - - - - name: build-docker-prod # 制作docker镜像 - image: docker # 使用官方docker镜像 - volumes: # 将容器内目录挂载到宿主机 - - name: docker - path: /var/run/docker.sock # 挂载宿主机的docker - - name: config - path: /config - environment: # 获取到密文的docker用户名和密码 - DOCKER_USERNAME: - from_secret: docker_username - DOCKER_PASSWORD: - from_secret: docker_password - REGISTRY: - from_secret: registry - REGISTRY_NAMESPACE: - from_secret: registry_namespace - commands: # 定义在Docker容器中执行的shell命令 - - cat Dockerfile - - sed -i 's/$REGISTRY/'"$REGISTRY"'/' deployment.yml - - sed -i 's/$REGISTRY_NAMESPACE/'"$REGISTRY_NAMESPACE"'/' deployment.yml - - sed -i 's/$DRONE_REPO_NAME/'"$DRONE_REPO_NAME"'/' deployment.yml - - sed -i 's/$DRONE_COMMIT/'"$DRONE_COMMIT"'/' deployment.yml - - sed -i 's/$PORTS_NAME/'"dasdafas"'/' deployment.yml - - sed -i 's/$PORTS_PORT/'"8081"'/' deployment.yml - - sed -i 's/$PROFILES/'"mosr"'/' nginx.conf - # docker登录,不能在脚本中登录,并且不能使用docker login -u -p - - echo $DOCKER_PASSWORD | docker login $REGISTRY --username $DOCKER_USERNAME --password-stdin - - chmod +x docker.sh - - cat docker.sh - - sh docker.sh - # 执行完脚本删除本次制作的docker镜像,避免多次后当前runner空间不足 - - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}') - when: - branch: - - prod - - - name: build-docker-dm # 制作docker镜像 - image: docker # 使用官方docker镜像 - volumes: # 将容器内目录挂载到宿主机 - - name: docker - path: /var/run/docker.sock # 挂载宿主机的docker - - name: config - path: /config - environment: # 获取到密文的docker用户名和密码 - DOCKER_USERNAME: - from_secret: docker_username - DOCKER_PASSWORD: - from_secret: docker_password - REGISTRY: - from_secret: registry - REGISTRY_NAMESPACE: - from_secret: registry_namespace - commands: # 定义在Docker容器中执行的shell命令 - - cat Dockerfile - - sed -i 's/$REGISTRY/'"$REGISTRY"'/' deployment.yml - - sed -i 's/$REGISTRY_NAMESPACE/'"$REGISTRY_NAMESPACE"'/' deployment.yml - - sed -i 's/$DRONE_REPO_NAME/'"$DRONE_REPO_NAME"'/' deployment.yml - - sed -i 's/$DRONE_COMMIT/'"$DRONE_COMMIT"'/' deployment.yml - - sed -i 's/$PORTS_NAME/'"dasdafas"'/' deployment.yml - - sed -i 's/$PORTS_PORT/'"8082"'/' deployment.yml - - sed -i 's/$PROFILES/'"mosr-dm"'/' nginx.conf - # docker登录,不能在脚本中登录,并且不能使用docker login -u -p - - echo $DOCKER_PASSWORD | docker login $REGISTRY --username $DOCKER_USERNAME --password-stdin - - chmod +x docker.sh - - cat docker.sh - - sh docker.sh - # 执行完脚本删除本次制作的docker镜像,避免多次后当前runner空间不足 - - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}') - when: - branch: - - dm - - - name: drone-rancher-prod # rancher运行 - image: bitnami/kubectl:1.26.13-debian-11-r1 - volumes: # 将容器内目录挂载到宿主机 - - name: config - path: /app/config # 将kubectl 配置文件挂载出来 - commands: # 定义在Docker容器中执行的shell命令 - # 将deployment中定义的变量替换为drone中的内置变量 - - kubectl apply -f deployment.yml -n mosr --kubeconfig=/app/config/base-taishan-kubectl.yml - when: - branch: - - prod - - - - name: drone-rancher-dm # rancher运行 - image: bitnami/kubectl:1.26.13-debian-11-r1 - volumes: # 将容器内目录挂载到宿主机 - - name: config - path: /app/config # 将kubectl 配置文件挂载出来 - commands: # 定义在Docker容器中执行的shell命令 - # 将deployment中定义的变量替换为drone中的内置变量 - - kubectl apply -f deployment.yml -n mosr-dm --kubeconfig=/app/config/base-taishan-kubectl.yml - when: - branch: - - dm - - - -volumes: - - name: cache - host: - path: /home/npm/mosr-web - - name: config # k8s对接的配置文件 - host: - path: /home/kubect - - name: docker # 宿主机中的docker - host: - path: /var/run/docker.sock - -load: -trigger: - branch: - - prod - - dm - event: - - push From 508e3918230e70a2e71a3dc39a5555960a5cd909 Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Mon, 1 Apr 2024 11:27:06 +0800 Subject: [PATCH 007/161] =?UTF-8?q?feat:=20=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..fada25d --- /dev/null +++ b/.drone.yml @@ -0,0 +1,153 @@ +kind: pipeline +type: docker +name: mosr-web +platform: + os: linux + arch: arm64 +steps: + + + - name: build-package + image: node:16.20.0 + volumes: + - name: cache + path: /drone/src/node_modules + commands: + - export CI=false + - mkdir -p /app/build/$DRONE_REPO_NAME + - rm -rf /app/build/$DRONE_REPO_NAME/* + - cp deployment.yml /app/build/$DRONE_REPO_NAME/ + - cp Dockerfile /app/build/$DRONE_REPO_NAME/ + - cp .dockerignore /app/build/$DRONE_REPO_NAME/ + - cp default.conf /app/build/$DRONE_REPO_NAME/ + - cp docker.sh /app/build/$DRONE_REPO_NAME/ + - cp nginx.conf /app/build/$DRONE_REPO_NAME/ + - npm -v + - mkdir -p ./node_modules + - export NODE_MODULES_PATH=`pwd`/node_modules + #- npm config set registry https://registry.npm.taobao.org + #- set NODE_OPTIONS=--openssl-legacy-provider + - npm install + - npm run build + - ls /app/build/$DRONE_REPO_NAME/ + - echo $NODE_MODULES_PATH + - cp -r dist /app/build/$DRONE_REPO_NAME + + + - name: build-docker-prod # 制作docker镜像 + image: docker # 使用官方docker镜像 + volumes: # 将容器内目录挂载到宿主机 + - name: docker + path: /var/run/docker.sock # 挂载宿主机的docker + - name: config + path: /config + environment: # 获取到密文的docker用户名和密码 + DOCKER_USERNAME: + from_secret: docker_username + DOCKER_PASSWORD: + from_secret: docker_password + REGISTRY: + from_secret: registry + REGISTRY_NAMESPACE: + from_secret: registry_namespace + commands: # 定义在Docker容器中执行的shell命令 + - cat Dockerfile + - sed -i 's/$REGISTRY/'"$REGISTRY"'/' deployment.yml + - sed -i 's/$REGISTRY_NAMESPACE/'"$REGISTRY_NAMESPACE"'/' deployment.yml + - sed -i 's/$DRONE_REPO_NAME/'"$DRONE_REPO_NAME"'/' deployment.yml + - sed -i 's/$DRONE_COMMIT/'"$DRONE_COMMIT"'/' deployment.yml + - sed -i 's/$PORTS_NAME/'"dasdafas"'/' deployment.yml + - sed -i 's/$PORTS_PORT/'"8081"'/' deployment.yml + - sed -i 's/$PROFILES/'"mosr"'/' nginx.conf + # docker登录,不能在脚本中登录,并且不能使用docker login -u -p + - echo $DOCKER_PASSWORD | docker login $REGISTRY --username $DOCKER_USERNAME --password-stdin + - chmod +x docker.sh + - cat docker.sh + - sh docker.sh + # 执行完脚本删除本次制作的docker镜像,避免多次后当前runner空间不足 + - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}') + when: + branch: + - prod + + - name: build-docker-dm # 制作docker镜像 + image: docker # 使用官方docker镜像 + volumes: # 将容器内目录挂载到宿主机 + - name: docker + path: /var/run/docker.sock # 挂载宿主机的docker + - name: config + path: /config + environment: # 获取到密文的docker用户名和密码 + DOCKER_USERNAME: + from_secret: docker_username + DOCKER_PASSWORD: + from_secret: docker_password + REGISTRY: + from_secret: registry + REGISTRY_NAMESPACE: + from_secret: registry_namespace + commands: # 定义在Docker容器中执行的shell命令 + - cat Dockerfile + - sed -i 's/$REGISTRY/'"$REGISTRY"'/' deployment.yml + - sed -i 's/$REGISTRY_NAMESPACE/'"$REGISTRY_NAMESPACE"'/' deployment.yml + - sed -i 's/$DRONE_REPO_NAME/'"$DRONE_REPO_NAME"'/' deployment.yml + - sed -i 's/$DRONE_COMMIT/'"$DRONE_COMMIT"'/' deployment.yml + - sed -i 's/$PORTS_NAME/'"dasdafas"'/' deployment.yml + - sed -i 's/$PORTS_PORT/'"8082"'/' deployment.yml + - sed -i 's/$PROFILES/'"mosr-dm"'/' nginx.conf + # docker登录,不能在脚本中登录,并且不能使用docker login -u -p + - echo $DOCKER_PASSWORD | docker login $REGISTRY --username $DOCKER_USERNAME --password-stdin + - chmod +x docker.sh + - cat docker.sh + - sh docker.sh + # 执行完脚本删除本次制作的docker镜像,避免多次后当前runner空间不足 + - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}') + when: + branch: + - dm + + - name: drone-rancher-prod # rancher运行 + image: bitnami/kubectl:1.26.13-debian-11-r1 + volumes: # 将容器内目录挂载到宿主机 + - name: config + path: /app/config # 将kubectl 配置文件挂载出来 + commands: # 定义在Docker容器中执行的shell命令 + # 将deployment中定义的变量替换为drone中的内置变量 + - kubectl apply -f deployment.yml -n mosr --kubeconfig=/app/config/base-taishan-kubectl.yml + when: + branch: + - prod + + + - name: drone-rancher-dm # rancher运行 + image: bitnami/kubectl:1.26.13-debian-11-r1 + volumes: # 将容器内目录挂载到宿主机 + - name: config + path: /app/config # 将kubectl 配置文件挂载出来 + commands: # 定义在Docker容器中执行的shell命令 + # 将deployment中定义的变量替换为drone中的内置变量 + - kubectl apply -f deployment.yml -n mosr-dm --kubeconfig=/app/config/base-taishan-kubectl.yml + when: + branch: + - dm + + + +volumes: + - name: cache + host: + path: /home/npm/mosr-web + - name: config # k8s对接的配置文件 + host: + path: /home/kubect + - name: docker # 宿主机中的docker + host: + path: /var/run/docker.sock + +load: +trigger: + branch: + - prod + - dm + event: + - push From 5977480404a8b1c3bb8e202d7911fa1d70f510aa Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Mon, 1 Apr 2024 13:41:23 +0800 Subject: [PATCH 008/161] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index fada25d..d703ad1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: - npm -v - mkdir -p ./node_modules - export NODE_MODULES_PATH=`pwd`/node_modules - #- npm config set registry https://registry.npm.taobao.org + - npm config set registry https://registry.npm.taobao.org #- set NODE_OPTIONS=--openssl-legacy-provider - npm install - npm run build From de971d224ea92b0d9e0be8df746e4468a7d8804a Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Mon, 1 Apr 2024 13:48:34 +0800 Subject: [PATCH 009/161] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E6=BA=90=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index d703ad1..164e9c0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: - npm -v - mkdir -p ./node_modules - export NODE_MODULES_PATH=`pwd`/node_modules - - npm config set registry https://registry.npm.taobao.org + - npm config set registry https://registry.npmmirror.com #- set NODE_OPTIONS=--openssl-legacy-provider - npm install - npm run build From 8964cbe4bdf818d7568ab70c8819e6719ff7d95e Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Mon, 1 Apr 2024 13:58:03 +0800 Subject: [PATCH 010/161] =?UTF-8?q?fix:=20=E6=B3=A8=E9=87=8Ainstall?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 164e9c0..f2400d2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,9 +25,9 @@ steps: - npm -v - mkdir -p ./node_modules - export NODE_MODULES_PATH=`pwd`/node_modules - - npm config set registry https://registry.npmmirror.com + # - npm config set registry https://registry.npmmirror.com #- set NODE_OPTIONS=--openssl-legacy-provider - - npm install + # - npm install - npm run build - ls /app/build/$DRONE_REPO_NAME/ - echo $NODE_MODULES_PATH From 1b10b9aa2b86510723071dcd11b35b1923c20dff Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Mon, 1 Apr 2024 14:27:52 +0800 Subject: [PATCH 011/161] =?UTF-8?q?fix:=20=E8=A7=92=E8=89=B2=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/role/role.js | 8 +++++ src/views/system/role/add.vue | 55 ++++++++++++++++++++++++--------- src/views/system/role/index.vue | 19 ------------ 3 files changed, 48 insertions(+), 34 deletions(-) diff --git a/src/api/role/role.js b/src/api/role/role.js index 6aa7b3d..28a4f7b 100644 --- a/src/api/role/role.js +++ b/src/api/role/role.js @@ -14,6 +14,14 @@ export const getRoleOption = () => { method: "get" }); }; + +export const getTemRoleOption = () => { + return request({ + url: '/admin/role/option/template', + method: "get" + }); +}; + //查询角色信息 export const getRoleDetail = (roleId) => { return request({ diff --git a/src/views/system/role/add.vue b/src/views/system/role/add.vue index 54c750b..7229e15 100644 --- a/src/views/system/role/add.vue +++ b/src/views/system/role/add.vue @@ -2,13 +2,17 @@
- - - - - - - +
+ + +
+
{ @@ -135,6 +141,8 @@ const getInstance = (e) => { const init = async () => { form.value.setValues({state: '1', template: false}) + const res = await getTemRoleOption() + localData.tempRoleOpt = res.data const { data } = await getMenuList() localData.menuData = data } @@ -145,12 +153,25 @@ const getInfo = async () => { data.menuIds.forEach(key=>{ menuTree.value.setChecked(key, true, false) }) - if(route.query.isAdd) { + form.value.setValues(data) +} + +const roleTempChange = async (val) => { + try { + loading.value = true + const { data } = await getRoleDetail(val.value) + data.menuIds.forEach(key=>{ + menuTree.value.setChecked(key, true, false) + }) delete data.roleId delete data.roleName delete data.roleKey + form.value.setValues(data) + loading.value = false + } catch (error) { + loading.value = false } - form.value.setValues(data) + } const filterMenu = (value, data) => { @@ -166,12 +187,8 @@ const checkChange = (data) => { return [...checkedKeys, ...halfCheckedKeys] } -console.log(localData.checkList, 'localData.checkList'); const checkBoxChange = (val) => { - console.log(val, 'val'); - console.log(val.includes('3'), 'val.includes'); localData.checkStrictly = val.includes('3') - console.log(localData.checkStrictly, 'localData.checkStrictly'); let nodes = menuTree.value.store.nodesMap if (val.includes('1')) { for (const node in nodes) { @@ -231,6 +248,14 @@ onMounted( async ()=>{ \ No newline at end of file diff --git a/src/views/projectdemand/demandsummary/index.vue b/src/views/projectdemand/demandsummary/index.vue new file mode 100644 index 0000000..18fde93 --- /dev/null +++ b/src/views/projectdemand/demandsummary/index.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file From dcc68662113ff0d9e44da9d77d63a581d1767aa6 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Thu, 9 May 2024 17:16:39 +0800 Subject: [PATCH 025/161] =?UTF-8?q?feat=20:=20=E6=96=B0=E5=A2=9E=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/index.scss | 28 +- src/assets/svg/home1.svg | 6 + src/assets/svg/home2.svg | 6 + src/assets/svg/home3.svg | 6 + src/assets/svg/home4.svg | 6 + src/views/home/index.vue | 481 +++++++++++++++++++---------------- 6 files changed, 301 insertions(+), 232 deletions(-) create mode 100644 src/assets/svg/home1.svg create mode 100644 src/assets/svg/home2.svg create mode 100644 src/assets/svg/home3.svg create mode 100644 src/assets/svg/home4.svg diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 5c1a3c7..2231156 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -19,7 +19,7 @@ html, body, #app, .el-container, .el-aside, .el-main { } .el-main { - background: #F4F6F8; + background: #EFEFEF; padding: 0 0 0 18px; position: fixed; left: 200px; @@ -27,6 +27,7 @@ html, body, #app, .el-container, .el-aside, .el-main { margin-left: 0; transition: margin-left .15s; width: calc(100vw - 200px); + &::-webkit-scrollbar { width: 6px; } @@ -83,9 +84,11 @@ html, body, #app, .el-container, .el-aside, .el-main { align-items: center; margin-bottom: 10px; } -.el-dialog__body{ + +.el-dialog__body { padding: 10px 20px; } + .stateIcon { margin-top: 9px; margin-right: 7px; @@ -248,7 +251,8 @@ html, body, #app, .el-container, .el-aside, .el-main { justify-content: center; z-index: 0; position: relative; - .el-icon{ + + .el-icon { width: 1.4em; height: 1.4em; } @@ -287,9 +291,10 @@ html, body, #app, .el-container, .el-aside, .el-main { .layout { display: flex; justify-content: space-around; + .scrollbar-user { - height: calc(100vh - 250px)!important; - overflow: auto!important; + height: calc(100vh - 250px) !important; + overflow: auto !important; } .scrollbar-dict { @@ -401,6 +406,15 @@ html, body, #app, .el-container, .el-aside, .el-main { } //SvgIcon组件的样式 +.home-icon { + width: 4em; + height: 4em; + vertical-align: -0.15em; + fill: currentColor; + overflow: hidden; + margin-right: 5px; +} + .svg-icon { width: 1.2em; height: 1.2em; @@ -445,10 +459,12 @@ html, body, #app, .el-container, .el-aside, .el-main { overflow: hidden; margin-right: 5px; } -.fen-icon{ + +.fen-icon { width: 1.8em; height: 1.7em; } + .middle-icon { width: 1.4em; height: 1.4em; diff --git a/src/assets/svg/home1.svg b/src/assets/svg/home1.svg new file mode 100644 index 0000000..0a99452 --- /dev/null +++ b/src/assets/svg/home1.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/svg/home2.svg b/src/assets/svg/home2.svg new file mode 100644 index 0000000..a71b307 --- /dev/null +++ b/src/assets/svg/home2.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/svg/home3.svg b/src/assets/svg/home3.svg new file mode 100644 index 0000000..98d2c13 --- /dev/null +++ b/src/assets/svg/home3.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/svg/home4.svg b/src/assets/svg/home4.svg new file mode 100644 index 0000000..d9206cd --- /dev/null +++ b/src/assets/svg/home4.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index cea4307..695f767 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,266 +1,295 @@ - From 6557b5d2c80cb182e9ef1e355254cd075b4bac59 Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Thu, 9 May 2024 17:32:21 +0800 Subject: [PATCH 026/161] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fvcomponents/fvSearchForm/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fvcomponents/fvSearchForm/index.vue b/src/fvcomponents/fvSearchForm/index.vue index 0994c8c..b4c6534 100644 --- a/src/fvcomponents/fvSearchForm/index.vue +++ b/src/fvcomponents/fvSearchForm/index.vue @@ -68,7 +68,7 @@ const filterConfig = computed(()=>{ // 搜索功能表单元素默认值 const setDefaultFormValues = () => { filterConfig.value.forEach(item=>{ - form.value[item.prop] = item.props.defaultValue || null + form.value[item.prop] = item.props?.defaultValue || null }) } From 639caadc46f0ecd99d65df0319045dfbe1e3e4d2 Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Thu, 9 May 2024 17:32:36 +0800 Subject: [PATCH 027/161] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/stores/permisstion.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/stores/permisstion.js b/src/stores/permisstion.js index 2a90914..e1864fe 100644 --- a/src/stores/permisstion.js +++ b/src/stores/permisstion.js @@ -107,7 +107,17 @@ export const usePermisstionStroe = defineStore('permisstion', () => { } const removeMenu = () => { - menuList.value.length = 0 + menuList.value = [ + { + name: 'home', + path: '/home', + icon: 'home', + title: '首页', + meta: { + breadcrumb: true + } + } + ] asyncRouters.value.length = 0 } From 28b4637e01c907798f15ba851cd21e68a18e27a7 Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Thu, 9 May 2024 17:33:01 +0800 Subject: [PATCH 028/161] =?UTF-8?q?feat:=20=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=B1=87=E6=80=BB=E4=B8=BB=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectdemand/demandsummary/index.vue | 122 +++++++++++++++++- 1 file changed, 119 insertions(+), 3 deletions(-) diff --git a/src/views/projectdemand/demandsummary/index.vue b/src/views/projectdemand/demandsummary/index.vue index 18fde93..f43b74c 100644 --- a/src/views/projectdemand/demandsummary/index.vue +++ b/src/views/projectdemand/demandsummary/index.vue @@ -1,11 +1,127 @@ \ No newline at end of file + From bf6a68326154a8f5952b6678c122ac11ff5eb4c0 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Thu, 9 May 2024 18:26:40 +0800 Subject: [PATCH 030/161] =?UTF-8?q?fix=20=EF=BC=9A=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/navbar/BellSocket.vue | 62 ++++++++++++++++---------------- src/layout/navbar/index.vue | 4 +-- src/views/home/index.vue | 57 ++++++++++++++++------------- 3 files changed, 66 insertions(+), 57 deletions(-) diff --git a/src/layout/navbar/BellSocket.vue b/src/layout/navbar/BellSocket.vue index ba6aac4..b0877d1 100644 --- a/src/layout/navbar/BellSocket.vue +++ b/src/layout/navbar/BellSocket.vue @@ -1,37 +1,37 @@ diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue index 685272f..e6153d3 100644 --- a/src/views/projectdemand/demandcollection/detail.vue +++ b/src/views/projectdemand/demandcollection/detail.vue @@ -44,7 +44,6 @@
-
-
diff --git a/src/views/projectdemand/demandcollection/index.vue b/src/views/projectdemand/demandcollection/index.vue index 0fa62b4..a4bfb44 100644 --- a/src/views/projectdemand/demandcollection/index.vue +++ b/src/views/projectdemand/demandcollection/index.vue @@ -116,7 +116,7 @@ const handleEdit = (row) => { router.push({ path: '/projectdemand/demandedit', query: { - id: row.roleId + id: row.requirementId } }) } From ce2752af9bed60d99e35eb224fa463c3e1f2484e Mon Sep 17 00:00:00 2001 From: wenhua <1084668738@qq.com> Date: Sun, 12 May 2024 01:29:49 +0800 Subject: [PATCH 055/161] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 - src/views/projectdemand/demandsummary/add.vue | 14 ++++ .../projectdemand/demandsummary/api/index.js | 12 +++ .../demandsummary/components/FileUpload.vue | 75 +++++++++++++++++++ 4 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 src/views/projectdemand/demandsummary/api/index.js create mode 100644 src/views/projectdemand/demandsummary/components/FileUpload.vue diff --git a/src/utils/request.js b/src/utils/request.js index 9c580c1..d95c00b 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -29,8 +29,6 @@ serveice.interceptors.response.use(response => { if (response.request.responseType === 'blob' || response.request.responseType === 'arraybuffer') { return response.data } - console.log("window.location.pathname", window.location.pathname) - console.log("windows", window.location.search) return response.data }, error => { let response = error.response diff --git a/src/views/projectdemand/demandsummary/add.vue b/src/views/projectdemand/demandsummary/add.vue index b806bde..9591b33 100644 --- a/src/views/projectdemand/demandsummary/add.vue +++ b/src/views/projectdemand/demandsummary/add.vue @@ -8,6 +8,8 @@ + + \ No newline at end of file From 48e5d82acb57d5b12dec7730facfd84cb353821a Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sun, 12 May 2024 13:05:52 +0800 Subject: [PATCH 056/161] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=BB=86?= =?UTF-8?q?=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/project-demand/index.js | 6 ++++ src/components/FileUpload.vue | 61 ++++++++++++++++++++++++++++----- src/views/home/index.vue | 2 +- vite.config.js | 2 +- 4 files changed, 60 insertions(+), 11 deletions(-) diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js index 043e7fc..0113419 100644 --- a/src/api/project-demand/index.js +++ b/src/api/project-demand/index.js @@ -34,3 +34,9 @@ export const addRequirement = (data) => { data: data }); }; +export const deleteFile = (path) => { + return request({ + url: '/process/file/delete/'+ path, + method: "delete" + }); +}; diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue index e4e2774..53f05a1 100644 --- a/src/components/FileUpload.vue +++ b/src/components/FileUpload.vue @@ -9,6 +9,9 @@ :auto-upload="true" :before-upload="beforeUpload" :on-success="handleUploadSuccess" + :before-remove="beforeRemove" + :on-remove="handleRemoveAttachment" + @handleRemove="handleRemove1" > 上传文件 @@ -16,10 +19,12 @@ diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 1f9f023..5675428 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -119,7 +119,7 @@ const tableConfig = reactive({ label: '类型', align: 'center', showOverflowTooltip: false, - currentRender: ({row, index}) => () + currentRender: ({row, index}) => () }, { prop: 'submitTime', diff --git a/vite.config.js b/vite.config.js index 92e2a1e..da93391 100644 --- a/vite.config.js +++ b/vite.config.js @@ -18,7 +18,6 @@ export default defineConfig({ AutoImport({ //自动导入vue相关函数 imports: ['vue','vue-router'], - resolvers: [ ElementPlusResolver(), //自动导入图标组件 @@ -70,6 +69,7 @@ export default defineConfig({ open: true, proxy: { '/api/workflow': { + // target: 'http://frp.feashow.cn:31800/', target: 'http://clay.frp.feashow.cn/', // target: 'http://192.168.31.175:8000', changeOrigin: true, From 6fbcdc82cafedce0ce662cec9796104785bb39d2 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sun, 12 May 2024 13:59:50 +0800 Subject: [PATCH 057/161] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=BB=86?= =?UTF-8?q?=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FileUpload.vue | 72 ++++++++++++++++++++++++----------- 1 file changed, 50 insertions(+), 22 deletions(-) diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue index 53f05a1..5398ed1 100644 --- a/src/components/FileUpload.vue +++ b/src/components/FileUpload.vue @@ -6,15 +6,37 @@ with-credentials :multiple="maxSize > 0" :data="uploadParams" + :show-file-list="false" :auto-upload="true" :before-upload="beforeUpload" :on-success="handleUploadSuccess" - :before-remove="beforeRemove" - :on-remove="handleRemoveAttachment" - @handleRemove="handleRemove1" > + + + 上传文件 +
+ + + + + + + + + + +
+ From 416fa2ed53d78088ad7099e10ea6b9c233cf28e3 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Sun, 12 May 2024 14:23:34 +0800 Subject: [PATCH 058/161] =?UTF-8?q?build=20:=20=E6=B5=81=E7=A8=8B=E6=BC=94?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/project-demand/index.js | 7 ++++++ .../projectdemand/demandcollection/add.vue | 2 +- .../projectdemand/demandcollection/detail.vue | 17 ++++++++++---- .../workflow/common/ProcessDiagramViewer.vue | 8 ++++++- .../process/common/AvatarEllipsis.vue | 4 ++++ src/views/workflow/process/nodes/Node.vue | 22 +++++++++++-------- 6 files changed, 45 insertions(+), 15 deletions(-) diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js index 0113419..24ee479 100644 --- a/src/api/project-demand/index.js +++ b/src/api/project-demand/index.js @@ -26,6 +26,13 @@ export const agreeTask = (data) => { data: data }); }; +export const rejectTask = (data) => { + return request({ + url: `/workflow/mosr/process/task/reject`, + method: "post", + data: data + }); +}; export const addRequirement = (data) => { return request({ diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue index b5119c3..0c54103 100644 --- a/src/views/projectdemand/demandcollection/add.vue +++ b/src/views/projectdemand/demandcollection/add.vue @@ -44,7 +44,7 @@
- + diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue index e6153d3..eb0781f 100644 --- a/src/views/projectdemand/demandcollection/detail.vue +++ b/src/views/projectdemand/demandcollection/detail.vue @@ -60,16 +60,16 @@
- - +
- 驳回 + 驳回 同意
@@ -79,7 +79,7 @@ import OperationRender from '@/views/workflow/common/OperationRender.vue' import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue' import {useProcessStore} from '@/stores/processStore.js'; -import {getInfo, agreeTask} from "@/api/project-demand/index.js"; +import {getInfo, agreeTask, rejectTask} from "@/api/project-demand/index.js"; const route = useRoute() const form = ref(); @@ -130,6 +130,15 @@ const handleSubmit = () => { console.log(res) }) } +const handleReject = () => { + let approve = { + taskId: processInstanceData.value.taskId, + auditOpinion : auditOpinion.value, + } + rejectTask(approve).then(res => { + console.log(res) + }) +} const init = async () => { getInfo(route.query.id).then(res => { diff --git a/src/views/workflow/common/ProcessDiagramViewer.vue b/src/views/workflow/common/ProcessDiagramViewer.vue index 1050a29..595e0c3 100644 --- a/src/views/workflow/common/ProcessDiagramViewer.vue +++ b/src/views/workflow/common/ProcessDiagramViewer.vue @@ -9,7 +9,7 @@
- +
@@ -20,6 +20,12 @@ import ProcessTree from '@/views/workflow/process/ProcessTree.vue' const processTreePreview = ref() const scale = ref(100) +const props = defineProps({ + mode: { + type: String, + default: 'preview' + } +}) nextTick(()=>{ processTreePreview.value.init() diff --git a/src/views/workflow/process/common/AvatarEllipsis.vue b/src/views/workflow/process/common/AvatarEllipsis.vue index 883f400..2665f58 100644 --- a/src/views/workflow/process/common/AvatarEllipsis.vue +++ b/src/views/workflow/process/common/AvatarEllipsis.vue @@ -38,6 +38,10 @@ const props = defineProps({ userInfo: { type: Array, default: [] + }, + mode: { + type: String, + default: 'design' } }) diff --git a/src/views/workflow/process/nodes/Node.vue b/src/views/workflow/process/nodes/Node.vue index b02ee1e..36acd65 100644 --- a/src/views/workflow/process/nodes/Node.vue +++ b/src/views/workflow/process/nodes/Node.vue @@ -17,24 +17,28 @@
From eeab66d8fb1c28f99441a8096f0a213e02c975bb Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sun, 12 May 2024 14:44:04 +0800 Subject: [PATCH 059/161] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=BB=86?= =?UTF-8?q?=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/project-demand/index.js | 4 +- src/components/FileUpload.vue | 16 ++++---- src/views/home/index.vue | 1 - .../projectdemand/demandcollection/index.vue | 10 +++-- .../process/common/AvatarEllipsis.vue | 39 ++++++++++++++----- src/views/workflow/process/nodes/Node.vue | 35 +---------------- 6 files changed, 48 insertions(+), 57 deletions(-) diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js index 24ee479..9ec21ce 100644 --- a/src/api/project-demand/index.js +++ b/src/api/project-demand/index.js @@ -41,9 +41,9 @@ export const addRequirement = (data) => { data: data }); }; -export const deleteFile = (path) => { +export const deleteFile = (id) => { return request({ - url: '/process/file/delete/'+ path, + url: `/process/file/delete/${id}`, method: "delete" }); }; diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue index 5398ed1..6f09d10 100644 --- a/src/components/FileUpload.vue +++ b/src/components/FileUpload.vue @@ -91,6 +91,8 @@ const beforeUpload = (file) => { const handleUploadSuccess = (res, file) => { if (res.code !== 1000) { ElMessage.error("上传失败") + }else { + ElMessage.success("上传成功") } showTable.value=true let data = res.data @@ -116,14 +118,12 @@ const handleRemoveAttachment = (file) => { } const handleRemove = (row) => { console.log('fil对对对e',row,fileList.value) - // "http://43.138.199.198:8888//group1/M00/00/00/CgAICGY_pZKAFiruAAAAAAAAAAA88.docx" - - // deleteFile(file.id).then(res => { - // if (res.code === 1000) { - // ElMessage.success("删除成功"); - // fileList.value.splice(fileList.value.findIndex((item) => item.id === file.id), 1); - // } - // }); + deleteFile(row.id).then(res => { + if (res.code === 1000) { + ElMessage.success("删除成功"); + // fileList.value.splice(fileList.value.findIndex((item) => item.id === file.id), 1); + } + }); }; const handleRemove1=()=>{ console.log('handleRemove1vdvd') diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 5675428..0bbfa5d 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -46,7 +46,6 @@ 常用网站
-
diff --git a/src/views/projectdemand/demandcollection/index.vue b/src/views/projectdemand/demandcollection/index.vue index a4bfb44..f67c2dc 100644 --- a/src/views/projectdemand/demandcollection/index.vue +++ b/src/views/projectdemand/demandcollection/index.vue @@ -4,9 +4,7 @@ - From 324cc268b5a509c1e71ebdd83ca82437de38f50e Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sun, 12 May 2024 17:03:12 +0800 Subject: [PATCH 066/161] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FileUpload.vue | 29 ++++++----- .../projectdemand/demandcollection/detail.vue | 52 +++++++------------ 2 files changed, 34 insertions(+), 47 deletions(-) diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue index 9533118..d90202e 100644 --- a/src/components/FileUpload.vue +++ b/src/components/FileUpload.vue @@ -15,20 +15,24 @@
- - - + + + - - + + + + - - - diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue index 67f6906..651bb42 100644 --- a/src/views/projectdemand/demandcollection/add.vue +++ b/src/views/projectdemand/demandcollection/add.vue @@ -39,9 +39,27 @@
+ + + + + + + + + + + +
@@ -76,6 +94,7 @@ const formData = ref({ deadline: '', collectExplain: '' }) +const showTable = ref(false) const processDiagramViewer = ref(false) const typeOption = ref([ @@ -109,7 +128,16 @@ const processStore = useProcessStore() const processInstanceData = ref() const getFile = (val) => { - console.log('val', val) + console.log('val', val, route.query.isAdd) + if(route.query.isAdd==undefined){ + showTable.value=true + val.forEach(item => { + + formData.value.fileList.push(item) + }) + fileList.value=formData.value.fileList + console.log('fileList.value',fileList.value) + } let fileObj = {} let newFileArray = [] val.forEach(item => { @@ -139,7 +167,6 @@ const init = async () => { } const handleSubmit = () => { - console.log(formData.value, "formData.value") addRequirement({ ...formData.value, requirementId: 0, @@ -161,6 +188,9 @@ const getDetailInfo = async () => { if (res.code === 1000) { ElMessage.success(res.msg) formData.value = res.data.formData + if(route.query.isAdd==undefined){ + showTable.value=true + } } else { ElMessage.error(res.msg) } @@ -187,12 +217,17 @@ onMounted(async () => { \ No newline at end of file From ad3fa0e688a9eada29d3d508b01b1a075a34234e Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Mon, 13 May 2024 22:25:37 +0800 Subject: [PATCH 081/161] =?UTF-8?q?feat:=20=E8=A1=A8=E6=A0=BC=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fvcomponents/fvTable/index.vue | 143 +++++++++++++++++++++++++---- 1 file changed, 124 insertions(+), 19 deletions(-) diff --git a/src/fvcomponents/fvTable/index.vue b/src/fvcomponents/fvTable/index.vue index 1b42ff2..c90af06 100644 --- a/src/fvcomponents/fvTable/index.vue +++ b/src/fvcomponents/fvTable/index.vue @@ -2,15 +2,48 @@
- - {{ btn.name }} - +
+ + {{ btn.name }} + +
+ +
+ + + + + + +
+ +
+
+ + + + + +
+ +
@@ -30,7 +63,7 @@ ref="tableInstance" > \ No newline at end of file + diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue index e696307..1d0cd33 100644 --- a/src/components/DetailComponent/SummaryDetail.vue +++ b/src/components/DetailComponent/SummaryDetail.vue @@ -161,10 +161,10 @@
-
- 驳回 - 同意 -
+ + + +
@@ -294,7 +294,6 @@ const handleDownload = (row) => { watch( () => props.formData, (val) => { - console.log(val, 'ssss'); } ) watch(() => props.processViewer, (newVal) => { diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index 4f36ca3..44eca8b 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -449,11 +449,11 @@ const init = async () => { const res = await getSubCompOpt() companyOption.value = res.data getProcessInfo().then(res => { - // ElNotification({ - // title: '提示', - // message: res.msg, - // type: res.code === 1000 ? 'success' : 'error' - // }) + ElNotification({ + title: '提示', + message: res.msg, + type: res.code === 1000 ? 'success' : 'error' + }) if (res.code === 1000) { let data = res.data deploymentId.value = data.deploymentId diff --git a/src/views/project-demand/summary/api/index.js b/src/views/project-demand/summary/api/index.js index f32bd7b..3baa2ef 100644 --- a/src/views/project-demand/summary/api/index.js +++ b/src/views/project-demand/summary/api/index.js @@ -21,7 +21,7 @@ export const requirementReported = (data) => { export const getProcessInfo = () => { return request({ url: '/workflow/mosr/requirement/collect/process', - method: "post" + method: "get" }); }; export const getDetail = (projectId) => { diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue index 3a973c8..2787ba2 100644 --- a/src/views/project-demand/summary/detail.vue +++ b/src/views/project-demand/summary/detail.vue @@ -5,11 +5,11 @@ :processViewer="summaryProcessViewer" :companyOption="companyOption" :loading="loading"/> - + - +