From c6246828d0f3d38530621a6d4eb1f74e66e14414 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 18 Aug 2023 19:04:02 +0800
Subject: [PATCH] viewview

---
 src/views/component/showdialog.vue       | 33 +++++++++++++++---------
 src/views/jsc/components/echartsLine.vue | 21 +++++++++++++--
 src/views/jsc/index.vue                  |  2 +-
 3 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/src/views/component/showdialog.vue b/src/views/component/showdialog.vue
index e1635b0..49ab2e7 100644
--- a/src/views/component/showdialog.vue
+++ b/src/views/component/showdialog.vue
@@ -4,7 +4,7 @@
       <div class="itemWrap">
         <template v-for="(item,index) in formInfo">
           <template v-if='item.form_show==1'>
-            <template v-if="item.field!='uploads'">
+            <template v-if="item.edit_input!=='file'&&item.edit_input!=='files'">
               <div class="itemField">
                 <span>{{item.name}}:</span>
                 <span>{{form[item.field]}}</span>
@@ -13,14 +13,21 @@
             <template v-else>
               <div class="itemField">
                 <span>{{item.name}}:</span>
-                <span v-if="typeof form['uploads_uploads_id_relation']==='object'">
-                  <a style='color:red' target="_blank" :href="form['uploads_uploads_id_relation']['url']">{{form['uploads_uploads_id_relation']['original_name']}}</a>
-                </span>
-                <span v-if="typeof form['uploads_uploads_id_relation']==='array'">
-                  <template v-for="(upload,index) in form['uploads_uploads_id_relation']">
-                    <a style='color:red;width:100%' target="_blank" :href="upload.url">{{upload.original_name}}</a>
-                  </template>
-                </span>
+                <template v-if="item.edit_input==='file'">
+                  <span v-if="form[item.field+'_uploads_id_relation']!=null">
+                    <a style='color:red' target="_blank" :href="form[item.field+'_uploads_id_relation']['url']">{{form[item.field+'_uploads_id_relation']['original_name']}}</a>
+                  </span>
+                </template>
+                <template v-if="item.edit_input==='files'">
+                  <span>
+                    <template v-if="form[item.field+'_upload_details']!=null">
+                      <template v-for="(upload,index) in form[item.field+'_upload_details']">
+                        <a style='color:red;width:100%;display:block' target="_blank" :href="upload.url">{{upload.original_name}}</a>
+                      </template>
+                    </template>
+                  </span>
+                </template>
+
               </div>
             </template>
 
@@ -56,7 +63,7 @@
     watch: {
       dialogVisible(newval) {
         if (newval) {
-          this.getDetail()
+          // this.getDetail()
         } else {
           this.id = ''
           this.form = {}
@@ -66,8 +73,9 @@
     },
     created() {},
     methods: {
-      show() {
-        this.dialogVisible = true
+      show() {
+        this.getDetail()
+
       },
       closeDia(){
         this.dialogVisible = false
@@ -85,6 +93,7 @@
           table_name: this.tableName
         });
         this.form = res;
+        this.dialogVisible = true
         // uploads_uploads_id_relation
       },
     }
diff --git a/src/views/jsc/components/echartsLine.vue b/src/views/jsc/components/echartsLine.vue
index dd96bd7..f917eba 100644
--- a/src/views/jsc/components/echartsLine.vue
+++ b/src/views/jsc/components/echartsLine.vue
@@ -44,7 +44,20 @@
             trigger: 'axis',
             axisPointer: { // 坐标轴指示器，坐标轴触发有效
               type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-            }
+            },
+            formatter: function (params) {
+                let returnData = params[0].name + "<br/>";
+                for (let i = 0; i < params.length; i++) {
+                    returnData += '<span></span>';
+                    console.log(params[i].value)
+                    if (params[i].seriesType == "bar" && params[i].value == 1.55) {    //这里判断了一下，只有柱状图类型值为1.55才转换，如果为折线图则不变，label也是一样的
+                        returnData += params[i].seriesName + ":1" + "</br>";
+                    } else {
+                        returnData += params[i].seriesName + ":" + (params[i].value ? params[i].value : 0) + "</br>";
+                    }
+                }
+                return returnData;
+            },
           },
           grid: {
             left: '8%',
@@ -70,12 +83,16 @@
             }
           }],
           yAxis: [{
-            type: 'value',
+            type: 'log',
             axisLabel: {
               textStyle: {
                 show: true,
                 color: this.color[1]
               },
+              formatter: function (value) {
+                      return value === 1 ? 0 : value
+                  },
+
             }
           }],
           series: [{
diff --git a/src/views/jsc/index.vue b/src/views/jsc/index.vue
index 70b2b4f..34a8ee7 100644
--- a/src/views/jsc/index.vue
+++ b/src/views/jsc/index.vue
@@ -298,7 +298,7 @@
           for(var view of res.viewrecords){
             let value = view.value=='茅山旅游度假区'?'茅山':view.value
             this.monthX.push(value)
-            this.monthY.push(view.total)
+            this.monthY.push(view.total===1?1.55:view.total)
           }
 
           this.showChart = true