Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev

src/assets/js/http.js

@@ -87,7 +87,7 @@ if (process.env.NODE_ENV == "development") {
   // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
   // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
-  // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
+  axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
   // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
   // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
   // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
@@ -95,7 +95,7 @@ if (process.env.NODE_ENV == "development") {
   // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
   // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
   // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
-  //   axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
+    // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
   // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
   // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
   // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址

src/store/index.js

@@ -48,13 +48,13 @@ export default new Vuex.Store({
     PAGESIZRS: [10, 20, 30, 50],
     // UPLOADURL:' http://101.43.164.214:11111/upload/image/',//  百色
     // FILEURL:' http://101.43.164.214:11111/image/',// 百色
-    // UPLOADURL:'http://182.90.224.237:51234/upload/image/',
-    // FILEURL:'http://182.90.224.237:51234/image/',
+    UPLOADURL:'http://182.90.224.237:51234/upload/image/',
+    FILEURL:'http://182.90.224.237:51234/image/',
     // UPLOADURL: "http://192.168.34.155:19111/upload/image/", // 洁本地
     // FILEURL: "http://192.168.34.155:19111/image/", //洁本地
-    UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
-    FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
-    WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
+    // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
+    // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
+    // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
     // WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
     // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
     // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程

src/views/projectFront/examSystem2/questionManagement/questionManagement.vue

@@ -90,7 +90,11 @@
           style="width: 100%; color: #737996"
           @selection-change="handleCheckedCitiesChange"
         >
-          <el-table-column prop="questionName" label="试题内容"></el-table-column>
+          <el-table-column prop="questionName" label="试题内容">
+            <template slot-scope="scope">
+              <div v-html="scope.row.questionName"></div>
+            </template>
+          </el-table-column>
           <el-table-column prop="type" width="100px" label="题目类型">
             <template slot-scope="scope">
               <div>{{ scope.row.type && typeArr[scope.row.type - 1].name }}</div>
@@ -656,7 +660,7 @@ export default {
       // + '&endReceiveTime=' + this.time[1] + '&startReceiveTime=' + this.time[0] + '&devName=' + this.devName, {
       // fetch(this.$http.defaults.baseURL + 'exam/questionBank/exportXls?&projectSn=' + this.projectSn + "&subjectId=" + this.subjectId,{
       let data = {
-        projectSn:this.projectSn,
+        projectSn:this.$store.state.projectSn,
         subjectId:this.subjectId
       }  
       fetch(this.$http.defaults.baseURL + 'exam/questionBank/exportXls',{
@@ -739,7 +743,7 @@ export default {
     },
     getExamSubjectList() {  // 获取科目类型列表
       let data = {
-        sn: this.projectSn,
+        projectSn: this.$store.state.projectSn,
       }
       // listTreeExamSubjectApi(data).then((res) => {
       listExamSubjectApi(data).then((res) => {
@@ -752,10 +756,10 @@ export default {
     //获取列表数据
     getExamSubjectTreeList() {
       let data = {
-        sn: this.$store.state.projectSn,
+        // projectSn: this.$store.state.projectSn,
       }
-      listTreeExamSubjectApi(data).then((res) => {
-      // listExamSubjectApi(data).then((res) => {
+      // listTreeExamSubjectApi(data).then((res) => {
+      listExamSubjectApi(data).then((res) => {
         if (res.code == 200) {
           this.level1CompanyData = res.result;
           console.log('11111111111111',res);
@@ -777,6 +781,7 @@ export default {
         pageSize: this.pageSize,
         questionName: this.tableParameter.name,
         subjectId: this.subjectId,
+        projectSn: this.$store.state.projectSn
       }).then((result) => {
         if (result.success) {
           console.log(result);
@@ -872,7 +877,8 @@ export default {
                 optionList:tempOptions,
                 options:this.questionForm.type == 1 ? this.questionForm.options : multiOptions,
                 score:this.questionForm.score,
-                subjectId:this.subjectId,
+                subjectId:this.questionForm.subjectId,
+                projectSn:this.$store.state.projectSn
               }).then(result => {
                   if (result.success) {
                     this.$message.success(result.message);
@@ -914,7 +920,7 @@ export default {
               options:this.questionForm.type == 1 ? option : multiOptions,
               score:this.questionForm.score,
               subjectId:this.subjectId,
-              projectSn: this.projectSn,
+              projectSn: this.$store.state.projectSn,
             }).then(result => {
                 if (result.success) {
                     console.log('信息添加成功', result);
@@ -941,7 +947,8 @@ export default {
     // 预览
     previewDialog(item) {
       detailIdQuestionBankApi({
-        id: item.id
+        id: item.id,
+        projectSn: this.$store.state.projectSn
       }).then(result => {
           if (result.success) {
             this.questionForm = result.result;
@@ -1072,7 +1079,7 @@ export default {
     refreshBtn() {
       window._paq.push(['trackEvent', '点击', '刷新', '刷新人员信息'])
       this.page = 1
-  
+
       this.tableParameter.name = ''
       // this.tableParameter.workerName = ''
       // this.tableParameter.inserviceType = ''
@@ -1144,7 +1151,8 @@ export default {
 
       moveQuestionBankApi({
         id:this.editQuestion.id,
-        subjectId:this.subjectId2
+        subjectId:this.subjectId2,
+        projectSn: this.$store.state.projectSn
       }).then(result => {
           if (result.success) {
             this.$message.success(result.message);

src/views/projectFront/examSystem2/subjectManagement/subjectManagement.vue

@@ -139,7 +139,7 @@ export default {
     //获取列表数据
     getExamSubjectList() {
       let data = {
-        // sn: this.projectSn,
+        projectSn: this.projectSn,
         pageNo: this.pagInfo.pageNo,
         pageSize: this.pagInfo.pageSize,
       }