commit

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -2566,13 +2566,13 @@ export default {
                     console.log(this.OCRDatas);
                     console.log(this.ocrList);
                     let json = {
-          standNumber: this.ocrList[0].standName,
+                        standNumber: this.ocrList[0].standYear ? this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber + '-' + this.ocrList[0].standYear : this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber,
                         standName: this.ocrList[0].standName,
                         attId: this.OCRDatas[0].attId,
                         fileName: this.OCRDatas[0].name,
                         fileType: this.ocrList[0].name,
                     }
-        console.log('这儿')
+                    console.log(json);
                 }
             },
             OCRAdd (type) {

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProject.vue

@@ -3,12 +3,12 @@
     <el-tabs v-model="tabValue" style="height: 100%;">
       <el-tab-pane label="项目评估结果" name="standInvolveProjectDetail" v-if="project">
         <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
-          <stand-involve-project-detail ></stand-involve-project-detail>
+          <stand-involve-project-detail v-if="tabValue === 'standInvolveProjectDetail'"></stand-involve-project-detail>
         </div>
       </el-tab-pane>
       <el-tab-pane label="技术评估结果" name="technologyInvolveProject" v-if="skill">
         <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
-          <technology-involve-project ></technology-involve-project>
+          <technology-involve-project v-if="tabValue === 'technologyInvolveProject'"></technology-involve-project>
         </div>
       </el-tab-pane>
     </el-tabs>
@@ -30,7 +30,7 @@ export default {
     return {
       skill: false,
       project: false,
-      tabValue: '',
+      tabValue: 'standInvolveProjectDetail',
       menuName: [ "项目评估结果", "技术评估结果"]
     }
   },
@@ -53,12 +53,12 @@ export default {
         }
       }
     });
-    if(this.skill === true){
+    if (this.project === true) {
-      this.tabValue = "technologyInvolveProject"
-      return;
-    }else if(this.project === true){
       this.tabValue = "standInvolveProjectDetail"
       return;
+    } else if (this.skill === true) {
+      this.tabValue = "technologyInvolveProject"
+      return;
     }
   }
 }

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue

@@ -159,24 +159,24 @@
               width="55"
               align="center">
             </el-table-column>
-            <el-table-column
+<!--            <el-table-column-->
-              width="150px"
+<!--              width="150px"-->
-              align="center"
+<!--              align="center"-->
-              prop="productLineId"
+<!--              prop="productLineId"-->
-              label="产品线">
+<!--              label="产品线">-->
-            </el-table-column>
+<!--            </el-table-column>-->
-            <el-table-column
+<!--            <el-table-column-->
-              width="150px"
+<!--              width="150px"-->
-              align="center"
+<!--              align="center"-->
-              prop="productId"
+<!--              prop="productId"-->
-              label="项目编号">
+<!--              label="项目编号">-->
-            </el-table-column>
+<!--            </el-table-column>-->
-            <el-table-column
+<!--            <el-table-column-->
-              width="150px"
+<!--              width="150px"-->
-              align="center"
+<!--              align="center"-->
-              prop="productName"
+<!--              prop="productName"-->
-              label="项目名称">
+<!--              label="项目名称">-->
-            </el-table-column>
+<!--            </el-table-column>-->
             <el-table-column
               width="150px"
               align="center"

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue

@@ -84,6 +84,20 @@
                 label="评估时间"
         >
         </el-table-column>
+        <el-table-column
+                prop="status"
+                label="技术储备情况"
+                width="150"
+        >
+          <template slot-scope="scope">
+            <div class="status" @click="editRiskDegree(scope.row)">
+              <div class="color" :style="iconColor(scope.row.riskDegree)"></div>
+              <div class="text" :style="textColor(scope.row.riskDegree)">
+                {{ scope.row.riskDegree === '0' ? '初始状态' : (scope.row.riskDegree === '1' ? '低风险' : (scope.row.riskDegree === '2' ? '中风险' : '高风险')) }}
+              </div>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column
                 fixed="right"
                 label=""
@@ -111,20 +125,20 @@
           <div class="search-area-detail">
             <div class="left" id="detailSearch">
               <el-form :inline="true" :model="sarProStateEO" class="label-input-form">
-                <el-form-item label="标准编号" class="search-item search-item-last">
+                <!--                <el-form-item label="标准编号" class="search-item search-item-last">-->
-                  <el-input
+                <!--                  <el-input-->
-                      v-model="sarProStateEO.standNumber"
+                <!--                      v-model="sarProStateEO.standNumber"-->
-                      placeholder="根据标准编号查找"
+                <!--                      placeholder="根据标准编号查找"-->
-                      :maxlength="100"
+                <!--                      :maxlength="100"-->
-                      clearable></el-input>
+                <!--                      clearable></el-input>-->
-                </el-form-item>
+                <!--                </el-form-item>-->
-                <el-form-item label="标准名称" class="search-item search-item-last">
+                <!--                <el-form-item label="标准名称" class="search-item search-item-last">-->
-                  <el-input
+                <!--                  <el-input-->
-                      v-model="sarProStateEO.standName"
+                <!--                      v-model="sarProStateEO.standName"-->
-                      placeholder="根据标准名称查找"
+                <!--                      placeholder="根据标准名称查找"-->
-                      :maxlength="100"
+                <!--                      :maxlength="100"-->
-                      clearable></el-input>
+                <!--                      clearable></el-input>-->
-                </el-form-item>
+                <!--                </el-form-item>-->
                 <el-form-item label="具体章条" class="search-item search-item-last">
                   <el-input
                           v-model="sarProStateEO.specificItem"
