From 8cdcc9b986f9d3c4672b2b9109a1edfc3548de45 Mon Sep 17 00:00:00 2001
From: heimawl <1785969728@qq.com>
Date: 星期二, 04 七月 2023 13:59:25 +0800
Subject: [PATCH] 11
---
src/views/complaint/complaintmy/index.vue | 17 +
src/views/login.vue | 7
vue.config.js | 2
src/views/shortmessage/communication/index.vue | 3
src/views/shortmessage/messagebank/index.vue | 338 ++++++++++++++++++-------------------
src/views/complaint/complaintlist/index.vue | 17 +
src/views/shortmessage/messagebank/compile/index.vue | 155 +++++++++++++++++
7 files changed, 363 insertions(+), 176 deletions(-)
diff --git a/src/views/complaint/complaintlist/index.vue b/src/views/complaint/complaintlist/index.vue
new file mode 100644
index 0000000..c1f894c
--- /dev/null
+++ b/src/views/complaint/complaintlist/index.vue
@@ -0,0 +1,17 @@
+<template>
+ <div>鎶曡瘔鍒楄〃</div>
+</template>
+
+<script>
+export default {
+ data() {
+ return {};
+ },
+
+ created() {},
+
+ methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/complaint/complaintmy/index.vue b/src/views/complaint/complaintmy/index.vue
new file mode 100644
index 0000000..7c13ca3
--- /dev/null
+++ b/src/views/complaint/complaintmy/index.vue
@@ -0,0 +1,17 @@
+<template>
+ <div>鎴戠殑鎶曡瘔</div>
+</template>
+
+<script>
+export default {
+ data() {
+ return {};
+ },
+
+ created() {},
+
+ methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/login.vue b/src/views/login.vue
index 6402807..f595938 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -36,7 +36,7 @@
/>
</el-input>
</el-form-item>
- <el-form-item prop="code" v-if="captchaEnabled">
+ <!-- <el-form-item prop="code" v-if="captchaEnabled">
<el-input
v-model="loginForm.code"
auto-complete="off"
@@ -53,7 +53,7 @@
<div class="login-code">
<img :src="codeUrl" @click="getCode" class="login-code-img" />
</div>
- </el-form-item>
+ </el-form-item> -->
<el-checkbox
v-model="loginForm.rememberMe"
style="margin: 0px 0px 25px 0px"
@@ -108,7 +108,7 @@
password: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勫瘑鐮�" },
],
- code: [{ required: true, trigger: "change", message: "璇疯緭鍏ラ獙璇佺爜" }],
+ // code: [{ required: true, trigger: "change", message: "璇疯緭鍏ラ獙璇佺爜" }],
},
loading: false,
// 楠岃瘉鐮佸紑鍏�
@@ -133,6 +133,7 @@
methods: {
getCode() {
getCodeImg().then((res) => {
+ console.log(res);
this.captchaEnabled =
res.captchaEnabled === undefined ? true : res.captchaEnabled;
if (this.captchaEnabled) {
diff --git a/src/views/shortmessage/communication/index.vue b/src/views/shortmessage/communication/index.vue
index 34e458f..18df674 100644
--- a/src/views/shortmessage/communication/index.vue
+++ b/src/views/shortmessage/communication/index.vue
@@ -625,7 +625,8 @@
},
// 鍙戦�佹柊娑堟伅瑙﹀彂
handleSend(message, next, file) {
- console.log(message, file);
+ console.log(message);
+ console.log(file);
console.log(next);
this.requstWs();
setTimeout(() => {
diff --git a/src/views/shortmessage/messagebank/compile/index.vue b/src/views/shortmessage/messagebank/compile/index.vue
new file mode 100644
index 0000000..bd742e1
--- /dev/null
+++ b/src/views/shortmessage/messagebank/compile/index.vue
@@ -0,0 +1,155 @@
+<template>
+ <div>
+ <div class="headline">
+ <div class="basics">闂閰嶇疆</div>
+ <div class="headbottom">
+ <el-button type="primary" icon="el-icon-notebook-2" @click="addzbiaofn"
+ >鍋ュ悍淇℃伅妯＄増</el-button
+ >
+ <el-button @click="emptyfn" type="primary" icon="el-icon-refresh-right"
+ >娓呯┖鐭俊鍐呭</el-button
+ >
+ </div>
+ </div>
+ <div class="top-text">
+ <el-input
+ :rows="5"
+ placeholder="璇疯緭鍏ョ煭淇″唴瀹规垨鍒╃敤妯℃澘杩涜缂栬緫"
+ type="textarea"
+ v-model="form.desc"
+ ></el-input>
+ </div>
+ <div class="headline">
+ <div class="basics">
+ 鎺ユ敹鐭俊鍙风爜<span>娉細鎵嬫満鍙风爜鐢ㄨ嫳鏂囩鍙� ';' 鍒嗛殧寮�锛�</span>
+ </div>
+ <div class="headbottom">
+ <el-button type="primary" icon="el-icon-phone" @click="selectphp"
+ >閫夋辰鍙风爜</el-button
+ >
+ <el-button
+ type="primary"
+ icon="el-icon-refresh-right
+"
+ >娓呯┖鍙风爜</el-button
+ >
+ </div>
+ </div>
+ <div class="top-text">
+ <el-input
+ :rows="5"
+ placeholder="璇疯緭鍏�"
+ type="textarea"
+ v-model="form.desc"
+ ></el-input>
+ </div>
+ <div class="headlinetwo">
+ <div class="basics">
+ <el-checkbox v-model="form.checked">棰勭害鍙戦��</el-checkbox>
+ </div>
+ <div class="headbottom">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-arrow-left"
+ @click="addzbiao"
+ >杩斿洖鐭俊鍒楄〃</el-button
+ >
+ <el-button type="success" plain icon="el-icon-position">鍙戦��</el-button>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+export default {
+ data() {
+ return {
+ optionvalue: "涓嶉渶瑕併�佹病鏈夈�佷笉鐭ラ亾",
+ form: {
+ name: "",
+ region: "",
+ date1: "",
+ date2: "",
+ delivery: false,
+ type: [],
+ resource: "",
+ desc: "",
+ },
+ deployList: [
+ {
+ id: 1,
+ name: "鏈�",
+ valuetop:
+ "(?!.*蹇榺.*涓峾.*娌�)^.*(鏄瘄鏈墊瀵箌鍋殀浣渱妫�|鏌澶嶈瘖|濂絴鍙傚姞|澶嶈瘖|鍘�(杩噟濂絴浜唡瀹寍鍖婚櫌)|鏉�(杩噟浜唡鍖婚櫌))|娌￠敊|瀵瑰憖|鍙兘|(宸茬粡|鏃�)鍘讳簡|寮�浜嗚嵂|鑵板甫|鍚婂甫|瑕佺殑|(?<!娌�)鏈夌殑|琛ㄥ甫,10;瑕�,5",
+ },
+ {
+ id: 2,
+ name: "涓嶇煡閬�",
+ valuetop:
+ "(涓峾娌璋亅楝紎鎬庝箞).*(鐥厊鍙兘|鐭ラ亾|浜嗚В|娓呮|鎳倈鏄庣櫧|纭|纭畾|鏅撳緱|鐭ユ檽|璁ゅ緱|璇嗗緱|鍗拌薄|鐔熸倝|璁皘浼殀鍏冲績|鍏虫敞|娉ㄦ剰|鍛婅瘔|閫氱煡|鍚�)",
+ },
+ ],
+ };
+ },
+
+ created() {},
+
+ methods: {
+ onSubmit() {
+ console.log("submit!");
+ },
+ deletei(index) {
+ console.log(index);
+ this.deployList.splice(index, 1);
+ },
+ addzbiao() {
+ this.$router.go(-1);
+ },
+ },
+};
+</script>
+
+<style lang="scss" scoped>
+.top-text {
+ margin: 15px;
+ margin-top: 0;
+ padding: 10px;
+ background: #f2f5fc;
+ 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);
+}
+.basic {
+ height: 50px;
+ margin: 15px;
+ margin-bottom: 0;
+ padding: 0 20px 20px 20px;
+ line-height: 50px;
+ background: #92c5f0;
+}
+.headline {
+ display: flex;
+ height: 50px;
+ margin: 15px;
+ margin-bottom: 0;
+ padding: 0 20px 20px 20px;
+ line-height: 50px;
+ background: #92c5f0;
+ justify-content: space-between;
+ span {
+ margin-left: 20px;
+ color: #fa3a3a;
+ font-weight: 600;
+ }
+}
+.headlinetwo {
+ display: flex;
+ height: 50px;
+ margin: 15px;
+ margin-bottom: 0;
+ padding: 0 20px 20px 20px;
+ line-height: 50px;
+ justify-content: space-between;
+}
+</style>
diff --git a/src/views/shortmessage/messagebank/index.vue b/src/views/shortmessage/messagebank/index.vue
index 98fc3b7..b8ae5f9 100644
--- a/src/views/shortmessage/messagebank/index.vue
+++ b/src/views/shortmessage/messagebank/index.vue
@@ -3,37 +3,42 @@
<!-- 宸︿晶鏍� -->
<div class="sidecolumn">
<div class="notebuttom"><i class="el-icon-chat-dot-square" />鍙戠煭淇�</div>
+ <el-divider></el-divider>
<div class="notestate">
<div class="state-text">鐭俊鐘舵��</div>
- <div class="state-line">
- <div class="value-left">
- <i class="el-icon-chat-dot-square" />鍏ㄩ儴
- </div>
+ <div
+ :class="classestag == 1 ? 'state-lines' : 'state-line'"
+ @click="completefn"
+ >
+ <div class="value-left"><i class="el-icon-menu" />鍏ㄩ儴</div>
<div class="quantityq">22</div>
</div>
- <div class="state-line">
- <div class="value-left">
- <i class="el-icon-chat-dot-square" />鍙戦�佹垚鍔�
- </div>
+ <div
+ :class="classestag == 2 ? 'state-lines' : 'state-line'"
+ @click="succeedfn"
+ >
+ <div class="value-left"><i class="el-icon-s-claim" />鍙戦�佹垚鍔�</div>
<div class="quantitycg">22</div>
</div>
- <div class="state-line">
- <div class="value-left">
- <i class="el-icon-chat-dot-square" />鍙戦�佸け璐�
- </div>
+ <div
+ :class="classestag == 3 ? 'state-lines' : 'state-line'"
+ @click="losefn"
+ >
+ <div class="value-left"><i class="el-icon-warning" />鍙戦�佸け璐�</div>
<div class="quantitysb">22</div>
</div>
- <div class="state-line">
- <div class="value-left">
- <i class="el-icon-chat-dot-square" />寰呭彂閫�
- </div>
+ <div
+ :class="classestag == 4 ? 'state-lines' : 'state-line'"
+ @click="awaitfn"
+ >
+ <div class="value-left"><i class="el-icon-s-comment" />寰呭彂閫�</div>
<div class="quantityd">22</div>
</div>
</div>
</div>
<!-- 鍙充晶鏁版嵁 -->
<div class="leftvlue">
- <div class="leftvlue-top">鐭俊璇︽儏</div>
+ <div class="leftvlue-top">鐭俊璇︽儏({{ total }})</div>
<div class="leftvlue-bg">
<el-row :gutter="20">
<!--鐢ㄦ埛鏁版嵁-->
@@ -55,7 +60,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
+ <el-form-item label="涓婁紶鏃ユ湡">
<el-date-picker
v-model="dateRange"
style="width: 240px"
@@ -148,63 +153,84 @@
prop="userId"
/>
<el-table-column
- label="涓绘棬"
+ label="鎵嬫満鍙风爜"
align="center"
key="userName"
prop="userName"
:show-overflow-tooltip="true"
/>
<el-table-column
- label="闂鏂囨湰"
+ label="绫诲瀷"
align="center"
key="nickName"
prop="nickName"
- width="400"
:show-overflow-tooltip="true"
/>
<el-table-column
- label="闂璇煶"
+ label="鍙戦�佷汉"
align="center"
- key="aphonenumber"
- prop="aphonenumber"
- width="400"
+ key="transmitleg"
+ prop="transmitleg"
/><el-table-column
- label="鍏宠仈鎸囨爣"
+ label="鎺ユ敹浜�"
align="center"
key="bphonenumber"
prop="bphonenumber"
width="120"
/>
<el-table-column
- label="鎸囨爣閫夐」"
+ label="涓婁紶鏃堕棿"
align="center"
- key="bphonenumber"
- prop="bphonenumber"
- width="120"
- />
- <el-table-column
- label="璇█"
- align="center"
- key="indicator"
- prop="indicator"
- width="120"
- />
- <el-table-column label="鏄惁鍚敤" align="center" key="status">
+ prop="createTime"
+ width="160"
+ >
<template slot-scope="scope">
- <el-switch
- v-model="scope.row.status"
- active-value="0"
- inactive-value="1"
- @change="handleStatusChange(scope.row)"
- ></el-switch>
+ <span>{{ parseTime(scope.row.createTime) }}</span>
+ </template> </el-table-column
+ ><el-table-column
+ label="鍙戦�佹椂闂�"
+ align="center"
+ prop="createTime"
+ width="160"
+ >
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.createTime) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鍙戦�佸唴瀹�"
+ align="center"
+ key="sendvalue"
+ prop="sendvalue"
+ width="300"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="鍙戦�佺姸鎬�"
+ align="center"
+ key="state"
+ prop="state"
+ >
+ <template slot-scope="scope">
+ <div
+ v-if="scope.row.state == 1"
+ style="color: rgb(58, 250, 144)"
+ >
+ <i class="el-icon-check"></i>
+ </div>
+ <div
+ v-else-if="scope.row.state == 2"
+ style="color: rgb(250, 96, 58)"
+ >
+ <i class="el-icon-check"></i>
+ </div>
</template>
</el-table-column>
<el-table-column
label="鎿嶄綔"
align="center"
- width="200"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
@@ -214,25 +240,7 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']"
><span class="button-textxg"
- ><i class="el-icon-edit-outline"></i>淇敼</span
- ></el-button
- >
- <el-button
- size="medium"
- type="text"
- @click="compileUpdate(scope.row)"
- v-hasPermi="['system:user:edit']"
- ><span class="button-bji"
- ><i class="el-icon-edit"></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-solid"></i>鍒犻櫎</span
+ ><i class="el-icon-edit-outline"></i>鍐嶆鍙戦��</span
></el-button
>
</template>
@@ -466,7 +474,6 @@
components: { Treeselect },
data() {
return {
- topactiveName: "Local", //椤堕儴閫夋嫨
// 閬僵灞�
loading: false,
// 閫変腑鏁扮粍
@@ -479,6 +486,7 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
+ classestag: 1, //绫诲埆鏍囪瘑
namequestionnaire: "",
haoquestionnaire: "",
idds: "",
@@ -643,68 +651,8 @@
console.log(this.userList);
});
},
- // 娣诲姞銆佷慨鏀圭被鍒�
- submitsidecolumn() {
- if (this.amendtag) {
- this.classifyform.tagcategoryid = this.idds;
- // toamendtagcategory(this.addDateRange(this.classifyform)).then(
- // (response) => {
- // console.log(response);
- // this.gitclasify();
- // }
- // );
- } else {
- // addtagcategory(this.addDateRange(this.classifyform)).then(
- // (response) => {
- // console.log(response);
- // this.gitclasify();
- // }
- // );
- }
- this.classifyform = {
- categoryname: "",
- };
- this.idds = "";
- this.dialogFormVisible = false;
- },
- //鍒犻櫎鍒嗙被
- deletefenlei(row) {
- if (this.deleteVisible) {
- // deletetagcategory(this.idds).then((response) => {
- // console.log(response);
- // this.gitclasify();
- // });
- this.deleteVisible = false;
- this.idds = "";
- } else {
- this.deleteVisible = true;
- this.idds = row.tagcategoryid;
- this.deletefenl = row.title;
- }
- },
- compileUpdate(row) {
- this.$router.push({
- path: "/repositoryai/verbaltrick/particulars/",
- query: { id: "1" },
- });
- },
- // 棰樼洰鐘舵�佷慨鏀�
- handleStatusChange(row) {
- let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
- this.$modal
- .confirm('纭瑕�"' + text + '""' + row.userName + '"鐢ㄦ埛鍚楋紵')
- .then(function () {
- return changeUserStatus(row.userId, row.status);
- })
- .then(() => {
- this.$modal.msgSuccess(text + "鎴愬姛");
- })
- .catch(function () {
- row.status = row.status === "0" ? "1" : "0";
- });
- },
- //鎼滅储绫诲埆
- sidecolumnss() {},
+ submitsidecolumn() {},
+ deletefenlei() {},
// 渚挎嵎鏍囩
tsgnameto() {},
// 鍒囨崲鍏变韩/鏈湴
@@ -754,9 +702,7 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
- this.reset();
- this.title = "鏂板鐭俊";
- this.indexopen = true;
+ this.$router.push("/shortmessage/messagebank/compile/");
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -805,6 +751,22 @@
})
.catch(() => {});
},
+ // 鍒囨崲鍏ㄩ儴绫诲埆
+ completefn() {
+ this.classestag = 1;
+ },
+ // 鍒囨崲鎴愬姛绫诲埆
+ succeedfn() {
+ this.classestag = 2;
+ },
+ // 鍒囨崲澶辫触绫诲埆
+ losefn() {
+ this.classestag = 3;
+ },
+ // 鍒囨崲寰呭彂閫佺被鍒�
+ awaitfn() {
+ this.classestag = 4;
+ },
},
};
</script>
@@ -814,60 +776,94 @@
display: flex;
}
.sidecolumn {
- width: 300px;
+ width: 350px;
min-height: 100vh;
text-align: center;
// display: flex;
margin-top: 20px;
margin: 20px;
- padding: 30px;
- background: #edf1f7;
+ padding: 10px;
+ padding-top: 20px;
+ text-align: center;
+ background: #dfeffd;
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);
- .sidecolumn-top {
- display: flex;
- justify-content: space-between;
- .top-wj {
- font-size: 20px;
+ .notebuttom {
+ height: 35px;
+ background: #85c046;
+ color: #ffff;
+ font-size: 20px;
+ line-height: 35px;
+ cursor: pointer;
+ border-radius: 3px;
+ }
+ .notestate {
+ font-size: 20px;
+ .state-text {
+ height: 40px;
}
- .top-tj {
- font-size: 18px;
-
- color: rgb(0, 89, 255);
+ .state-line {
+ display: flex;
+ height: 40px;
+ align-items: center;
+ padding: 10px 10px;
cursor: pointer;
+ justify-content: space-between;
}
- }
- .center-ss {
- margin-top: 30px;
- .input-with-select {
- height: 40px !important;
+ .state-lines {
+ display: flex;
+ height: 40px;
+ align-items: center;
+ padding: 10px 10px;
+ background: #88abfc;
+ cursor: pointer;
+ justify-content: space-between;
}
- }
- .bottom-fl {
- margin-top: 30px;
- display: center !important;
+ .state-line:hover {
+ background: #88abfc;
+ }
+ .quantityq {
+ height: 30px;
+ line-height: 30px;
+ padding: 0 5px;
+ border-radius: 10px;
+ color: #fff;
+ background: #9eb8ff;
+ }
+ .quantitycg {
+ height: 30px;
+ line-height: 30px;
+ padding: 0 5px;
+ border-radius: 10px;
+ color: #fff;
+
+ background: #48cf2d;
+ }
+ .quantitysb {
+ height: 30px;
+ line-height: 30px;
+ padding: 0 5px;
+ border-radius: 10px;
+ color: #fff;
+
+ background: #ce513b;
+ }
+ .quantityd {
+ height: 30px;
+ line-height: 30px;
+ padding: 0 5px;
+ border-radius: 10px;
+ color: #fff;
+
+ background: #3fbff1;
+ }
}
}
-.qrcode-dialo {
- text-align: center;
- // display: flex;
- margin: 20px;
- padding: 30px;
- background: #edf1f7;
- 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);
- .qrcode-text {
- font-size: 20px;
- span {
- margin-left: 20px;
- }
- }
- .qrcode-img {
- width: 300px;
- height: 400px;
- }
+[class^="el-icon-"],
+[class*=" el-icon-"] {
+ font-weight: 600;
+ font-size: 20px;
}
.tsgname {
width: 90px;
diff --git a/vue.config.js b/vue.config.js
index 311eeab..034b409 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -129,7 +129,7 @@
config.optimization.runtimeChunk('single'),
{
from: path.resolve(__dirname, './public/robots.txt'), //闃茬埇铏枃浠�
- to: './' //鍒版牴鐩綍涓�
+ to: '/' //鍒版牴鐩綍涓�
}
}
)
--
Gitblit v1.9.3