qule 2 years ago
parent
commit
fb8ef53d26

+ 2 - 2
src/components/cadDrawingManage/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: ql
  * @Date: 2022-01-11 14:46:04
- * @LastEditTime: 2022-01-24 17:18:04
+ * @LastEditTime: 2022-01-24 19:30:09
  * @LastEditors: Please set LastEditors
  * @FilePath: \adm-frontend\src\components\cadDrawingManage\index.vue
 -->
@@ -163,7 +163,7 @@ export default {
   filters: {
     timeFormat(timestr) {
       if(timestr) {
-         return moment(timestr).format('YYYY-MM-DD HH:mm:ss')
+         return moment(timestr).format('YYYY-MM-DD HH:mm')
       } 
       return '--'
     }

+ 134 - 132
src/components/old-adm/relation/components/overview/CardList.vue

@@ -12,155 +12,157 @@
         class="container"
         v-for="(child,childIndex) in item.childGraphicTypeList"
       >
-        <p class="relation-text">
-          <span class="iconfont icon-juxing"></span>
-          <span @click="toDetail(child)" style="cursor:pointer;">
-            {{ child.graphTypeName }}
-            <i class="icon-zuzhiguanxi iconfont"/></span>
-          <span class="pic-code">图类型编码:{{ child.graphTypeCode }}</span>
-          <el-tooltip
-            v-if="child.Note"
-            :content="child.Note"
-            placement="top">
-            <i
-              @click="explain"
-              class="icon-shuoming iconfont"
-            />
-          </el-tooltip>
-        </p>
-
-        <el-row :gutter="24">
-          <el-col
-            :key="relation.Id"
-            :span="8"
-            v-for="(relation,relIndex) in child.relationTypeProjectList"
-          >
-            <el-card
-              class="card "
-              shadow="hover"
-              style="position: relative;"
-
+        <div v-if="!!child.relationTypeProjectList.length">
+          <p class="relation-text">
+            <span class="iconfont icon-juxing"></span>
+            <span @click="toDetail(child)" style="cursor:pointer;">
+              {{ child.graphTypeName }}
+              <i class="icon-zuzhiguanxi iconfont"/></span>
+            <span class="pic-code">图类型编码:{{ child.graphTypeCode }}</span>
+            <el-tooltip
+              v-if="child.Note"
+              :content="child.Note"
+              placement="top">
+              <i
+                @click="explain"
+                class="icon-shuoming iconfont"
+              />
+            </el-tooltip>
+          </p>
+
+          <el-row :gutter="24">
+            <el-col
+              :key="relation.Id"
+              :span="8"
+              v-for="(relation,relIndex) in child.relationTypeProjectList"
             >
-              <!-- border:none-->
-              <!--              <div v-show="relation.cardDisabled || relation.ComputationalState === 3 " class="mask"></div>-->
-              <div v-show="relation.computationalState === 3 " class="mask"></div>
-              <div style="overflow: hidden;">
-                <el-tooltip
-                  :content="relation.relationTypeName"
-                  placement="top"
-                >
-                  <p class="relation-title reset-test reset-title">{{ relation.relationTypeName }}</p>
-                </el-tooltip>
-                <el-tooltip
-                  :content="relation.relationTypeCode"
-                  placement="top"
-                >
-                  <p class="asc reset-title reset-test">边类型编码:{{ relation.relationTypeCode }}</p>
-                </el-tooltip>
-                <p class="relation-title-icon reset-test fr">
+              <el-card
+                class="card "
+                shadow="hover"
+                style="position: relative;"
+
+              >
+                <!-- border:none-->
+                <!--              <div v-show="relation.cardDisabled || relation.ComputationalState === 3 " class="mask"></div>-->
+                <div v-show="relation.computationalState === 3 " class="mask"></div>
+                <div style="overflow: hidden;">
                   <el-tooltip
-                    v-if="relation.note"
-                    :content="relation.note"
+                    :content="relation.relationTypeName"
                     placement="top"
-                    style="z-index: 3;position:relative;"
                   >
-                    <i class="iconfont icon-warn icon"/>
+                    <p class="relation-title reset-test reset-title">{{ relation.relationTypeName }}</p>
                   </el-tooltip>
-                </p>
-              </div>
-              <article>
-                <el-row>
-                  <el-col :span="13">
-                    <div class="grid-content">
-                      <p class="object">主要连接对象</p>
-                      <el-tooltip
-                        :content="relation.conneObject"
-                        placement="top"
-                      >
-                        <p class="group reset-title">{{ relation.conneObject }}</p>
-                      </el-tooltip>
-                    </div>
-                  </el-col>
-                  <el-col :span="2">
-                    <div class="grid-content">
-                      <p class="thread"></p>
-                    </div>
-                  </el-col>
-                  <el-col :span="9">
-                    <div class="grid-content ">
-                      <p class="line-number">连接数量</p>
-                      <p :class="relation.count > 0? 'line-number-show' :'line-number-hide'">{{ relation.count }}</p>
-
-                    </div>
-                  </el-col>
-                </el-row>
-                <p class="last-computed">
-                  <!--  <span v-show="relation.ComputationalState === 3 || relation.ComputationalState === 4">关系计算中...</span>-->
-                  <!--                  <span v-show="relation.cardDisabled || relation.ComputationalState === 3">关系计算中...</span>-->
-                  <span v-show="relation.computationalState === 3">关系计算中...</span>
-                  <span v-show="relation.computationalState === 5">计算失败</span>
-                  <span
-                    v-show="relation.computationalState !== 3  && relation.computingTime">最后一次计算时间 {{ relation.computingTime }}</span>
                   <el-tooltip
-                    :content="relation.computationalState === 2 ? '关系变更,请重新计算':'启动计算'"
+                    :content="relation.relationTypeCode"
                     placement="top"
                   >
-                    <el-badge
-                      class="item float-right"
-                      :is-dot="relation.computationalState === 2 || relation.computationalState === 5"
+                    <p class="asc reset-title reset-test">边类型编码:{{ relation.relationTypeCode }}</p>
+                  </el-tooltip>
+                  <p class="relation-title-icon reset-test fr">
+                    <el-tooltip
+                      v-if="relation.note"
+                      :content="relation.note"
+                      placement="top"
+                      style="z-index: 3;position:relative;"
+                    >
+                      <i class="iconfont icon-warn icon"/>
+                    </el-tooltip>
+                  </p>
+                </div>
+                <article>
+                  <el-row>
+                    <el-col :span="13">
+                      <div class="grid-content">
+                        <p class="object">主要连接对象</p>
+                        <el-tooltip
+                          :content="relation.conneObject"
+                          placement="top"
+                        >
+                          <p class="group reset-title">{{ relation.conneObject }}</p>
+                        </el-tooltip>
+                      </div>
+                    </el-col>
+                    <el-col :span="2">
+                      <div class="grid-content">
+                        <p class="thread"></p>
+                      </div>
+                    </el-col>
+                    <el-col :span="9">
+                      <div class="grid-content ">
+                        <p class="line-number">连接数量</p>
+                        <p :class="relation.count > 0? 'line-number-show' :'line-number-hide'">{{ relation.count }}</p>
+
+                      </div>
+                    </el-col>
+                  </el-row>
+                  <p class="last-computed">
+                    <!--  <span v-show="relation.ComputationalState === 3 || relation.ComputationalState === 4">关系计算中...</span>-->
+                    <!--                  <span v-show="relation.cardDisabled || relation.ComputationalState === 3">关系计算中...</span>-->
+                    <span v-show="relation.computationalState === 3">关系计算中...</span>
+                    <span v-show="relation.computationalState === 5">计算失败</span>
+                    <span
+                      v-show="relation.computationalState !== 3  && relation.computingTime">最后一次计算时间 {{ relation.computingTime }}</span>
+                    <el-tooltip
+                      :content="relation.computationalState === 2 ? '关系变更,请重新计算':'启动计算'"
+                      placement="top"
+                    >
+                      <el-badge
+                        class="item float-right"
+                        :is-dot="relation.computationalState === 2 || relation.computationalState === 5"
+                      >
+                        <el-button
+                          @click="computed(relation)"
+                          :disabled="!relation.source && !relation.automatic "
+                          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
-                        @click="computed(relation)"
-                        :disabled="!relation.source && !relation.automatic "
+                        :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-changyongtubiao-mianxing-"
-                        class="sm-button"
+                        icon="iconfont icon-bianji"
+
                       >
-                        <!--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.source"
-                  >
-                    <el-button
-                      @click="equipment(relation)"
-                      type="primary"
-                      plain
-                      circle
-                      class="float-right sm-button"
-                      icon="iconfont icon-23 "
-                      style="transform: rotate(90deg);"
+                    </el-tooltip>
+                    <el-tooltip
+                      content="设定设备对象源/末端"
+                      placement="top"
+                      v-if="relation.source"
                     >
-                    </el-button>
-                  </el-tooltip>
-                </p>
-              </article>
-            </el-card>
-          </el-col>
-        </el-row>
+                      <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>
+          </el-row>
+        </div>
       </section>
     </div>
     <RelationMaintain

+ 1 - 2
src/components/uploadFile/index.vue

@@ -31,7 +31,7 @@
             @confirm='confirmHandle'
         >
             <template #content>
-                确定取消上传
+                确定关闭弹框
             </template>
             <template #handle>
                 <Button @click="modalClose" type="default">取消</Button>
@@ -80,7 +80,6 @@ export default {
                     },
                     files: that.fileList
                 });
-                console.log({res})
             }
         },
         uploading(nv, ov) {