Kaynağa Gözat

feat:修改醉驾

DESKTOP-USV654P\pc 4 ay önce
ebeveyn
işleme
c6e9548aba

+ 1 - 1
.drone.yml

@@ -87,7 +87,7 @@ steps:
    commands:
       # 清理 docker 服务中不再使用的镜像、挂载、网络等资源
       - docker system prune --force --volumes || true
-      - docker build -f ./Dockerfile-Dev -t $IMAGE ./
+      - docker build -f ./Dockerfile-Pre -t $IMAGE ./
 
  - name: run
    image: docker/compose

+ 1 - 1
.env.production

@@ -16,7 +16,7 @@ VITE_BUILD_COMPRESS = 'gzip'
 VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 
 # 接口地址 可以由nginx做转发或者直接写实际地址
-VITE_GLOB_API_URL=http://10.150.10.139:8888/api
+VITE_GLOB_API_URL=http://42.247.8.136:8007/tlapipre
 
 
 # 文件上传地址 可以由nginx做转发或者直接写实际地址

+ 32 - 0
Dockerfile-Pre

@@ -0,0 +1,32 @@
+# 制定镜像
+FROM gplane/pnpm:node20
+# 声明作者
+MAINTAINER fanxp
+# 编译程序
+WORKDIR /app
+COPY . /app
+
+# RUN yarn install
+
+# 配置环境变量
+ENV HOST 0.0.0.0
+ENV PORT 3100
+# 对外暴露的端口
+EXPOSE 3100
+
+# 程序启动脚本
+CMD [ "pnpm","serve:pre" ]
+
+# RUN yarn run build
+
+# #制定空镜像
+# FROM nginx:1.17.0
+# #声明作者
+# MAINTAINER fanxp
+
+# #移动当前目录下面的文件到code目录下
+# COPY dist/ /usr/share/nginx/html
+# COPY default.conf /etc/nginx/conf.d/default.conf
+
+# #对外暴露的端口
+# EXPOSE 80

+ 1 - 0
package.json

@@ -9,6 +9,7 @@
   "scripts": {
     "bootstrap": "pnpm install",
     "serve": "npm run dev",
+    "serve:pre": "vite --mode production",
     "dev": "vite",
     "gapi": "node ./src/utils/gapi/index.js",
     "build": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=8192 vite build && esno ./build/script/postBuild.ts",

+ 3 - 0
src/views/evaluate/manager/components/data.config.ts

@@ -192,6 +192,9 @@ export const formSchema: FormSchema[] = [
         { label: '关闭', value: '0' },
       ],
     },
+    ifShow: ({ values }) => {
+      return values.evaluateType !== 'tea_evaluate_class';
+    },
   },
   {
     label: '生成规则',

+ 18 - 16
src/views/evaluate/result/components/data.config.ts

@@ -199,6 +199,7 @@ export const detailSearchFormSchema: FormSchema[] = [
       fieldNames: { label: 'name', value: 'id' },
     },
     colProps: { span: 8 },
+    ifShow: false,
   },
   {
     field: 'classId',
@@ -210,19 +211,7 @@ export const detailSearchFormSchema: FormSchema[] = [
       params: { url: 'educational/class/option' },
     },
     colProps: { span: 8 },
-  },
-  {
-    field: 'status',
-    label: '是否评分',
-    component: 'Select',
-    componentProps: {
-      options: [
-        { label: '未评分', value: '0' },
-        { label: '已评分', value: '1' },
-      ],
-      getPopupContainer: () => document.body,
-    },
-    colProps: { span: 8 },
+    ifShow: false,
   },
   {
     field: 'checkObject',
@@ -239,11 +228,24 @@ export const detailSearchFormSchema: FormSchema[] = [
     colProps: { span: 8 },
   },
   {
-    label: '名',
+    label: '名',
     field: 'name',
     component: 'Input',
     colProps: { span: 8 },
   },
+  {
+    field: 'status',
+    label: '是否评分',
+    component: 'Select',
+    componentProps: {
+      options: [
+        { label: '未评分', value: '0' },
+        { label: '已评分', value: '1' },
+      ],
+      getPopupContainer: () => document.body,
+    },
+    colProps: { span: 8 },
+  },
 ];
 
 //问卷/评价结果详情查看表格字段
@@ -375,7 +377,7 @@ export const evaluateResultTableColumns: BasicColumn[] = [
   {
     title: '应打分人数',
     dataIndex: 'planExecuterNum',
-    width: 80,
+    width: 100,
     align: 'left',
     customCell: (record) => {
       return { rowSpan: record.rowSpanTopic };
@@ -384,7 +386,7 @@ export const evaluateResultTableColumns: BasicColumn[] = [
   {
     title: '实际打分人数',
     dataIndex: 'actualExecuterNum',
-    width: 80,
+    width: 110,
     align: 'left',
     customCell: (record) => {
       return { rowSpan: record.rowSpanTopic };