Merge remote-tracking branch 'origin/develop' into dev-hanshaozhuang

src/layout/components/Navbar.vue

 <template>
   <div class="navbar">
-    <div><quick-new></quick-new></div>
+    <!-- <div><quick-new></quick-new></div> -->
     <hamburger
       id="hamburger-container"
       :is-active="sidebar.opened"
@@ -50,14 +50,14 @@ import Breadcrumb from '@/components/Breadcrumb'
 import TopNav from '@/components/TopNav'
 import Hamburger from '@/components/Hamburger'
 
-import QuickNew from '@/components/QuickNew'
+// import QuickNew from '@/components/QuickNew'
 // import MessageWaring from '@/components/MessageWaring'
 export default {
   components: {
     Breadcrumb,
     TopNav,
-    Hamburger,
-    QuickNew
+    Hamburger
+    // QuickNew
     // MessageWaring
   },
   computed: {
@@ -102,7 +102,7 @@ export default {
 
 <style lang="scss" scoped>
 .navbar {
-  height: 80px;
+  height: 50px;
   overflow: hidden;
   position: relative;
   background: #fff;

src/utils/ruoyi.js

@@ -83,7 +83,7 @@ export function selectDictLabel(datas, value) {
   }
   var actions = []
   Object.keys(datas).some(key => {
-    if (datas[key].value === '' + value) {
+    if (datas[key].value == '' + value) {
       actions.push(datas[key].label)
       return true
     }
@@ -108,7 +108,7 @@ export function selectDictLabels(datas, value, separator) {
   Object.keys(value.split(currentSeparator)).some(val => {
     var match = false
     Object.keys(datas).some(key => {
-      if (datas[key].value === '' + temp[val]) {
+      if (datas[key].value == '' + temp[val]) {
         actions.push(datas[key].label + currentSeparator)
         match = true
       }
@@ -138,7 +138,7 @@ export function sprintf(str) {
 
 // 转换字符串，undefined,null等转化为""
 export function parseStrEmpty(str) {
-  if (!str || str === 'undefined' || str === 'null') {
+  if (!str || str == 'undefined' || str == 'null') {
     return ''
   }
   return str
@@ -148,7 +148,7 @@ export function parseStrEmpty(str) {
 export function mergeRecursive(source, target) {
   for (var p in target) {
     try {
-      if (target[p].constructor === Object) {
+      if (target[p].constructor == Object) {
         source[p] = mergeRecursive(source[p], target[p])
       } else {
         source[p] = target[p]
@@ -180,7 +180,7 @@ export function handleTree(data, id, parentId, children) {
 
   for (let d of data) {
     let parentId = d[config.parentId]
-    if (childrenListMap[parentId] === null) {
+    if (childrenListMap[parentId] == null) {
       childrenListMap[parentId] = []
     }
     nodeIds[d[config.id]] = d
@@ -189,7 +189,7 @@ export function handleTree(data, id, parentId, children) {
 
   for (let d of data) {
     let parentId = d[config.parentId]
-    if (nodeIds[parentId] === null) {
+    if (nodeIds[parentId] == null) {
       tree.push(d)
     }
   }

src/views/processing/processed-review/index.vue

@@ -103,7 +103,7 @@
           <el-button type="success" @click="handleDetail()"
             >查看审查问卷</el-button
           >
-          <el-button type="success">查看审查报告</el-button>
+          <el-button type="success" @click="goReport()">查看审查报告</el-button>
           <el-button type="success">查看企业留档文件</el-button>
           <el-button type="success">查看车企文件库</el-button>
           <el-button v-if="!isSysReview" type="success"
@@ -150,6 +150,9 @@ export default {
     /* 跳转到问卷详情*/
     handleDetail() {
       this.$router.push({ path: '/processing/review-questionnaire' })
+    },
+    goReport() {
+      this.$router.push({ path: '/processing/vehicleEvaluation' })
     }
   }
 }

src/views/processing/vehicleEvaluation/index.vue

+<template>
+  <div class="content">
+    <iframe
+      :src="'http://storage.xuetangx.com/public_assets/xuetangx/PDF/PlayerAPI_v1.0.6.pdf'"
+      frameborder="0"
+      style="width: 100%; height: 100%"
+    ></iframe>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Index'
+}
+</script>
+
+<style scoped>
+.content {
+  height: 100%;
+  width: 100%;
+  position: absolute;
+}
+</style>

src/views/setting/rules/index.vue

@@ -111,25 +111,25 @@
           class="item"
           effect="dark"
           :content="node.label"
-          placement="bottom"
+          placement="bottom-start"
         >
           <div class="title">{{ node.label }}</div>
         </el-tooltip>
 
         <div class="buttons-list">
-          <el-button
+          <!-- <el-button
             v-if="node.level == 1"
             type="text"
             size="mini"
             @click="() => append(data)"
           >
             添加标准要求
-          </el-button>
+          </el-button> -->
           <el-button
             v-if="node.level == 2"
             type="text"
             size="mini"
-            @click="() => append(data)"
+            @click="handlePointAdd"
           >
             添加审查要点
           </el-button>
@@ -137,19 +137,19 @@
             v-if="node.level == 3"
             type="text"
             size="mini"
-            @click="() => append(data)"
+            @click="handleAdd"
           >
             添加审查细则
           </el-button>
-          <el-button
+          <!-- <el-button
             v-if="node.level == 4"
             type="text"
             size="mini"
             @click="() => append(data)"
           >
             添加关联场景
-          </el-button>
-          <el-button type="text" size="mini" @click="() => append(data)">
+          </el-button> -->
+          <el-button type="text" size="mini" @click="() => handleUpdate(data)">
             修改
           </el-button>
           <el-button

src/views/setting/standard/index.vue

 <template>
   <page-standard>
     <div slot="tab">
-      <el-radio-group v-model="queryParams.type">
+      <el-radio-group v-model="queryParams.type" @input="loadData">
         <el-radio-button
           v-for="dict in dict.type.sys_detailed_classification"
           :key="dict.value"
@@ -226,7 +226,7 @@ export default {
       showSearch: true,
       list: [],
       tableData: [],
-      queryParams: { type: '2' },
+      queryParams: { type: '1' },
       dialogManger: {
         dialogVisible: false,
         refreshList: false,
@@ -244,8 +244,10 @@ export default {
     }
   },
   methods: {
+    objectSpanMethod() {},
     loadData() {
       this.loading = true
+      console.log(this.queryParams)
       request({
         url: this.listUrl,
         method: 'get',
@@ -253,10 +255,9 @@ export default {
       })
         .then(res => {
           if (res.code === 200) {
+            console.log(res.rows)
             this.list = res.rows
-            console.log(2222)
             if (this.queryParams.type === '2') {
-              console.log(geSpanList(res.rows, ['way', 'object', 'scene']))
               this.tableData = geSpanList(res.rows, ['way', 'object', 'scene'])
             } else {
               this.tableData = res.rows