From 1150720266547527daec0edbe59f0b395f0cddc6 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 05 二月 2024 14:52:04 +0800
Subject: [PATCH] Merge branch 'wulong' of http://116.62.18.175:6699/r/~yxh/smartor-web into yxh01
---
src/views/knowledge/questionnaire/compilequer/index.vue | 488 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 392 insertions(+), 96 deletions(-)
diff --git a/src/views/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue
index 2bb899e..03e8202 100644
--- a/src/views/knowledge/questionnaire/compilequer/index.vue
+++ b/src/views/knowledge/questionnaire/compilequer/index.vue
@@ -19,6 +19,7 @@
</div>
<!-- 鍙充晶鏁版嵁 -->
<div class="leftvlue">
+ <!-- 鍩烘湰淇℃伅 -->
<div v-if="Editprogress == 1">
<div class="leftvlue-jbxx">
鍩烘湰淇℃伅<span>褰撳墠鐗堟湰:{{ currentVersion }}</span>
@@ -66,6 +67,7 @@
</el-form-item>
</el-form>
</div>
+ <!-- 闂嵎璁剧疆 -->
<div v-if="Editprogress == 2">
<div class="leftvlue-jbxx">闂嵎璁剧疆</div>
<el-form
@@ -81,7 +83,6 @@
v-model="ruleForm.templatevalue"
:options="options"
:props="{ expandTrigger: 'hover' }"
- @change="handleChange"
></el-cascader>
<el-select v-model="ruleForm.data2" placeholder="鎻愪氦鎻愮ず">
<el-option
@@ -92,16 +93,123 @@
>
</el-option>
</el-select>
- <dev class="PreviewTemplate" @click="PreviewTemplate()"
- >棰勮妯＄増</dev
- >
- <el-button type="primary">纭寮曠敤</el-button>
+ <div style="display: flex; margin-top: 20px">
+ <div class="PreviewTemplate" @click="PreviewTemplate()">
+ 棰勮妯＄増
+ </div>
+ <el-button type="primary">纭寮曠敤</el-button>
+ </div>
</el-form-item>
<el-form-item label="娲诲姩褰㈠紡" prop="desc">
<el-input type="textarea" v-model="ruleForm.desc"></el-input>
</el-form-item>
<el-form-item label="娲诲姩褰㈠紡" prop="desc">
<el-input type="textarea" v-model="ruleForm.desc"></el-input>
+ <div class="addtopic">
+ <el-select
+ v-model="addvalue"
+ @change="changeaddtopic"
+ class="addtopic-input"
+ >
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </div>
+
+ <div class="presentation">
+ <div class="presentation-left">
+ <el-table v-loading="loading" :data="userList">
+ <el-table-column
+ label="搴忓彿"
+ align="center"
+ key="userid"
+ prop="userid"
+ />
+ <el-table-column
+ label="棰樼洰"
+ align="center"
+ key="userName"
+ prop="userName"
+ :show-overflow-tooltip="true"
+ />
+
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ width="300"
+ class-name="small-padding fixed-width"
+ >
+ <template slot-scope="scope">
+ <!-- <el-button
+ size="medium"
+ type="text"
+ @click="goQRCode(scope.row)"
+ v-hasPermi="['system:user:edit']"
+ >
+ <span class="button-text"
+ ><i class="el-icon-edit"></i>浜岀淮鐮�</span
+ ></el-button
+ >
+ <el-button
+ size="medium"
+ type="text"
+ @click="ViewQuestionnaire(scope.row)"
+ v-hasPermi="['system:user:edit']"
+ ><span class="button-textck"
+ ><i class="el-icon-edit"></i>鏌ョ湅</span
+ ></el-button
+ > -->
+ <el-button
+ size="medium"
+ type="text"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['system:user:edit']"
+ ><span class="button-textxg"
+ ><i class="el-icon-scissors"></i>淇敼</span
+ ></el-button
+ >
+ <el-button
+ size="medium"
+ type="text"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:user:remove']"
+ ><span class="button-textsc"
+ ><i class="el-icon-delete"></i>鍒犻櫎</span
+ ></el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
+ />
+ </div>
+ <div class="presentation-right">
+ <div class="headline">棰樼洰璁剧疆璇︽儏</div>
+ <div>棰樼洰鏍囬锛�<span>杩欏鏈烘瀯鎬庝箞鏍�</span></div>
+ <div>鏄惁蹇呯瓟锛�<span>鏄�</span> 鏄惁闅愯棌锛�<span>鍚�</span></div>
+ <div class="headline">閫夐」璁剧疆</div>
+ <div>
+ <p>閫夐」1:<span>鍖荤枟鏈烘瀯</span></p>
+ <p>
+ 濉啓鏄庣粏锛�<span>鏃�</span> 寮傚父閫夐」锛�<span>鏃�</span>
+ 鍒嗗�硷細<span>3</span>
+ </p>
+ <p>閫変腑鎻愮ず锛�<span>杩欎釜棰樻湁鐐归毦璇锋敞鎰�</span></p>
+ <p>閫変腑璺宠浆锛�<span>鏃�</span></p>
+ </div>
+ </div>
+ </div>
</el-form-item>
<el-form-item>
<el-button type="success" @click="submitForm('ruleForm')"
@@ -112,74 +220,60 @@
</el-form-item>
</el-form>
</div>
+ <!-- 闂嵎棰勮 -->
<div v-if="Editprogress == 3">
- <el-form
- :model="ruleForm"
- :rules="rules"
- ref="ruleForm"
- label-width="100px"
- class="demo-ruleForm"
+ <div class="preview-left">
+ <!-- 鍗曢�� -->
+ <div class="topic-dev" v-for="item in valssu" :key="item.aaa">
+ <div class="dev-text">
+ {{ item.idd }}銆乕鍗曢�塢<span>{{ item.wssd }}</span>
+ </div>
+ <div class="dev-xx">
+ <el-radio-group v-model="radio">
+ <el-radio
+ v-for="(items, index) in item.sdadd"
+ :key="index"
+ :label="index"
+ >{{ items }}</el-radio
+ >
+ </el-radio-group>
+ </div>
+ </div>
+ <!-- 澶氶�� -->
+ <div class="topic-dev" v-for="item in valssu" :key="item.aaa">
+ <div class="dev-text">
+ {{ item.idd }}銆乕澶氶�塢<span>{{ item.wssd }}</span>
+ </div>
+ <div class="dev-xx">
+ <el-checkbox-group v-model="radios">
+ <el-checkbox
+ v-for="(items, index) in item.sdadd"
+ :key="index"
+ :label="index"
+ >
+ {{ items }}
+ </el-checkbox>
+ </el-checkbox-group>
+ </div>
+ </div>
+ <!-- 濉┖ -->
+ <div class="topic-dev" v-for="item in valssu" :key="item.aaa">
+ <div class="dev-text">
+ {{ item.idd }}銆乕濉┖]<span>{{ item.wssd }}</span>
+ </div>
+ <div class="dev-xx">
+ <el-input placeholder="璇疯緭鍏ョ瓟妗�" v-model="radioas" clearable>
+ </el-input>
+ </div>
+ </div>
+ </div>
+ <el-button type="success" @click="submitForm('ruleForm')"
+ >涓嬩竴姝�</el-button
>
- <el-form-item label="娲诲姩鍚嶇О" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
- </el-form-item>
- <el-form-item label="娲诲姩鍖哄煙" prop="region">
- <el-select v-model="ruleForm.region" placeholder="璇烽�夋嫨娲诲姩鍖哄煙">
- <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
- <el-option label="鍖哄煙浜�" value="beijing"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="娲诲姩鏃堕棿" required>
- <el-col :span="11">
- <el-form-item prop="date1">
- <el-date-picker
- type="date"
- placeholder="閫夋嫨鏃ユ湡"
- v-model="ruleForm.date1"
- style="width: 100%"
- ></el-date-picker>
- </el-form-item>
- </el-col>
- <el-col class="line" :span="2">-</el-col>
- <el-col :span="11">
- <el-form-item prop="date2">
- <el-time-picker
- placeholder="閫夋嫨鏃堕棿"
- v-model="ruleForm.date2"
- style="width: 100%"
- ></el-time-picker>
- </el-form-item>
- </el-col>
- </el-form-item>
- <el-form-item label="鍗虫椂閰嶉��" prop="delivery">
- <el-switch v-model="ruleForm.delivery"></el-switch>
- </el-form-item>
- <el-form-item label="娲诲姩鎬ц川" prop="type">
- <el-checkbox-group v-model="ruleForm.type">
- <el-checkbox label="缇庨/椁愬巺绾夸笂娲诲姩" name="type"></el-checkbox>
- <el-checkbox label="鍦版帹娲诲姩" name="type"></el-checkbox>
- <el-checkbox label="绾夸笅涓婚娲诲姩" name="type"></el-checkbox>
- <el-checkbox label="鍗曠函鍝佺墝鏇濆厜" name="type"></el-checkbox>
- </el-checkbox-group>
- </el-form-item>
- <el-form-item label="鐗规畩璧勬簮" prop="resource">
- <el-radio-group v-model="ruleForm.resource">
- <el-radio label="绾夸笂鍝佺墝鍟嗚禐鍔�"></el-radio>
- <el-radio label="绾夸笅鍦哄湴鍏嶈垂"></el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="娲诲姩褰㈠紡" prop="desc">
- <el-input type="textarea" v-model="ruleForm.desc"></el-input>
- </el-form-item>
- <el-form-item>
- <el-button type="success" @click="submitForm('ruleForm')"
- >涓嬩竴姝�</el-button
- >
- <el-button type="primary" @click="laststep()">涓婁竴姝�</el-button>
- <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
+ <el-button type="primary" @click="laststep()">涓婁竴姝�</el-button>
+ <!-- <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button> -->
</div>
+ <!-- 缁撴灉鍙嶉 -->
<div v-if="Editprogress == 4">
<el-form
:model="ruleForm"
@@ -249,12 +343,58 @@
</el-form>
</div>
</div>
+ <!-- 棰勮妯＄増寮圭獥 -->
<el-drawer
- title="鎴戞槸鏍囬"
+ title="闂嵎棰勮"
:visible.sync="drawer"
- :before-close="handleClose"
+ custom-class="demo-drawer"
+ width="50%"
>
- <span>鎴戞潵鍟�!</span>
+ <div class="preview-left">
+ <!-- 鍗曢�� -->
+ <div class="topic-dev" v-for="item in valssu" :key="item.aaa">
+ <div class="dev-text">
+ {{ item.idd }}銆乕鍗曢�塢  <span>{{ item.wssd }}</span>
+ </div>
+ <div class="dev-xx">
+ <el-radio-group v-model="radio">
+ <el-radio
+ v-for="(items, index) in item.sdadd"
+ :key="index"
+ :label="index"
+ >{{ items }}</el-radio
+ >
+ </el-radio-group>
+ </div>
+ </div>
+ <!-- 澶氶�� -->
+ <div class="topic-dev" v-for="item in valssu" :key="item.aaa">
+ <div class="dev-text">
+ {{ item.idd }}銆乕澶氶�塢  <span>{{ item.wssd }}</span>
+ </div>
+ <div class="dev-xx">
+ <el-checkbox-group v-model="radios">
+ <el-checkbox
+ v-for="(items, index) in item.sdadd"
+ :key="index"
+ :label="index"
+ >
+ {{ items }}
+ </el-checkbox>
+ </el-checkbox-group>
+ </div>
+ </div>
+ <!-- 濉┖ -->
+ <div class="topic-dev" v-for="item in valssu" :key="item.aaa">
+ <div class="dev-text">
+ {{ item.idd }}銆乕濉┖]  <span>{{ item.wssd }}</span>
+ </div>
+ <div class="dev-xx">
+ <el-input placeholder="璇疯緭鍏ョ瓟妗�" v-model="radioas" clearable>
+ </el-input>
+ </div>
+ </div>
+ </div>
</el-drawer>
</div>
</template>
@@ -264,9 +404,15 @@
data() {
return {
sidecolumnrabs: "left", //鏂瑰悜
- Editprogress: 1, //缂栬緫杩涘害
+ Editprogress: 2, //缂栬緫杩涘害
currentVersion: "1.2.3", //褰撳墠鐗堟湰
+ loading: false, // 閬僵灞�
drawer: false, //鎺у埗灞曞紑
+ radio: "false", //鍗曢�夐閫変腑
+ radios: [], //澶氶�夐閫変腑
+ radioas: "", //濉┖棰樼瓟妗�
+ // 鎬绘潯鏁�
+ total: 1,
ruleForm: {
name: "",
region: "",
@@ -317,28 +463,28 @@
],
desc: [{ required: true, message: "璇峰～鍐欐椿鍔ㄥ舰寮�", trigger: "blur" }],
},
- options: [
- {
- value: "閫夐」1",
- label: "榛勯噾绯�",
- },
- {
- value: "閫夐」2",
- label: "鍙岀毊濂�",
- },
- {
- value: "閫夐」3",
- label: "铓典粩鐓�",
- },
- {
- value: "閫夐」4",
- label: "榫欓』闈�",
- },
- {
- value: "閫夐」5",
- label: "鍖椾含鐑ら腑",
- },
- ],
+ // options: [
+ // {
+ // value: "閫夐」1",
+ // label: "榛勯噾绯�",
+ // },
+ // {
+ // value: "閫夐」2",
+ // label: "鍙岀毊濂�",
+ // },
+ // {
+ // value: "閫夐」3",
+ // label: "铓典粩鐓�",
+ // },
+ // {
+ // value: "閫夐」4",
+ // label: "榫欓』闈�",
+ // },
+ // {
+ // value: "閫夐」5",
+ // label: "鍖椾含鐑ら腑",
+ // },
+ // ],
options: [
{
value: "zhinan",
@@ -607,6 +753,58 @@
],
},
],
+ valssu: [
+ {
+ idd: 1,
+ wssd: "浣犳渶杩戞�庝箞鏍�",
+ sdadd: ["sss", "ssccss", "ssaas", "ss"],
+ },
+ ],
+ // options: [
+ // {
+ // value: "閫夐」1",
+ // label: "鍗曢��",
+ // },
+ // {
+ // value: "閫夐」2",
+ // label: "澶氶��",
+ // disabled: true,
+ // },
+ // {
+ // value: "閫夐」3",
+ // label: "濉┖",
+ // },
+ // ],
+ addvalue: "娣诲姞棰樼洰",
+ // 棰樼洰琛ㄦ牸鏁版嵁
+ userList: [
+ {
+ userid: "1",
+ userName: "涓�鍙烽棶鍗�",
+ },
+ {
+ userid: "2",
+ userName: "浜屽彿闂嵎",
+ },
+ {
+ userid: "3",
+ userName: "涓夊彿闂嵎",
+ },
+ {
+ userid: "4",
+ userName: "鍥涘彿闂嵎",
+ },
+ ],
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ userName: undefined,
+ phonenumber: undefined,
+ status: undefined,
+ deptId: undefined,
+ IDnumber: undefined,
+ },
};
},
@@ -627,6 +825,25 @@
return false;
}
});
+ },
+ /** 鏌ヨ棰樼洰鍒楄〃 */
+ getList() {
+ // this.loading = true;
+ listUser().then((response) => {
+ console.log(response);
+ // this.userList = response.data;
+ // this.total = response.total;
+ // this.loading = false;
+ console.log(this.userList);
+ });
+ // const { rows } = await listUser();
+ // console.log(rows);
+ // this.list = rows;
+ },
+ changeaddtopic(val) {
+ console.log(11);
+ console.log(val);
+ this.addvalue = "娣诲姞棰樼洰";
},
// 棰勮妯＄増
PreviewTemplate() {
@@ -692,6 +909,64 @@
margin: 0 20px;
}
}
+.preview-left {
+ margin: 20px;
+ // margin: 20px;
+ padding: 30px;
+ background: #ffff;
+ border: 1px solid #dcdfe6;
+ -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
+ 0 0 6px 0 rgba(0, 0, 0, 0.04);
+ .topic-dev {
+ margin-bottom: 25px;
+ font-size: 20px !important;
+ .dev-text {
+ margin-bottom: 10px;
+ }
+ }
+}
+.addtopic {
+ margin-top: 30px;
+}
+.presentation {
+ margin: 20px 0;
+ display: flex;
+ .presentation-left {
+ width: 50%;
+ height: 500px;
+ .button-textxg {
+ color: #024df0;
+ }
+ .button-textsc {
+ color: #f52727;
+ }
+ }
+ .presentation-right {
+ width: 50%;
+ height: 500px;
+ padding: 20px;
+ font-size: 18px;
+ border: 1px solid #909091;
+ span {
+ padding: 0 35px;
+ margin-right: 10px;
+ border-bottom: 1px solid #909091;
+ }
+ .headline {
+ font-size: 20px;
+ border-left: 3px solid #41a1be;
+ padding-left: 5px;
+ margin: 15px 0;
+ }
+ }
+}
+::v-deep .addtopic-input {
+ input {
+ background: #02a7f0;
+ color: #edf1f7;
+ width: 150px;
+ }
+}
::v-deep.el-step.is-vertical .el-step__title {
font-size: 25px;
}
@@ -707,4 +982,25 @@
font-size: 20px;
max-width: 888px !important;
}
+::v-deep.el-radio__inner {
+ width: 22px;
+ height: 22px;
+}
+// ::v-deep.topic-dev.el-radio__label {
+// font-size: 24px;
+// }
+::v-deep.el-radio-group {
+ span {
+ font-size: 24px;
+ }
+}
+::v-deep.el-checkbox-group {
+ span {
+ font-size: 24px;
+ }
+}
+// ::v-deep.el-form-item--medium .el-form-item__content {
+// line-height: 36px;
+// display: flex;
+// }
</style>
--
Gitblit v1.9.3