From 2073439ddb4584a1daa629bd749285ffb7f1d2c3 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 10 九月 2024 13:45:03 +0800
Subject: [PATCH] 测试完成
---
src/views/tool/build/index.vue | 2
dist.zip | 0
vue.config.js | 6
src/assets/logo/logoxh.png | 0
.env.staging | 4
public/favicon1.ico | 0
src/views/register.vue | 2
.env.development | 4
src/views/login.vue | 2
src/layout/components/Sidebar/Logo.vue | 4
src/views/outsideChainwt.vue | 180 ++++++++++++++++++++++++++++++++++++++++----
package.json | 2
.env.production | 4
public/favicon.ico | 0
14 files changed, 176 insertions(+), 34 deletions(-)
diff --git a/.env.development b/.env.development
index dde9393..6b0c6ec 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
# 椤甸潰鏍囬
-VUE_APP_TITLE = 鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�
+VUE_APP_TITLE = 娴欎腑澶т簩闄㈡櫤鎱ч殢璁垮钩鍙�
# 寮�鍙戠幆澧冮厤缃�
ENV = 'development'
-# 鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�/寮�鍙戠幆澧�
+# 娴欎腑澶т簩闄㈡櫤鎱ч殢璁垮钩鍙�/寮�鍙戠幆澧�
VUE_APP_BASE_API = '/dev-api'
# 璺敱鎳掑姞杞�
diff --git a/.env.production b/.env.production
index df7f99e..2db2f3c 100644
--- a/.env.production
+++ b/.env.production
@@ -1,8 +1,8 @@
# 椤甸潰鏍囬
-VUE_APP_TITLE = 鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�
+VUE_APP_TITLE = 娴欎腑澶т簩闄㈡櫤鎱ч殢璁垮钩鍙�
# 鐢熶骇鐜閰嶇疆
ENV = 'production'
-# 鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�/鐢熶骇鐜
+# 娴欎腑澶т簩闄㈡櫤鎱ч殢璁垮钩鍙�/鐢熶骇鐜
VUE_APP_BASE_API = '/prod-api'
diff --git a/.env.staging b/.env.staging
index 097f6ae..4a1a952 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,10 +1,10 @@
# 椤甸潰鏍囬
-VUE_APP_TITLE = 鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�
+VUE_APP_TITLE = 娴欎腑澶т簩闄㈡櫤鎱ч殢璁垮钩鍙�
NODE_ENV = production
# 娴嬭瘯鐜閰嶇疆
ENV = 'staging'
-# 鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�/娴嬭瘯鐜
+# 娴欎腑澶т簩闄㈡櫤鎱ч殢璁垮钩鍙�/娴嬭瘯鐜
VUE_APP_BASE_API = '/stage-api'
diff --git a/dist.zip b/dist.zip
index 07b2e2f..223041f 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/package.json b/package.json
index 2d12b50..c537c27 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "ruoyi",
"version": "3.8.5",
- "description": "鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�",
+ "description": "娴欎腑澶т簩闄㈡櫤鎱ч殢璁垮钩鍙�",
"author": "鏉柊",
"license": "MIT",
"scripts": {
diff --git a/public/favicon.ico b/public/favicon.ico
index e263760..3c7a2b4 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/public/favicon1.ico b/public/favicon1.ico
new file mode 100644
index 0000000..e263760
--- /dev/null
+++ b/public/favicon1.ico
Binary files differ
diff --git a/src/assets/logo/logoxh.png b/src/assets/logo/logoxh.png
new file mode 100644
index 0000000..c0760d3
--- /dev/null
+++ b/src/assets/logo/logoxh.png
Binary files differ
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 36f833b..31371c6 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -49,7 +49,7 @@
</template>
<script>
-import logoImg from "@/assets/logo/logo.png";
+import logoImg from "@/assets/logo/logoxh.png";
import variables from "@/assets/styles/variables.scss";
export default {
@@ -70,7 +70,7 @@
},
data() {
return {
- title: "鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�",
+ title: "娴欎腑澶т簩闄㈡櫤鎱ч殢璁垮钩鍙�",
logo: logoImg,
};
},
diff --git a/src/views/login.vue b/src/views/login.vue
index e9975b8..8ace361 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -6,7 +6,7 @@
:rules="loginRules"
class="login-form"
>
- <h3 class="title">鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�</h3>
+ <h3 class="title">娴欎腑澶т簩闄㈡櫤鎱ч殢璁垮钩鍙�</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"
diff --git a/src/views/outsideChainwt.vue b/src/views/outsideChainwt.vue
index 6d86ebc..fca9f11 100644
--- a/src/views/outsideChainwt.vue
+++ b/src/views/outsideChainwt.vue
@@ -1,8 +1,14 @@
<template>
<div class="questionnaire">
<div class="CONTENT" v-if="!accomplish">
- <div class="title">{{ taskname ? taskname : "闂嵎" }}</div>
<div class="preview-left">
+ <div class="toptitle">
+ <div class="title">{{ taskname ? taskname : "闂嵎" }}</div>
+ <div style="font-size: 22px; margin-bottom: 20px; line-height: 1.5;">
+ {{ kcb }}
+ </div>
+ </div>
+ <el-divider></el-divider>
<!-- 鍗曢�� -->
<div
class="topic-dev"
@@ -11,14 +17,19 @@
>
<div class="scriptTopic-dev" :key="index" v-if="item.scriptType == 1">
<div class="dev-text">
- {{ index + 1 }}銆乕鍗曢�塢<span>{{ item.scriptContent }}</span>
+ {{ index + 1 }}銆�<span>{{ item.scriptContent }} <span style="color: #3BA2F7;">[鍗曢�塢</span></span>
</div>
<div class="dev-xx">
<el-radio-group
+ class="radio-group"
v-model="item.scriptResult"
@change="handleOptionChange($event, index, item)"
>
<el-radio
+ :class="{
+ 'radio-option': true,
+ 'radio-option-first': index === 0,
+ }"
border
v-for="(items, index) in item.svyLibTemplateTargetoptions"
:key="index"
@@ -34,15 +45,20 @@
<!-- 澶氶�� -->
<div class="scriptTopic-dev" :key="index" v-if="item.scriptType == 2">
<div class="dev-text">
- {{ index + 1 }}銆乕澶氶�塢<span>{{ item.scriptContent }}</span>
+ {{ index + 1 }}銆�<span>{{ item.scriptContent }} <span style="color: #3BA2F7;">[澶氶�塢</span></span>
</div>
<div class="dev-xx">
<el-checkbox-group
+ class="radio-group"
v-model="item.scriptResult"
@change="updateScore($event, index, item)"
>
<el-checkbox
- border
+ :class="{
+ 'radio-option': true,
+ 'radio-option-first': index === 0,
+ }"
+ border
@change="$forceUpdate()"
v-for="(items, indexs) in item.svyLibTemplateTargetoptions"
:key="indexs"
@@ -59,7 +75,7 @@
<!-- 濉┖ -->
<div class="scriptTopic-dev" :key="index" v-if="item.scriptType == 4">
<div class="dev-text">
- {{ index + 1 }}銆乕闂瓟]<span>{{ item.scriptContent }}</span>
+ {{ index + 1 }}銆�<span>{{ item.scriptContent }}<span style="color: #3BA2F7;">[闂瓟]</span></span>
</div>
<div class="dev-xx">
<el-input
@@ -73,13 +89,10 @@
</div>
</div>
</div>
+ <div class="bottom-fixed">
+ <el-button type="primary" style="width: 100%;" @click="cache(true)">鎻愪氦闂嵎</el-button>
+ </div>
</div>
- <el-form :model="formData" label-width="80px">
- <el-form-item>
- <el-button type="primary" @click="cache(true)">鎻愪氦闂嵎</el-button>
- <!-- <el-button type="primary" @click="cache">缂撳瓨闂嵎</el-button> -->
- </el-form-item>
- </el-form>
</div>
<div class="CONTENT" v-else>
<div class="preview-left" style="margin-top: 100px">
@@ -120,11 +133,98 @@
return {
taskid: 355,
patid: 265823,
- questionList: null,
+ kcb:'',
+ questionList: [
+ // {
+ // scriptType: 1,
+ // scriptContent: "鎮ㄧ殑骞撮緞鑼冨洿鏄紵",
+ // scriptResult: null,
+ // svyLibTemplateTargetoptions: [
+ // { optioncontent: "18-25", value: "18-25" },
+ // { optioncontent: "26-35", value: "26-35" },
+ // { optioncontent: "36-45", value: "36-45" },
+ // { optioncontent: "46-55", value: "46-55" },
+ // { optioncontent: "56+", value: "56+" },
+ // ],
+ // required: true,
+ // },
+ // {
+ // scriptType: 1,
+ // scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
+ // scriptResult: null,
+ // svyLibTemplateTargetoptions: [
+ // { optioncontent: "瀛︾敓", value: "student" },
+ // { optioncontent: "鏁欏笀", value: "teacher" },
+ // { optioncontent: "宸ョ▼甯�", value: "engineer" },
+ // { optioncontent: "鍖荤敓", value: "doctor" },
+ // { optioncontent: "鍏朵粬", value: "other" },
+ // ],
+ // required: false,
+ // },
+ // {
+ // scriptType: 2,
+ // scriptContent: "鎮ㄦ劅鍏磋叮鐨勬椿鍔ㄦ湁鍝簺锛�",
+ // scriptResult: [],
+ // svyLibTemplateTargetoptions: [
+ // { optioncontent: "鏃呮父", value: "travel" },
+ // { optioncontent: "闃呰", value: "reading" },
+ // { optioncontent: "杩愬姩", value: "sports" },
+ // { optioncontent: "闊充箰", value: "music" },
+ // { optioncontent: "鐢靛奖", value: "movies" },
+ // ],
+ // required: false,
+ // },
+ // {
+ // scriptType: 1,
+ // scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
+ // scriptResult: null,
+ // svyLibTemplateTargetoptions: [
+ // { optioncontent: "瀛︾敓", value: "student" },
+ // { optioncontent: "鏁欏笀", value: "teacher" },
+ // { optioncontent: "宸ョ▼甯�", value: "engineer" },
+ // { optioncontent: "鍖荤敓", value: "doctor" },
+ // { optioncontent: "鍏朵粬", value: "other" },
+ // ],
+ // required: false,
+ // },
+ // {
+ // scriptType: 1,
+ // scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
+ // scriptResult: null,
+ // svyLibTemplateTargetoptions: [
+ // { optioncontent: "瀛︾敓", value: "student" },
+ // { optioncontent: "鏁欏笀", value: "teacher" },
+ // { optioncontent: "宸ョ▼甯�", value: "engineer" },
+ // { optioncontent: "鍖荤敓", value: "doctor" },
+ // { optioncontent: "鍏朵粬", value: "other" },
+ // ],
+ // required: false,
+ // },
+ // {
+ // scriptType: 1,
+ // scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
+ // scriptResult: null,
+ // svyLibTemplateTargetoptions: [
+ // { optioncontent: "瀛︾敓", value: "student" },
+ // { optioncontent: "鏁欏笀", value: "teacher" },
+ // { optioncontent: "宸ョ▼甯�", value: "engineer" },
+ // { optioncontent: "鍖荤敓", value: "doctor" },
+ // { optioncontent: "鍏朵粬", value: "other" },
+ // ],
+ // required: false,
+ // },
+ // {
+ // scriptType: 4,
+ // scriptContent: "鎮ㄧ殑濮撳悕鏄粈涔堬紵",
+ // scriptResult: "name",
+ // required: true,
+ // scriptResult: null,
+ // },
+ ],
revisitAfter: null,
dialogVisible: false,
Endornot: true,
- accomplish: true,
+ accomplish: false,
// 鍓嶇鍏挜
publicKey:
"MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKR0yHv0rbJWQE+Sc7/FwpW66qMd9qX2k6z+SDgkSdxWh/1GbBoAP7bDQQRF6vXmoKsD2ya42H6XRLSDXAoayuMCAwEAAQ== ",
@@ -192,6 +292,7 @@
if (res.code == 200) {
this.questionList = res.data.script;
this.revisitAfter = res.data.revisitAfter;
+ this.kcb = res.data.kcb;
// 澶勭悊棰樼洰鏀堕泦缁撴灉鏍煎紡
this.questionList.forEach((item) => {
item.nextScriptno = Number(item.nextScriptno);
@@ -300,7 +401,7 @@
<style lang="scss" scoped>
.questionnaire {
// background-image: url("../assets/images/chainbackground.jpg");
- background-color: #DDDDDD;
+ background-color: #f9f9fb;
background-size: cover;
background-attachment: fixed; /* 淇濇寔鑳屾櫙鍥哄畾 */
background-position: center;
@@ -309,8 +410,8 @@
margin: 0;
padding: 0;
.CONTENT {
- padding: 10px;
.title {
+ color: #3769F3;
font-size: 22px;
font-weight: bold;
margin-bottom: 20px;
@@ -320,6 +421,9 @@
}
.preview-left {
margin: 10px;
+ margin-bottom: 60px;
+ background-color: #fff;
+ border-radius: 5px;
// margin: 20px;
padding: 10px;
// background: #ffff;
@@ -334,18 +438,56 @@
}
}
}
+.radio-group {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 10px; /* 璁剧疆閫夐」涔嬮棿鐨勯棿闅� */
+ align-items: start; /* 纭繚閫夐」涓婁笅瀵归綈 */
+ padding: 10px 0; /* 涓烘暣涓粍璁剧疆涓婁笅闂撮殧 */
+}
+
+.radio-option {
+ flex: none; /* 涓嶈閫夐」鑷姩濉厖绌洪棿 */
+ white-space: nowrap; /* 闃叉閫夐」鏂囨湰鎹㈣ */
+ margin: 0 10px; /* 璁剧疆閫夐」宸﹀彸鐨勯棿闅� */
+ font-size: 20px; /* 澧炲ぇ瀛椾綋澶у皬 */
+}
+
+.el-radio__label {
+ font-size: 20px; /* 澧炲ぇ鏍囩鏂囧瓧澶у皬 */
+}
+.toptitle {
+}
+.bottom-fixed {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ padding: 10px 0; /* 鏍规嵁闇�瑕佽皟鏁村唴杈硅窛 */
+ background: #fff; /* 鏍规嵁闇�瑕佽皟鏁磋儗鏅鑹� */
+ box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1); /* 鍙�夌殑闃村奖鏁堟灉 */
+ z-index: 1000; /* 纭繚鎸夐挳鍦ㄩ〉闈㈡渶涓婂眰 */
+}
::v-deep.el-alert--warning.is-light {
background-color: #fbf9f3;
color: #ffba00;
}
::v-deep {
.el-alert__title {
- font-size: 18px;
+ font-size: 20px;
line-height: 18px;
}
}
-::v-deep.el-radio.el-radio__label {
- font-size: 22px;
- line-height: 2;
+::v-deep.el-radio--medium.is-bordered .el-radio__label {
+ font-size: 20px;
+}
+::v-deep.el-radio--medium.is-bordered {
+ padding: 5px 20px 0px 10px;
+ border-radius: 4px;
+ height: 36px;
+}
+::v-deep.el-checkbox.is-bordered.el-checkbox--medium .el-checkbox__label {
+ line-height: 17px;
+ font-size: 20px;
}
</style>
diff --git a/src/views/register.vue b/src/views/register.vue
index fda2d82..0f89d7e 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -6,7 +6,7 @@
:rules="registerRules"
class="register-form"
>
- <h3 class="title">鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�</h3>
+ <h3 class="title">娴欎腑澶т簩闄㈡櫤鎱ч殢璁垮钩鍙�</h3>
<el-form-item prop="username">
<el-input
v-model="registerForm.username"
diff --git a/src/views/tool/build/index.vue b/src/views/tool/build/index.vue
index d679422..2c8efa0 100644
--- a/src/views/tool/build/index.vue
+++ b/src/views/tool/build/index.vue
@@ -147,7 +147,7 @@
import { makeUpJs } from '@/utils/generator/js'
import { makeUpCss } from '@/utils/generator/css'
import drawingDefault from '@/utils/generator/drawingDefault'
-import logo from '@/assets/logo/logo.png'
+import logo from '@/assets/logo/logoxh.png'
import CodeTypeDialog from './CodeTypeDialog'
import DraggableItem from './DraggableItem'
diff --git a/vue.config.js b/vue.config.js
index 60e2b6f..481b81d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,9 +7,9 @@
const CompressionPlugin = require('compression-webpack-plugin')
-const name = process.env.VUE_APP_TITLE || '鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�' // 缃戦〉鏍囬
+const name = process.env.VUE_APP_TITLE || '娴欎腑澶т簩闄㈡櫤鎱ч殢璁垮钩鍙�' // 缃戦〉鏍囬
-const port = process.env.port || process.env.npm_config_port || 8093 // 绔彛
+const port = process.env.port || process.env.npm_config_port || 8096 // 绔彛
// vue.config.js 閰嶇疆璇存槑
//瀹樻柟vue.config.js 鍙傝�冩枃妗� https://cli.vuejs.org/zh/config/#css-loaderoptions
@@ -37,7 +37,7 @@
[process.env.VUE_APP_BASE_API]: {
target: `http://192.168.1.10:8095`,
// target:`http://localhost:8095`,
- // target: `http://192.168.101.135:8095`,
+ // target: `http://192.168.101.166:8093`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.9.3