合并分支 'thy' 到 'master'

src/components/assessment/homeDetailcopy.vue

@@ -74,6 +74,42 @@
                     <el-input v-model="notime"></el-input>
                     <span class="input_text">月</span>
                   </el-form-item>
+                  
+                  <el-form-item label="单位名称：" style="opacity:0;">
+                    <el-input v-model="notime"></el-input>
+                  
+                  </el-form-item>
+                  <el-form-item label="单位名称：" style="opacity:0;">
+                    <el-input v-model="notime"></el-input>
+                  
+                  </el-form-item>
+                  <el-form-item label="单位名称：">
+                    <el-input v-model="notime"></el-input>
+                  
+                  </el-form-item>
+           
+                  
+                  <el-form-item label="单位联系人：">
+                    <el-input v-model="notime"></el-input>
+               
+                  </el-form-item>
+                  
+                  <el-form-item label="单位电话：">
+                    <el-input v-model="notime"></el-input>
+             
+                  </el-form-item>
+             
+                  
+                  <el-form-item label="原单位联系人：">
+                    <el-input v-model="notime"></el-input>
+      
+                  </el-form-item>
+                  
+                  <el-form-item label="原单位电话：">
+                    <el-input v-model="notime"></el-input>
+        
+                  </el-form-item>
+             
                   <div class="form-radio one">
                     <div class="radio-text one">开发单位是否为本地：</div>
                     <el-radio
@@ -100,6 +136,19 @@
                       @click.native.prevent="clickitem1('form','secret',2)"
                     >否</el-radio>
                   </div>
+                  <div class="form-radio one">
+                    <div class="radio-text one">原应用是否通过等级保护：</div>
+                    <el-radio
+                      v-model="form.secret"
+                      :label="1"
+                      @click.native.prevent="clickitem1('form','secret',1)"
+                    >是</el-radio>
+                    <el-radio
+                      v-model="form.secret"
+                      :label="2"
+                      @click.native.prevent="clickitem1('form','secret',2)"
+                    >否</el-radio>
+                  </div>
                   <div class="form-radio one">
                     <div class="radio-text one">容灾能力：</div>
                     <el-radio
@@ -198,12 +247,12 @@
               </el-form>
             </div>
             <!-- <div class="line"></div> -->
-            <div :class="{'pg-button no':!isLog,'pg-button':isLog}" @click="goPrev">对应评估报告</div>
+            <div :class="{'pg-button no':!isLog,'pg-button':isLog}" @click="goPrev">上次报告</div>
     
             <div
               :class="{'pg-button':form.cost!=''&& form.projectName!=''  ,'pg-button no':form.cost==''|| form.projectName=='' }"
               @click="goPg2(1)"
-            >保存并快速评估</div>
+            >快速评估</div>
               <div class="pg-button" @click="goBack">关闭</div>
           </div>
         </div>
@@ -1960,7 +2009,7 @@ export default {
   width: 98%;
   margin: 0 auto;
   height: 100%;
-  height: 630px;
+  height:780px;
   /* background-color: orange; */
 }
 .home-detail-copy .copy-form >>> .el-form-item {
@@ -2137,7 +2186,7 @@ export default {
   font-size: 18px;
 }
 .form-radio .radio-text.one {
-  width: 180px;
+  width: 220px;
   float: left;
   text-align: right;
   font-size: 18px;

src/components/roleDispose/addRole.vue

@@ -104,6 +104,7 @@ export default {
                 id: this.detailData.id,
                 oldRule: this.form
             };
+            obj.suffix  = obj.suffix.join(",")
             console.log(this.detailData.id)
             if (this.modalName === '修改规则') {
                 this.$server.editConfigUpdate(obj).then(res => {

src/components/roleDispose/roleDispose.vue

@@ -5,19 +5,27 @@
         <div class="content">
           <p class="search">
             <span class="searchVal">
-              <span>关键字：</span>
-              <el-input v-model="input2" size="medium" @change="search" placeholder="请输入关键字"></el-input>
-            </span>
-            <span class="searchVal">
-              <span>关键技术：</span>
-              <el-select v-model="searchVal" @change="search" placeholder="请选择关键技术" clearable>
+              <!-- <span>查询：</span> -->
+              <el-select v-model="input3" size="medium" @change="mySelect" placeholder="请选择查询条件">
+               <el-option
+      label="关键技术"
+      value="technologyName">
+    </el-option>
+               <el-option
+      label="关键字"
+      value="target">
+    </el-option>
+
                <el-option
-                  v-for="item in allList"
-                  :label="item.technologyName"
-                  :value="item.technologyName">
+      label="范围"
+      value="suffix">
     </el-option>
               </el-select>
             </span>
+            <span class="searchVal">
+              <span>查询：</span>
+              <el-input v-model="input2" size="medium" @change="search" placeholder="请输入关键技术"></el-input>
+            </span>
             <span class="button searchBtn" @click="search">搜索</span>
             <span class="button add" @click="addRole"><img src="../../assets/img/add.png"></span>
           </p>
@@ -84,9 +92,11 @@ export default {
     name: 'roleDispose',
     data () {
         return {
-            input2: '', // 关键字
-            searchVal: '', // 关键技术
-            allList: [], // 所有关键技术
+          searchKey:'',
+          input3:'',
+            input2: '',
+            suffix:'',
+            target:'',
             tableData: [],
             tablePageSize: 0,
             pageSize: 9,  // 每页个数
@@ -108,27 +118,28 @@ export default {
     },
     methods: {
         // 搜索
+        mySelect(val){
+          this.searchKey =val
+       
+        },
         search () {
-            let obj;
-            if (this.input2 !== '' && this.searchVal !== '') {
-                obj = {
-                    'technologyName': this.searchVal,
-                    'target': this.input2
+          let obj = {
+                technologyName:'',
+                target:'',
+                suffix:'',
             }
-            } else if (this.input2 !== '' && this.searchVal === '') {
-                obj = {
-                    'target': this.input2
-                }
-            } else if (this.input2 === '' && this.searchVal !== '') {
-                obj = {
-                    'technologyName': this.searchVal
-                }
-            } else {
-                obj = {}
+            if(this.searchKey == 'suffix'){
+              obj.suffix = this.input2
+         }else if (this.searchKey == 'technologyName'){
+   obj.technologyName = this.input2
+         }else if (this.searchKey == 'target'){
+   obj.target = this.input2
          }
+            
             this.$server.getConfigPageList(this.myPage,this.pageSize,obj).then(res => {
-                this.tableData = res.data.objects;
-                this.tablePageSize = res.data.totalElement;
+                console.log(res)
+                this.tableData = res.data.rows;
+                this.tablePageSize = res.data.total;
             })
         },
         // 修改