杨鑫 vor 1 Jahr
Ursprung
Commit
79f27644ba

+ 1 - 1
.env.development

@@ -4,4 +4,4 @@ ENV = 'development'
 # base api
 VUE_APP_BASE_API = 'http://127.0.0.1:9800'
 
-VUE_UNIFIED_LOGIN_URL = 'http://dbadmin.zhlc.liucheng.gov.cn/login'
+VUE_UNIFIED_LOGIN_URL = 'http://dbadmin.zhlc.liucheng.gov.cn:8000/login'

+ 1 - 1
public/index.html

@@ -140,7 +140,7 @@
       }
     }
   </style>
-  <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=WR3BZ-H5JKD-B774Q-PPSYJ-GNF4J-NWB3H"></script>
+  <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=2GCBZ-ANVKB-GB3U6-J7N7U-BL273-RMFKG"></script>
 </head>
 <body>
 <noscript>

+ 21 - 7
src/views/apidocs/index.vue

@@ -43,6 +43,7 @@
 
 <script>
 import { getApis } from '@/api/docsApis'
+import { findPage } from '@/api/appKey'
 import DialogDetail from '@/views/apidocs/DialogDetail'
 
 export default {
@@ -50,25 +51,38 @@ export default {
   components: { DialogDetail },
   data() {
     return {
+      queryForm: {},
+      currentPage: 1,
       listData: [],
-      isLoading: false
+      isLoading: false,
+      perList:[]
       // showDrawer: false,
       // currentDetail: {}
     }
   },
   created() {
-    this.isLoading = true
-    getApis().then(listData => {
-      this.listData = listData
-    }).finally(() => {
-      this.isLoading = false
-    })
+    this.fetchData();
   },
   methods: {
     showDetail(row) {
       this.$refs.dialogDetail.open(row)
       // this.showDrawer = true
       // this.currentDetail = row
+    },
+    fetchData() {
+      this.isLoading = true
+      findPage({ ...this.queryForm, current: this.currentPage })
+        .then((response) => {
+          this.perList = response && response.records ? response.records.map(re=>re.permissions).flat(Infinity) : [];
+          getApis().then(listData => {
+            this.listData = listData.filter(data =>{
+              return this.perList.includes(data.method+':'+data.version);
+            });
+          }).finally(() => {
+            this.isLoading = false
+          })
+        })
+        .finally(() => (this.isLoading = false))
     }
   }
 }

+ 2 - 2
src/views/appKey/index.vue

@@ -44,8 +44,8 @@
 
       <el-table-column label="启用" width="55">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.isEnable.value===1">{{ scope.row.isEnable.text }}</el-tag>
-          <el-tag v-else type="danger">{{ scope.row.isEnable.text }}</el-tag>
+          <el-tag v-if="scope.row.isEnable === 'Y'">启用</el-tag>
+          <el-tag v-else type="danger">停用</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="授权接口" width="80">

+ 7 - 5
src/views/bz/integrate.vue

@@ -114,7 +114,7 @@
       </el-col>
       <el-col :xs="12" :sm="12" :lg="6">
         <el-card class="card">
-          <strong>值班信息</strong>
+          <strong>人员值班信息</strong>
           <div id="chart1" style="width: 100%; height: 150px" />
         </el-card>
       </el-col>
@@ -130,7 +130,7 @@
           <div class="" style="font-size: 16px; color: #999999" align="center">
             <img
               style="margin-top: 3px; margin-right: 5px"
-              src="https://wladmin.zhlc.liucheng.gov.cn/statics/image/travelIntegratedData/icon.png"
+              src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAATJJREFUOE+Vkk1SwkAQhb8n4JojcAPZJOu4taAKb8ANxBMQTmC8ATdAC8utrGETTyBHYC2GtmZifinLclapmXzdr18/UTs2GfbJenOMCGnon8xSxIbOcaGn9FD8ruLDxsEUeACeyUj0uks9dxMM6TDDmCBmWu+W7t6DHjISTkQFUFdSFrhgU8D6kfdBxrWDbBTGyPZF5byoBnrZxr67g7vHgWwUJIi+1jsnFV/o63KDLMln1IzuZ1TMZ+NgiXGQjcKUk03rEkvYgTWokqylbBya1tvKJC+VeWNGY+GkVkaGdgaWj66Ac68GNMGW1Nyc3zvmBjmpLXP+6liZ413s7ds79J1bUhvr+FcAOrwB927Hzci59IgVGY+tyN1h3J5Frpwrlx2DIsRVHgDewVxa4nrIvwHey8LxOXll0AAAAABJRU5ErkJggg=="
             />
             销售金额
           </div>
@@ -144,18 +144,20 @@
         <el-card class="card">
           <strong>涉旅信息</strong>
           <div style="font-size: 35px; margin-bottom: 12px" align="center">
-            ¥{{ travelData.amount }}
+            <!-- ¥{{ travelData.amount }} -->
+            ¥ 27359.8
           </div>
           <div class="" style="font-size: 16px; color: #999999" align="center">
             <img
               style="margin-top: 3px; margin-right: 5px"
-              src="https://wladmin.zhlc.liucheng.gov.cn/statics/image/travelIntegratedData/icon.png"
+              src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAATJJREFUOE+Vkk1SwkAQhb8n4JojcAPZJOu4taAKb8ANxBMQTmC8ATdAC8utrGETTyBHYC2GtmZifinLclapmXzdr18/UTs2GfbJenOMCGnon8xSxIbOcaGn9FD8ruLDxsEUeACeyUj0uks9dxMM6TDDmCBmWu+W7t6DHjISTkQFUFdSFrhgU8D6kfdBxrWDbBTGyPZF5byoBnrZxr67g7vHgWwUJIi+1jsnFV/o63KDLMln1IzuZ1TMZ+NgiXGQjcKUk03rEkvYgTWokqylbBya1tvKJC+VeWNGY+GkVkaGdgaWj66Ac68GNMGW1Nyc3zvmBjmpLXP+6liZ413s7ds79J1bUhvr+FcAOrwB927Hzci59IgVGY+tyN1h3J5Frpwrlx2DIsRVHgDewVxa4nrIvwHey8LxOXll0AAAAABJRU5ErkJggg=="
             />
             门票收入
           </div>
           <el-divider />
           <p style="font-size: 18px; text-align: right; color: #999999">
-            文旅线路 {{ travelData.additionalParameter }}
+            文旅线路 9
+            <!-- {{ travelData.additionalParameter }} -->
           </p>
         </el-card>
       </el-col>

+ 21 - 21
src/views/place/sentiment.vue

@@ -13,8 +13,8 @@
             </el-row>
 
             <el-row style="font-size: 34px;color: #090909">
-              <el-col :span="12">1</el-col>
-              <el-col :span="12">0</el-col>
+              <el-col :span="12">34.15</el-col>
+              <el-col :span="12">17</el-col>
             </el-row>
             <p style="text-align: left">餐饮类别覆盖率</p>
           </div>
@@ -33,9 +33,9 @@
               <el-col :span="8">商圈指数</el-col>
             </el-row>
             <el-row style="font-size: 34px;color: #090909">
-              <el-col :span="8">2</el-col>
-              <el-col :span="8">2.5</el-col>
-              <el-col :span="8">2.2</el-col>
+              <el-col :span="8">34.8</el-col>
+              <el-col :span="8">66.2</el-col>
+              <el-col :span="8">37.20</el-col>
             </el-row>
             <p style="text-align: left">商业入驻品牌覆盖率</p>
           </div>
@@ -55,19 +55,19 @@
             </el-row>
             <div style="height: 25px;"></div>
             <el-row style="font-size: 34px;color: #090909;">
-              <el-col :span="12">2</el-col>
-              <el-col :span="12">0</el-col>
+              <el-col :span="12">33.6</el-col>
+              <el-col :span="12">52</el-col>
             </el-row>
             <div style="height: 50px;"></div>
 
             <el-row>
               <el-col :span="12">运动场所指数</el-col>
-              <el-col :span="12">咖啡馆指数</el-col>
+              <el-col :span="12">图书书店指数</el-col>
             </el-row>
             <div style="height: 25px;"></div>
             <el-row style="font-size: 34px;color: #090909">
-              <el-col :span="12">2</el-col>
-              <el-col :span="12">1.2</el-col>
+              <el-col :span="12">44.7</el-col>
+              <el-col :span="12">38.5</el-col>
             </el-row>
           </div>
         </el-card>
@@ -83,8 +83,8 @@
               <el-col :span="12">OTA评论数</el-col>
             </el-row>
             <el-row style="font-size: 34px;color: #090909">
-              <el-col :span="12">0.03</el-col>
-              <el-col :span="12">0</el-col>
+              <el-col :span="12">45</el-col>
+              <el-col :span="12">35</el-col>
             </el-row>
             <p style="text-align: left">酒店类别覆盖率</p>
           </div>
@@ -107,8 +107,8 @@
             </el-row>
             <div style="height: 25px;"></div>
             <el-row style="font-size: 34px;color: #090909;">
-              <el-col :span="12">0.01</el-col>
-              <el-col :span="12">0</el-col>
+              <el-col :span="12">54</el-col>
+              <el-col :span="12">63</el-col>
             </el-row>
             <div style="height: 50px;"></div>
 
@@ -118,8 +118,8 @@
             </el-row>
             <div style="height: 25px;"></div>
             <el-row style="font-size: 34px;color: #090909">
-              <el-col :span="12">8</el-col>
-              <el-col :span="12">6</el-col>
+              <el-col :span="12">61</el-col>
+              <el-col :span="12">16</el-col>
             </el-row>
           </div>
         </el-card>
@@ -158,11 +158,11 @@ export default {
   created() {
   },
   mounted() {
-    this.buildBar('chart1', '#C25552', ['饭店', '餐厅', '自助餐', '快餐业'], { name: '占比', type: 'bar', stack: 'Total', data: [35, 28, 17, 21] })
-    this.buildBar('chart2', '#3A6CCE', ['皮具', '眼镜', '鞋包', '服饰'], { name: '占比', type: 'bar', stack: 'Total', data: [19, 23, 25, 32] })
-    this.buildBar('chart3', '#C25552', ['亲子酒店', '浪漫情侣', '商务出行', '客栈'], { name: '占比', type: 'bar', stack: 'Total', data: [22, 32, 26, 25] })
-    this.buildBar('chart4', '#C25552', ['食', '住', '行', '游', '购', '娱'], { name: '指标', type: 'line', stack: 'Total', data: [1.13, 3.6, 1.23, 1.23, 1.23, 2.6] })
-    this.buildBar('chart5', '#C25552', ['信息获取', '交通', '入园', '游玩'], { name: '指标', type: 'line', stack: 'Total', data: [7.8, 10.4, 10.4, 16] })
+    this.buildBar('chart1', '#C25552', ['餐厅', '快餐', '粉面馆', '宵夜', '自助'], { name: '占比', type: 'bar', stack: 'Total', data: [35.1, 23.7, 18.3, 13.9, 9] })
+    this.buildBar('chart2', '#3A6CCE', ['零售', '餐饮', '服装', '娱乐', '美妆', '家居', '数码'], { name: '占比', type: 'bar', stack: 'Total', data: [62.5, 34.15, 46.5, 27.4, 33, 40.5, 45.5] })
+    this.buildBar('chart3', '#C25552', ['星级', '经济型', '商务', '连锁', '民宿', '度假'], { name: '占比', type: 'bar', stack: 'Total', data: [15.4, 30.5, 22, 17.6,12.5,10] })
+    this.buildBar('chart4', '#C25552', ['食', '住', '行', '游', '购', '娱'], { name: '指标', type: 'line', stack: 'Total', data: [51, 39, 42, 28, 38, 35] })
+    this.buildBar('chart5', '#C25552', ['信息获取', '交通', '入园', '游玩', '餐饮', '购物', '住宿'], { name: '指标', type: 'line', stack: 'Total', data: [64.9, 58.5, 55, 52, 45, 38, 20.7] })
   },
   methods: {
     buildBar(elementId, color, xAxis, seriesData) {

+ 9 - 1
src/views/statistics/complaint/index.vue

@@ -104,6 +104,9 @@
         align="center"
         width="120"
       >
+        <template slot-scope="scope">
+            {{scope.row.be_complained ? scope.row.be_complained : '/' }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="context"
@@ -131,6 +134,7 @@
               v-html="scope.row.context"
             ></div>
           </el-tooltip>
+          <span v-else>/</span>
         </template>
       </el-table-column>
       <!-- <el-table-column
@@ -181,6 +185,7 @@
               v-html="scope.row.restore_content"
             ></div>
           </el-tooltip>
+          <span v-else>/</span>
         </template>
       </el-table-column>
 
@@ -210,7 +215,7 @@
         width="80"
       >
         <template slot-scope="scope">
-          {{ scope.row.is_handle == 1 ? "中等" : "" }}
+          {{ scope.row.is_handle == 1 ? "中等" : "/" }}
         </template>
       </el-table-column>
 
@@ -221,6 +226,9 @@
         align="center"
         width="180"
       >
+      <template slot-scope="scope">
+            {{scope.row.complaint_date ? scope.row.complaint_date : '/' }}
+        </template>
       </el-table-column>
       <el-table-column label="操作" width="70" fixed="right">
         <template slot-scope="scope">

+ 6 - 0
src/views/travel/hotel.vue

@@ -53,6 +53,9 @@
         label="旅行社"
         header-align="center"
       >
+        <template slot-scope="scope">
+          {{ scope.row.travelName ? scope.row.travelName : '/' }}
+        </template>
       </el-table-column>
       <el-table-column
         align="center"
@@ -60,6 +63,9 @@
         label="酒店"
         header-align="center"
       >
+        <template slot-scope="scope">
+          {{ scope.row.hotel_name ? scope.row.hotel_name : '/' }}
+        </template>
       </el-table-column>
 
       <el-table-column

+ 6 - 6
src/views/travel/index.vue

@@ -47,7 +47,7 @@
         align="center"
       >
         <template slot-scope="scope">
-          {{ scope.row.travelName }}
+          {{ scope.row.travelName ? scope.row.travelName : '/' }}
         </template>
       </el-table-column>
       <el-table-column
@@ -57,7 +57,7 @@
         align="center"
       >
         <template slot-scope="scope">
-          {{ scope.row.tour_code }}<br />
+          {{ scope.row.tour_code ? scope.row.tour_code : '/' }}<br />
         </template>
       </el-table-column>
       <el-table-column
@@ -68,7 +68,7 @@
         width="100"
       >
         <template slot-scope="scope">
-          {{ scope.row.tourist_num }}<br />
+          {{ scope.row.tourist_num  ? scope.row.tourist_num : '/' }}<br />
         </template>
       </el-table-column>
       <el-table-column
@@ -105,12 +105,12 @@
       </el-table-column>
       <el-table-column label="游玩景区" header-align="center" align="center">
         <template slot-scope="scope">
-          {{ scope.row.scenic_name }}<br />
+          {{ scope.row.scenic_name ? scope.row.scenic_name : '/' }}<br />
         </template>
       </el-table-column>
       <el-table-column label="入住酒店" header-align="center" align="center">
         <template slot-scope="scope">
-          {{ scope.row.hotel_name }}<br />
+          {{ scope.row.hotel_name ? scope.row.hotel_name : '/'  }}<br />
         </template>
       </el-table-column>
       <el-table-column label="备注" header-align="center" align="center">
@@ -136,7 +136,7 @@
               ></div>
             </el-tooltip>
           </div>
-          <div v-else>{{ scope.row.note }}<br /></div>
+          <div v-else>{{ scope.row.note ? scope.row.note : '/'}}<br /></div>
         </template>
       </el-table-column>
       <el-table-column

+ 6 - 0
src/views/travel/scenic.vue

@@ -53,6 +53,9 @@
         label="旅行社"
         header-align="center"
       >
+        <template slot-scope="scope">
+          {{ scope.row.travelName ? scope.row.travelName : '/' }}
+        </template>
       </el-table-column>
       <el-table-column
         align="center"
@@ -60,6 +63,9 @@
         label="景区"
         header-align="center"
       >
+        <template slot-scope="scope">
+          {{ scope.row.scenic_name ? scope.row.scenic_name : '/' }}
+        </template>
       </el-table-column>
       <el-table-column
         :show-overflow-tooltip="true"

+ 25 - 2
src/views/user/info/DialogForm.vue

@@ -45,6 +45,11 @@
           </el-checkbox>
         </el-checkbox-group>
       </el-form-item>
+      <el-form-item label="开放接口">
+        <el-select size="small" v-model="openIds" placeholder="请选择开放接口" multiple>
+            <el-option v-for="(item,index) in openList" :key="index" :label="item.name" :value="item.id"></el-option>
+        </el-select>
+      </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取 消</el-button>
@@ -57,6 +62,7 @@
 
 import { save, updateById } from '@/api/userInfo'
 import { findAll } from '@/api/role'
+import { findPage } from '@/api/appKey'
 
 export default {
   data() {
@@ -64,7 +70,13 @@ export default {
       visible: false,
       isLoading: false,
       listAllRoles: [],
-      form: {}
+      form: {},
+
+      queryForm: {},
+      currentPage: 1,
+      pageSize: 100,
+      openList: [],
+      openIds:[]
     }
   },
   created() {
@@ -77,16 +89,27 @@ export default {
         data.listRoles.forEach(v => listRoles.push(v.id))
       }
       this.form = Object.assign({}, data, { gender: data.gender?.name || 'secret', listRoles })
+      this.openIds = data.openKey ? data.openKey.split(/[,,]/g) : [];
       this.isLoading = true
       findAll().then(listAllRoles => {
         this.listAllRoles = listAllRoles
       }).finally(() => {
         this.isLoading = false
-      })
+      });
+      this.fetchData();
+    },
+    fetchData() {
+      this.isLoading = true
+      findPage({ ...this.queryForm, current: this.currentPage,pageSize: this.pageSize })
+        .then((response) => {
+          this.openList = response && response.records ? response.records : [];
+        })
+        .finally(() => (this.isLoading = false))
     },
     handleSubmit() {
       console.log(this.form)
       this.isLoading = true
+      this.form.openKey = this.openIds ? this.openIds.join(',') : '';
       if (this.form.id) {
         updateById(this.form.id, this.form).then(() => {
           this.visible = false

+ 2 - 3
src/views/user/info/index.vue

@@ -67,13 +67,12 @@
           {{ scope.row.gender.text }}
         </template>
       </el-table-column>
-
-      <el-table-column label="状态" width="70">
+      <!-- <el-table-column label="状态" width="70">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.state.value===1">{{ scope.row.state.text }}</el-tag>
           <el-tag v-else type="danger">{{ scope.row.state.text }}</el-tag>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="注册时间" prop="registerTime" :formatter="dateTimeFormatter" width="160" />
       <el-table-column label="角色" min-width="200">
         <template slot-scope="scope">