bug修复

src/views/patentMining/components/details/components/projectPath.vue

@@ -4,6 +4,8 @@
     <span>项目流程</span>
     <el-divider></el-divider>
     <svg viewBox="0 0 1800 400" width="100%" height="100%">
+
+
       <g transform=translate(0,0) class="svgG">
         <g @click="toDrawer('创新点梳理', 1)">
           <rect width="200" height="120" :fill="getColor('创新点梳理',1)"> </rect>
@@ -23,44 +25,89 @@
         </g>
         <polygon points="350,55,360,60,350,65"></polygon>
       </g>
+
+
       <g transform="translate(360,0)" class="svgG">
         <g @click="toDrawer('查新检索', 2)">
-          <rect width="200" height="120" :fill="getColor('查新检索')"> </rect>
+          <rect width="200" height="120" :fill="getColor('查新检索',2)"> </rect>
           <text x="30" y="65">查新检索</text>
-          <circle cx="150" cy="60" r="15" stroke-width="1" stroke="#fff" :fill="getColor('查新检索')" />
-          <text :x="getNumber('查新检索') > 9 ? '140' : '145'" y="65" fill="#fff">{{ getNumber('查新检索') }}</text>
+        </g>
+        <g>
+          <text x="120" y="45">任务：</text>
+          <circle cx="180" cy="40" r="15" stroke-width="1" stroke="#fff" :fill="getColor('查新检索',2)" />
+          <text :x="getNumber('查新检索',2) > 9 ? '170' : '175'" y="45" fill="#fff">{{ getNumber('查新检索',2,'task') }}</text>
+          <line x1="200" y1="60" x2="350" y2="60" stroke='#333'></line>
+        </g>
+        <g>
+          <text x="120" y="85">文件：</text>
+          <circle cx="180" cy="80" r="15" stroke-width="1" stroke="#fff" :fill="getColor('查新检索',2)" />
+          <text :x="getNumber('查新检索',2) > 9 ? '170' : '175'" y="85" fill="#fff">{{ getNumber('查新检索',2,'file') }}</text>
           <line x1="200" y1="60" x2="350" y2="60" stroke='#333'></line>
         </g>
         <polygon points="350,55,360,60,350,65"></polygon>
       </g>
+
+
       <g transform="translate(720,0)" class="svgG">
         <g @click="toDrawer('保护主题规划', 3)">
-          <rect width="200" height="120" :fill="getColor('保护主题规划')"> </rect>
+          <rect width="200" height="120" :fill="getColor('保护主题规划',3)"> </rect>
           <text x="30" y="65">保护主题规划</text>
-          <circle cx="150" cy="60" r="15" stroke-width="1" stroke="#fff" :fill="getColor('保护主题规划')" />
-          <text x="145" y="65" fill="#fff">{{ getNumber('保护主题规划') }}</text>
+        </g>
+        <g>
+          <text x="120" y="45">任务：</text>
+          <circle cx="180" cy="40" r="15" stroke-width="1" stroke="#fff" :fill="getColor('保护主题规划',3)" />
+          <text :x="getNumber('保护主题规划',3) > 9 ? '170' : '175'" y="45" fill="#fff">{{ getNumber('保护主题规划',3,'task') }}</text>
+          <line x1="200" y1="60" x2="350" y2="60" stroke='#333'></line>
+        </g>
+        <g>
+          <text x="120" y="85">文件：</text>
+          <circle cx="180" cy="80" r="15" stroke-width="1" stroke="#fff" :fill="getColor('保护主题规划',3)" />
+          <text :x="getNumber('保护主题规划',3) > 9 ? '170' : '175'" y="85" fill="#fff">{{ getNumber('保护主题规划',3,'file') }}</text>
           <line x1="200" y1="60" x2="350" y2="60" stroke='#333'></line>
         </g>
 
         <polygon points="350,55,360,60,350,65"></polygon>
       </g>
