修改bug

0f44f00a · yanglang123 · 6b6ce94f · 0f44f00a · 0f44f00a · 0f44f00a
Commit 0f44f00a authored Apr 14, 2025 by yanglang123
7 changed files
--- a/dist.zip
+++ b/dist.zip
--- a/src/common/Editor/editor.js
+++ b/src/common/Editor/editor.js
@@ -21,25 +21,25 @@ class Editor extends PureComponent {
  }
  componentDidMount() {
    const { importContent } = this.props;
-    if (importContent) {
+    // if (importContent) {
-      return {
+    //   return {
-        defaultValue: BraftEditor.createEditorState(importContent),
+    //     defaultValue: BraftEditor.createEditorState(importContent),
-        importContent,
+    //     importContent,
-      };
+    //   };
-    }
+    // }
    this.props.gupfetch();
  }
-  static getDerivedStateFromProps(nextProps, prevState) {
+  // static getDerivedStateFromProps(nextProps, prevState) {
-    const { importContent } = nextProps;
+  //   const { importContent } = nextProps;
-    if (importContent !== prevState.importContent) {
+  //   if (importContent !== prevState.importContent) {
-      return {
+  //     return {
-        defaultValue: BraftEditor.createEditorState(importContent),
+  //       defaultValue: BraftEditor.createEditorState(importContent),
-        importContent,
+  //       importContent,
-      };
+  //     };
-    }
+  //   }
-    return null;
+  //   return null;
-  }
+  // }
  submitContent = () => {
    // 在编辑器获得焦点时按下ctrl+s会执行此方法
    // 编辑器内容提交到服务端之前，可直接调用editorState.toHTML()来获取HTML格式的内容

--- a/src/pages/TrainingPrograms/ProgeamsManage/index.jsx
+++ b/src/pages/TrainingPrograms/ProgeamsManage/index.jsx
@@ -94,9 +94,6 @@ const steps = [
    title: "活动基本信息",
  },
  {
-    title: "投票",
-  },
-  {
    title: "设置活动规则",
  },
  {
@@ -3731,7 +3728,7 @@ class NewTP extends Component {
                (this.state.current === 3 && (
                  <div className={styles.steps_content}>
                    {/* 发布页面 */}
-                    <Release trainId={this.state.trainId} />
+                    {/* <Release trainId={this.state.trainId} /> */}
                  </div>
                ))}
              {/* 步骤条button显示 */}

--- a/src/pages/TrainingTools/Question/Create/index.jsx
+++ b/src/pages/TrainingTools/Question/Create/index.jsx
@@ -344,10 +344,10 @@ class SurveyCreact extends Component {
        content: (
          <div className={styles.survey_create_qccode}>
            <p className={styles.survey_create_info}>恭喜您，调研发布成功</p>
-            <p className={styles.survey_create_info}>调研二维码</p>
+            {/* <p className={styles.survey_create_info}>调研二维码</p> */}
-            <div>
+            {/* <div>
              <QRCode style={{ marginTop: "20px" }} value={code} key="1" />
-            </div>
+            </div> */}
          </div>
        ),
      },

--- a/src/pages/TrainingTools/Survey/Create/Base.jsx
+++ b/src/pages/TrainingTools/Survey/Create/Base.jsx
@@ -50,17 +50,17 @@ class Base extends Component {
      data: [
        {
          key: "1",
-          name: "金融行业调研",
+          name: "金融行业投票",
          age: "2017-1-1",
        },
        {
          key: "2",
-          name: "金融行业调研",
+          name: "金融行业投票",
          age: "2017-1-1",
        },
        {
          key: "3",
-          name: "金融行业调研",
+          name: "金融行业投票",
          age: "2017-1-1",
        },
      ],
@@ -327,7 +327,7 @@ class Base extends Component {
    const columns = [
      {
-        title: "调研名称",
+        title: "投票名称",
        dataIndex: "name",
        key: "name",
        width: "50%",
@@ -354,7 +354,7 @@ class Base extends Component {
    return (
      <div className={styles.cred_edit}>
        <Form>
-          <FormItem {...formItemLayout} label="调研名称：">
+          <FormItem {...formItemLayout} label="投票名称：">
            {getFieldDecorator("name", {
              initialValue: defaultValue.name ? defaultValue.name : "",
              rules: [
@@ -365,7 +365,7 @@ class Base extends Component {
                      rule,
                      value,
                      callback,
-                      "请输少于100字的调研名称",
+                      "请输少于100字的投票名称",
                      100
                    );
                  },
@@ -373,7 +373,7 @@ class Base extends Component {
              ],
            })(
              <Input
-                placeholder="请输入调研名称"
+                placeholder="请输入投票名称"
                style={{ display: "inline-block" }}
              />
            )}
@@ -384,7 +384,7 @@ class Base extends Component {
                size="small"
                style={{ display: "inline-block" }}
              >
-                复制调研
+                复制投票
              </Button>
            )}
          </FormItem>
@@ -457,7 +457,7 @@ class Base extends Component {
              )}
            </FormItem>
          )}
-          <FormItem {...formItemLayout} label="调研时间：">
+          <FormItem {...formItemLayout} label="投票时间：">
            {getFieldDecorator("time", {
              initialValue: defaultValue.startTime
                ? [
@@ -475,7 +475,7 @@ class Base extends Component {
                {
                  type: "array",
                  required: true,
-                  message: "请选择调研时间",
+                  message: "请选择投票时间",
                },
              ],
            })(
@@ -496,7 +496,6 @@ class Base extends Component {
                },
              ],
            })(<Input type="number" placeholder="请输入投票次数" />)}
-            <p style={{ color: "red" }}>(0为不限次数)</p>
          </FormItem>
          <FormItem
            {...formItemLayout}
@@ -508,7 +507,7 @@ class Base extends Component {
                    style={{ fontSize: 12, color: "#999" }}
                  />
                </Tooltip>
-                调研logo
+                投票logo
              </span>
            }
          >
@@ -517,7 +516,7 @@ class Base extends Component {
              rules: [
                {
                  required: false,
-                  message: "请上传调研logo",
+                  message: "请上传投票logo",
                },
              ],
            })(
@@ -550,7 +549,7 @@ class Base extends Component {
              </RadioGroup>
            )}
          </FormItem>
-          <FormItem {...formItemLayout} label="调研说明：">
+          <FormItem {...formItemLayout} label="投票说明：">
            {getFieldDecorator("content", {
              initialValue: defaultValue.content ? defaultValue.content : "",
              rules: [
@@ -561,7 +560,7 @@ class Base extends Component {
              ],
            })(<TextArea />)}
          </FormItem>
-          <FormItem {...formItemLayout} label="调研备注：">
+          <FormItem {...formItemLayout} label="投票备注：">
            {getFieldDecorator("remark", {
              initialValue: defaultValue.remark ? defaultValue.remark : "",
              rules: [
@@ -574,14 +573,14 @@ class Base extends Component {
          </FormItem>
        </Form>
        <Modal
-          title="选择调研"
+          title="选择投票"
          visible={visible}
          onOk={this.handleOk}
          confirmLoading={confirmLoading}
          onCancel={this.handleCancel}
        >
          <Search
-            placeholder="请输入调研名称"
+            placeholder="请输入投票名称"
            onSearch={this.searchValue}
            style={{ width: 200, marginBottom: 20 }}
          />

--- a/src/pages/TrainingTools/Survey/Create/index.jsx
+++ b/src/pages/TrainingTools/Survey/Create/index.jsx
@@ -265,7 +265,7 @@ class SurveyCreact extends Component {
      usable: false,
      contentFlag: true,
    };
-    console.log(details.remind, "调研消息是否提醒", this.id, "调研id");
+    console.log(details.remind, "投票消息是否提醒", this.id, "投票id");
    const steps = [
      {
        title: "基本信息",
@@ -331,23 +331,23 @@ class SurveyCreact extends Component {
          </div>
        ),
      },
-      {
+      // {
-        title: "跳题策略",
+      //   title: "跳题策略",
-        content: (
+      //   content: (
-          <div>
+      //     <div>
-            <Jumpquestion id={surid} />
+      //       <Jumpquestion id={surid} />
-          </div>
+      //     </div>
-        ),
+      //   ),
-      },
+      // },
      {
        title: "预览",
        content: (
          <div className={styles.survey_create_qccode}>
-            <p className={styles.survey_create_info}>恭喜您，调研发布成功</p>
+            <p className={styles.survey_create_info}>恭喜您，投票发布成功</p>
-            <p className={styles.survey_create_info}>调研二维码</p>
+            {/* <p className={styles.survey_create_info}>投票二维码</p>
            <div>
              <QRCode style={{ marginTop: "20px" }} value={code} key="1" />
-            </div>
+            </div> */}
          </div>
        ),
      },
@@ -356,7 +356,7 @@ class SurveyCreact extends Component {
    const { current } = this.state;
    return (
      <div className={styles.survey_create}>
-        <Breadcrumb title="新建调研" />
+        <Breadcrumb title="新建投票" />
        <Steps current={current} className={styles.survey_create_steps}>
          {steps.map(item => (
            <Step key={item.title} title={item.title} />
@@ -391,7 +391,7 @@ class SurveyCreact extends Component {
              </Button>
            </div>
          )}
-          {this.state.current === 1 && (
+          {/* {this.state.current === 1 && (
            <div>
              <Link
                to={
@@ -421,8 +421,8 @@ class SurveyCreact extends Component {
                下一步
              </Button>
            </div>
-          )}
+          )} */}
-          {this.state.current === 2 && (
+          {this.state.current === 1 && (
            <div>
              <Link
                to={
@@ -461,7 +461,7 @@ class SurveyCreact extends Component {
              </Button>
            </div>
          )}
-          {this.state.current === 3 && (
+          {this.state.current === 2 && (
            <div>
              <Link
                to={

--- a/src/pages/TrainingTools/Survey/index.jsx
+++ b/src/pages/TrainingTools/Survey/index.jsx
@@ -224,10 +224,10 @@ class Survey extends Component {
  }
  detil(id, type) {
    if (type == 1) {
-      //调研明细
+      //投票明细
      this.props.exdetail({ researchId: id });
    } else {
-      //调研分析
+      //投票分析
      this.props.exana({ researchId: id });
    }
  }
@@ -244,7 +244,7 @@ class Survey extends Component {
        key: "researchNo",
      },
      {
-        title: "调研名称",
+        title: "投票名称",
        dataIndex: "name",
        key: "name",
        width: 300,
@@ -274,7 +274,7 @@ class Survey extends Component {
        render: text => <span>{text ? text : 0}</span>,
      },
      {
-        title: "调研时间",
+        title: "投票时间",
        render: (text, record) => (
          <div>
            <div>{moment(record.startTime).format("YYYY-MM-DD HH:mm")}</div>
@@ -394,14 +394,14 @@ class Survey extends Component {
                  style={{ cursor: "pointer", color: "#1890FF" }}
                  onClick={() => this.detil(record.id, 1)}
                >
-                  调研明细导出
+                  投票明细导出
                </div>
                <div
                  className={styles.survey_list_btn}
                  style={{ cursor: "pointer", color: "#1890FF" }}
                  onClick={() => this.detil(record.id, 2)}
                >
-                  调研分析导出
+                  投票分析导出
                </div>
              </div>
            ) : null}
@@ -436,7 +436,7 @@ class Survey extends Component {
              marginTop: 16,
              marginRight: 16,
            }}
-            placeholder="请输入调研名称、自定义关键词"
+            placeholder="请输入投票名称、自定义关键词"
            onChange={this.handleChange}
          />
          <Button