Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/pages/activity/resultPageList.vue

@@ -24,10 +24,9 @@
             <div flex="dir:left cross:center"> {{scope.row.AliasName}}</div>
           </template></el-table-column>
         <el-table-column label="创建时间" prop="CreateDateStr"></el-table-column>
-        <el-table-column fixed="right" label="操作" width="180"><template slot-scope="scope">
-            <!-- <el-tooltip class="item" effect="dark" content="详情" placement="top"><img
-                src="../../assets/img/userman/detail.png" alt="" class="imgstyle" @click="grant(scope.row)">
-            </el-tooltip> -->
+        <el-table-column fixed="right" label="操作" width="180">
+          <template slot-scope="scope">
+              <a  @click="grant(scope.row)">详情</a>
           </template></el-table-column>
       </el-table>
       <el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
@@ -51,15 +50,15 @@
               :disabled="true"></el-input>
           </div>
           <!-- 单选 -->
-            <div v-if="item.SurveyType==2|| item.SurveyType==3" style="margin: 10px 0;">
-              <el-checkbox v-model="x.IsCheck==1?true:false" disabled v-for="(x,y) in item.SurveyOptionsList" :key="y">
-                {{x.OptionsName}}
-              </el-checkbox>
-            </div>
-            <div v-if="item.SurveyType==1" style="margin: 10px 0;">
-              <el-rate v-model="item.ScoreNum" disabled show-score text-color="#ff9900" score-template="{value}分">
-              </el-rate>
-            </div>
+          <div v-if="item.SurveyType==2|| item.SurveyType==3" style="margin: 10px 0;">
+            <el-checkbox v-model="x.IsCheck==1?true:false" disabled v-for="(x,y) in item.SurveyOptionsList" :key="y">
+              {{x.OptionsName}}
+            </el-checkbox>
+          </div>
+          <div v-if="item.SurveyType==1" style="margin: 10px 0;">
+            <el-rate v-model="item.ScoreNum" disabled show-score text-color="#ff9900" score-template="{value}分">
+            </el-rate>
+          </div>
         </div>
         <div style="font-size: 16px;margin: 10px 0 ;font-weight: bold">问卷调查表信息</div>
         <div v-for="(item,index) in xqdata.surverList" :key="index">
@@ -72,15 +71,15 @@
               :disabled="true"></el-input>
           </div>
           <!-- 单选 -->
-            <div v-if="item.SurveyType==2|| item.SurveyType==3" style="margin: 10px 0;">
-              <el-checkbox v-model="x.IsCheck==1?true:false" disabled v-for="(x,y) in item.SurveyOptionsList" :key="y">
-                {{x.OptionsName}}
-              </el-checkbox>
-            </div>
-            <div v-if="item.SurveyType==1" style="margin: 10px 0;">
-              <el-rate v-model="item.ScoreNum" disabled show-score text-color="#ff9900" score-template="{value}分">
-              </el-rate>
-            </div>
+          <div v-if="item.SurveyType==2|| item.SurveyType==3" style="margin: 10px 0;">
+            <el-checkbox v-model="x.IsCheck==1?true:false" disabled v-for="(x,y) in item.SurveyOptionsList" :key="y">
+              {{x.OptionsName}}
+            </el-checkbox>
+          </div>
+          <div v-if="item.SurveyType==1" style="margin: 10px 0;">
+            <el-rate v-model="item.ScoreNum" disabled show-score text-color="#ff9900" score-template="{value}分">
+            </el-rate>
+          </div>
         </div>
       </div>
     </el-dialog>
@@ -108,14 +107,10 @@
         dialogVisible: false,
         xqdata: null,
       }
-    }
-
-    ,
+    },
     created() {
       this.getDateList();
-    }
-
-    ,
+    },
     methods: {
       getDateList() {
         this.loading = true;
@@ -126,19 +121,18 @@
           this.msg.StartDate = '';
           this.msg.EndDate = '';
         }
-        this.apipost("/api/Survey/GetResultPageList", this.msg, res => {
-            this.loading = false;
-            if (res.data.resultCode == 1) {
-              this.tableData = res.data.data.pageData;
-              this.count = res.data.data.count;
-            } else {
-              this.Info(res.data.message);
-            }
+        this.apipostDS("/api/Survey/GetResultPageList", this.msg, res => {
+          this.loading = false;
+          if (res.data.resultCode == 1) {
+            this.tableData = res.data.data.pageData;
+            this.count = res.data.data.count;
+          } else {
+            this.Info(res.data.message);
           }
-        )
+        })
       },
       getList() {
-        this.msg.pageIndex = 1 
+        this.msg.pageIndex = 1
         this.getDateList();
       },
       handleCurrentChange(val) {
@@ -146,7 +140,7 @@
         this.getDateList();
       },
       grant(row) {
-        this.apipost("/api/Survey/GetGuestSurveyDetails", {
+        this.apipostDS("/api/Survey/GetGuestSurveyDetails", {
             SurveyID: row.ID
           }, res => {
             if (res.data.resultCode == 1) {
@@ -162,7 +156,6 @@
       }
     }
   }
-
 </script>
 <style>
   .resultPageList .el-card__header {
@@ -220,5 +213,4 @@
 
     ;
   }
-
-</style>
+</style>
\ No newline at end of file

src/pages/teacher/dayStatic.vue

@@ -2,6 +2,7 @@
   .Sysuser_Date .el-input__inner {
     background: transparent !important;
     border: 0 !important;
+    height:28px!important;
   }
 
   .myTable_Zk tbody tr:first-child td {

src/utils/erpindex.js

@@ -83,7 +83,7 @@ export default {
  
         let domainUrl = 'http://192.168.10.65:8083';
         let viewFileUrl = 'http://192.168.10.214:8120';
-        let mallUrl = "http://192.168.10.65:8088";
+        let mallUrl = "http://192.168.10.46:8200";
  
         let vtUploadUrl = "http://upload.oytour.com";
         let vtViewUrl = "http://192.168.10.214:8130";