+
+
       <g transform="translate(1080,0)" class="svgG">
         <g @click="toDrawer('独权撰写', 4)">
-          <rect width="200" height="120" :fill="getColor('独权撰写')"> </rect>
+          <rect width="200" height="120" :fill="getColor('独权撰写',4)"> </rect>
           <text x="30" y="65">独权撰写</text>
-          <circle cx="150" cy="60" r="15" stroke-width="1" stroke="#fff" :fill="getColor('独权撰写')" />
-          <text x="145" y="65" fill="#fff">{{ getNumber('独权撰写') }}</text>
+        </g>
+        <g>
+          <text x="120" y="45">任务：</text>
+          <circle cx="180" cy="40" r="15" stroke-width="1" stroke="#fff" :fill="getColor('独权撰写',4)" />
+          <text :x="getNumber('独权撰写',4) > 9 ? '170' : '175'" y="45" fill="#fff">{{ getNumber('独权撰写',4,'task') }}</text>
+          <line x1="200" y1="60" x2="350" y2="60" stroke='#333'></line>
+        </g>
+        <g>
+          <text x="120" y="85">文件：</text>
+          <circle cx="180" cy="80" r="15" stroke-width="1" stroke="#fff" :fill="getColor('独权撰写',4)" />
+          <text :x="getNumber('独权撰写',4) > 9 ? '170' : '175'" y="85" fill="#fff">{{ getNumber('独权撰写',4,'file') }}</text>
           <line x1="200" y1="60" x2="350" y2="60" stroke='#333'></line>
         </g>
 
         <polygon points="350,55,360,60,350,65"></polygon>
       </g>
+
+
+      
       <g transform="translate(1440,0)" class="svgG">
         <g @click="toDrawer('从权撰写', 5)">
-          <rect width="200" height="120" :fill="getColor('从权撰写')"> </rect>
+          <rect width="200" height="120" :fill="getColor('从权撰写',5)"> </rect>
           <text x="30" y="65">从权撰写</text>
-          <circle cx="150" cy="60" r="15" stroke-width="1" stroke="#fff" :fill="getColor('从权撰写')" />
-          <text x="145" y="65" fill="#fff">{{ getNumber('从权撰写') }}</text>
+        </g>
+        <g>
+          <text x="120" y="45">任务：</text>
+          <circle cx="180" cy="40" r="15" stroke-width="1" stroke="#fff" :fill="getColor('从权撰写',5)" />
+          <text :x="getNumber('从权撰写',5) > 9 ? '170' : '175'"  y="45" fill="#fff">{{ getNumber('从权撰写',5,'task') }}</text>
+          <line x1="100" y1="120" x2="100" y2="190" stroke='#333'></line>
+        </g>
+        <g>
+          <text x="120" y="85">文件：</text>
+          <circle cx="180" cy="80" r="15" stroke-width="1" stroke="#fff" :fill="getColor('从权撰写',5)" />
+          <text :x="getNumber('从权撰写',5) > 9 ? '170' : '175'"  y="85" fill="#fff">{{ getNumber('从权撰写',5,'file') }}</text>
           <line x1="100" y1="120" x2="100" y2="190" stroke='#333'></line>
         </g>
         <polygon points="95,190,100,200,105,190"></polygon>
@@ -75,20 +122,39 @@
       </g> -->
       <g transform="translate(1440,200)" class="svgG">
         <g @click="toDrawer('申请文件定稿', 6)">
-          <rect width="200" height="120" :fill="getColor('申请文件定稿')"> </rect>
+          <rect width="200" height="120" :fill="getColor('申请文件定稿',6)"> </rect>
           <text x="30" y="65">申请文件定稿</text>
