Merge branch 'master' of http://192.168.168.218/xiaminwei/xxx_phase2_web

.gitignore

 node_modules/
-dist/
 .vscode/
 src/view/zchj/zchj1.vue
+web/
\ No newline at end of file

package-lock.json

@@ -3769,6 +3769,11 @@
         "assert-plus": "^1.0.0"
       }
     },
+    "dayjs": {
+      "version": "1.11.10",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
+      "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
+    },
     "de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npm.taobao.org/de-indent/download/de-indent-1.0.2.tgz",

package.json

@@ -35,6 +35,7 @@
     "animate.css": "^4.1.1",
     "clipboard": "^2.0.0",
     "css-color-function": "^1.3.3",
+    "dayjs": "^1.11.10",
     "docxtemplater": "^3.22.2",
     "docxtemplater-image-module-free": "^1.1.1",
     "echarts": "^5.1.2",

src/api/chat/chatRoom.js

@@ -29,7 +29,7 @@ export const leaveChatRoom = (userId) => {
 
 //查询某个用户所有聊天室（群组）
 export const getChatRoomList = (data) => {
-    return post(`${PREFIX_CHATROOM}/list`,data);
+    return post(`${PREFIX_CHATROOM}/list`, data);
 }
 
 //阅读（群组）信息
@@ -52,6 +52,20 @@ export const upLoadFiles = (bucket, data) => {
     return fileUpload(`api/rest/file/upload?bucket=${bucket}`, data)
 }
 
+//启动聊天室（群组）
+export const startExercise = (chatRoomId) => {
+    return post(`${PREFIX_CHATROOM}/start?chatRoomId=${chatRoomId}`);
+}
+
+//删除聊天室（群组）
+export const removeExercise = (chatRoomId) => {
+    return get(`${PREFIX_CHATROOM}/remove?chatRoomId=${chatRoomId}`);
+}
+
+//停止聊天室（群组）
+export const stopExercise = (data) => {
+    return post(`${PREFIX_CHATROOM}/end`, data);
+}
 
 
 

src/view/ddkz/components/chatRoomDialog.vue

@@ -112,7 +112,7 @@ export default {
                 this.imgList = [];
                 tmpArr.forEach((item, index) => {
                     let tmpObj = { content: item, messageForm: 'TEXT' }
-                    if (item.indexOf('data:image/jpeg;base64') == 0) {
+                    if (item.indexOf('data:image/jpeg;base64') == 0||item.indexOf('data:image/png;base64') == 0) {
                         let obj = { index: index, url: item }
                         this.imgList.push(obj);
                         tmpObj.messageForm = 'PICTURE';

src/view/ddkz/components/chatRoomInfo.vue

@@ -17,13 +17,13 @@
                 <el-form-item>
                     <img class="goBack" :src="goBack" alt="" @click="goBackFn">
                 </el-form-item>
-                <el-form-item>
+                <!-- <el-form-item>
                     <div class="searchButton"
-                        :style="{ background: stompClient.connected ? 'Green' : 'gray', color: 'white' }">
-                        <span :class="[!stompClient.connected ? 'el-icon-loading' : '']"></span>
-                        {{ stompClient.connected ? '已连接' : '重连中' }}
+                        :style="{ background: status ? 'Green' : 'gray', color: 'white' }">
+                        <span :class="[!status ? 'el-icon-loading' : '']"></span>
+                        {{ status ? '已连接' : '重连中' }}
                     </div>
-                </el-form-item>
+                </el-form-item> -->
             </el-form>
         </div>
         <div class="ddkz-info-content">
@@ -120,7 +120,8 @@ export default {
             newsList: [],
             publicNoticeList: [],
             stompClient: { connected: false },
-            peopleList: []
+            peopleList: [],
+            // status:false
         }
     },
     components: {
@@ -247,7 +248,13 @@ export default {
             } else {
                 this.dataOrderByParams(this.formInfo.day, newVal);
             }
-        }
+        },
+        // 'stompClient.connected':{
+        //     handler(newVal,oldVal){
+        //         this.status = newVal;
+        //     },
+        //     immediate:true
+        // }
     },
     computed: {
         userInfo() {
@@ -261,6 +268,7 @@ export default {
     activated() {
         this.currentChatRoomInfo = this.$route.params.data;
         this.stompClient = this.$route.params.client;
+        // this.status = this.stompClient.connected;
         this.listChatroom(this.currentChatRoomInfo);
         //获取当前组成员
         this.getCurrentTeamPeople(this.currentChatRoomInfo);

src/view/ddkz/components/noticeDialog.vue

@@ -66,11 +66,11 @@ export default {
             upLoadFiles('CHAT', fd).then(res => {
                 this.form.attachment = res;
                 let type = file.name.split('.')[1];
-                if (type == 'png' || type == 'jpg') {
+                if (type == 'png' || type == 'jpg' || type == 'PNG' || type == 'JPG') {
                     this.form.messageForm = 'PICTURE';
-                } else if (type == 'mp4') {
+                } else if (type == 'mp4' || type == 'MP4') {
                     this.form.messageForm = 'VIDEO';
-                } else if (type == 'xlsx' || type == 'xls') {
+                } else if (type == 'xlsx' || type == 'xls' || type == 'XLSX' || type == 'XLS') {
                     this.form.messageForm = 'EXCEL';
                 } else {
                     this.form.messageForm = 'TEXT';

src/view/ddkz/ddkzzs.vue

@@ -20,8 +20,8 @@
                         <el-form-item>
                             <div class="searchButton"
                                 :style="{ background: stompClient.connected ? 'Green' : 'gray', color: 'white' }">
-                               <span :class="[!stompClient.connected?'el-icon-loading':'']"></span>
-                               {{stompClient.connected ? '已连接' : '重连中'}}
+                                <span :class="[!stompClient.connected ? 'el-icon-loading' : '']"></span>
+                                {{ stompClient.connected ? '已连接' : '重连中' }}
                             </div>
                         </el-form-item>
                     </el-form>
@@ -29,7 +29,10 @@
                 <div class="ddkz-content">
                     <div v-for="item in analogData" class="content-card bk-ddkz-animation animate__animated animate__ZoomIn"
                         @click="showInfo(item)">
-                        <div class="card-title" v-text="item.nickname" :title="item.nickname"></div>
+                        <div class="card-title" :title="item.nickname">{{ item.nickname
+                        }}<span
+                                :style="{ fontSize: '14px', color: item.status.name == '待开始' ? '#85ce61' : (item.status.name == '进行中' ? '#409eff' : (item.status.name == '已结束' ? '#f78989' : '')) }">{{
+                                    '（' + item.status.name + '）' }}</span></div>
                         <div class="card-date" v-text="item.createTime"></div>
                         <div class="card-text" v-text="item.conRemark" :title="item.conRemark"></div>
                         <div class="card-tags">
@@ -71,7 +74,12 @@ export default {
     },
     methods: {
         showInfo(item) {
+            if (item.status.name !== '待开始') {
                 this.$router.push({ name: '聊天室详情' + this.$route.meta.type_name, params: { data: item, client: this.stompClient } });
+            } else {
+                this.$message.warning('此演习暂未开启，不能进入！');
+            }
+
         },
         queryChatRoomListFn(params) {
             getChatRoomList(params).then(res => {

src/view/home.vue

@@ -15,8 +15,8 @@
             </div>
             <h1><span>业务辅助分析系统</span></h1>
             <div class="home-date">
-                <span class="date">2023年06月14日</span>&emsp;&emsp;
-                <span class="week">星期三</span>
+                <span class="date" v-text="myDate.day"></span>&emsp;&emsp;
+                <span class="week" v-text="myDate.week"></span>
             </div>
             <div class="top-nav3">
                 <div class="top-nav3-content">
@@ -81,6 +81,7 @@ import "../assets/css/home.css";
 import { endLoading, get, post } from "../util/http_util";
 import { queryDictItem } from '../api/dictitem';
 import Push from 'push.js'
+import dayjs from 'dayjs';
 
 export default {
     name: "home",
@@ -117,7 +118,11 @@ export default {
                     { id: 6, title: '新技术实验模块', eg: 'New Technology Experiment Module' },
                 ],
             },
-            isSelected: 0
+            isSelected: 0,
+            myDate:{
+                day:null,
+                week:null
+            }
         };
     },
     methods: {
@@ -261,6 +266,11 @@ export default {
         // });
         this.isSelected = this.activeIndex;
         this.choiceModule(this.activeIndex);
+
+        //获取时间
+        this.myDate.day = dayjs().format('YYYY年MM月DD日');
+        const weekList = ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'];
+        this.myDate.week = weekList[dayjs().get('day')]
     },
     computed: {
         userInfo() {

src/view/homepage.vue

@@ -3,8 +3,8 @@
         <div class="header">
             <h1><span>业务辅助分析系统</span></h1>
             <div>
-                <span class="date">2023年06月14日</span>&emsp;&emsp;
-                <span class="week">星期三</span>
+                <span class="date" v-text="myDate.day"></span>&emsp;&emsp;
+                <span class="week" v-text="myDate.week"></span>
             </div>
         </div>
         <div class="content">
@@ -50,6 +50,7 @@
 
 <script>
 import LeaderLine from "../util/leader-line.min";
+import dayjs from 'dayjs';
 export default {
     name: 'homepage',
     data() {
@@ -72,7 +73,11 @@ export default {
             line3:null,
             line4:null,
             line5:null,
-            line6:null
+            line6:null,
+            myDate:{
+                day:null,
+                week:null
+            }
         }
     },
     methods: {
@@ -142,6 +147,11 @@ export default {
                 end:document.getElementById('right33'),
             });
         })
+
+        //获取时间
+        this.myDate.day = dayjs().format('YYYY年MM月DD日');
+        const weekList = ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'];
+        this.myDate.week = weekList[dayjs().get('day')]
     },
 }
 </script>

src/view/login.vue

@@ -3,8 +3,8 @@
     <div class="login-head">
       <h1><span>业务辅助分析系统</span></h1>
       <div>
-        <span class="date">2023年06月14日</span>&emsp;&emsp;
-        <span class="week">星期三</span>
+        <span class="date" v-text="myDate.day"></span>&emsp;&emsp;
+        <span class="week" v-text="myDate.week"></span>
       </div>
     </div>
     <div class="login-content">
@@ -46,6 +46,7 @@ import leftOne from '../assets/img/login/text1.png';
 import leftTwo from '../assets/img/login/text2.png';
 import rightOne from '../assets/img/login/text3.png';
 import rightTwo from '../assets/img/login/text4.png';
+import dayjs from "dayjs";
 export default {
   name: "login",
   data() {
@@ -60,10 +61,14 @@ export default {
         checkPass: [{ required: true, message: "请输入密码", trigger: "blur" }],
       },
       checked: true,
-      leftOne:leftOne,
-      leftTwo:leftTwo,
-      rightOne:rightOne,
-      rightTwo:rightTwo
+      leftOne: leftOne,
+      leftTwo: leftTwo,
+      rightOne: rightOne,
+      rightTwo: rightTwo,
+      myDate: {
+        day: null,
+        week: null
+      }
     };
   },
   methods: {
@@ -117,6 +122,10 @@ export default {
         type: "warning",
       });
     }
+    //获取时间
+    this.myDate.day = dayjs().format('YYYY年MM月DD日');
+    const weekList = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
+    this.myDate.week = weekList[dayjs().get('day')]
   }
 };
 </script>
@@ -137,6 +146,7 @@ export default {
     background-size: 90% 73%;
     background-repeat: no-repeat;
     background-position: center 33px;
+
     h1 {
       font-size: 34px;
       letter-spacing: 7px;
@@ -145,7 +155,8 @@ export default {
       margin-bottom: 0px !important;
       font-family: cursive;
       text-align: center;
-      span{
+
+      span {
         background-image: linear-gradient(to right, #498ce1, #75f8d2, #498ce1);
         color: transparent;
         -webkit-background-clip: text;
@@ -178,7 +189,7 @@ export default {
       -webkit-animation: warn 3s ease-out infinite;
       -moz-animation: warn 3s ease-out infinite;
       animation: warn 3s ease-out infinite;
-      animation-direction:alternate;
+      animation-direction: alternate;
     }
 
     .login-center-content {
@@ -264,12 +275,19 @@ export default {
     -webkit-animation: warn 3s ease-out infinite;
     -moz-animation: warn 3s ease-out infinite;
     animation: warn 3s ease-out infinite;
-      animation-direction:alternate;
+    animation-direction: alternate;
   }
 
   @keyframes warn {
-    from  {  opacity:1;  transform:scale(0.98);  }
-    to    {  opacity:1;  transform:scale(1);  }
+    from {
+      opacity: 1;
+      transform: scale(0.98);
+    }
+
+    to {
+      opacity: 1;
+      transform: scale(1);
+    }
   }
 }
 </style>
\ No newline at end of file

src/view/sjgl/ddkzConfig.vue

@@ -2,29 +2,35 @@
     <div class="ddkzConfig">
         <el-tabs type="border-card" @tab-click="handleTabClick" v-model="activeTabs">
             <el-tab-pane>
-                <span slot="label"><i class="el-icon-date"></i> 新增会议</span>
+                <span slot="label"><i class="el-icon-document-add"></i> 新增演习</span>
                 <DdkzConfigAdd></DdkzConfigAdd>
             </el-tab-pane>
             <el-tab-pane>
-                <span slot="label"><i class="el-icon-date"></i> 会议列表</span>
+                <span slot="label"><i class="el-icon-document-copy"></i> 演习列表</span>
                 <DdkzConfigList></DdkzConfigList>
             </el-tab-pane>
+            <el-tab-pane>
+                <span slot="label"><i class="el-icon-document-checked"></i> 演习审批</span>
+                <DdkzConfigApprove></DdkzConfigApprove>
+            </el-tab-pane>
         </el-tabs>
     </div>
 </template>
 
 <script>
-import ddkzConfigAdd from '../sjgl/ddkzConfig/ddkzConfigAdd.vue';
-import ddkzConfigList from '../sjgl/ddkzConfig/ddkzConfigList.vue';
+import ddkzConfigAdd from '@/view/sjgl/ddkzConfig/ddkzConfigAdd.vue';
+import ddkzConfigList from '@/view/sjgl/ddkzConfig/ddkzConfigList.vue';
+import ddkzConfigApprove from '@/view/sjgl/ddkzConfig/ddkzConfigApprove.vue';
 export default {
     data() {
         return {
             activeTabs: ''
         }
     },
-    components:{
-        DdkzConfigAdd:ddkzConfigAdd,
-        DdkzConfigList:ddkzConfigList
+    components: {
+        DdkzConfigAdd: ddkzConfigAdd,
+        DdkzConfigList: ddkzConfigList,
+        DdkzConfigApprove: ddkzConfigApprove
     },
     methods: {
         handleTabClick() {
@@ -45,7 +51,7 @@ export default {
     >.el-tabs--border-card {
         width: calc(100% - 4px);
         height: calc(100% - 4px);
-        border: 2px solid #125473;
+        border: 2px solid #3a5f94c9;
         border-radius: 5px;
         box-sizing: border-box;
         background: #ffffff00;
@@ -58,7 +64,7 @@ export default {
 
         >.el-tabs__header {
             background-color: unset;
-            border-bottom: 2px solid #125473;
+            border-bottom: 2px solid #3a5f94c9;
 
             .el-tabs__item {
                 color: #dedede;
@@ -66,9 +72,9 @@ export default {
 
             .el-tabs__item.is-active {
                 color: #ffe000;
-                background-color: #116791;
-                border-right-color: #116791;
-                border-left-color: #116791;
+                background-color: #3a5f94c9;
+                border-right-color: #3a5f94c9;
+                border-left-color: #3a5f94c9;
             }
 
             .el-tabs__item:not(.is-disabled):hover {

src/view/sjgl/ddkzConfig/ddkzConfigAdd.vue

 <template>
     <div class="addDdkzConfig">
         <el-form class="myForm" label-position="right" label-width="200px" :model="formData">
-            <el-form-item label="议题">
+            <el-form-item label="演习标题">
                 <el-input v-model="formData.nickname"></el-input>
             </el-form-item>
-            <el-form-item label="聊天室主持人">
+            <el-form-item label="演习主持人">
                 <!-- <el-input v-model="formData.chatroomOwner"></el-input> -->
                 <el-select v-model="formData.chatroomOwner" placeholder="请选择">
                     <el-option v-for="item in allData" :key="item.account" :label="item.account" :value="item.account">
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="备注">
+            <el-form-item label="演习内容">
                 <el-input v-model="formData.conRemark"></el-input>
             </el-form-item>
             <el-form-item label="与会方">
@@ -96,7 +96,7 @@
                 </el-form>
             </el-form-item>
             <el-form-item>
-                <el-button type="success" @click="createMeeting">创建会议</el-button>
+                <el-button type="success" @click="createMeeting">创建演习</el-button>
             </el-form-item>
         </el-form>
     </div>

src/view/sjgl/ddkzConfig/ddkzConfigApprove.vue

+<template>
+    <div class="yxsp">
+        
+    </div>
+</template>
\ No newline at end of file

src/view/sjgl/ddkzConfig/ddkzConfigList.vue

 <template>
     <div class="ddkzConfigList">
         <div class="ddkzCondition">
-            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="dateRange" type="daterange" range-separator="至"
+            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="form.dateRange" type="daterange" range-separator="至"
                 start-placeholder="开始时间" end-placeholder="结束时间" :default-time="['00:00:00', '23:59:59']">
             </el-date-picker>
+            <el-select style="margin-left: 10px;" v-model="form.status" placeholder="请选择演习状态" clearable>
+                <el-option v-for="item in exerciseList" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+            </el-select>
+            <el-input class="myInput" v-model="form.keyword"></el-input>
             <div class="searchButton" @click="searchChatList">搜索</div>
         </div>
         <div class="ddkzContent">
@@ -11,41 +16,92 @@
                 @selection-change="handleSelectionChange">
                 <!-- <el-table-column type="selection" width="55">
                 </el-table-column> -->
+                <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
                 <el-table-column prop="nickname" label="主题" align="center"></el-table-column>
-                <el-table-column prop="chatroomOwner" label="支持人" align="center"></el-table-column>
-                <el-table-column prop="createTime" label="日期" align="center"></el-table-column>
-                <!-- <el-table-column label="操作" align="center" width="500">
+                <el-table-column prop="conRemark" label="演习内容" align="center"></el-table-column>
+                <el-table-column prop="createTime" label="演习结果" align="center"></el-table-column>
+                <el-table-column prop="status.name" label="演习状态" align="center"></el-table-column>
+                <el-table-column prop="createTime" label="开始时间" align="center"></el-table-column>
+                <el-table-column label="操作" align="center" width="500">
                     <template slot-scope="scope">
-                        <el-button size="mini" type="danger" @click="deleteMeeting(scope.row)">删除</el-button>
+                        <el-button v-if="scope.row.status.name !== '进行中'" size="mini" type="danger"
+                            @click="deleteExercise(scope.row)">删除</el-button>
+                        <el-button v-if="scope.row.status.name == '待开始'" size="mini" type="success"
+                            @click="startExercise(scope.row)">启动</el-button>
+                        <el-button v-if="scope.row.status.name == '进行中'" size="mini" type="warning"
+                            @click="stopExercise(scope.row)">结束</el-button>
                     </template>
-                </el-table-column> -->
+                </el-table-column>
             </el-table>
         </div>
     </div>
 </template>
 
 <script>
-import { getChatRoomList } from "@/api/chat/chatRoom";
+import { getChatRoomList, startExercise, stopExercise, removeExercise } from "@/api/chat/chatRoom";
 export default {
     data() {
         return {
+            form: {
                 dateRange: [],
-            meetingList: []
+                status: null,
+                keyword: null
+            },
+
+            meetingList: [],
+            exerciseList: [{ label: '待开始', value: 'CREATED' }, { label: '进行中', value: 'ONGOING' }, { label: '已结束', value: 'CLOSED' }]
         }
     },
     methods: {
         handleSelectionChange() { },
-        deleteMeeting(item) { },
+        //删除演习
+        deleteExercise(item) {
+            removeExercise(item.id).then(res => {
+                if (res == 1) {
+                    this.$message.success('删除演习成功！');
+                    this.searchChatList();
+                }
+            }).catch(error => {
+                this.$message.error(error.message);
+            });
+        },
+        //启动演习
+        startExercise(item) {
+            startExercise(item.id).then(res => {
+                if (res == 1) {
+                    this.$message.success('启动成功！');
+                    this.searchChatList();
+                }
+            }).catch(error => {
+                this.$message.error(error.message);
+            });
+        },
+        //结束演习
+        stopExercise(item) {
+            let params = {
+                chatRoomId: item.id,
+                result: '暂无'
+            };
+            stopExercise(params).then(res => {
+                if (res == 1) {
+                    this.$message.success('此演习结束！');
+                    this.searchChatList();
+                }
+            }).catch(error => {
+                this.$message.error(error.message);
+            });
+        },
         queryChatRoomListFn(param) {
             getChatRoomList(param).then(res => {
                 this.meetingList = res;
+                console.log(res);
             });
         },
-        searchChatList(){
-            if(this.dateRange.length==2){
-                this.queryChatRoomListFn({startTime:this.dateRange[0],endTime:this.dateRange[1],userId:this.userInfo.account})
-            }else{
-                this.queryChatRoomListFn({userId:this.userInfo.account})
+        searchChatList() {
+            if (this.form.dateRange.length == 2) {
+                this.queryChatRoomListFn({ startTime: this.form.dateRange[0], endTime: this.form.dateRange[1], userId: this.userInfo.account, status: this.form.status == '' ? null : this.form.status, keyword: this.form.keyword == '' ? null : this.form.keyword })
+            } else {
+                this.queryChatRoomListFn({ userId: this.userInfo.account, status: this.form.status == '' ? null : this.form.status, keyword: this.form.keyword == '' ? null : this.form.keyword })
             }
         }
     },
@@ -59,7 +115,7 @@ export default {
         }
     },
     mounted() {
-        this.queryChatRoomListFn({userId:this.userInfo.account});
+        this.queryChatRoomListFn({ userId: this.userInfo.account });
     }
 }
 </script>
@@ -87,6 +143,18 @@ export default {
             }
         }
 
+        .el-input {
+            float: left;
+            width: 200px;
+            margin-left: 10px;
+
+            .el-input__inner {
+                background: none;
+                color: #ffff;
+                border: 1px solid #3a5f94c9 !important;
+            }
+        }
+
         .el-input__inner {
             border: 1px solid #3a5f94c9 !important;
         }

src/view/sjgl/dfzygl.vue

@@ -344,7 +344,7 @@ export default {
   >.el-tabs--border-card {
     width: calc(100% - 4px);
     height: calc(100% - 4px);
-    border: 2px solid #125473;
+    border: 2px solid #3a5f94c9;
     border-radius: 5px;
     box-sizing: border-box;
     background: #ffffff00;
@@ -355,15 +355,15 @@ export default {
     }
     >.el-tabs__header {
       background-color: unset;
-      border-bottom: 2px solid #125473;
+      border-bottom: 2px solid #3a5f94c9;
       .el-tabs__item {
         color: #dedede;
       }
       .el-tabs__item.is-active {
         color: #ffe000;
-        background-color: #116791;
-        border-right-color: #116791;
-        border-left-color: #116791;
+        background-color: #3a5f94c9;
+        border-right-color: #3a5f94c9;
+        border-left-color: #3a5f94c9;
       }
       .el-tabs__item:not(.is-disabled):hover {
         color: #ffe000;
@@ -495,7 +495,7 @@ export default {
     float: left;
     margin-left: 20px;
     overflow-y: auto;
-    border: 1px solid #125473;
+    border: 1px solid #3a5f94c9;
     border-radius: 5px;
     box-sizing: border-box;
   }

src/view/sjgl/flfggl.vue

@@ -65,7 +65,7 @@ export default {
   > .el-tabs--border-card {
     width: calc(100% - 4px);
     height: calc(100% - 4px);
-    border: 2px solid #125473;
+    border: 2px solid #3a5f94c9;
     border-radius: 5px;
     box-sizing: border-box;
     background: #ffffff00;
@@ -76,15 +76,15 @@ export default {
     }
     > .el-tabs__header {
       background-color: unset;
-      border-bottom: 2px solid #125473;
+      border-bottom: 2px solid #3a5f94c9;
       .el-tabs__item {
         color: #dedede;
       }
       .el-tabs__item.is-active {
         color: #ffe000;
-        background-color: #116791;
-        border-right-color: #116791;
-        border-left-color: #116791;
+        background-color: #3a5f94c9;
+        border-right-color: #3a5f94c9;
+        border-left-color: #3a5f94c9;
       }
       .el-tabs__item:not(.is-disabled):hover {
         color: #ffe000;

src/view/sjgl/fzjcgl.vue

@@ -62,7 +62,7 @@ export default {
   >.el-tabs--border-card {
     width: calc(100% - 4px);
     height: calc(100% - 4px);
-    border: 2px solid #125473;
+    border: 2px solid #3a5f94c9;
     border-radius: 5px;
     box-sizing: border-box;
     background: #ffffff00;
@@ -73,15 +73,15 @@ export default {
         }
         > .el-tabs__header {
             background-color: unset;
-            border-bottom: 2px solid #125473;
+            border-bottom: 2px solid #3a5f94c9;
             .el-tabs__item {
                 color: #dedede;
             }
             .el-tabs__item.is-active {
                 color: #ffe000;
-                background-color: #116791;
-                border-right-color: #116791;
-                border-left-color: #116791;
+                background-color: #3a5f94c9;
+                border-right-color: #3a5f94c9;
+                border-left-color: #3a5f94c9;
             }
             .el-tabs__item:not(.is-disabled):hover {
                 color: #ffe000;
@@ -216,7 +216,7 @@ export default {
         float: left;
         margin-left: 20px;
         overflow-y: auto;
-        border: 1px solid #125473;
+        border: 1px solid #3a5f94c9;
         border-radius: 5px;
         box-sizing: border-box;
     }

src/view/sjgl/xxxlgl.vue

@@ -2831,14 +2831,14 @@ export default {
 .el-tabs--border-card {
     width: calc(100% - 4px);
     height: calc(100% - 4px);
-    border: 2px solid #125473;
+    border: 2px solid #3a5f94c9;
     border-radius: 5px;
     box-sizing: border-box;
     background: #ffffff00;
 
     .el-tabs__header {
         background-color: unset;
-        border-bottom: 2px solid #125473;
+        border-bottom: 2px solid #3a5f94c9;
 
         .el-tabs__item {
             color: #dedede;
@@ -2846,9 +2846,9 @@ export default {
 
         .el-tabs__item.is-active {
             color: #ffe000;
-            background-color: #116791;
-            border-right-color: #116791;
-            border-left-color: #116791;
+            background-color: #3a5f94c9;
+            border-right-color: #3a5f94c9;
+            border-left-color: #3a5f94c9;
         }
 
         .el-tabs__item:not(.is-disabled):hover {

src/view/sjgl/yqjcgl.vue

@@ -1501,14 +1501,14 @@ export default {
     .el-tabs--border-card {
         width: calc(100% - 4px);
         height: calc(100% - 4px);
-        border: 2px solid #125473;
+        border: 2px solid #3a5f94c9;
         border-radius: 5px;
         box-sizing: border-box;
         background: #ffffff00;
 
         .el-tabs__header {
             background-color: unset;
-            border-bottom: 2px solid #125473;
+            border-bottom: 2px solid #3a5f94c9;
 
             .el-tabs__item {
                 color: #dedede;
@@ -1516,9 +1516,9 @@ export default {
 
             .el-tabs__item.is-active {
                 color: #ffe000;
-                background-color: #116791;
-                border-right-color: #116791;
-                border-left-color: #116791;
+                background-color: #3a5f94c9;
+                border-right-color: #3a5f94c9;
+                border-left-color: #3a5f94c9;
             }
 
             .el-tabs__item:not(.is-disabled):hover {

src/view/xjssy/components/newTechniqueDialog.vue

@@ -86,7 +86,7 @@ export default {
             } else if (this.form.technique == 4) {
                 if (this.form.text.trim() != '') {
                     emotionNews({ data: this.form.text.trim() }).then(res => {
-                        this.form.result = JSON.parse(res.score);
+                        this.form.result = JSON.parse(res).score;
                     }).catch(err=>{
                         this.$message.warning(err.message);
                     })

webpack.config.js

@@ -11,7 +11,7 @@ module.exports = {
     entry: path.resolve(__dirname, './src/main.js'), // 项目入口文件
     output: {
         filename: '[name].[contenthash:8].js',
-        path: path.resolve(__dirname, './dist') // 打包后的目录
+        path: path.resolve(__dirname, './web') // 打包后的目录
     },
     resolve:{
         alias:{