Merge branch 'develop_interview' of 39.98.150.180:antissoft/antissoft.dati.admin…

… into develop_interview

Merge branch 'develop_interview' of 39.98.150.180:antissoft/antissoft.dati.admin…
… into develop_interview
yangzhi
2 parents e6276ef2 52e3f6e1
Showing 2 changed files with 11 additions and 45 deletions
src/views/QuestionBank/index.vue
vue.config.js
@@ -19,8 +19,9 @@
               <span class="custom-tree-node" slot-scope="{ node, data }">
                 <span>{{ node.label }}</span>
                 <span style="">
+                  <!-- v-if="activeTab == 'first'?true:node.level<2?true:false" -->
                   <el-button type="text" size="mini" @click="showClassDialog(node)"
-                    v-if="activeTab == 'first'?true:node.level<2?true:false">
+                 >
                     添加下级
                   </el-button>
                   <el-button type="text" v-if="activeTab == 'second'" @click="handleEditDimension(node, data)">编辑
@@ -156,7 +157,7 @@
         </el-form-item>
         <el-form-item label="分类" style="padding-top: 5px">
           <el-cascader @change="changequestionclass" v-model="Dataform.QuestionClassId" style="width: 400px"
-            :props="{ emitPath: false ,checkStrictly:true}" :clearable="true" :options="randomQuestionTypeList">
+            :props="{ emitPath: false ,checkStrictly:true}" :clearable="true" :options="QuestionClass">
           </el-cascader>
         </el-form-item>
         <el-form-item label="题型" style="padding-top: 5px">
@@ -177,11 +178,11 @@
                   <template slot="prepend">{{ scope.row.option }}</template>
                 </el-input>
-                <el-input placeholder="维度分值" v-model="scope.row.score" class="optionInput" v-if="FormClassType==2"
+                <el-input placeholder="维度分值" v-model="scope.row.score" class="optionInput"  
                   style="width:21% !important;margin-left:1%">
                 </el-input>
-
-                <el-select v-model="scope.row.scorerule"  class="optionInput" placeholder="分值规则" v-if="FormClassType==2"  style="width:20% !important;margin-left:1%">
+                <!-- v-if="FormClassType==2"  -->
+                <el-select v-model="scope.row.scorerule"  class="optionInput" placeholder="分值规则"  style="width:20% !important;margin-left:1%">
                   <el-option label="" >不设置</el-option>
                   <el-option v-for="sritem in scoreRules" :label="sritem" :value="sritem">{{sritem}}</el-option>
                 </el-select>
@@ -241,7 +242,6 @@
     },
     data() {
       return {
-        randomQuestionTypeList:[],
         FormClassType: 0,
         loading: false,
         currentEditDimension: {},
@@ -295,9 +295,7 @@
         scoreRules:['高','中','低'],
       };
     },
-    created() { 
-      this.getQuestionClassListHeadler2();
-    },
+    created() { },
     mounted() {
       let ContentAreaHight =
         window.innerHeight - document.getElementById("elRow").offsetTop - 70;
@@ -311,39 +309,6 @@
       this.getQuestionClassListHeadler();
     },
     methods: {
-      getSubTree1(id, list) {
-        let result = [];
-        result = list.filter((t) => t.ParentId == id);
-        if (result.length) {
-          result = result.map((item) => {
-            item.value = item.id;
-            item.label = item.ClassificationName;
-            item.children = this.getSubTree1(item.id, list);
-            if(!item.children || !item.children.length){
-              delete item.children;
-            }
-            return item;
-          });
-        }
-        return result;
-      },
-      getQuestionClassListHeadler2() {
-        let _this = this;
-        getQuestionClassList().then((res) => {
-          let alllist = res.data.data;
-          let list  = alllist.filter(t=>!t.ParentId);
-          list = list.map((t) => {
-            t.value = t.id;
-            t.label = t.ClassificationName;
-            t.children = this.getSubTree1(t.id,alllist);
-            if(!t.children || !t.children.length){
-              delete t.children;
-            }
-            return t;
-          });
-          this.randomQuestionTypeList = list;
-        });
-      },
       AddSubject() { 
         this.FormClassType = 0;
         // if(!this.Dataform.scoperule)
@@ -38,15 +38,16 @@ module.exports = {
         },
         proxy: {
             '/development': {
-                target: `http://inteview.t1j2.com/`, //后台服务地址
-                // target:'https://localhost:44399',
+                // target: `http://inteview.t1j2.com/`, //后台服务地址
+                target:'http://localhost:8877',
                 changeOrigin: true,
                 pathRewrite: {
                     '^/development': ''
                 }
             },
             '/api': {
-                target: `http://inteview.t1j2.com/`, //后台服务地址
+                // target: `http://inteview.t1j2.com/`, //后台服务地址
+                target:'http://localhost:8877',
                 changeOrigin: true,
                 pathRewrite: {}
             }