Merge branch 'dev' into 'master'

Dev

See merge request !84

xichongSys/src/utils/global.js

-//ww
-//  export const baseUrl = 'http://xc.rensheju.com'
+/**
+ * 全局常量、方法封装模块
+ * 通过原型挂载到Vue属性
+ * 通过 this.Global 调用
+ */
+
+// 后台管理系统服务器地址
 // export const baseUrl2 = 'http://xclc.rensheju.com'
-export const baseUrl = 'http://172.16.10.33:9002'
-export const baseUrl2 = 'http://172.16.10.25:9007'
+//export const baseUrl = 'http://xc.rensheju.com'
+export const baseUrl2 = 'http://xclc.rensheju.com'
+export const baseUrl = 'http://xc.rensheju.com'
+//export const baseUrl = 'http://172.16.10.33:9002'
 
+//  export const baseUrl = 'http://xc.rensheju.com'
+//  export const baseUrl2 = 'http://xclc.rensheju.com'
 
 export default {
     baseUrl,

xichongSys/src/views/Myvue/interact.vue

@@ -12,6 +12,15 @@
         <el-form-item label="描述" prop = "remark">
           <el-input type = "textarea" :rows="8"  placeholder="请输入内容 " v-model="pushForm.remark"></el-input>
         </el-form-item>
+        <el-form-item label="下发乡镇" prop = "toType" align="left">
+          <el-switch
+            v-model="pushForm.toType"
+            active-color="#13ce66" inactive-color="#ff4949"
+            active-text = "是" inactive-text="否"
+            :inactive-value = "2" :active-value = "3"
+            >
+          </el-switch><span style="margin-left: 20px;font-size: 5px">注意：下发乡镇文件必须按照固定模板格式</span>
+        </el-form-item>
         <el-form-item label="附件上传" prop = "file">
           <el-upload
             ref="upload"
@@ -23,6 +32,7 @@
           >
             <el-button slot="trigger" size="small"  class = "el-icon-upload2" type="success" >选取文件</el-button><span style="margin-left: 10px" class="el-upload__tip">不能超过10Mb</span>
           </el-upload>
+
         </el-form-item>
         <el-form-item size="large">
           <el-button size = "mini" type = "primary" @click = "upload('pushForm')">立即发布</el-button>