ソースを参照

Merge branch 'dev'

zhangyu 4 年 前
コミット
770d0d209d

+ 63 - 62
src/components/relation/overview/CardList.vue

@@ -84,70 +84,71 @@
                     <div class="grid-content ">
                       <p class="line-number">连接数量</p>
                       <p :class="relation.count > 0? 'line-number-show' :'line-number-hide'">{{relation.count}}</p>
-                      <p class="last-computed">
-                        <span
-                          v-show="relation.ComputationalState === 3 || relation.ComputationalState === 4">关系计算中...</span>
-                        <span v-show="relation.ComputationalState === 5">计算失败</span>
-                        <span v-show="relation.ComputingTime">最后一次计算时间 {{relation.ComputingTime}}</span>
-                        <el-tooltip
-                          content="启动计算"
-                          placement="top"
-                        >
-                          <el-badge
-                            class="item float-right"
-                            :is-dot="relation.ComputationalState === 2"
-                          >
-                            <el-button
-                              @click="computed(relation)"
-                              :disabled="!relation.IsSource && !relation.IsAutomatic"
-                              circle
-                              type="primary"
-                              plain
-                              icon="iconfont icon-changyongtubiao-mianxing-"
-                              class="sm-button"
-                            >
-                              <!--style="background: #000;color: #fff"-->
-                            </el-button>
-                          </el-badge>
-                        </el-tooltip>
-                        <el-tooltip
-                          content="手动编辑"
-                          placement="top"
-                        >
-                          <el-button
-                            :disabled="relation.Manual === 1"
-                            :style="{'border':(relation.Manual=== 1? '1px solid #DCDFE6' :'')}"
-                            @click="manual(relation)"
-                            circle
-                            class="float-right sm-button"
-                            type="primary"
-                            plain
-                            icon="iconfont icon-bianji"
-
-                          >
-                          </el-button>
-
-                        </el-tooltip>
-                        <el-tooltip
-                          content="设定设备对象源/末端"
-                          placement="top"
-                          v-if="relation.IsSource"
-                        >
-                          <el-button
-                            @click="equipment(relation)"
-                            type="primary"
-                            plain
-                            circle
-                            class="float-right sm-button"
-                            icon="iconfont icon-23 "
-                            style="transform: rotate(90deg);"
-                          >
-                          </el-button>
-                        </el-tooltip>
-                      </p>
+
                     </div>
                   </el-col>
                 </el-row>
+                <p class="last-computed">
+                        <span
+                          v-show="relation.ComputationalState === 3 || relation.ComputationalState === 4">关系计算中...</span>
+                  <span v-show="relation.ComputationalState === 5">计算失败</span>
+                  <span v-show="relation.ComputingTime">最后一次计算时间 {{relation.ComputingTime}}</span>
+                  <el-tooltip
+                    content="启动计算"
+                    placement="top"
+                  >
+                    <el-badge
+                      class="item float-right"
+                      :is-dot="relation.ComputationalState === 2"
+                    >
+                      <el-button
+                        @click="computed(relation)"
+                        :disabled="!relation.IsSource && !relation.IsAutomatic"
+                        circle
+                        type="primary"
+                        plain
+                        icon="iconfont icon-changyongtubiao-mianxing-"
+                        class="sm-button"
+                      >
+                        <!--style="background: #000;color: #fff"-->
+                      </el-button>
+                    </el-badge>
+                  </el-tooltip>
+                  <el-tooltip
+                    content="手动编辑"
+                    placement="top"
+                  >
+                    <el-button
+                      :disabled="relation.Manual === 1"
+                      :style="{'border':(relation.Manual=== 1? '1px solid #DCDFE6' :'')}"
+                      @click="manual(relation)"
+                      circle
+                      class="float-right sm-button"
+                      type="primary"
+                      plain
+                      icon="iconfont icon-bianji"
+
+                    >
+                    </el-button>
+
+                  </el-tooltip>
+                  <el-tooltip
+                    content="设定设备对象源/末端"
+                    placement="top"
+                    v-if="relation.IsSource"
+                  >
+                    <el-button
+                      @click="equipment(relation)"
+                      type="primary"
+                      plain
+                      circle
+                      class="float-right sm-button"
+                      icon="iconfont icon-23 "
+                      style="transform: rotate(90deg);"
+                    >
+                    </el-button>
+                  </el-tooltip>
+                </p>
               </article>
             </el-card>
           </el-col>
@@ -268,7 +269,7 @@
           localStorage.setItem('RelManualType',relation.RelManualType)
           localStorage.setItem('RelationTypeName',relation.RelationTypeName)
           localStorage.setItem('RelationType',relation.RelationType)