-          <circle cx="150" cy="60" r="15" stroke-width="1" stroke="#fff" :fill="getColor('申请文件定稿')" />
-          <text x="145" y="65" fill="#fff">{{ getNumber('申请文件定稿') }}</text>
+        </g>
+        <g>
+          <text x="120" y="45">任务：</text>
+          <circle cx="180" cy="40" r="15" stroke-width="1" stroke="#fff" :fill="getColor('申请文件定稿',6)" />
+          <text :x="getNumber('申请文件定稿',6) > 9 ? '170' : '175'" y="45" fill="#fff">{{ getNumber('申请文件定稿',6,'task') }}</text>
+          <line x1="0" y1="60" x2="-150" y2="60" stroke='#333'></line>
+        </g>
+        <g>
+          <text x="120" y="85">文件：</text>
+          <circle cx="180" cy="80" r="15" stroke-width="1" stroke="#fff" :fill="getColor('申请文件定稿',6)" />
+          <text :x="getNumber('申请文件定稿',6) > 9 ? '170' : '175'" y="85" fill="#fff">{{ getNumber('申请文件定稿',6,'file') }}</text>
           <line x1="0" y1="60" x2="-150" y2="60" stroke='#333'></line>
         </g>
         <polygon points="-150,55,-160,60,-150,65"></polygon>
       </g>
+
+
       <g transform="translate(1080,200)" class="svgG" @click="toDrawer('说明书规划撰写', 7)">
-        <rect width="200" height="120" :fill="getColor('说明书规划撰写')"> </rect>
+        <rect width="200" height="120" :fill="getColor('说明书规划撰写',7)"> </rect>
         <text x="15" y="65" xml:space='preserve'>说明书规划撰写
         </text>
-        <circle cx="150" cy="60" r="15" stroke-width="1" stroke="#fff" :fill="getColor('说明书规划撰写')" />
-        <text x="145" y="65" fill="#fff">{{ getNumber('说明书规划撰写') }}</text>
+        <g>
+          <text x="120" y="45">任务：</text>
+          <circle cx="180" cy="40" r="15" stroke-width="1" stroke="#fff" :fill="getColor('说明书规划撰写',7)" />
+          <text :x="getNumber('说明书规划撰写',7) > 9 ? '170' : '175'" y="45" fill="#fff">{{ getNumber('说明书规划撰写',7,'task') }}</text>
+        </g>
+        <g>
+          <text x="120" y="85">文件：</text>
+          <circle cx="180" cy="80" r="15" stroke-width="1" stroke="#fff" :fill="getColor('说明书规划撰写',7)" />
+          <text :x="getNumber('说明书规划撰写',7) > 9 ? '170' : '175'" y="85" fill="#fff">{{ getNumber('说明书规划撰写',7,'file') }}</text>
+        </g>
       </g>
     </svg>
 
@@ -114,16 +180,16 @@ export default {
     }
   },
   computed: {},
-  mounted() {
-
+  async mounted() {
+    // await this.getFileNumber()
   },
   methods: {
     // 获取流程节点及相对应的文件
-    getFileNumber() {
+    async getFileNumber() {
       let params = {
         id: this.id,
       }
-      this.$api.query(params).then(response => {
+      await this.$api.query(params).then(response => {
         if (response.code == 200) {
           this.numObj = response.data
         }

src/views/patentMining/components/fileMessage.vue

@@ -130,7 +130,7 @@ export default {
     }
   },
   watch: {
-    pathObj(val) {
+    pathObjCopy(val) {
       if (val) {
         this.getList()
       }

src/views/project/patentCollection/components/views/Picture.vue

@@ -13,7 +13,7 @@
               <el-link :disabled="!$permission('/workspace/details')"
                 :class="$permission('/workspace/details') ? '' : 'jinzhi'" :type="item.read === 1 ? 'success' : 'danger'"
                 @click.native.prevent="handleLink(item)">
-                <span v-html="getViewDom(item,'patentNo')"></span>
+                <span v-html="getView(item,'patentNo')"></span>
               </el-link>
 
             </el-checkbox> </span>