@@ -166,19 +180,19 @@
                     width="55"
                     align="center">
             </el-table-column>
-            <el-table-column
+            <!--            <el-table-column-->
-                    prop="standNumber"
+            <!--                    prop="standNumber"-->
-                    label="标准编号">
+            <!--                    label="标准编号">-->
-            </el-table-column>
+            <!--            </el-table-column>-->
-            <el-table-column
+            <!--            <el-table-column-->
-                    prop="standName"
+            <!--                    prop="standName"-->
-                    label="标准名称">
+            <!--                    label="标准名称">-->
-            </el-table-column>
+            <!--            </el-table-column>-->
-            <el-table-column
+            <!--            <el-table-column-->
-                    v-if="sarProject.position === '1'"
+            <!--                    v-if="sarProject.position === '1'"-->
-                    prop="lastVersionNumber"
+            <!--                    prop="lastVersionNumber"-->
-                    label="上一版本标准编号">
+            <!--                    label="上一版本标准编号">-->
-            </el-table-column>
+            <!--            </el-table-column>-->
             <el-table-column
                     v-if="sarProject.position === '2'"
                     prop="correspondDomesticStandard"
@@ -224,6 +238,18 @@
         </div>
       </div>
     </el-drawer>
+    <el-dialog width='400px' :visible.sync="riskDegreeModal" title="修改技术储备情况">
+      <el-select v-model="riskDegree" placeholder="请选择">
+        <el-option label="初始状态" value="0"></el-option>
+        <el-option label="低风险" value="1"></el-option>
+        <el-option label="中风险" value="2"></el-option>
+        <el-option label="高风险" value="3"></el-option>
+      </el-select>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" size="mini" @click="risSubmit">确定</el-button>
+        <el-button type="primary" size="mini" @click="riskDegreeModal = false">关闭</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -232,6 +258,9 @@ export default {
     name: "technologyInvolveProject",
     data () {
       return {
+        riskDegreeModal: false,
+        editData: {},
+        riskDegree: '',
         SarProStateType: '', // 国内外
         sarProject: {
           standName: '', // 标准政策名称
@@ -264,6 +293,47 @@ name: "technologyInvolveProject",
       }
     },
     methods: {
+      risSubmit () {
+        this.$http.postData('sarStandardComplianceAssessResult/sar-interpretation-national-standard/updateById', {
+          standNumber: this.editData.standNumber,
+          standName: this.editData.standName,
+          interpretationTime: this.editData.interpretationTime,
+          standId: this.editData.standId,
+          riskDegree: this.riskDegree
+        }, {
+          _this: this
+        }, res => {
+          this.riskDegreeModal = false
+          this.searchStandAndLaws()
+        })
+      },
+      editRiskDegree (row) {
+        this.riskDegreeModal = true
+        this.editData = row
+        this.riskDegree = row.riskDegree
+      },
+      iconColor (row) {
+        if (row === '0') {
+          return 'background: #409EFF'
+        } else if (row === '1') {
+          return 'background: #67c23a'
+        } else if (row === '2') {
+          return 'background: #e6a23c'
+        } else if (row === '3') {
+          return 'background: #f56c6c'
+        }
+      },
+      textColor (row) {
+        if (row === '0') {
+          return 'color: #409EFF'
+        } else if (row === '1') {
+          return 'color: #67c23a'
+        } else if (row === '2') {
+          return 'color: #e6a23c'
+        } else if (row === '3') {
+          return 'color: #f56c6c'
+        }
+      },
       searchStandAndLaws () {
         this.page = 1
         this.queryStandAndLaws()
@@ -285,6 +355,19 @@ name: "technologyInvolveProject",
           loading: 'loading',
         }, res => {
           this.sarProjectListDatas = res.data.records
+          this.sarProjectListDatas.forEach((item, index) => {
+            if (index === 0) {
+              item.status = '0'
+            } else if (index === 1) {
+              item.status = '1'
+            } else if (index === 2) {
+              item.status = '2'
+            } else if (index === 3) {
+              item.status = '3'
+            } else {
+              item.status = '3'
+            }
+          })
           this.total = res.data.total
         }, e=> {})
       },
@@ -370,6 +453,23 @@ name: "technologyInvolveProject",
 <style lang="less" scoped>
   .technology-involve-project{
     height: 100%;
+    .status {
+      border: 1px solid #ccc;
+      border-radius: 5px;
+      display: flex;
+      line-height: 30px;
+      margin: 5px;
+      align-items: center;
+      .text {
+        font-weight: bold;
+      }
+      .color {
+        margin: 0 10px;
+        width: 15px;
+        height: 15px;
+        border-radius: 50%;
+      }
+    }
     .laws-details-header {
       background: #fff;
       // height: 30px;