Merge branch 'dev' into 'master'

版本更新

See merge request !37

src/views/production/AssistantManage.vue

@@ -85,7 +85,6 @@
           <el-upload
           <el-upload
             action
             action
             :http-request="handleCustom"
             :http-request="handleCustom"
-            :limit="1"
             :multiple="false"
             :multiple="false"
             :on-change="handleChange"
             :on-change="handleChange"
             :on-remove="handleRemove"
             :on-remove="handleRemove"
@@ -192,29 +191,38 @@ export default {
     tableColumns() {
     tableColumns() {
       return [
       return [
         {
         {
+          label: '版本号',
+          key: 'version',
+          width: '100'
+        },
+        {
           label: '更新标题',
           label: '更新标题',
           key: 'title',
           key: 'title',
           width: ''
           width: ''
         },
         },
-        {
-          label: '版本号',
-          key: 'version',
-          width: '80'
-        },
+
         {
         {
           label: '更新内容',
           label: '更新内容',
           key: 'content',
           key: 'content',
           width: ''
           width: ''
         },
         },
         {
         {
-          label: ' 是否强制更新',
+          label: '是否强制更新',
           key: 'forcedUpdate',
           key: 'forcedUpdate',
-          width: '100',
+          width: '140',
           render: item => {
           render: item => {
             return item.forcedUpdate === 1 ? '是' : '否'
             return item.forcedUpdate === 1 ? '是' : '否'
           }
           }
         },
         },
         {
         {
+          label: '是否全量更新',
+          key: 'forcedUpdate',
+          width: '140',
+          render: item => {
+            return item.fullUpdate === 1 ? '是' : '否'
+          }
+        },
+        {
           label: '应用软件名称',
           label: '应用软件名称',
           key: 'businessType',
           key: 'businessType',
           width: '100',
           width: '100',