-          localStorage.setItem('ZoneType',relation.ZoneType)
+          localStorage.setItem('ZoneType',relation.ZoneType ? relation.ZoneType : '')
           localStorage.setItem('MainObject',relation.MainObject)
           localStorage.setItem('FromObject', relation.FromObject)
           localStorage.setItem('count', relation.count)

+ 8 - 2
src/components/relation/overview/Modal/RelationMaintain.vue

@@ -357,11 +357,17 @@
       },
       downloadProject(str) {
         let relType = this.ManualMaintenance.RelationType ? `?relType=${this.ManualMaintenance.RelationType}` : ''
-        let zoneType = this.ManualMaintenance.ZoneType ? `&zoneType=${this.ManualMaintenance.ZoneType}` : ''
+        let zoneType = this.ManualMaintenance.ZoneType ? `&zoneType=${this.ManualMaintenance.ZoneType}` : null
         let url;
         if (str === 'excel') {
           relType = this.ManualMaintenance.RelationType ? `&relType=${this.ManualMaintenance.RelationType}` : ''
-          url = `/api/datacenter/graphic/export?code=对象ID${relType}${zoneType}`
+          // url = `/api/datacenter/graphic/export?code=对象ID${relType}${zoneType}`
+          if(zoneType) {
+            url = '/api/datacenter/graphic/export?code=对象ID' + relType + zoneType
+
+          } else {
+            url = '/api/datacenter/graphic/export?code=对象ID' + relType
+          }
         } else {
           url = `/api/datacenter/graphic/report-downloads${relType}${zoneType}`
         }

+ 5 - 4
src/components/relation/relationShip/Modal/exportExcel.vue

@@ -13,6 +13,8 @@
           </p>
 
           <a :href="downloadProject('excel')">
+
+            <!--          <a :href=`/api/datacenter/graphic/export?code=对象ID${localStorage.getItem('RelationType')?relType=${localStorage.getItem('RelationType')} : null}${ localStorage.getItem('ZoneType') ? `&zoneType=${localStorage.getItem('ZoneType')}` : null}` >-->
             <el-button
               type="primary"
               class="mt-10"
@@ -27,7 +29,7 @@
       </el-row>
       <el-upload
         class="upload-demo"
-        drag
+        :drag="true"
         action="/api/datacenter/graphic/import"
         multiple
         :show-file-list='false'
@@ -37,7 +39,6 @@
         :on-progress="progress"
         :on-success="success"
         :on-error="error"
-        accept="xlsx,xls"
       >
         <i class="el-icon-upload"/>
         <div
@@ -131,8 +132,8 @@
     },
     methods: {
       downloadProject(str) {
-        let relType = localStorage.getItem('RelationType') ? `?relType=${localStorage.getItem('RelationType')}` : '';
-        let zoneType = localStorage.getItem('ZoneType') ? `&zoneType=${localStorage.getItem('ZoneType')}` : '';
+        let relType = localStorage.getItem('RelationType') != '' ? `?relType=${localStorage.getItem('RelationType')}` : '';
+        let zoneType = localStorage.getItem('ZoneType') != '' ? `&zoneType=${localStorage.getItem('ZoneType')}` : '';
         let url;
         if (str === 'excel') {
           relType = localStorage.getItem('RelationType') ? `&relType=${localStorage.getItem('RelationType')}` : '';

+ 4 - 3
src/views/relation/relationShip/index.vue

@@ -258,7 +258,6 @@
   import editRelationShip from "../../../components/relation/relationShip/Modal/editRelationShip";
   import {relDelete, relQuery} from "../../../api/relation/api";
 
-  const ComputingTime = localStorage.getItem('ComputingTime') ? localStorage.getItem('ComputingTime') : ''
   export default {
     name: "index",
     data() {
@@ -275,7 +274,7 @@
           optionTips: `请下载最新最新<${localStorage.getItem('RelationTypeName')}>数据进行手动维护`, //请下载最新最新 xxxx 数据进行手动维护
           currentNum: '当前关系数量:',
           download: '下载模板(含数据)',
-          lastTime: `最后更新时间为:${ComputingTime}`, //最后更新时间为
+          lastTime: `最后更新时间为:${localStorage.getItem('ComputingTime') || ''}`, //最后更新时间为
           uploadTxt: '将Excel文件拖到此处,或<em>单击上传Excel文件<em>',
           uploadTips: '上传的Excel数据将完全覆盖当前关系表(关系表先前数据不会保留)',
           downloadFile: ' 下载报告文件',
@@ -466,9 +465,11 @@
         this.init()
       },
       lookOver(index, row) {
-
+        this.$message.info('开发中')
         console.log(index, row)
 
+        return false
+
         // this.$refs.editShipComponent.editShipDialog = true
       },
       deleteObject(index, row) {